summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--langpacks/english/=CORE=.txt4
-rw-r--r--langpacks/english/Plugins/AdvancedAutoAway.txt1
-rw-r--r--langpacks/english/Plugins/Clist_modern.txt21
-rw-r--r--langpacks/english/Plugins/ICQ.txt2
-rw-r--r--langpacks/english/Plugins/KeepStatus.txt1
-rw-r--r--langpacks/english/Plugins/SkypeWeb.txt21
-rw-r--r--langpacks/english/Plugins/StartupStatus.txt1
-rw-r--r--langpacks/english/Plugins/Steam.txt4
-rw-r--r--langpacks/russian/=CORE=.txt8
-rw-r--r--langpacks/russian/Plugins/AdvancedAutoAway.txt2
-rw-r--r--langpacks/russian/Plugins/Clist_modern.txt42
-rw-r--r--langpacks/russian/Plugins/ICQ.txt2
-rw-r--r--langpacks/russian/Plugins/KeepStatus.txt2
-rw-r--r--langpacks/russian/Plugins/SkypeWeb.txt38
-rw-r--r--langpacks/russian/Plugins/StartupStatus.txt2
-rw-r--r--langpacks/russian/Plugins/Steam.txt6
-rw-r--r--langpacks/russian/Untranslated/Steam.txt1
-rw-r--r--langpacks/russian/Untranslated/weatherxml.txt5
18 files changed, 93 insertions, 70 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 1668550f25..671a45fc46 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -8,7 +8,7 @@
[Choose the protocol type]
[Specify the internal account name (optional)]
[Cancel]
-[Add %s]
+[Add contact]
[&Add]
[&Cancel]
[Send "You were added"]
@@ -1008,7 +1008,7 @@
;file \src\mir_core\src\ui_utils.cpp
[Account]
;file \src\modules\addcontact\addcontact.cpp
-[Add contact]
+[Add %s]
[Please authorize my request and add me to your contact list.]
;file \src\modules\chat\chat_opts.cpp
[Others nicknames]
diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index e9e74b5e19..d8d6bcf7b7 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -36,6 +36,7 @@
[Reset status on return]
[Confirm resetting status]
[Only set if current status is]
+[Command line]
[Copy to clipboard]
[Command line:]
[Create shortcut]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index a31a7e2aad..e4c57f29b4 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -314,15 +314,6 @@
[&Rename group]
[&Delete group]
;file \plugins\Clist_modern\src\modern_clc.cpp
-[Skins]
-[Modern contact list]
-[Avatar overlay]
-[Status overlay]
-[Contact list smileys]
-[List background]
-[Menu background]
-[Status bar background]
-[Frames title bar background]
[Do you want contact '%s' to be converted to metacontact and '%s' be added to it?]
[Converting to metacontact]
[Do you want contact '%s' to be converted to metacontact and '%s' be added to it (remove it from '%s')?]
@@ -333,6 +324,17 @@
[Set default contact]
[Do you want contact '%s' to be removed from metacontact '%s' and added to '%s'?]
[Changing metacontacts (moving)]
+[Clist Modern requires AVS plugin to be present. Install it using PluginUpdater or download from http://miranda-ng.org]
+[Error loading plugin]
+[Skins]
+[Modern contact list]
+[Avatar overlay]
+[Status overlay]
+[Contact list smileys]
+[List background]
+[Menu background]
+[Status bar background]
+[Frames title bar background]
;file \plugins\Clist_modern\src\modern_clcopts.cpp
[Contact names]
[Row items]
@@ -412,7 +414,6 @@
[Icon]
[Text]
[Extra icons]
-[Animate avatars (GDI+ and Avatar service module (avs.dll) are required)]
[Left align group names]
[Center group names]
[Right align group names]
diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 9ef86ec007..6615406a1d 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
;============================================================
; File: ICQ.dll
; Plugin: IcqOscarJ protocol
-; Version: 0.11.3.2
+; Version: 0.11.3.3
; Authors: Joe Kucera, Bio, Martin Öberg, Richard Hughes, Jon Keating, etc.
;============================================================
[ICQ protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 8fa4cb31c5..e2c728d80a 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -36,6 +36,7 @@
[Reset status on return]
[Confirm resetting status]
[Only set if current status is]
+[Command line]
[Copy to clipboard]
[Command line:]
[Create shortcut]
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 76ffae2514..63636d6c42 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
;============================================================
; File: SkypeWeb.dll
; Plugin: Skype protocol (Web)
-; Version: 0.11.0.2
+; Version: 0.11.0.3
; Authors: Miranda NG Team
;============================================================
[Skype protocol support for Miranda NG. Based on new Skype for Web.]
@@ -19,11 +19,7 @@
[Others]
[Automatic messages synchronization]
[Use local time for received messages]
-[Mark message as read...]
-[on read]
-[on receive]
-[on reply]
-[on typing]
+[Always notify as unread for all incoming message]
[Enter password]
[Save password]
[Enter the password to continue.]
@@ -43,6 +39,12 @@
[&User]
;file \protocols\SkypeWeb\src\skype_contacts.cpp
[Are you sure?]
+;file \protocols\SkypeWeb\src\skype_events.cpp
+[Incoming call]
+[Action]
+[Call information.]
+[Calls]
+[Notifications]
;file \protocols\SkypeWeb\src\skype_history_sync.cpp
[Edited at]
[Call started]
@@ -52,6 +54,7 @@
[File name]
[Size]
[bytes]
+[Image]
;file \protocols\SkypeWeb\src\skype_icons.cpp
[Protocol icon]
[Create new chat icon]
@@ -59,6 +62,7 @@
[Block user icon]
[Unblock user icon]
[Incoming call icon]
+[Notification icon]
[Protocols]
;file \protocols\SkypeWeb\src\skype_menus.cpp
[Request authorization]
@@ -68,15 +72,12 @@
[Unblock contact]
[Create new chat]
;file \protocols\SkypeWeb\src\skype_messages.cpp
-[Incoming call]
;file \protocols\SkypeWeb\src\skype_options.cpp
[Network]
;file \protocols\SkypeWeb\src\skype_proto.cpp
[%s connection]
-[Action]
[Incoming call sound]
[Incoming call canceled sound]
-[Calls]
-[Notifications]
;file \protocols\SkypeWeb\src\skype_trouter.cpp
+[Failed establish a TRouter connection.]
[Incoming call from %s]
diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index ec643bf3b7..f49acca813 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -36,6 +36,7 @@
[Reset status on return]
[Confirm resetting status]
[Only set if current status is]
+[Command line]
[Copy to clipboard]
[Command line:]
[Create shortcut]
diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index 7194042143..065b54d32b 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Steam.dll
; Plugin: Steam protocol
-; Version: 0.11.3.2
+; Version: 0.11.3.3
; Authors: unsane, Robert Pösel
;============================================================
[Steam protocol support for Miranda NG.]
@@ -24,6 +24,8 @@
[Enter the password to continue.]
;file \protocols\Steam\src\main.cpp
[Steam game]
+;file \protocols\Steam\src\steam_account.cpp
+[Connection token expired. Please login again.]
;file \protocols\Steam\src\steam_contacts.cpp
[Looking to play]
[Looking to trade]
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index 9ff719e802..93b9deacd3 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -11,8 +11,8 @@
Укажите внутреннее имя (не обязательно)
[Cancel]
Отмена
-[Add %s]
-Добавить %s
+[Add contact]
+Добавить контакт
[&Add]
&Добавить
[&Cancel]
@@ -1907,8 +1907,8 @@ URL от %s
%s в сети
[Account]
Учётная запись
-[Add contact]
-Добавить контакт
+[Add %s]
+Добавить %s
[Please authorize my request and add me to your contact list.]
Пожалуйста, разрешите добавить вас в мой список контактов.
[Others nicknames]
diff --git a/langpacks/russian/Plugins/AdvancedAutoAway.txt b/langpacks/russian/Plugins/AdvancedAutoAway.txt
index 05c5e82719..417ec08293 100644
--- a/langpacks/russian/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/russian/Plugins/AdvancedAutoAway.txt
@@ -65,6 +65,8 @@
Подтвердить сброс статуса
[Only set if current status is]
Только если статус:
+[Command line]
+Ком. строка
[Copy to clipboard]
Копировать в буфер обмена
[Command line:]
diff --git a/langpacks/russian/Plugins/Clist_modern.txt b/langpacks/russian/Plugins/Clist_modern.txt
index 67a7f69d0b..a0f3c4ed72 100644
--- a/langpacks/russian/Plugins/Clist_modern.txt
+++ b/langpacks/russian/Plugins/Clist_modern.txt
@@ -619,24 +619,6 @@ Ctrl+Левый клик вкл. фильтр по протоколу, клик
&Переименовать группу
[&Delete group]
&Удалить группу
-[Skins]
-Скины
-[Modern contact list]
-Список контактов Modern
-[Avatar overlay]
-Оверлей аватара
-[Status overlay]
-Оверлей статуса
-[Contact list smileys]
-Список контактов
-[List background]
-Фон списка
-[Menu background]
-Фон меню
-[Status bar background]
-Фон панели статусов
-[Frames title bar background]
-Фон заголовка фреймов
[Do you want contact '%s' to be converted to metacontact and '%s' be added to it?]
Хотите конвертировать '%s' в метаконтакт и добавить '%s' в него?
[Converting to metacontact]
@@ -657,6 +639,28 @@ Ctrl+Левый клик вкл. фильтр по протоколу, клик
Хотите удалить '%s' из метаконтакта '%s' и добавить в '%s'?
[Changing metacontacts (moving)]
Изменение метаконтакта (перемещение)
+[Clist Modern requires AVS plugin to be present. Install it using PluginUpdater or download from http://miranda-ng.org]
+Clist Modern требует наличия плагина AVS. Установите его, используя PluginUpdater или скачайте с http://miranda-ng.org
+[Error loading plugin]
+Ошибка загрузки плагина
+[Skins]
+Скины
+[Modern contact list]
+Список контактов Modern
+[Avatar overlay]
+Оверлей аватара
+[Status overlay]
+Оверлей статуса
+[Contact list smileys]
+Список контактов
+[List background]
+Фон списка
+[Menu background]
+Фон меню
+[Status bar background]
+Фон панели статусов
+[Frames title bar background]
+Фон заголовка фреймов
[Contact names]
Контакты
[Row items]
@@ -807,8 +811,6 @@ Ctrl+Левый клик вкл. фильтр по протоколу, клик
Текст
[Extra icons]
Экстра значки
-[Animate avatars (GDI+ and Avatar service module (avs.dll) are required)]
-Анимировать аватары (требуется GDI+ и avs.dll)
[Left align group names]
Имена групп слева
[Center group names]
diff --git a/langpacks/russian/Plugins/ICQ.txt b/langpacks/russian/Plugins/ICQ.txt
index 8db12ad3bc..3554a617fd 100644
--- a/langpacks/russian/Plugins/ICQ.txt
+++ b/langpacks/russian/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
;============================================================
; File: ICQ.dll
; Plugin: IcqOscarJ protocol
-; Version: 0.11.3.2
+; Version: 0.11.3.3
; Authors: Joe Kucera, Bio, Martin Öberg, Richard Hughes, Jon Keating, etc.
;============================================================
[ICQ protocol support for Miranda NG.]
diff --git a/langpacks/russian/Plugins/KeepStatus.txt b/langpacks/russian/Plugins/KeepStatus.txt
index 1ca82ff44a..926b56aeb4 100644
--- a/langpacks/russian/Plugins/KeepStatus.txt
+++ b/langpacks/russian/Plugins/KeepStatus.txt
@@ -65,6 +65,8 @@
Подтвердить сброс статуса
[Only set if current status is]
Только если статус:
+[Command line]
+Ком. строка
[Copy to clipboard]
Копировать в буфер обмена
[Command line:]
diff --git a/langpacks/russian/Plugins/SkypeWeb.txt b/langpacks/russian/Plugins/SkypeWeb.txt
index fb7eaaa8ee..f035d8d244 100644
--- a/langpacks/russian/Plugins/SkypeWeb.txt
+++ b/langpacks/russian/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
;============================================================
; File: SkypeWeb.dll
; Plugin: Skype protocol (Web)
-; Version: 0.11.0.2
+; Version: 0.11.0.3
; Authors: Miranda NG Team
;============================================================
[Skype protocol support for Miranda NG. Based on new Skype for Web.]
@@ -31,16 +31,8 @@
Автоматическая синхронизация сообщений
[Use local time for received messages]
Локальное время для принятых сообщений
-[Mark message as read...]
-Помечать сообщение прочитанным...
-[on read]
-при прочтении
-[on receive]
-при получении
-[on reply]
-при ответе
-[on typing]
-при наборе текста
+[Always notify as unread for all incoming message]
+Помечать все входящие сообщения как "Непрочитанное"
[Enter password]
Введите пароль
[Save password]
@@ -73,6 +65,16 @@
&Пользователь
[Are you sure?]
Вы уверены?
+[Incoming call]
+Входящий звонок
+[Action]
+Действие
+[Call information.]
+Информация о звонке.
+[Calls]
+Звонки
+[Notifications]
+Уведомления
[Edited at]
Отредактировано в
[Call started]
@@ -89,6 +91,8 @@
Размер
[bytes]
байт
+[Image]
+Изображение
[Protocol icon]
Значок протокола
[Create new chat icon]
@@ -101,6 +105,8 @@
Разблокировать контакт
[Incoming call icon]
Значок входящего звонка
+[Notification icon]
+Notification icon
[Protocols]
Протоколы
[Request authorization]
@@ -115,21 +121,15 @@
Разблокировать контакт
[Create new chat]
Создать новый чат
-[Incoming call]
-Входящий звонок
[Network]
Сеть
[%s connection]
%s подключение
-[Action]
-Действие
[Incoming call sound]
Звук входящего звонка
[Incoming call canceled sound]
Звук отмены входящего звонка
-[Calls]
-Звонки
-[Notifications]
-Уведомления
+[Failed establish a TRouter connection.]
+Неврзможно установить соединение для TRouter.
[Incoming call from %s]
Входящий звонок от %s
diff --git a/langpacks/russian/Plugins/StartupStatus.txt b/langpacks/russian/Plugins/StartupStatus.txt
index d4d410d767..d57d9cf30c 100644
--- a/langpacks/russian/Plugins/StartupStatus.txt
+++ b/langpacks/russian/Plugins/StartupStatus.txt
@@ -65,6 +65,8 @@
Подтвердить сброс статуса
[Only set if current status is]
Только если статус:
+[Command line]
+Ком. строка
[Copy to clipboard]
Копировать в буфер обмена
[Command line:]
diff --git a/langpacks/russian/Plugins/Steam.txt b/langpacks/russian/Plugins/Steam.txt
index 6b867e0c22..b5ec936e63 100644
--- a/langpacks/russian/Plugins/Steam.txt
+++ b/langpacks/russian/Plugins/Steam.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Steam.dll
; Plugin: Steam protocol
-; Version: 0.11.3.2
+; Version: 0.11.3.3
; Authors: unsane, Robert Pösel
;============================================================
[Steam protocol support for Miranda NG.]
@@ -35,6 +35,10 @@
Сохранить пароль
[Enter the password to continue.]
Введите пароль, чтобы продолжить.
+[Steam game]
+Игра Steam
+[Connection token expired. Please login again.]
+Токен соединения устарел. Пожалуйста, войдите заново.
[Looking to play]
Хотите играть
[Looking to trade]
diff --git a/langpacks/russian/Untranslated/Steam.txt b/langpacks/russian/Untranslated/Steam.txt
index 0166788c6d..38c4f20f70 100644
--- a/langpacks/russian/Untranslated/Steam.txt
+++ b/langpacks/russian/Untranslated/Steam.txt
@@ -1,3 +1,2 @@
[Steam Guard]
-[Steam game]
[SteamID]
diff --git a/langpacks/russian/Untranslated/weatherxml.txt b/langpacks/russian/Untranslated/weatherxml.txt
index b6a9b637fe..6207e51e3a 100644
--- a/langpacks/russian/Untranslated/weatherxml.txt
+++ b/langpacks/russian/Untranslated/weatherxml.txt
@@ -33,3 +33,8 @@
[Rain / Snow Late]
[Am Rain / Snow]
[Rain Early]
+[AM Rain]
+[Pm Rain]
+[Am Snow]
+[Pm Snow]
+[Pm Showers / Wind]