- langpacks/english: update;

- langpacks/russian: update;

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

11 files changed, 3 insertions, 16 deletions

diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt
index 697dd4d997..0ca4687317 100644
--- a/langpacks/english/Plugins/AIM.txt
+++ b/langpacks/english/Plugins/AIM.txt
@@ -176,7 +176,6 @@
 [Your account has already been confirmed.]

 [Can't start the confirmation procedure.]

 ;file \protocols\AimOscar\src\theme.cpp

-[ICQ]

 [Block]

 [Profile]

 [AOL Mail]

diff --git a/langpacks/english/Plugins/BossKey.txt b/langpacks/english/Plugins/BossKey.txt
index 8cf2d8be0b..ad15b0d714 100644
--- a/langpacks/english/Plugins/BossKey.txt
+++ b/langpacks/english/Plugins/BossKey.txt
@@ -21,7 +21,6 @@
 [Hotkey]

 [Password:]

 [Cancel]

-[EN]

 [Workstation is locked]

 [Screen Saver is running]

 [Windows is inactive]

diff --git a/langpacks/english/Plugins/ChangeKeyboardLayout.txt b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
index 0e517d4a22..1fee43ee34 100644
--- a/langpacks/english/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
@@ -18,7 +18,6 @@
 [Copy result to clipboard]

 [Show result in Popup]

 [Strings for keyboard layouts]

-[EN]

 [Default]

 [Invert current state]

 [Switch off]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 703370127a..22008b7c75 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -17,7 +17,6 @@
 [Enter a password for UIN %d:]

 [Remember this session password]

 [Cancel]

-[ICQ]

 [ICQ number:]

 [Hint: If you don't enter your password here, Miranda will ask for the password everytime you try to go online.]

 [Retrieve a lost password or ICQ number]

@@ -206,7 +205,6 @@
 ;file \protocols\IcqOscarJ\src\icq_avatar.cpp

 [Error uploading avatar to server, server temporarily unavailable.]

 [Error uploading avatar to server, server refused to accept the image.]

-;file \protocols\IcqOscarJ\src\icq_constants.h

 ;file \protocols\IcqOscarJ\src\icq_fieldnames.cpp

 [Afghanistan]

 [Albania]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 9000d7d641..9adb9d89e6 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -27,7 +27,6 @@
 [Upload]

 [Import from file]

 [Export to file]

-[Jabber]

 [Username:]

 [Change password]

 [Priority:]

diff --git a/langpacks/english/Plugins/SMS.txt b/langpacks/english/Plugins/SMS.txt
index fa8cd3a646..1e0a66ff1e 100644
--- a/langpacks/english/Plugins/SMS.txt
+++ b/langpacks/english/Plugins/SMS.txt
@@ -17,7 +17,6 @@
 [Send SMS]

 [To:]

 [Add number to list]

-[&H]

 [Save number]

 [Multiple >>]

 [Enter message:]

diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index b420a8284c..9726802336 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -27,9 +27,9 @@
 [Credits >]

 [&Close]

 [Edit]

-[C&lient Area]

 [Caption:]

 [Size (HxW):]

+[C&lient Area]

 [Target Tool]

 [Result]

 [&Copy]

@@ -100,8 +100,6 @@
 [Target Cursor]

 [Target Desktop]

 [Default]

-[Overlay on]

-[Overlay off]

 [Help]

 [Open Folder]

 [Description off]

@@ -111,7 +109,6 @@
 [Prev]

 [Next]

 [Update]

-[Apply]

 [Down arrow]

 ;file \plugins\SendScreenshotPlus\src\mir_icolib.h

 [Buttons]

diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt
index d77a1da982..117e434be5 100644
--- a/langpacks/english/Plugins/WhatsApp.txt
+++ b/langpacks/english/Plugins/WhatsApp.txt
@@ -18,7 +18,6 @@
 [Paste password from WART utility]

 [Use WART utility from Plugins folder for registering your number and generating password]

 [Use SSL connection (443 port)]

-[WhatsApp]

 [Cancel]

 ;file \protocols\WhatsApp\src\connection.cpp

 [Please enter a country-code.]

diff --git a/langpacks/english/Plugins/XSoundNotify.txt b/langpacks/english/Plugins/XSoundNotify.txt
index 55bda874ad..b75270088a 100644
--- a/langpacks/english/Plugins/XSoundNotify.txt
+++ b/langpacks/english/Plugins/XSoundNotify.txt
@@ -15,7 +15,6 @@
 [Test play]

 [Reset]

 [Ignore sound for this contact]

-[XSoundNotify]

 [Cancel]

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

 [Custom sound for %s (%s)]

diff --git a/langpacks/english/Plugins/YARelay.txt b/langpacks/english/Plugins/YARelay.txt
index bd35db4dc6..ebefe7aab2 100644
--- a/langpacks/english/Plugins/YARelay.txt
+++ b/langpacks/english/Plugins/YARelay.txt
@@ -34,5 +34,5 @@
 ;file \plugins\YARelay\src\options.cpp

 [!EVERYONE!]

 [!DON'T FORWARD!]

-[Plugins]

-[yaRelay]

+[Message Sessions]

+[Messages forwarding]

diff --git a/langpacks/english/Plugins/wbOSD.txt b/langpacks/english/Plugins/wbOSD.txt
index 7987e465d9..ecb009b3a6 100644
--- a/langpacks/english/Plugins/wbOSD.txt
+++ b/langpacks/english/Plugins/wbOSD.txt
@@ -37,4 +37,3 @@
 [Help]

 [Miranda NG is great and this is a long message.]

 [Plugins]

-[OSD]