diff options
| -rw-r--r-- | langpacks/english/=CORE=.txt | 20 | ||||
| -rw-r--r-- | langpacks/english/Plugins/Import.txt | 8 | ||||
| -rw-r--r-- | langpacks/english/Plugins/Jabber.txt | 4 | ||||
| -rw-r--r-- | langpacks/english/Plugins/MirOTR.txt | 24 | ||||
| -rw-r--r-- | langpacks/english/Plugins/NewXstatusNotify.txt | 2 | ||||
| -rw-r--r-- | langpacks/english/Plugins/VKontakte.txt | 2 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/Import.txt | 8 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/Jabber.txt | 4 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/MirOTR.txt | 8 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/NewXstatusNotify.txt | 2 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/VKontakte.txt | 2 | ||||
| -rw-r--r-- | langpacks/russian/Untranslated/=CORE=.txt | 19 | ||||
| -rw-r--r-- | langpacks/russian/Untranslated/MirOTR.txt | 20 |
13 files changed, 89 insertions, 34 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index 40934ea63f..467d3040c0 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -1005,6 +1005,8 @@ [View/change my &details...]
;file \src\core\stduseronline\src\useronline.cpp
[%s is online]
+;file \src\mir_core\src\ui_utils.cpp
+[Account]
;file \src\modules\addcontact\addcontact.cpp
[Add contact]
[Please authorize my request and add me to your contact list.]
@@ -1335,6 +1337,24 @@ [You need to disable plugin to delete this account]
[&Accounts...]
;file \src\modules\skin\hotkey_opts.cpp
+[Browser: Back]
+[Browser: Forward]
+[Browser: Refresh]
+[Browser: Stop]
+[Browser: Search]
+[Browser: Fav]
+[Browser: Home]
+[Mute]
+[Vol-]
+[Vol+]
+[Media: Next Track]
+[Media: Prev. Track]
+[Media: Stop]
+[Media: Play/Pause]
+[Mail]
+[Media: Select]
+[App 1]
+[App 2]
[Ctrl + ]
[Alt + ]
[Shift + ]
diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt index 7abda7081e..50f19f2fc3 100644 --- a/langpacks/english/Plugins/Import.txt +++ b/langpacks/english/Plugins/Import.txt @@ -26,13 +26,13 @@ [Cancel]
[< &Back]
[Import all settings, contacts and all messages]
-[Makes precise copy of the original profile]
[Import all contacts and all messages]
-[Select this if you want to import as much data as possible. This is the recommended option.]
[Only import contacts]
-[Select this if you want to import contacts but don't want to import any message history.]
[Custom import]
-[Select this if you want to customize what to import.]
+[Makes precise copy of the original profile, including all settings, contacts and history]
+[Imports only contacts and history, and a few settings. Ideal for synchronizing.]
+[Imports contacts only, doesn't import any message history.]
+[Custom schema: you can choose what to import.]
[New contacts && groups]
[System history]
[Select items to import:]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt index 0a006d0400..03e8602cf0 100644 --- a/langpacks/english/Plugins/Jabber.txt +++ b/langpacks/english/Plugins/Jabber.txt @@ -402,6 +402,8 @@ [Supported features]
[Info request error]
[Items request error]
+;file \protocols\JabberG\src\jabber_filterlist.cpp
+[Set filter...]
;file \protocols\JabberG\src\jabber_form2.cpp
[One or more addresses for communication related to abusive traffic]
[One or more addresses for customer feedback]
@@ -1284,5 +1286,3 @@ [Listening To]
[Moods]
[Activities]
-;file \protocols\JabberG\src\ui_utils.cpp
-[Set filter...]
diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt index 9e9f0802e9..8db76a7138 100644 --- a/langpacks/english/Plugins/MirOTR.txt +++ b/langpacks/english/Plugins/MirOTR.txt @@ -17,6 +17,7 @@ [End sessions on window close]
[End sessions when contacts go offline]
[Prefix encrypted IMs:]
+[don't rely on the prefix, always check the OTR status icon]
[Don't add encrypted messages to the history]
[Also remove OTR system messages]
[Show OTR system messages inline]
@@ -67,11 +68,6 @@ [OTR could not encrypt when sending message]
[OTR Information]
[[OTR INFO] ]
-[Authentication from %s]
-[Authenticate %s]
-[Unknown]
-[OTR: %s (%s)]
-[OTR %s (%s)]
[OTR encrypted session with '%s' is now using a VERIFIED fingerprint]
[OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
[OTR unverified]
@@ -126,8 +122,26 @@ [OTR: SecureIM installed]
[You are using SecureIM. MirOTR will only work for contacts with SecureIM disabled]
;file \plugins\MirOTR\src\mirotrmenu.cpp
+[ [v%i]]
[MirOTR menu]
[OTR Status]
;file \plugins\MirOTR\src\options.cpp
[Private Data]
[Services]
+;file \plugins\MirOTR\src\otr.cpp
+[\nusing older protocol version %i]
+[Attempting to start a private conversation...]
+[An error occurred when encrypting your message.\nThe message was not sent]
+['%s' has already closed his/her private connection to you; you should do the same]
+[Error setting up private conversation: %s]
+[Malformed message received]
+[We are receiving our own OTR messages.\nYou are either trying to talk to yourself, or someone is reflecting your messages back at you]
+[The last message to '%s' was resent]
+[The encrypted message received from '%s' is unreadable, as you are not currently communicating privately]
+[We received an unreadable encrypted message from '%s']
+[We received a malformed data message from '%s']
+[The following message received from '%s' was NOT encrypted: [%s]]
+['%s' has sent a message intended for a different session. If you are logged in multiple times, another session may have received the message.]
+[unknown OTR message received, please report that to Miranda NG]
+;file \plugins\MirOTR\src\utils.cpp
+['(Unknown contact)']
diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt index b5fdeb45fa..781ad44b0a 100644 --- a/langpacks/english/Plugins/NewXstatusNotify.txt +++ b/langpacks/english/Plugins/NewXstatusNotify.txt @@ -2,7 +2,7 @@ ;============================================================
; File: NewXstatusNotify.dll
; Plugin: xStatus notify
-; Version: 1.4.0.10
+; Version: 1.4.0.11
; Authors: Luca Santarelli, Vasilich, yaho
;============================================================
[Notifies you when a contact changes his/her (X)status or status message.]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt index f2fb3cccff..669f00cf59 100644 --- a/langpacks/english/Plugins/VKontakte.txt +++ b/langpacks/english/Plugins/VKontakte.txt @@ -2,7 +2,7 @@ ;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.0.51
+; Version: 0.1.0.52
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/russian/Plugins/Import.txt b/langpacks/russian/Plugins/Import.txt index 983d2b2563..79b6513b4d 100644 --- a/langpacks/russian/Plugins/Import.txt +++ b/langpacks/russian/Plugins/Import.txt @@ -45,20 +45,12 @@ Miranda нашла следующие профили. Выберите проф < &Назад
[Import all settings, contacts and all messages]
Импортировать все настройки, контакты и сообщения
-[Makes precise copy of the original profile]
-Создаёт точную копию оригинального профиля
[Import all contacts and all messages]
Импортировать все контакты и сообщения
-[Select this if you want to import as much data as possible. This is the recommended option.]
-Выберите эту опцию, чтобы импортировать как можно больше данных (рекомендуется).
[Only import contacts]
Импортировать только контакты
-[Select this if you want to import contacts but don't want to import any message history.]
-Выберите эту опцию, чтобы импортировать только контакты (без истории сообщений).
[Custom import]
Импорт вручную
-[Select this if you want to customize what to import.]
-Выберите эту опцию, чтобы указать, что именно импортировать
[New contacts && groups]
Новые контакты и группы
[System history]
diff --git a/langpacks/russian/Plugins/Jabber.txt b/langpacks/russian/Plugins/Jabber.txt index e9610acfd6..9525e744b1 100644 --- a/langpacks/russian/Plugins/Jabber.txt +++ b/langpacks/russian/Plugins/Jabber.txt @@ -759,6 +759,8 @@ Jabber ошибка Ошибка запроса информации
[Items request error]
Ошибка запроса значений
+[Set filter...]
+Фильтр...
[First Name]
Имя
[Last Name]
@@ -2193,5 +2195,3 @@ Jabber vCard: редактирование телефона Настроения
[Activities]
Занятия
-[Set filter...]
-Фильтр...
diff --git a/langpacks/russian/Plugins/MirOTR.txt b/langpacks/russian/Plugins/MirOTR.txt index 135e2f0bfe..d6c8fe9196 100644 --- a/langpacks/russian/Plugins/MirOTR.txt +++ b/langpacks/russian/Plugins/MirOTR.txt @@ -123,12 +123,6 @@ OTR-шифрование: завершено OTR не может шифровать во время отправки сообщения
[OTR Information]
Информация OTR
-[Authentication from %s]
-Идентификация от %s
-[Authenticate %s]
-Идентификация %s
-[Unknown]
-Неизвестно
[OTR encrypted session with '%s' is now using a VERIFIED fingerprint]
Шифрованная сессия с '%s' теперь использует ПРОВЕРЕННЫЙ отпечаток.
[OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]
@@ -243,3 +237,5 @@ OTR: установлен SecureIM Личные данные
[Services]
Службы
+['(Unknown contact)']
+'(Неизвестный контакт)'
diff --git a/langpacks/russian/Plugins/NewXstatusNotify.txt b/langpacks/russian/Plugins/NewXstatusNotify.txt index 130fcac85a..f31426d335 100644 --- a/langpacks/russian/Plugins/NewXstatusNotify.txt +++ b/langpacks/russian/Plugins/NewXstatusNotify.txt @@ -2,7 +2,7 @@ ;============================================================
; File: NewXstatusNotify.dll
; Plugin: xStatus notify
-; Version: 1.4.0.10
+; Version: 1.4.0.11
; Authors: Luca Santarelli, Vasilich, yaho
;============================================================
[Notifies you when a contact changes his/her (X)status or status message.]
diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt index 0d7c38dc3c..2d32400bdf 100644 --- a/langpacks/russian/Plugins/VKontakte.txt +++ b/langpacks/russian/Plugins/VKontakte.txt @@ -2,7 +2,7 @@ ;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.0.51
+; Version: 0.1.0.52
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/russian/Untranslated/=CORE=.txt b/langpacks/russian/Untranslated/=CORE=.txt index 849b5f2cff..082a9a2b1c 100644 --- a/langpacks/russian/Untranslated/=CORE=.txt +++ b/langpacks/russian/Untranslated/=CORE=.txt @@ -1,5 +1,24 @@ [&E-mail]
+[Account]
[ID]
+[Browser: Back]
+[Browser: Forward]
+[Browser: Refresh]
+[Browser: Stop]
+[Browser: Search]
+[Browser: Fav]
+[Browser: Home]
+[Mute]
+[Vol-]
+[Vol+]
+[Media: Next Track]
+[Media: Prev. Track]
+[Media: Stop]
+[Media: Play/Pause]
+[Mail]
+[Media: Select]
+[App 1]
+[App 2]
[Ctrl + ]
[Alt + ]
[Shift + ]
diff --git a/langpacks/russian/Untranslated/MirOTR.txt b/langpacks/russian/Untranslated/MirOTR.txt index 028aa4e888..a504b8a7b8 100644 --- a/langpacks/russian/Untranslated/MirOTR.txt +++ b/langpacks/russian/Untranslated/MirOTR.txt @@ -1,3 +1,17 @@ -[[OTR INFO] ]
-[OTR: %s (%s)]
-[OTR %s (%s)]
+[don't rely on the prefix, always check the OTR status icon]
+[[OTR INFO] ]
+[ [v%i]]
+[\nusing older protocol version %i]
+[Attempting to start a private conversation...]
+[An error occurred when encrypting your message.\nThe message was not sent]
+['%s' has already closed his/her private connection to you; you should do the same]
+[Error setting up private conversation: %s]
+[Malformed message received]
+[We are receiving our own OTR messages.\nYou are either trying to talk to yourself, or someone is reflecting your messages back at you]
+[The last message to '%s' was resent]
+[The encrypted message received from '%s' is unreadable, as you are not currently communicating privately]
+[We received an unreadable encrypted message from '%s']
+[We received a malformed data message from '%s']
+[The following message received from '%s' was NOT encrypted: [%s]]
+['%s' has sent a message intended for a different session. If you are logged in multiple times, another session may have received the message.]
+[unknown OTR message received, please report that to Miranda NG]
|