english langpack update; russian langpack update

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

8 files changed, 17 insertions, 16 deletions

diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index 6a8efe824a..2bc60fdbd0 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -8,7 +8,6 @@
 [Provides Miranda database support: global settings, contacts, history, settings per contact.]

 ;file \plugins\Db3x_mmap\res\db3x_mmap.rc

 [Login to Miranda NG]

-[EN]

 [Cancel]

 [New password]

 [Please enter your new password]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 7770bb1072..377a4e614e 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -108,7 +108,6 @@
 [Message read: %s by %s]

 [Message read: %s]

 [This message is no longer available, because it was marked as abusive or spam.]

-[%s and more (%d)]

 ;file \protocols\FacebookRM\src\messages.cpp

 [You cannot send messages when you are offline.]

 ;file \protocols\FacebookRM\src\process.cpp

diff --git a/langpacks/english/Plugins/NewEventNotify.txt b/langpacks/english/Plugins/NewEventNotify.txt
index c30b51e2a1..35c945dff9 100644
--- a/langpacks/english/Plugins/NewEventNotify.txt
+++ b/langpacks/english/Plugins/NewEventNotify.txt
@@ -47,8 +47,6 @@
 [Contacts]

 [You were added!]

 [Requests your authorization]

-[ICQ Web pager]

-[ICQ Email express]

 [SMS Message]

 [SMS Confirmation]

 [Unknown Event]

diff --git a/langpacks/english/Plugins/SMS.txt b/langpacks/english/Plugins/SMS.txt
index 1e0a66ff1e..92e8448e58 100644
--- a/langpacks/english/Plugins/SMS.txt
+++ b/langpacks/english/Plugins/SMS.txt
@@ -21,7 +21,6 @@
 [Multiple >>]

 [Enter message:]

 [Chars:]

-[%d/160]

 [&Send]

 [SMS Message Didn't Send]

 [&Try again]

@@ -65,7 +64,6 @@
 [Invalid phone number]

 [<< Single]

 ;file \plugins\SMS\src\SMSConstans.h

-[SMS]

 [Send &SMS...]

 [&SMS Message]

 ;file \plugins\SMS\src\SMS_svc.cpp

diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index 885a419fd0..8e0f61a02e 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -37,7 +37,6 @@
 [Reset colors]

 [Last seen plugin]

 [You missed following contacts:]

-[Test\nTest]

 [Alert when user status changes]

 ;file \plugins\SeenPlugin\src\history.cpp

 [last seen history]

diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index 9726802336..99454cd9fd 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.3.1

+;  Version: 0.8.4.0

 ;  Authors: Merlin

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

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

@@ -32,10 +32,14 @@
 [C&lient Area]

 [Target Tool]

 [Result]

+[Thumbnail]

 [&Copy]

 [Close]

 ;file \plugins\SendScreenshotPlus\src\CSend.cpp

 [Resulting URL from\n]

+[Copy]

+[Copy BBCode]

+[Copy BBCode w/ link]

 [%s requires a valid contact!]

 [Error]

 [GCHAT error]

@@ -67,13 +71,14 @@
 ;file \plugins\SendScreenshotPlus\src\CSendFTPFile.cpp

 [FTPFile transfer]

 [%s (%i):\nCould not add a share to the FTP File plugin.]

+;file \plugins\SendScreenshotPlus\src\CSendHost_uploadpie.cpp

+[Image upload]

+[Upload server did not respond timely.]

 ;file \plugins\SendScreenshotPlus\src\CSendHTTPServer.cpp

 [HTTPServer transfer]

 [Could not start the HTTP Server plugin.]

 [%s (%i):\nCould not add a share to the HTTP Server plugin.]

 ;file \plugins\SendScreenshotPlus\src\CSendImageShack.cpp

-[Image upload]

-[Upload server did not respond timely.]

 ;file \plugins\SendScreenshotPlus\src\dlg_msgbox.cpp

 [Retry]

 [Yes]

@@ -109,6 +114,8 @@
 [Prev]

 [Next]

 [Update]

+[BBC]

+[BBC link]

 [Down arrow]

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

 [Buttons]

@@ -131,6 +138,9 @@
 [FTP File]

 [Dropbox]

 [ImageShack]

+[Upload Pie (30m)]

+[Upload Pie (1d)]

+[Upload Pie (1w)]

 [Information]

 [Fill description textbox.]

 [Delete after send]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 5f61978dbc..ec47cc8650 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -246,7 +246,7 @@
 [milliseconds]

 [Help on containers]

 [Windows Aero settings]

-[Use Aero UI elements(only when not using a custom skin)]

+[Use Aero UI elements (only when not using a custom skin)]

 [Use Windows 7 task bar enhancements (restart required)]

 [Popups]

 [...is &typing]

@@ -522,7 +522,7 @@
 [There are %d pending send jobs. Message length: %d bytes, message length limit: %d bytes\n\n%d messages are queued for later delivery]

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

 [One of your popup actions is set to DISMISS EVENT.\nNote that this options may have unwanted side effects as it REMOVES the event from the unread queue.\nThis may lead to events not showing up as "new". If you don't want this behavior, please review the Event Notifications settings page.]

-[tabSRMM Warning Message]

+[TabSRMM warning message]

 [Incoming file]

 [No description given]

 [Incoming file (invalid format)]

@@ -921,7 +921,6 @@
 [Closing Window|You are about to close a window with multiple tabs open.\n\nProceed?]

 [Closing options dialog|To reflect the changes done by importing a theme in the options dialog, the dialog must be closed after loading a theme \\b1 and unsaved changes might be lost\\b0 .\n\nDo you want to continue?]

 [Loading a theme|Loading a color and font theme can overwrite the settings defined by your skin.\n\nDo you want to continue?]

-[TabSRMM warning message]

 ;file \plugins\TabSRMM\src\chat\colorchooser.cpp

 [Text color]

 ;file \plugins\TabSRMM\src\chat\log.cpp

@@ -989,7 +988,7 @@
 [* Message Input Area]

 [* Status changes]

 [* Dividers]

-[* Error and warning Messages]

+[* Error and warning messages]

 [* Symbols (incoming)]

 [* Symbols (outgoing)]

 [Nickname]

diff --git a/langpacks/english/Plugins/WhoUsesMyFiles.txt b/langpacks/english/Plugins/WhoUsesMyFiles.txt
index 9578bd6757..e3787dba3f 100644
--- a/langpacks/english/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/english/Plugins/WhoUsesMyFiles.txt
@@ -31,7 +31,6 @@
 [Disabled options will be available in the next version]

 [Show current connections]

 ;file \plugins\WhoUsesMyFiles\src\wumf.cpp

-[ID]

 [User]

 [File]

 [Access]

@@ -47,7 +46,7 @@
 [Common Dialog Error 0x%lx]

 [Not implemented yet...]

 [Show connections list]

-[Wumf]

+[Who uses my files]

 [Services]

 [Popups]

 [WUMF: Show connections]