- langpacks/english: update;

- langpacks/russian: update;






git-svn-id: http://svn.miranda-ng.org/main/trunk@9504 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

9 files changed, 20 insertions, 39 deletions

diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index 4cdf737bcd..426b82957e 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -129,15 +129,15 @@
 [Settings]

 ;file \plugins\DbEditorPP\src\deletemodule.cpp

 [Are you sure you want to delete module "%s"?]

-[Confirm Module Deletion]

-[Delete module from Database]

-[Delete module from Database... Loading]

-[Delete module from all contacts (Includes Setting)]

+[Confirm module deletion]

+[Delete module from database]

+[Delete module from database... Loading]

+[Delete module from all contacts (including Setting)]

 ;file \plugins\DbEditorPP\src\exportimport.cpp

 [INI Files]

 [All Files]

 [Export to file]

-[Error Loading Module List]

+[Error loading module list]

 [Couldn't open file for writing]

 [Import from files]

 ;file \plugins\DbEditorPP\src\findwindow.cpp

@@ -150,6 +150,7 @@
 [%s Setting "%s" in module "%s" in contact "%s" - "%s"]

 [%s Setting "%s" in module "%s" in contact "%s"]

 [%s "%s" in Setting "%s" in module "%s" in contact "%s"]

+[Error Loading Module List]

 [Searching...]

 [Error Loading Setting List]

 [Finished. %d items were found, %d items were deleted.]

@@ -181,7 +182,6 @@
 [Loading contacts...]

 [Loading modules...]

 [Module tree not found]

-[Error loading module list]

 [Contacts]

 [HANDLE]

 [Add module to contact "%s"]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 3b05f4a1cd..800d2ee71f 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -139,6 +139,7 @@
 [Newsfeed]

 [Friendship details]

 [Conversation]

+[Message read]

 [Visit profile]

 [Visit friendship details]

 [Visit conversation]

diff --git a/langpacks/english/Plugins/NotifyAnything.txt b/langpacks/english/Plugins/NotifyAnything.txt
index e8aeb0c95c..88e7b9e361 100644
--- a/langpacks/english/Plugins/NotifyAnything.txt
+++ b/langpacks/english/Plugins/NotifyAnything.txt
@@ -23,16 +23,6 @@
 ;file \plugins\NotifyAnything\src\common.h

 [NotifyAnything]

 ;file \plugins\NotifyAnything\src\main.cpp

-[No resource name given.]

-[Could not find the requested icon.]

-[Application launching is disabled.]

-[Unterminated option.]

-[No argument given to msg option.]

-[ID is required for replacement.]

-[Invalid argument for replace option: ]

-[Empty message ignored.]

-[Failed to write to log file.]

-[Failed to open log file.]

 [N/A: Failed to format error message]

 [N/A: FormatMessage failed, error code was 0x]

 [Error]

diff --git a/langpacks/english/Plugins/Omegle.txt b/langpacks/english/Plugins/Omegle.txt
index 41f57fb541..1c08a0ec44 100644
--- a/langpacks/english/Plugins/Omegle.txt
+++ b/langpacks/english/Plugins/Omegle.txt
@@ -41,8 +41,8 @@
 [Stranger 2]

 [Stranger]

 [You and the Stranger both like: ]

-[Stranger is typing.]

-[Stranger stopped typing.]

+[%s is typing.]

+[%s stopped typing.]

 [%s disconnected.]

 [Recaptcha is required.\nOpen http://omegle.com , solve Recaptcha and try again.]

 [Error: ]

diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index dcfa063231..73a318aa96 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SendSS.dll

 ;  Plugin: Send ScreenShot+

-;  Version: 0.8.5.1

+;  Version: 0.8.5.2

 ;  Authors: Merlin

 ;============================================================

 [Take a screenshot and send it to a contact.]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index a904ba7b5c..c7fe1e05f8 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: TabSRMM.dll

 ;  Plugin: TabSRMM

-;  Version: 3.3.0.3

+;  Version: 3.3.1.2

 ;  Authors: The Miranda developers team and contributors

 ;============================================================

 [IM and group chat module for Miranda NG.]

@@ -823,15 +823,18 @@
 [Change skin]

 ;file \plugins\TabSRMM\src\translator.cpp

 [Message window tweaks]

+[Display metacontact icons]

 [Error feedback]

 [Show skinnable tooltip in chat (Tipper plugin required)]

 [Enable typing sounds]

 [Disable animated GIF avatars (will not affect already open message windows)]

 [Close current tab on send]

-[Disable error popups on sending failures]

 [Automatic keyboard layout: Do not load the system default for new contacts]

 [Enable unattended send (experimental feature, required for multisend and send later) (*)]

 [Show client description in info panel]

+[On tab control]

+[On the button bar]

+[Disable error popups on sending failures]

 [Show a preview of the event]

 [Don't announce event when message dialog is open]

 [Don't announce events from RSS protocols]

diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt
index f61e3ea5f9..0ea905cd89 100644
--- a/langpacks/english/Plugins/Tlen.txt
+++ b/langpacks/english/Plugins/Tlen.txt
@@ -140,7 +140,7 @@
 [Forwarding]

 [SOCKS4]

 [SOCKS5]

-[%s mail]

+[%S mail]

 ;file \protocols\Tlen\src\tlen_picture.cpp

 [Image sent file://%s]

 [Image received file://%s]

@@ -156,6 +156,7 @@
 [E-mail]

 [An alert has been received.]

 [Private conference]

+[%s mail]

 [Subject]

 ;file \protocols\Tlen\src\tlen_userinfo.cpp

 [Account]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index cf9727fe4c..4d669c7fb2 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -50,7 +50,7 @@
 [Phone can receive SMS text messages]

 [Add e-mail]

 [Enter your full e-mail address.\n(e.g., john.doe@provider.com)]

-[Enter a representitive name for the e-mail address here:]

+[Enter a representative name for the e-mail address here:]

 [Enter the e-mail address here:]

 [Show menu items]

 [Remind me]

@@ -327,9 +327,8 @@
 [Export/import group]

 [&Export group]

 [&Import group]

-[export/import]

-[&export]

-[&import]

+[&Export xml]

+[&Import xml]

 ;file \plugins\UserInfoEx\src\psp_about.cpp

 [My notes:]

 [About:]

@@ -367,7 +366,6 @@
 [Interest]

 [Sorry, but there is a problem with adding a new item of type "%s"]

 [<empty>]

-[Add affliation]

 [Edit category]

 [Edit value]

 [Delete an entry]

@@ -571,7 +569,6 @@
 ;file \plugins\UserInfoEx\src\svc_phone.cpp

 [Phone (uinfoex)]

 ;file \plugins\UserInfoEx\src\svc_refreshci.cpp

-[Refresh Contact Details]

 [[b]%s (%S)...[/b]\n%d Contacts remaning]

 [Abort Refreshing Contact Details]

 [Do you want to cancel the current refresh procedure?]

@@ -646,4 +643,3 @@
 ;file \plugins\UserInfoEx\src\Flags\svc_flags.cpp

 [Flags (uinfoex)]

 ;file \plugins\UserInfoEx\src\Flags\svc_flagsicons.cpp

-[Country Flags]

diff --git a/langpacks/english/Plugins/XSoundNotify.txt b/langpacks/english/Plugins/XSoundNotify.txt
index 43e385159f..b75270088a 100644
--- a/langpacks/english/Plugins/XSoundNotify.txt
+++ b/langpacks/english/Plugins/XSoundNotify.txt
@@ -24,15 +24,5 @@
 [Sounds]

 [XSound Notify]

 ;file \plugins\XSoundNotify\src\xsn_main.cpp

-[Offline]

-[Online]

-[Away]

-[Do Not Disturb]

-[Not Available]

-[Occupied]

-[Free For Chat]

-[Invisible]

-[On The Phone]

-[Out To Lunch]

 [Self status]

 [Custom contact sound]