summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2014-01-19 18:45:16 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2014-01-19 18:45:16 +0000
commit1c7fe4defb2900dbe3afc54ccbacae25b48bd432 (patch)
tree7b8d7727ebce18826edef34ad5b15b58b99b6633
parent4a9e3209328ff6583370352d4ff35ac881c66e4e (diff)
- langpacks/english: update;
- langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@7766 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--langpacks/english/=CORE=.txt6
-rw-r--r--langpacks/english/Plugins/CmdLine.txt2
-rw-r--r--langpacks/russian/=CORE=.txt8
-rw-r--r--langpacks/russian/Plugins/CmdLine.txt4
-rw-r--r--langpacks/russian/Plugins/QuickSearch.txt3
-rw-r--r--langpacks/russian/Untranslated/QuickSearch.txt1
6 files changed, 16 insertions, 8 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index b6a0160fdf..d8339077f5 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -154,7 +154,7 @@
[Undo]
[Reset]
[Export...]
-[(Background) Color]
+[Color/background]
[Text effect]
[Text color]
[Choose font]
@@ -1009,9 +1009,11 @@
[User disables status for ...]
[Action message]
[Highlighted message]
-[Message typing area]
[User list members (online)]
[User list members (away)]
+[Userlist background]
+[Message typing area]
+[Chat log symbols (Webdings)]
[Message is highlighted]
[User has performed an action]
[User has kicked some other user]
diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index e8c765ebd7..f43d9d66ce 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -79,7 +79,7 @@
[[me]]
[No unread messages found.]
[%s:%s - %d unread events.]
-[Contact '%s' has '%d' events in history.]
+[Contact '%s' has %d events in history.]
[Error setting nickname to '%s' for protocol '%s']
;file \plugins\CmdLine\src\services.cpp
[Could not create CommandLine listening server!]
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index 890bf727b4..950a095e1f 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -1901,12 +1901,16 @@ URL от %s
Действие
[Highlighted message]
Подсвеченное сообщение
-[Message typing area]
-Поле набора текста
[User list members (online)]
Пользователи (в сети)
[User list members (away)]
Пользователи (отсутствуют)
+[Userlist background]
+Фон списка пользователей
+[Message typing area]
+Поле набора текста
+[Chat log symbols (Webdings)]
+Символы в чате (шрифт Webdings)
[Message is highlighted]
Сообщение выделено
[User has performed an action]
diff --git a/langpacks/russian/Plugins/CmdLine.txt b/langpacks/russian/Plugins/CmdLine.txt
index 6d322337f8..bf6bc38de8 100644
--- a/langpacks/russian/Plugins/CmdLine.txt
+++ b/langpacks/russian/Plugins/CmdLine.txt
@@ -123,8 +123,8 @@ Miranda была закрыта или произошла ошибка при о
Нет непрочитанных сообщений.
[%s:%s - %d unread events.]
%s:%s - %d непрочитанные сообщения.
-[Contact '%s' has '%d' events in history.]
-Контакт '%s' имеет '%d' событий в истории.
+[Contact '%s' has %d events in history.]
+Контакт '%s' имеет %d событий в истории.
[Could not create CommandLine listening server!]
Невозможно создать сервер CommandLine!
[You can only run one instance of CmdLine plugin.]
diff --git a/langpacks/russian/Plugins/QuickSearch.txt b/langpacks/russian/Plugins/QuickSearch.txt
index 9aba0b91fa..813d1349a1 100644
--- a/langpacks/russian/Plugins/QuickSearch.txt
+++ b/langpacks/russian/Plugins/QuickSearch.txt
@@ -233,9 +233,12 @@ ID клиента
Изменить с помощью QuickSearch
[default]
по умолчанию
+[contacts]
+Контакты
[Unknown]
Неизвестный
[Stay on Top]
Поверх всех окон
+; this line is not present in the sources, but it present in compiled plugin
[Text Editor]
Текстовый редактор
diff --git a/langpacks/russian/Untranslated/QuickSearch.txt b/langpacks/russian/Untranslated/QuickSearch.txt
index c8148f7425..bee7d97e6c 100644
--- a/langpacks/russian/Untranslated/QuickSearch.txt
+++ b/langpacks/russian/Untranslated/QuickSearch.txt
@@ -11,4 +11,3 @@
[Content is count of ALL contact events (not messages only)]
[Other info]
[Selected]
-[contacts]