english langpack update; russian langpack update

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

18 files changed, 51 insertions, 24 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]

diff --git a/langpacks/russian/Plugins/CryptoPP.txt b/langpacks/russian/Plugins/CryptoPP.txt
index e42ec05115..f236b82e9a 100644
--- a/langpacks/russian/Plugins/CryptoPP.txt
+++ b/langpacks/russian/Plugins/CryptoPP.txt
@@ -15,5 +15,7 @@
 ID пользователя

 [Cancel]

 Отмена

+[GnuPG Plugin - Select public key]

+Плагин GnuPG - Выбрать открытый ключ

 [Refresh]

 Обновить

diff --git a/langpacks/russian/Plugins/DbChecker.txt b/langpacks/russian/Plugins/DbChecker.txt
index eea24abcdc..14806bcbbe 100644
--- a/langpacks/russian/Plugins/DbChecker.txt
+++ b/langpacks/russian/Plugins/DbChecker.txt
@@ -127,6 +127,8 @@
 Активировано восстановление работоспособности базы

 [<check only>]

 <только проверить>

+[ (Output).dat]

+ (Выходной).dat

 [Can't create output file (%u)]

 Невозможно создать файл на выходе (%u)

 [Processing aborted by user]

diff --git a/langpacks/russian/Plugins/Dbx_mmap.txt b/langpacks/russian/Plugins/Dbx_mmap.txt
index 3973a90282..146eddc033 100644
--- a/langpacks/russian/Plugins/Dbx_mmap.txt
+++ b/langpacks/russian/Plugins/Dbx_mmap.txt
@@ -53,6 +53,8 @@ Miranda нашла повреждения в вашей базе. Они мог�
 Конвертирование базы

 [Change/remove password]

 Изменить/удалить пароль

+[Logo]

+Логотип

 [Password]

 Пароль

 [Too many errors!]

@@ -146,6 +148,4 @@ Miranda нашла повреждения в вашей базе. Они мог�
 [User corrupted, this could cause major problems]

 Пользователь повреждён, это может быть серьезной проблемой

 [More than one user contact: keeping only first]

-Больше чем один контакт пользователя: сохраняем только первый

-[Logo]

-Логотип
\ No newline at end of file
+Больше чем один контакт пользователя: сохраняем только первый
\ No newline at end of file
diff --git a/langpacks/russian/Plugins/HistorySweeperLight.txt b/langpacks/russian/Plugins/HistorySweeperLight.txt
index 06adef4383..9b19fcee00 100644
--- a/langpacks/russian/Plugins/HistorySweeperLight.txt
+++ b/langpacks/russian/Plugins/HistorySweeperLight.txt
@@ -53,6 +53,8 @@
 Сохранить 20 последних событий

 [Keep 50 last events]

 Сохранить 50 последних событий

+[Default Action]

+Действие по умолчанию

 [Delete All]

 Удалить все

 [*** Defaut Action ***]

diff --git a/langpacks/russian/Plugins/NoHistory.txt b/langpacks/russian/Plugins/NoHistory.txt
index 60a002c3a4..30095fe0a6 100644
--- a/langpacks/russian/Plugins/NoHistory.txt
+++ b/langpacks/russian/Plugins/NoHistory.txt
@@ -21,6 +21,8 @@
 Отключить историю

 [History Enabled]

 История включена

+[History Disabled]

+История выключена

 [Disable]

 Выключить

 [Enable]

diff --git a/langpacks/russian/Plugins/StopSpam.txt b/langpacks/russian/Plugins/StopSpam.txt
index b8291ddf2e..f328b31bb3 100644
--- a/langpacks/russian/Plugins/StopSpam.txt
+++ b/langpacks/russian/Plugins/StopSpam.txt
@@ -53,6 +53,8 @@
 Нет больше спама! Роботы отдыхают!\r\n\r\nЭтот плагин работает просто:\r\nВ то время как сообщения от пользователей в вашем списке приходят без проверки на спам, сообщения от неизвестных пользователей вам не доставляются. Но они не игнорируются, плагин отвечает простым вопросом, и если пользователь дает правильный ответ, плагин добавляет его в список, для того чтобы он мог связаться с вами.

 [StopSpam automatic message:\r\n]

 Сообщение антиспама:\r\n

+[Not In List]

+Не в списке

 [Complete]

 Готово

 [Remove Temporary Contacts]

diff --git a/langpacks/russian/Plugins/Watrack_MPD.txt b/langpacks/russian/Plugins/Watrack_MPD.txt
index 6c4965ebd1..c6e00a9f77 100644
--- a/langpacks/russian/Plugins/Watrack_MPD.txt
+++ b/langpacks/russian/Plugins/Watrack_MPD.txt
@@ -7,6 +7,8 @@
 ;============================================================

 [Music Player Daemon support for Watrack.]

 Поддержка Music Player Daemon для плагина Watrack.

+[MPD Host]

+MPD хост

 [Port]

 Порт

 [Password]

@@ -17,3 +19,5 @@
 Сейчас играет (WATrack)

 [Plugins]

 Плагины

+[Watrack MPD]

+MPD для плагина Watrack
\ No newline at end of file
diff --git a/langpacks/russian/Plugins/WhoUsesMyFiles.txt b/langpacks/russian/Plugins/WhoUsesMyFiles.txt
index d435e8e911..fc0527f815 100644
--- a/langpacks/russian/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/russian/Plugins/WhoUsesMyFiles.txt
@@ -53,8 +53,6 @@ WUMF: Текущие соединения
 Будут доступны в следующей версии

 [Show current connections]

 Показать соединения

-[ID]

-ID

 [User]

 Пользователь

 [File]

@@ -77,13 +75,17 @@ ID
 Включить WUMF окна

 [Disable WUMF popups]

 Выключить WUMF окна

+[Common Dialog Error 0x%lx]

+Ошибка диалога 0x%lx

 [Not implemented yet...]

 Еще не реализовано...

 [Show connections list]

 Показать список подключений

+[Who uses my files]

+Используемые файлы

 [Services]

 Службы

 [Popups]

 Всплывающие окна

 [WUMF: Show connections]

-WUMF: Показать подключения

+WUMF: Показать подключения
\ No newline at end of file
diff --git a/langpacks/russian/Plugins/YARelay.txt b/langpacks/russian/Plugins/YARelay.txt
index 31d7859768..230620ac74 100644
--- a/langpacks/russian/Plugins/YARelay.txt
+++ b/langpacks/russian/Plugins/YARelay.txt
@@ -61,3 +61,5 @@
 !НЕ ПЕРЕСЫЛАТЬ!

 [Message Sessions]

 Беседы

+[Messages forwarding]

+Пересылка сообщений
\ No newline at end of file
diff --git a/langpacks/russian/Untranslated/SendSS.txt b/langpacks/russian/Untranslated/SendSS.txt
index 8fabd79a2b..316368675e 100644
--- a/langpacks/russian/Untranslated/SendSS.txt
+++ b/langpacks/russian/Untranslated/SendSS.txt
@@ -2,7 +2,10 @@
 [%s\nv%s]

 [Target Tool]

 [Result]

+[Thumbnail]

 [Resulting URL from\n]

+[Copy BBCode]

+[Copy BBCode w/ link]

 [%s requires a valid contact!]

 [GCHAT error]

 [Unable to initiate %s.]

@@ -25,14 +28,16 @@
 [The user canceled one of the dialog boxes]

 [FTPFile transfer]

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

-[HTTPServer transfer]

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

 [Image upload]

 [Upload server did not respond timely.]

+[HTTPServer transfer]

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

 [SendScreenshot - Error]

 [Fatal error, image services not found. Send Screenshot will be disabled.]

 [Could not register Miranda service.]

 [Could not create Screenshot folder (error code: %d):\n%s\nDo you have write permissions?]

+[BBC]

+[BBC link]

 [Send screenshot to\n]

 [<Entire Desktop>]

 [Monitor]

@@ -40,6 +45,9 @@
 [<Only save>]

 [Dropbox]

 [ImageShack]

+[Upload Pie (30m)]

+[Upload Pie (1d)]

+[Upload Pie (1w)]

 [Fill description textbox.]

 [Delete after send]

 [Capture]