summaryrefslogtreecommitdiff
path: root/langpacks
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2014-01-29 06:43:36 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2014-01-29 06:43:36 +0000
commit430fa0f75a2cbea880eb28bda460878ba83fa556 (patch)
treeea772aedae616ac63f72be0a05ad4cdcc6df1461 /langpacks
parent444dc7ad76abe11db6b9184c45d20a9b55a39c12 (diff)
- langpacks/english: update;
- langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@7942 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks')
-rw-r--r--langpacks/english/=CORE=.txt1
-rw-r--r--langpacks/english/Plugins/Clist_mw.txt2
-rw-r--r--langpacks/english/Plugins/Clist_nicer.txt4
-rw-r--r--langpacks/english/Plugins/MRA.txt3
-rw-r--r--langpacks/russian/=CORE=.txt2
-rw-r--r--langpacks/russian/Plugins/Clist_mw.txt4
-rw-r--r--langpacks/russian/Plugins/Clist_nicer.txt8
-rw-r--r--langpacks/russian/Plugins/MRA.txt4
8 files changed, 11 insertions, 17 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 9392143d27..f6bf19c080 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -839,7 +839,6 @@
;file \src\core\stdclist\src\clistopts.cpp
[Global]
;file \src\core\stdclist\src\cluiopts.cpp
-[Contact List]
;file \src\core\stdcrypt\encrypt.cpp
[Standard crypto provider]
;file \src\core\stdemail\email.cpp
diff --git a/langpacks/english/Plugins/Clist_mw.txt b/langpacks/english/Plugins/Clist_mw.txt
index 502eea1d05..5df7a35a86 100644
--- a/langpacks/english/Plugins/Clist_mw.txt
+++ b/langpacks/english/Plugins/Clist_mw.txt
@@ -169,11 +169,11 @@
[Group Closed]
[Hover Contacts]
[Background]
+[Contact list]
[Selected Text]
[Hottrack Text]
[Quicksearch Text]
;file \plugins\Clist_mw\src\clcopts.cpp
-[Contact list]
[List]
[List MetaContacts]
[Not focused]
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index af3058035d..5baa0776e8 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -329,6 +329,7 @@
[Far left]
[Far right]
[With Nickname - right]
+[Contact list]
[List layout]
[Background]
[Contact rows]
@@ -336,7 +337,6 @@
[Groups and layout]
[Advanced]
[Skins]
-[Contact list]
;file \plugins\Clist_nicer\src\clistmenus.cpp
[Add permanently]
[Revert to default]
@@ -374,10 +374,10 @@
[Standard contacts]
[Online contacts to whom you have a different visibility]
[Offline contacts]
-[Offline contacts to whom you have a different visibility]
[Contacts which are 'not on list']
[Group member counts]
[Dividers]
+[Offline contacts to whom you have a different visibility]
[Frame titles]
[Contact list local time]
[Selected Text]
diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index 62038a6817..ef98726f76 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -2,7 +2,7 @@
;============================================================
; File: MRA.dll
; Plugin: MRA
-; Version: 2.1.0.7
+; Version: 2.1.0.8
; Authors: Ivan Rozhuk
;============================================================
[Miranda Mail.ru Agent protocol plugin.]
@@ -128,7 +128,6 @@
[My Video]
[My Answers]
[My World]
-[Zhuki]
[Web search]
[Update all users info]
[Check users avatars updates]
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index 9882a2c7ba..b78bd7502a 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -1617,8 +1617,6 @@ Miranda NG перезапускается.\nПожалуйста, подожди
Фон списка
[Global]
Глобальные
-[Contact List]
-Список контактов
[Standard crypto provider]
Поставщик шифрования по умолчанию
[User has not registered an e-mail address]
diff --git a/langpacks/russian/Plugins/Clist_mw.txt b/langpacks/russian/Plugins/Clist_mw.txt
index c02068869d..a5d39e4a60 100644
--- a/langpacks/russian/Plugins/Clist_mw.txt
+++ b/langpacks/russian/Plugins/Clist_mw.txt
@@ -325,14 +325,14 @@ Cлужба:
Контакты под указателем
[Background]
Фон
+[Contact list]
+Список контактов
[Selected Text]
Выделенный текст
[Hottrack Text]
Под курсором
[Quicksearch Text]
Быстрый поиск
-[Contact list]
-Список контактов
[List]
Список
[List MetaContacts]
diff --git a/langpacks/russian/Plugins/Clist_nicer.txt b/langpacks/russian/Plugins/Clist_nicer.txt
index 22d9ab9c35..1cd76cb6ae 100644
--- a/langpacks/russian/Plugins/Clist_nicer.txt
+++ b/langpacks/russian/Plugins/Clist_nicer.txt
@@ -631,6 +631,8 @@
По правому краю
[With Nickname - right]
Справа от ника
+[Contact list]
+Список контактов
[List layout]
Расположение списка
[Background]
@@ -645,8 +647,6 @@
Дополнительно
[Skins]
Скины
-[Contact list]
-Список контактов
[Add permanently]
Добавить в список
[Revert to default]
@@ -707,14 +707,14 @@
Контакты с изменённой видимостью (в сети)
[Offline contacts]
Отключённые контакты
-[Offline contacts to whom you have a different visibility]
-Контакты с изменённой видимостью (отключённые)
[Contacts which are 'not on list']
Контакты 'не в списке'
[Group member counts]
Счётчики групп
[Dividers]
Разделители
+[Offline contacts to whom you have a different visibility]
+Контакты с изменённой видимостью (отключённые)
[Frame titles]
Заголовки фреймов
[Contact list local time]
diff --git a/langpacks/russian/Plugins/MRA.txt b/langpacks/russian/Plugins/MRA.txt
index d026aa7271..d3b701172f 100644
--- a/langpacks/russian/Plugins/MRA.txt
+++ b/langpacks/russian/Plugins/MRA.txt
@@ -2,7 +2,7 @@
;============================================================
; File: MRA.dll
; Plugin: MRA
-; Version: 2.1.0.7
+; Version: 2.1.0.8
; Authors: Ivan Rozhuk
;============================================================
[Miranda Mail.ru Agent protocol plugin.]
@@ -239,8 +239,6 @@ xСтатус "%s"
Мои ответы
[My World]
Мой мир
-[Zhuki]
-Жуки
[Web search]
Поиск в вебе
[Update all users info]