summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2014-10-07 05:28:42 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2014-10-07 05:28:42 +0000
commitff52f19c6020808ef81c9225f767a76f84f3647e (patch)
treef20e2bf2fa1b7087d566c823e85ce1e16e5fc54c
parent74a853fd31f1fd7356fb3fd041b5e6722ab80eed (diff)
- langpacks/english: update;
- langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@10724 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--langpacks/english/Plugins/Import.txt1
-rw-r--r--langpacks/english/Plugins/VKontakte.txt11
-rw-r--r--langpacks/russian/Plugins/Import.txt2
-rw-r--r--langpacks/russian/Plugins/VKontakte.txt20
4 files changed, 34 insertions, 0 deletions
diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index 069c8ce812..3b1b2ca9f0 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -47,6 +47,7 @@
[Failed to add %S contact %s]
[Added %S contact %s, '%s']
[Added %S contact %s]
+[Metacontact cannot be imported due to its ambiguity.]
[Added metacontact '%s']
[Added metacontact]
[Skipping contact with no protocol]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 44b4db4f79..9c741d531b 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -56,6 +56,17 @@
[&Destroy room]
[&User details]
[&Kick]
+;file \protocols\VKontakte\src\vk_files.cpp
+[Couldn't save file]
+[Invalid album id]
+[Invalid server]
+[Invalid hash]
+[Invalid audio]
+[The audio file was removed by the copyright holder and cannot be reuploaded]
+[Invalid filename]
+[Invalid filesize]
+[Unknown error occurred]
+[File upload error]
;file \protocols\VKontakte\src\vk_options.cpp
[Network]
[Account]
diff --git a/langpacks/russian/Plugins/Import.txt b/langpacks/russian/Plugins/Import.txt
index d70b9ddb1f..ef667b6bef 100644
--- a/langpacks/russian/Plugins/Import.txt
+++ b/langpacks/russian/Plugins/Import.txt
@@ -85,6 +85,8 @@ Miranda нашла следующие профили. Выберите проф
Добавлен %S контакт %s, '%s'
[Added %S contact %s]
Добавлен %S контакт %s
+[Metacontact cannot be imported due to its ambiguity.]
+Метаконтакт не может быть импортирован из-за неоднозначной принадлежности.
[Added metacontact '%s']
Добавлен метаконтакт '%s'
[Added metacontact]
diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt
index 4c63d1738a..3eda4b28f9 100644
--- a/langpacks/russian/Plugins/VKontakte.txt
+++ b/langpacks/russian/Plugins/VKontakte.txt
@@ -99,6 +99,26 @@ Cоздать комнату чата
Информация о &контакте
[&Kick]
&Выкинуть
+[Couldn't save file]
+Невозможно сохранить файл
+[Invalid album id]
+Неверный ID альбома
+[Invalid server]
+Неверный сервер
+[Invalid hash]
+Неверный хэш
+[Invalid audio]
+Неподходящий тип аудио
+[The audio file was removed by the copyright holder and cannot be reuploaded]
+Аудио файл был удалён правообладателем и не может быть загружен заново
+[Invalid filename]
+Неверное имя файла
+[Invalid filesize]
+Неверный размер файла
+[Unknown error occurred]
+Неизвестная ошибка
+[File upload error]
+Ошибка загрузки файла
[Network]
Сеть
[Account]