summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--langpacks/english/Plugins/Jabber.txt26
-rw-r--r--langpacks/english/Plugins/StartupSilence.txt2
-rw-r--r--langpacks/english/Plugins/VKontakte.txt5
-rw-r--r--langpacks/russian/Plugins/Jabber.txt46
-rw-r--r--langpacks/russian/Plugins/VKontakte.txt8
-rw-r--r--langpacks/russian/Untranslated/Jabber.txt1
6 files changed, 27 insertions, 61 deletions
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 7fd057c342..11cd4c1ca7 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -53,19 +53,6 @@
[Hint:]
[Try to uncheck all checkmarks above if you're experiencing troubles with sending files. But it can cause problems with transfer of large files.]
[Jabber Account Registration]
-[Jabber Agents]
-[Register/Search Jabber Agents]
-[Jabber server:]
-[Browse]
-[Register...]
-[Browse/Join chat room...]
-[Search...]
-[Registered Jabber Transports]
-[Log on]
-[Log off]
-[Register with a new service...]
-[Close]
-[Command]
[Jabber Form]
[Instruction:]
[Submit]
@@ -75,7 +62,6 @@
[Jabber Password]
[Remember password for this session]
[Save password permanently]
-[Data form test]
[Address1:]
[Address2:]
[City:]
@@ -123,19 +109,15 @@
[Current Password:]
[New Password:]
[Confirm New Password:]
-[Jabber Multi-User Conference]
-[Conference server:]
[Create or Join group chat]
[Jabber Multi-User Conference\nCreate or join existing conference room.]
+[Conference server:]
[Room:]
[Recently visited chatrooms:]
[Bookmarks]
[JID List]
[Apply Filter]
[Reset Filter]
-[Jabber Agent Registration]
-[JID:]
-[Register]
[Invite Users]
[<room jid>\nSend group chat invitation.]
[Other JID:]
@@ -151,6 +133,7 @@
[Server side bookmarks\nStore conference rooms and web links on server.]
[Remove]
[Edit]
+[Close]
[Bookmark Details]
[Bookmark Type]
[Conference]
@@ -189,9 +172,8 @@
[View as list]
[Favorites]
[Refresh]
+[JID:]
[Node:]
-[Change %s Message]
-[Closing in %d]
[Account type:]
[Login server:]
[Register account now]
@@ -246,6 +228,8 @@
[Sending Ad-Hoc command to %s]
;file \protocols\JabberG\src\jabber_agent.cpp
[No message]
+[Jabber Agent Registration]
+[Register]
[Please wait...]
;file \protocols\JabberG\src\jabber_bookmarks.cpp
[Bookmark Name]
diff --git a/langpacks/english/Plugins/StartupSilence.txt b/langpacks/english/Plugins/StartupSilence.txt
index 7cc3196deb..9139a96825 100644
--- a/langpacks/english/Plugins/StartupSilence.txt
+++ b/langpacks/english/Plugins/StartupSilence.txt
@@ -5,7 +5,7 @@
; Version: 0.2.0.0
; Authors: Vladimir Lyubimov
;============================================================
-[Disables ALL popups and sounds for 10-300 sec at Miranda startup and enables them always for Miranda NG (Automatically per computer settings).]
+[Suppresses popups and mutes sounds for 10-300 sec at Miranda NG startup, then sets them back to predefined state (Automatically per computer settings).]
;file \plugins\StartupSilence\res\StartupSilence.rc
[Silence at Startup]
[Settings for the next Computer Name:]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 7cf4c9a7e3..7ce9067375 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -25,12 +25,17 @@
[VKontakte]
;file \protocols\VKontakte\src\vk_captcha.cpp
[Enter the text you see]
+;file \protocols\VKontakte\src\vk_chats.cpp
+[Participants]
+[Owners]
+[Unknown]
;file \protocols\VKontakte\src\vk_options.cpp
[Network]
[Account]
;file \protocols\VKontakte\src\vk_proto.cpp
[%s server connection]
;file \protocols\VKontakte\src\vk_thread.cpp
+[me]
[Attachments:]
[Photo]
[Audio]
diff --git a/langpacks/russian/Plugins/Jabber.txt b/langpacks/russian/Plugins/Jabber.txt
index b99a5466d9..efa1a477fa 100644
--- a/langpacks/russian/Plugins/Jabber.txt
+++ b/langpacks/russian/Plugins/Jabber.txt
@@ -95,32 +95,6 @@ TLS
Отключите все опции, если у вас проблемы с отправкой файлов. Могут возникнуть проблемы с передачей больших файлов.
[Jabber Account Registration]
Регистрация учётной записи Jabber
-[Jabber Agents]
-Агенты Jabber
-[Register/Search Jabber Agents]
-Регистрация/поиск агентов Jabber
-[Jabber server:]
-Сервер Jabber:
-[Browse]
-Обзор
-[Register...]
-Регистрация
-[Browse/Join chat room...]
-Обзор комнат...
-[Search...]
-Поиск...
-[Registered Jabber Transports]
-Зарегистрированные транспорты Jabber
-[Log on]
-Войти
-[Log off]
-Выйти
-[Register with a new service...]
-Регистрация новой службы...
-[Close]
-Закрыть
-[Command]
-Команда
[Jabber Form]
Jabber форма
[Instruction:]
@@ -231,12 +205,10 @@ Jabber vCard: добавление телефона
Новый пароль:
[Confirm New Password:]
Подтверждение:
-[Jabber Multi-User Conference]
-Конференция Jabber
-[Conference server:]
-Сервер:
[Jabber Multi-User Conference\nCreate or join existing conference room.]
Комната чата Jabber\nСоздание или вход в комнату чата.
+[Conference server:]
+Сервер:
[Room:]
Комната чата:
[Recently visited chatrooms:]
@@ -249,10 +221,6 @@ Jabber vCard: добавление телефона
Применить фильтр
[Reset Filter]
Сбросить фильтр
-[Jabber Agent Registration]
-Регистрация агента Jabber
-[Register]
-Регистрация
[Invite Users]
Приглашение пользователей
[<room jid>\nSend group chat invitation.]
@@ -283,6 +251,8 @@ Jabber vCard: добавление телефона
Удалить
[Edit]
Изменить
+[Close]
+Закрыть
[Bookmark Details]
Детали закладки
[Bookmark Type]
@@ -361,10 +331,6 @@ Hовое имя списка приватности:
Обновить
[Node:]
Узел:
-[Change %s Message]
-Изменить сообщение "%s"
-[Closing in %d]
-Закрыть (%d)
[Account type:]
Тип аккаунта:
[Login server:]
@@ -463,6 +429,10 @@ Jabber Ad-Hoc команды на %s
Отправить Ad-Hoc команду %s
[No message]
Нет сообщения
+[Jabber Agent Registration]
+Регистрация агента Jabber
+[Register]
+Регистрация
[Please wait...]
Подождите, пожалуйста...
[Bookmark Name]
diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt
index 2dddceb27a..9585d92e72 100644
--- a/langpacks/russian/Plugins/VKontakte.txt
+++ b/langpacks/russian/Plugins/VKontakte.txt
@@ -39,12 +39,20 @@ E-mail или номер телефона:
ВКонтакте
[Enter the text you see]
Введите текст, который видите
+[Participants]
+Участники
+[Owners]
+Владельцы
+[Unknown]
+Неизвестный
[Network]
Сеть
[Account]
Учётная запись
[%s server connection]
Подключение к серверу %s
+[me]
[Attachments:]
Вложения:
[Photo]
diff --git a/langpacks/russian/Untranslated/Jabber.txt b/langpacks/russian/Untranslated/Jabber.txt
index f640ee70be..d9c46582de 100644
--- a/langpacks/russian/Untranslated/Jabber.txt
+++ b/langpacks/russian/Untranslated/Jabber.txt
@@ -1,6 +1,5 @@
[OK]
[Jabber]
-[Data form test]
[X400]
[Create or Join group chat]
[JID:]