summaryrefslogtreecommitdiff
path: root/langpacks
diff options
context:
space:
mode:
Diffstat (limited to 'langpacks')
-rw-r--r--langpacks/russian/=CORE=.txt2
-rw-r--r--langpacks/russian/Plugins/Facebook.txt4
-rw-r--r--langpacks/russian/Plugins/MsgPopup.txt2
-rw-r--r--langpacks/russian/Plugins/Skype.txt4
-rw-r--r--langpacks/russian/Plugins/SkypeClassic.txt2
-rw-r--r--langpacks/russian/Untranslated/=CORE=.txt1
-rw-r--r--langpacks/russian/Untranslated/Facebook.txt2
-rw-r--r--langpacks/russian/Untranslated/MsgPopup.txt1
-rw-r--r--langpacks/russian/Untranslated/Skype.txt2
-rw-r--r--langpacks/russian/Untranslated/SkypeClassic.txt1
10 files changed, 14 insertions, 7 deletions
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index cba8419fd8..a0717ffd01 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -2291,6 +2291,8 @@ Miranda NG не может открыть этот профиль
Удалить метаконтакт?
[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?]
Нет еще ни одного метаконтакта в базе (в этом случае нужно сначала конвертировать один простой контакт в метаконтакт).\nКак вариант преобразуйте этот контакт в новый метаконтакт.\n\nПреобразовать этот контакт в метаконтакт?
+[This contact is a MetaContact.\nYou can't add a MetaContact to another MetaContact.\n\nPlease choose another.]
+Этот контакт уже является метаконтактом.\nНевозможно добавить один метаконтакт в другой.\n\nПожалуйста, выберите другой.
[MetaContact Conflict]
Конфликт метаконтактов
[This contact is already associated to a MetaContact.\nYou cannot add a contact to multiple MetaContacts.]
diff --git a/langpacks/russian/Plugins/Facebook.txt b/langpacks/russian/Plugins/Facebook.txt
index 13d5cbbd2e..0ab5256bcf 100644
--- a/langpacks/russian/Plugins/Facebook.txt
+++ b/langpacks/russian/Plugins/Facebook.txt
@@ -97,6 +97,8 @@ URL:
Ошибка входа: %s
[Unknown error]
Неизвестная ошибка
+[Your account requires HTTPS connection. Activating.]
+Ваша учётная запись требует соединения по HTTPS. Включим его.
[Status update was successful.]
Успешное обновление статуса.
[Please enter a username.]
@@ -171,6 +173,8 @@ URL:
%s подключение к серверу
[Unable to get Netlib connection for Facebook]
Не удается установить соединение с Facebook
+[Facebook ID must be numeric value.]
+Значение Facebook ID должно быть числовым.
[Network]
Сеть
[Account]
diff --git a/langpacks/russian/Plugins/MsgPopup.txt b/langpacks/russian/Plugins/MsgPopup.txt
index 5984ed1b45..92fa063b41 100644
--- a/langpacks/russian/Plugins/MsgPopup.txt
+++ b/langpacks/russian/Plugins/MsgPopup.txt
@@ -31,6 +31,8 @@
Ошибка виртуальной защиты. Код %d\nСвяжитесь с автором
[Error]
Ошибка
+[Hmm. Something goes wrong. I can't write into the memory.\nAnd as you can see, there are no any exception raised...\nTry to call the author]
+Гм. Что-то пошло не так. Не удается произвести запись в память.\И, как вы уже видите, не сгенерировано никакого исключения...\nПопробуйте отправить сообщение об ошибке
[MessagePopup]
Диалоговые окна
[Popups]
diff --git a/langpacks/russian/Plugins/Skype.txt b/langpacks/russian/Plugins/Skype.txt
index 2be25cd71f..ee85c787b0 100644
--- a/langpacks/russian/Plugins/Skype.txt
+++ b/langpacks/russian/Plugins/Skype.txt
@@ -249,6 +249,10 @@ SkypeKit.exe не распакован.
Контакт уже в списке контактов
[Enter a password for %s:]
Введите пароль для %s:
+[Password can't be empty.]
+Пароль не может быть пустым.
+[Old password is not correct.]
+Неправильный старый пароль.
[New password is same as old password.]
Новый и старый пароль одинаковы
[New password and confirmation must be same.]
diff --git a/langpacks/russian/Plugins/SkypeClassic.txt b/langpacks/russian/Plugins/SkypeClassic.txt
index bdac375caa..fbc8df6d80 100644
--- a/langpacks/russian/Plugins/SkypeClassic.txt
+++ b/langpacks/russian/Plugins/SkypeClassic.txt
@@ -177,6 +177,8 @@ SkypeOut контакты в статусе:
Входящий Skype звонок
[Incoming call from %s]
Входящий Skype звонок от %s
+[Connection to Skype lost]
+Потеряно cоединение со Skype
[This seems to be the first time that you're running the Skype protocol plugin. Do you want to enable the protocol for this Miranda profile? If you chose NO, you can always enable it in the plugin options later.]
Вы впервые запустили протокол Skype. Хотите включить его для этого профиля Miranda? Если вы откажетесь, всегда можно включить его в настройках.
[Preview Error Message]
diff --git a/langpacks/russian/Untranslated/=CORE=.txt b/langpacks/russian/Untranslated/=CORE=.txt
index bc8a7c9ae8..52a9cfe869 100644
--- a/langpacks/russian/Untranslated/=CORE=.txt
+++ b/langpacks/russian/Untranslated/=CORE=.txt
@@ -9,7 +9,6 @@
[Windows]
[Miranda]
[E-mail]
-[This contact is a MetaContact.\nYou can't add a MetaContact to another MetaContact.\n\nPlease choose another.]
[Meta ID]
[Meta ID: ]
[Ctrl + ]
diff --git a/langpacks/russian/Untranslated/Facebook.txt b/langpacks/russian/Untranslated/Facebook.txt
index bf38a0704b..1c81061a86 100644
--- a/langpacks/russian/Untranslated/Facebook.txt
+++ b/langpacks/russian/Untranslated/Facebook.txt
@@ -2,7 +2,6 @@
[Login error: Some Facebook things are required.]
[Login error: Captcha code is required. Bad login credentials?]
[Login error, probably bad login credentials.]
-[Your account requires HTTPS connection. Activating.]
[Something happened to Facebook. Maybe there was some major update so you should wait for an update.]
[Need confirmation for sending messages to other clients.\nOpen Facebook website and try to send message to this contact again!]
[Timeout when sending message.]
@@ -16,4 +15,3 @@
[%s and more (%d)]
[Contact is back on server-list.]
[Contact is no longer on server-list.]
-[Facebook ID must be numeric value.]
diff --git a/langpacks/russian/Untranslated/MsgPopup.txt b/langpacks/russian/Untranslated/MsgPopup.txt
deleted file mode 100644
index 8ca8272cb5..0000000000
--- a/langpacks/russian/Untranslated/MsgPopup.txt
+++ /dev/null
@@ -1 +0,0 @@
-[Hmm. Something goes wrong. I can't write into the memory.\nAnd as you can see, there are no any exception raised...\nTry to call the author]
diff --git a/langpacks/russian/Untranslated/Skype.txt b/langpacks/russian/Untranslated/Skype.txt
index a2309ab2ae..0ff5c0646b 100644
--- a/langpacks/russian/Untranslated/Skype.txt
+++ b/langpacks/russian/Untranslated/Skype.txt
@@ -21,8 +21,6 @@
[Outlaw]
[waits to join]
[Contacts received]
-[Password can't be empty.]
-[Old password is not correct.]
[Skype account]
[SENDER_NOT_AUTHORIZED]
[REMOTELY_CANCELED]
diff --git a/langpacks/russian/Untranslated/SkypeClassic.txt b/langpacks/russian/Untranslated/SkypeClassic.txt
index 3ce85ff8d4..fdc31fe53f 100644
--- a/langpacks/russian/Untranslated/SkypeClassic.txt
+++ b/langpacks/russian/Untranslated/SkypeClassic.txt
@@ -1,5 +1,4 @@
[OK]
[&Kick user]
[invited ]
-[Connection to Skype lost]
[Skype ID]