- langpacks/english: update;

- langpacks/russian: update;





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

12 files changed, 160 insertions, 13 deletions

diff --git a/langpacks/russian/Plugins/Dbx_mmap.txt b/langpacks/russian/Plugins/Dbx_mmap.txt
index 968403da3f..bcb5a72e0c 100644
--- a/langpacks/russian/Plugins/Dbx_mmap.txt
+++ b/langpacks/russian/Plugins/Dbx_mmap.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Dbx_mmap.dll

 ;  Plugin: Miranda NG mmap database driver

-;  Version: 0.95.0.2

+;  Version: 0.95.0.3

 ;  Authors: Miranda-NG project

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

 [Provides Miranda database support: global settings, contacts, history, settings per contact.]

diff --git a/langpacks/russian/Plugins/Dropbox.txt b/langpacks/russian/Plugins/Dropbox.txt
new file mode 100644
index 0000000000..af9e368475
--- /dev/null
+++ b/langpacks/russian/Plugins/Dropbox.txt
@@ -0,0 +1,45 @@
+#muuid {b908773a-86f7-4a91-8674-6a20ba0e67d1}

+;============================================================

+;  File: Dropbox.dll

+;  Plugin: Dropbox

+;  Version: 0.11.0.1

+;  Authors: unsane

+;============================================================

+[Provides ability to upload files on Dropbox.]

+Плагин загрузки и пересылки файлов на сервис Dropbox.

+[You have been authorized]

+Авторизация прошла успешно

+[Are you sure you want to request athorization?]

+Вы уверены, что хотите запросить авторизацию?

+[Request athorization]

+Запросить авторизацию

+[Send files to Dropbox]

+Файл через Dropbox

+[Network]

+Сеть

+[Protocols]

+Протоколы

+[Protocol icon]

+Значок протокола

+[Request Authorization]

+Запросить авторизацию

+[Server does not respond]

+Нет ответа от сервера

+[Link to download file "%s": %s]

+Ссылка для закачки файла "%s": %s

+[Link to download folder "%s": %s]

+Ссылка для закачки папки "%s": %s

+[Bad input parameter. Error message should indicate which one and why]

+Неправильный параметр ввода. Сообщение об ошибке должно указывать что пошло не так и почему

+[Bad or expired token. This can happen if the user or Dropbox revoked or expired an access token. To fix, you should re-authenticate the user]

+Неисправный или просроченный токен. Возможно пользователь или Dropbox отозвал токен. Чтобы исправить это - авторизуете заново пользователя

+[Bad OAuth request (wrong consumer key, bad nonce, expired timestamp...). Unfortunately, re-authenticating the user won't help here]

+Неудачный запрос OAuth (неправильный ключ, плохой криптографический код, просроченные временные метки...). К сожалению, повторная авторизация пользователя не поможет в данном случае

+[File or folder not found at the specified path]

+Файл или папка не были найдены по указанному пути

+[Request method not expected (generally should be GET or POST)]

+Непредвиденный метод запроса (обычно должен быть GET, а не POST)

+[User is over Dropbox storage quota]

+Пользователь превысил квоту, выделенную ему сервисом Dropbox

+[Unknown]

+Неизвестно

diff --git a/langpacks/russian/Plugins/NewAwaySys.txt b/langpacks/russian/Plugins/NewAwaySys.txt
index c401985bb5..e02ef14bf3 100644
--- a/langpacks/russian/Plugins/NewAwaySys.txt
+++ b/langpacks/russian/Plugins/NewAwaySys.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: NewAwaySys.dll

 ;  Plugin: New Away System Mod

-;  Version: 0.4.0.1

+;  Version: 0.4.0.2

 ;  Authors: NightFox, Deathdemon, XF007, Goblineye Entertainment

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

 [New Away System Mod plugin for Miranda NG.]

@@ -109,6 +109,8 @@
 Новая категория

 [Delete]

 Удалить

+[Status messages:]

+Сообщения статуса:

 [Wait]

 Ждать

 [seconds before closing the status message dialog (-1=don't close)]

@@ -203,6 +205,8 @@ Windows
 ** Все контакты **

 [** Not-on-list contacts **]

 ** Контакты не в списке **

+[Status messages]

+Сообщения статуса

 [Main options]

 Основные настройки

 [Autoreply]

diff --git a/langpacks/russian/Plugins/StartupStatus.txt b/langpacks/russian/Plugins/StartupStatus.txt
index 652c7cd228..c2f027c451 100644
--- a/langpacks/russian/Plugins/StartupStatus.txt
+++ b/langpacks/russian/Plugins/StartupStatus.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: StartupStatus.dll

 ;  Plugin: StartupStatus

-;  Version: 0.8.0.46

+;  Version: 0.8.0.47

 ;  Authors: P Boon

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

 [StartupStatus, allows you to define the status Miranda should set on startup, configurable per protocol.]

diff --git a/langpacks/russian/Untranslated/=CORE=.txt b/langpacks/russian/Untranslated/=CORE=.txt
index eae0c3cc3d..4aded7b359 100644
--- a/langpacks/russian/Untranslated/=CORE=.txt
+++ b/langpacks/russian/Untranslated/=CORE=.txt
@@ -2,13 +2,113 @@
 [E-mail:]

 [AaBbYyZz]

 [Miranda NG]

+[Add to Existing MetaContact]

+[Please select a MetaContact:]

+[&OK]

+[Sort Alphabetically]

+[Editing]

+[&Remove]

+[&Set as Default]

+[Move &Up]

+[Move &Down]

+[Force use of default for sending (even if offline)]

+[Send &Offline]

+[Set default contact on receipt of message]

+[Always send to default contact if not offline]

+[Suppress status notification for subcontacts]

+[Context Menu]

+[Use contact's unique ID]

+[Use contact's display name]

+[Contact Labels]

+[Function]

+[Set default and open message window]

+[Show subcontact context menu]

+[Show user information]

+[Display subcontact nickname]

+[Display subcontact display name]

+[Use subcontact message windows]

+[Copy subcontact data]

+[Lock name to first contact]

+[but only for the current conversation]

+[History Copy]

+[Please wait while the contact's history is copied.]

+[History Remove]

+[Please wait while the contact's history is removed.]

+[Subcontact Priorities]

+[Rank:]

+[Status:]

+[Protocol:]

+[Reset All]

+[(Lower ranks are preferred)]

+[Copy subcontact history to MetaContact when creating or adding]

+[Number of days to copy (0=all):]

+[Keep MetaContact history synchronized with subcontacts]

+[Keep subcontact history synchronized with MetaContact]

+[History (** beware - change at your own risk **)]

 [Google]

 [Wikipedia]

 [Miranda NG\n%s]

 [Windows]

 [Miranda]

-[%s\t%s]

 [E-mail]

+[You are going to remove all the contacts associated with this MetaContact.\nThis will delete the MetaContact.\n\nProceed Anyway?]

+[Either there is no MetaContact in the database (in this case you should first convert a contact into one)\nor there is none that can host this contact.\nAnother solution could be to convert this contact into a new MetaContact.\n\nConvert this contact into a new MetaContact?]

+[This contact is a MetaContact.\nYou can't add a MetaContact to another MetaContact.\n\nPlease choose another.]

+[MetaContact Conflict]

+[This contact is already associated to a MetaContact.\nYou cannot add a contact to multiple MetaContacts.]

+[Multiple MetaContacts]

+[No suitable MetaContact found]

+[a contact]

+[Adding %s...]

+[Please select a MetaContact]

+[No MetaContact selected]

+[Assignment to the MetaContact failed.]

+[Assignment failure]

+[ID]

+[Send Offline]

+[Delete MetaContact?]

+[Toggle Off]

+[Toggle On]

+[Convert to MetaContact]

+[Add to Existing]

+[Set to Default]

+[Error - Database corruption.\nPlugin disabled.]

+[MetaContacts]

+[There was a problem in assigning the contact to the MetaContact]

+[This will remove the MetaContact permanently.\n\nProceed Anyway?]

+[Are you sure?]

+[Remove from MetaContact]

+[Toggle MetaContacts On]

+[Toggle MetaContacts Off]

+[Add to existing MetaContact...]

+[Edit MetaContact...]

+[Set as MetaContact default]

+[Delete MetaContact]

+[Context]

+[<default>]

+[Meta ID]

+[No online contacts found.]

+[Priorities]

+[Sender]

+[Could not get MetaContact ID]

+[Assignment error]

+[Could not retreive MetaContact contact count]

+[Could not retreive contact protocol]

+[Could not get unique ID of contact]

+[Contact is 'Not on List' - please add the contact to your contact list before assigning.]

+[MetaContact is full]

+[Could not write contact protocol to MetaContact]

+[Could not write unique ID of contact to MetaContact]

+[Could not write nickname of contact to MetaContact]

+[Subcontact contact number < 0 - deleting MetaContact]

+[Subcontact contact number (%d) > meta num contacts (%d) - deleting MetaContact]

+[Subcontact's MetaContact not found - deleting MetaContact data]

+[MetaContact number of contacts < 0 - deleting MetaContact]

+[MetaContact default contact number out of range - deleting MetaContact]

+[Meta ID: ]

+[MetaContact corrupted - the number of subcontacts is incorrect.\nDeleting MetaContact.]

+[The 'MetaContacts Hidden Group' has been added to your contact list.\nThis is most likely due to server-side contact information. To fix this, so that\nMetaContacts continues to function correctly, you should:\n   - disable MetaContacts using the 'Toggle MetaContacts Off' main menu item\n   - move all contacts out of this group\n   - synchronize your contacts with the server\n   - re-enable MetaContacts]

+[MetaContacts Warning]

 [Ctrl + ]

 [Alt + ]

 [Shift + ]

diff --git a/langpacks/russian/Untranslated/AssocMgr.txt b/langpacks/russian/Untranslated/AssocMgr.txt
index f10e6f0282..3db2215482 100644
--- a/langpacks/russian/Untranslated/AssocMgr.txt
+++ b/langpacks/russian/Untranslated/AssocMgr.txt
@@ -1,4 +1,3 @@
-[%hs:]

-[Miranda NG was not able to open "%S".\n\nThere is no registered handler for this file type.]

+[Miranda NG was not able to open "%S".\n\nThere is no registered handler for this file type.]

 [Miranda NG was not able to open "%S".\n\nThe file could not be processed.]

 [Miranda NG was not able to open "%S".\n\nThere is no registered handler for this URL type.]

diff --git a/langpacks/russian/Untranslated/BasicHistory.txt b/langpacks/russian/Untranslated/BasicHistory.txt
index 82cdbae1d0..895f0f90c2 100644
--- a/langpacks/russian/Untranslated/BasicHistory.txt
+++ b/langpacks/russian/Untranslated/BasicHistory.txt
@@ -1,7 +1,6 @@
 [OK]

 [Execute history task]

 [%s Files (*.%s)]

-[*.%s]

 [File does not contain selected contact]

 [File is corrupted]

 [Do you want to delete all imported messages for this contact?\nNote that next scheduler task import this messages again.]

diff --git a/langpacks/russian/Untranslated/Clist_modern.txt b/langpacks/russian/Untranslated/Clist_modern.txt
index d2825e7105..fa7e07d591 100644
--- a/langpacks/russian/Untranslated/Clist_modern.txt
+++ b/langpacks/russian/Untranslated/Clist_modern.txt
@@ -1,6 +1,5 @@
 [OK]

 [UNDER CONSTRUCTION!!!           IT DOES NOT WORK]

-[%s]

 [ layered]

 [( unknown )]

 [reVista for Modern v0.5]

diff --git a/langpacks/russian/Untranslated/CmdLine.txt b/langpacks/russian/Untranslated/CmdLine.txt
index ba53ade3ea..9ceba84616 100644
--- a/langpacks/russian/Untranslated/CmdLine.txt
+++ b/langpacks/russian/Untranslated/CmdLine.txt
@@ -7,6 +7,5 @@
 [Failed to change status message for account '%s' to '%s' (status is '%s').]

 [CallService call successful: service '%s' returned %p.]

 [Message to '%s' was marked as sent but the account seems to be offline]

-['%s/%s' - %s.]

 [[me]]

 [Error setting nickname to '%s' for protocol '%s']

diff --git a/langpacks/russian/Untranslated/Dropbox.txt b/langpacks/russian/Untranslated/Dropbox.txt
new file mode 100644
index 0000000000..5486a2cf96
--- /dev/null
+++ b/langpacks/russian/Untranslated/Dropbox.txt
@@ -0,0 +1,5 @@
+[grant_type=authorization_code&code=%s]

+[Dropbox]

+[Ok]

+[Your app is making too many requests and is being rate limited. 429s can trigger on a per-app or per-user basis]

+[If the response includes the Retry-After header, this means your OAuth 1.0 app is being rate limited. Otherwise, this indicates a transient server error, and your app should retry its request.]

diff --git a/langpacks/russian/Untranslated/NewAwaySys.txt b/langpacks/russian/Untranslated/NewAwaySys.txt
index 3a1c48a34c..5e5ac5ab28 100644
--- a/langpacks/russian/Untranslated/NewAwaySys.txt
+++ b/langpacks/russian/Untranslated/NewAwaySys.txt
@@ -1,13 +1,11 @@
 [V]

 [Colors]

 [OK]

-[Status messages:]

 [Configure autoaway]

 [Store for each status separately]

 [Use default...]

 [Miranda]

 [When this checkbox is ticked, NewAwaySys counts "send times" starting from the last status message change, even if status mode didn't change.\nWhen the checkbox isn't ticked, "send times" are counted from last status mode change (i.e., disabled state is more restrictive).]

-[Status messages]

 [Been fragging since %nas_awaysince_time%, I'll message you later when the adrenaline wears off.]

 [Away since time in default format; ?nas_awaysince_time(x) in format x]

 [Away since date in default format; ?nas_awaysince_date(x) in format x]

diff --git a/langpacks/russian/Untranslated/Weather.txt b/langpacks/russian/Untranslated/Weather.txt
index c2855f7cb4..126e0e353c 100644
--- a/langpacks/russian/Untranslated/Weather.txt
+++ b/langpacks/russian/Untranslated/Weather.txt
@@ -1,4 +1,3 @@
-[%n  [%t, %c]]

-[%n   (%u)]

+[%n   (%u)]

 [Temperature: %[Temperature]]

 [No update data file is found. Please check your Plugins\\Weather directory.]