diff options
| -rw-r--r-- | langpacks/english/=CORE=.txt | 1 | ||||
| -rw-r--r-- | langpacks/english/Plugins/CmdLine.txt | 6 | ||||
| -rw-r--r-- | langpacks/english/Plugins/VKontakte.txt | 12 | ||||
| -rw-r--r-- | langpacks/english/Plugins/WhatsApp.txt | 2 | ||||
| -rw-r--r-- | langpacks/russian/=CORE=.txt | 2 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/CmdLine.txt | 6 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/VKontakte.txt | 22 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/WhatsApp.txt | 2 | ||||
| -rw-r--r-- | langpacks/russian/Untranslated/=CORE=.txt | 1 | ||||
| -rw-r--r-- | langpacks/russian/Untranslated/CmdLine.txt | 3 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_proto.cpp | 2 |
11 files changed, 45 insertions, 14 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index 7c46978d54..f37f6ce77e 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -1177,6 +1177,7 @@ ;file \src\modules\findadd\findadd.cpp
[You haven't filled in the search field. Please enter a search term and try again.]
[Search]
+[Ctrl+Search add contact]
[Results]
[There are no results to display.]
[Searching]
diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt index a4bf7e5379..be57a6689d 100644 --- a/langpacks/english/Plugins/CmdLine.txt +++ b/langpacks/english/Plugins/CmdLine.txt @@ -21,7 +21,7 @@ [Could not initialize CmdLine plugin property]
[Error]
;file \plugins\CmdLine\src\mimcmd_data.h
-[Changes account status either globally or per account.\nUsage: status <status> [<account>].\nPossible values for <status> are: offline, online, away, dnd, na, occupied, freechat, invisible, onthephone, outtolunch.\n<Account> is the name of the account. If it's not specified then the command will issue a global status change.]
+[Changes account status either globally or per account.\nUsage: status <status> [<account>].\nPossible values for <status> are: offline, online, away, dnd, na, occupied, freechat, invisible, onthephone, outtolunch.\n<Account> is an optional parameter specifying the account to set the status for. If it's not specified then the command will issue a global status change.]
[Changes away message either globally or per account.\nUsage: awaymsg <message> [<account>].\n<Message> is the new away message.\n<Account> is an optional parameter specifying the account to set the away message for. If not specified then the away message will be set globally.]
[Changes extended status either globally or per account.\nUsage: xstatus <xStatus> [<account>].\n<xStatus> is the new extended status to set. Possible values are: ...\n<Account> is an optional parameter specifying the account for which extended status is set. If not specified then extended status for all accounts will be changed.\nNOTE: Not all accounts/protocols support extended status.]
[Disables or enables popups display.\nUsage: popups (disable | enable | toggle).\nThe command will either enable or disable popups display.]
@@ -31,11 +31,11 @@ [Provides help on other commands.\nUsage: help [<command>].\nThe command will print help information for other commands. If run without any parameters it will print available commands.]
[Notifies Exchange plugin to check for email.\nUsage: exchange check.]
[Notifies YAMN plugin to check for email.\nUsage: yamn check.]
-[Calls a Miranda service.\nUsage: callservice <service> (d|s)<wParam> (d|s)<lParam>.\nThe command will call Miranda <service> service using wParam and lParam as arguments; the first letter of the paramater must be either 'd' if the parameter is a decimal number or 's' if the parameter is a string. Be careful when you use this function as you can only pass numbers and strings as data.\nNOTE: If you pass invalid data to a service, Miranda might crash.]
+[Calls a Miranda service.\nUsage: callservice <service> (d|s)<wParam> (d|s)<lParam>.\nThe command will call Miranda <service> service using wParam and lParam as arguments; the first letter of the parameter must be either 'd' if the parameter is a decimal number or 's' if the parameter is a string. Be careful when you use this function as you can only pass numbers and strings as data.\nNOTE: If you pass invalid data to a service, Miranda might crash.]
[Sends a message to the specified contact(s).\nUsage: message <contact> [<contact> [<contact> [...]]] <message>.\nThe command will send <message> to the specified contact(s) - at least one contact must be specified - all parameters except the last one are considered recipients.\n<Contact> has the following format: <name>[:<account>]. <Name> is the contact display name or unique ID and <account> is an optional parameter representing the account of the contact (useful in case there is more than one contact with the same name).\nNOTE: The message string cannot exceed 512 characters. You can use \\n for new line (and \\\\n for \\n).]
[Allows you to manage database settings.\nUsage:\n db set <module> <name> (b|i|d|s|w)<value>\n db delete <module> <name>\n db get <module> <name>.\nThe command can set a database entry to the specified value (if the entry does not exist, it will be created) as well as read or delete a specified database entry. <Module> is the name of the module where the key should be located, <name> is the name of the key and <value> is the value to be written. A character must be placed before <value> in order to specify what kind of data to write: b - byte, i - integer (word), d - double word, s - string, w - wide string.]
[Configures proxy settings either globally or per account.\nUsage: proxy (global|<account>) <setting> [<params>].\n<Setting> is one of the following settings:\n status (disable | enable | toggle)\n server <proxy type> <server> <port>.]
-[Allows you to search/list contacts or open a message windows for specified contacts.\nUsage:\n contacts list [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'.\n contacts open [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will open a message window for all contacts that match the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'. If no keyword is specified, the command will open a message window for all contacts that have unread messages.]
+[Allows you to search/list contacts or open message windows for specified contacts.\nUsage:\n contacts list [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'.\n contacts open [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will open a message window for all contacts that match the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'. If no keyword is specified, the command will open a message window for all contacts that have unread messages.]
[Shows history or unread messages for a contact.\nUsage: history <command> <contact>.\n<Command> is one of the following commands:\n unread - show unread messages for that contact.\n show <contact> <start> <finish> - show history from event number <start> to <finish>. If any number is negative, it is interpreted as a relative index from the last event number +1 (so the last event for a contact is -1).]
[Shows version information for Miranda and CmdLine plugin. If VersionInfo plugin is installed, it will use its report instead.\nUsage: version.\nThe command will print Miranda's and CmdLine's version numbers or, if VersionInfo plugin is installed, it will show VersionInfo's report.]
[Changes the user's nickname on the given protocol to the new name.\nUsage: setnickname <protocol> new_nickname.]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt index 22a42ab724..1f695d8b7a 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.15
+; Version: 0.1.0.16
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
@@ -57,7 +57,17 @@ [Create new chat]
[Visit profile]
[Reload all messages from vk.com]
+[Add as friend]
+[Errors]
+[User add as friend]
+[Cannot add user himself as friend]
+[Error]
+[Cannot add this user to friends as they have put you on their blacklist]
+[Cannot add this user to friends as you put him on blacklist]
;file \protocols\VKontakte\src\vk_thread.cpp
+[History import is complete]
+[History import]
+[Please authorize me to add you to my friend list.]
[Are you sure to reload all messages from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a long time.\nDo you want to continue?]
[Attention!]
[Attachments:]
diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt index ee81fed697..db4a6eeaef 100644 --- a/langpacks/english/Plugins/WhatsApp.txt +++ b/langpacks/english/Plugins/WhatsApp.txt @@ -2,7 +2,7 @@ ;============================================================
; File: WhatsApp.dll
; Plugin: WhatsApp protocol
-; Version: 0.1.0.2
+; Version: 0.1.0.3
; Authors: Uli Hecht
;============================================================
[WhatsApp protocol support for Miranda NG.]
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt index b0fbdc8971..6e32321319 100644 --- a/langpacks/russian/=CORE=.txt +++ b/langpacks/russian/=CORE=.txt @@ -11,6 +11,8 @@ Укажите внутреннее имя (не обязательно)
[Cancel]
Отмена
+[Ctrl+Search add contact]
+Ctrl+Искать добавляет контакт
[Add %s]
Добавить %s
[&Add]
diff --git a/langpacks/russian/Plugins/CmdLine.txt b/langpacks/russian/Plugins/CmdLine.txt index c8896a60d7..ca706cacfd 100644 --- a/langpacks/russian/Plugins/CmdLine.txt +++ b/langpacks/russian/Plugins/CmdLine.txt @@ -27,8 +27,6 @@ Miranda была закрыта или произошла ошибка при о Неизвестная команда '%s'.\n
[Error]
Ошибка
-[Changes account status either globally or per account.\nUsage: status <status> [<account>].\nPossible values for <status> are: offline, online, away, dnd, na, occupied, freechat, invisible, onthephone, outtolunch.\n<Account> is the name of the account. If it's not specified then the command will issue a global status change.]
-Смена статуса учётной записи или глобального статуса.\nИспользование: status <статус> [<учётная запись>].\nВозможные значения <статус>: offline, online, away, dnd, na, occupied, freechat, invisible, onthephone, outtolunch.\n<Учётная запись> - имя учётной записи. Если не указано - будет установлен глобальный статус.
[Changes away message either globally or per account.\nUsage: awaymsg <message> [<account>].\n<Message> is the new away message.\n<Account> is an optional parameter specifying the account to set the away message for. If not specified then the away message will be set globally.]
Смена сообщения статуса учётной записи или глобально.\nИспользование: awaymsg <сообщение> [<учётная запись>].\n<Сообщение> - текст сообщения статуса.\n<Учётная запись> - дополнительный параметр, указывающий имя учётной записи для установки сообщения. Если не указано - сообщение статуса будет установлено глобально.
[Changes extended status either globally or per account.\nUsage: xstatus <xStatus> [<account>].\n<xStatus> is the new extended status to set. Possible values are: ...\n<Account> is an optional parameter specifying the account for which extended status is set. If not specified then extended status for all accounts will be changed.\nNOTE: Not all accounts/protocols support extended status.]
@@ -47,16 +45,12 @@ Miranda была закрыта или произошла ошибка при о Запускает проверку почты в плагине Exchangе.\nИспользование: exchange check.
[Notifies YAMN plugin to check for email.\nUsage: yamn check.]
Запускает проверку почты в плагине YAMN.\nИспользование: yamn check.
-[Calls a Miranda service.\nUsage: callservice <service> (d|s)<wParam> (d|s)<lParam>.\nThe command will call Miranda <service> service using wParam and lParam as arguments; the first letter of the paramater must be either 'd' if the parameter is a decimal number or 's' if the parameter is a string. Be careful when you use this function as you can only pass numbers and strings as data.\nNOTE: If you pass invalid data to a service, Miranda might crash.]
-Вызывает сервис Miranda.\nИспользование: callservice <сервис> (d|s)<wParam> (d|s)<lParam>.\nКоманда вызывает <сервис> Miranda с использованием в качестве аргументов wParam и lParam. Первая буква параметра должна быть либо 'd' (если параметр - десятичный), либо 's' (если параметр - строка). Будьте осторожны с использованием этой команды, т.к. в качестве значений параметров можно передавать только цифры и строки.\nЗАМЕЧАНИЕ: Если вы укажете неверные данные в параметрах сервиса, Miranda может аварийно завершиться.
[Sends a message to the specified contact(s).\nUsage: message <contact> [<contact> [<contact> [...]]] <message>.\nThe command will send <message> to the specified contact(s) - at least one contact must be specified - all parameters except the last one are considered recipients.\n<Contact> has the following format: <name>[:<account>]. <Name> is the contact display name or unique ID and <account> is an optional parameter representing the account of the contact (useful in case there is more than one contact with the same name).\nNOTE: The message string cannot exceed 512 characters. You can use \\n for new line (and \\\\n for \\n).]
Отправляет сообщение указанному контакту или контактам.\nИспользование: message <контакт> [<контакт> [<контакт>] [...]]] <сообщение>.\nКоманда отправит <сообщение> указанным контактам. Должен быть указан как минимум один контакт - все параметры за исключением последнего считаются получателями.\n<Контакт> имеет следующий формат: <имя>[:<учётная запись>]. <имя> - отображаемое имя контакта или его уникальный ID, <учётная запись> - дополнительный параметр, указывающий протокол контакта (используется, если есть несколько контактов с одинаковым именем).\nЗАМЕЧАНИЕ: <сообщение> не должно превышать 512 символов. Вы можете использовать \\n для начала новой строки (и \\\\n для \\n).
[Allows you to manage database settings.\nUsage:\n db set <module> <name> (b|i|d|s|w)<value>\n db delete <module> <name>\n db get <module> <name>.\nThe command can set a database entry to the specified value (if the entry does not exist, it will be created) as well as read or delete a specified database entry. <Module> is the name of the module where the key should be located, <name> is the name of the key and <value> is the value to be written. A character must be placed before <value> in order to specify what kind of data to write: b - byte, i - integer (word), d - double word, s - string, w - wide string.]
Позволяет управлять настройками в базе данных.\nИспользование:\n db set <модуль> <имя> (b|i|d|s|w)<значение>\n db delete <модуль> <имя>\n db get <модуль> <имя>.\nКоманда позволяет считывать, удалять и устанавливать значения параметров в базе (если указанного параметра нет, он будет создан).\n<Модуль> - имя модуля, в котором находится ключ, <имя> - имя ключа, а <значение> это данные ключа. Перед <значение> должен быть указан символ для указания типа данных ключа: b - байт, i - целое (слово), d - двойное слово, s - строка, w - юникод.
[Configures proxy settings either globally or per account.\nUsage: proxy (global|<account>) <setting> [<params>].\n<Setting> is one of the following settings:\n status (disable | enable | toggle)\n server <proxy type> <server> <port>.]
Настраивает прокси сервер для учётной записи или глобально.\nИспользование: proxy (global|<учётная запись>) <настройка> [<параметры>].\n<Настройка> - одно из следующих значений:\n status (disable | enable | toggle)*\n server <тип прокси> <сервер> <порт>.\n*disable - выключить.\n*enable - включить\n*toggle - переключить состояние.
-[Allows you to search/list contacts or open a message windows for specified contacts.\nUsage:\n contacts list [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'.\n contacts open [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will open a message window for all contacts that match the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'. If no keyword is specified, the command will open a message window for all contacts that have unread messages.]
-Позволяет искать/отображать контакты или открывать окно сообщения для указанных контактов.\nИспользование:\n contacts list [<ключ> [account:<учётная запись>] [id:<id>] [status:<статус>] [<ключ> [...]]].\nКоманда отобразит все контакты, найденные по указанным критериям.\nДля поиска по конкретной учётной записи используйте параметр 'account:<учётная запись>'\nДля поиска контакта по ID используйте ключ 'id:<id>'\nДля поиска контактов с указанным статусом, используйте 'status:<статус>'\n open [<ключ> [account:<учётная запись>] [id:<id>] [status:<статус>] [<ключ> [...]]].\nКоманда откроет окно сообщения для всех контактов, совпадающих с указанными критериями.\nДля поиска по конкретной учётной записи используйте параметр 'account:<учётная запись>'\nДля поиска контакта по ID используйте ключ 'id:<id>'\nДля поиска контактов с указанным статусом, используйте 'status:<статус>'\nЕсли ни один ключ не указан, команда откроет окно сообщения для всех контактов с непрочитанными сообщениями.
[Shows history or unread messages for a contact.\nUsage: history <command> <contact>.\n<Command> is one of the following commands:\n unread - show unread messages for that contact.\n show <contact> <start> <finish> - show history from event number <start> to <finish>. If any number is negative, it is interpreted as a relative index from the last event number +1 (so the last event for a contact is -1).]
Отображает непрочитанные сообщения или историю контакта.\nИспользование: history <команда> <контакт>.\n<Команда> - одна из следующих команд:\n unread - отобразить непрочитанные сообщения от указанного контакта\n show <контакт> <старт> <финиш> - отобразить историю начиная с события <старт> по <финиш>.\nЛюбое отрицательное значение интерпретируется как относительный индекс от последнего значения +1 (т.о. последнее событие для контакта это -1).
[Shows version information for Miranda and CmdLine plugin. If VersionInfo plugin is installed, it will use its report instead.\nUsage: version.\nThe command will print Miranda's and CmdLine's version numbers or, if VersionInfo plugin is installed, it will show VersionInfo's report.]
diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt index 494e94aea8..2c5d179d72 100644 --- a/langpacks/russian/Plugins/VKontakte.txt +++ b/langpacks/russian/Plugins/VKontakte.txt @@ -2,11 +2,29 @@ ;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.0.15
+; Version: 0.1.0.16
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
Поддержка протокола ВКонтакте в Miranda NG.
+[Add as friend]
+Добавить в друзья
+[Errors]
+Ошибки
+[User added as friend]
+Пользователь добавлен в друзья
+[You cannot add yourself as friend]
+Невозможно добавить себя в друзья
+[Cannot add this user to friends as they have put you on their blacklist]
+Невозможно добавить пользователя в друзья, так как вы находитесь в его чёрном списке
+[Cannot add this user to friends as you put him on blacklist]
+Невозможно добавить пользователя в друзья, так как он находится в вашем чёрном списке
+[History import is complete]
+Импорт истории завершён
+[History import]
+Импорт истории
+[Please authorize me to add you to my friend list.]
+Пожалуйста, разрешите мне добавить вас в список друзей.
[E-mail or phone number:]
E-mail или номер телефона:
[Password:]
@@ -97,6 +115,8 @@ Cоздать комнату чата Профиль на сайте
[Reload all messages from vk.com]
Загрузить историю с сайта
+[Error]
+Ошибка
[Are you sure to reload all messages from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a long time.\nDo you want to continue?]
Вы уверены, что хотите загрузить все сообщения с сайта vk.com?\nЛокальная история контакта будет удалена и загружена с сервера.\nЭто может занять много времени.\nВы уверены, что хотите продолжить?
[Attention!]
diff --git a/langpacks/russian/Plugins/WhatsApp.txt b/langpacks/russian/Plugins/WhatsApp.txt index b7368a0e43..0641faaf02 100644 --- a/langpacks/russian/Plugins/WhatsApp.txt +++ b/langpacks/russian/Plugins/WhatsApp.txt @@ -2,7 +2,7 @@ ;============================================================
; File: WhatsApp.dll
; Plugin: WhatsApp protocol
-; Version: 0.1.0.2
+; Version: 0.1.0.3
; Authors: Uli Hecht
;============================================================
[WhatsApp protocol support for Miranda NG.]
diff --git a/langpacks/russian/Untranslated/=CORE=.txt b/langpacks/russian/Untranslated/=CORE=.txt index 262a3a9f0a..f5c8496a1a 100644 --- a/langpacks/russian/Untranslated/=CORE=.txt +++ b/langpacks/russian/Untranslated/=CORE=.txt @@ -1,5 +1,6 @@ [AaBbYyZz]
[&E-mail]
+[Ctrl+Search add contact]
[ID]
[Ctrl + ]
[Alt + ]
diff --git a/langpacks/russian/Untranslated/CmdLine.txt b/langpacks/russian/Untranslated/CmdLine.txt index bbd44a3beb..9a5f2babc0 100644 --- a/langpacks/russian/Untranslated/CmdLine.txt +++ b/langpacks/russian/Untranslated/CmdLine.txt @@ -1,4 +1,7 @@ [Could not initialize CmdLine plugin property]
+[Changes account status either globally or per account.\nUsage: status <status> [<account>].\nPossible values for <status> are: offline, online, away, dnd, na, occupied, freechat, invisible, onthephone, outtolunch.\n<Account> is an optional parameter specifying the account to set the status for. If it's not specified then the command will issue a global status change.]
+[Calls a Miranda service.\nUsage: callservice <service> (d|s)<wParam> (d|s)<lParam>.\nThe command will call Miranda <service> service using wParam and lParam as arguments; the first letter of the parameter must be either 'd' if the parameter is a decimal number or 's' if the parameter is a string. Be careful when you use this function as you can only pass numbers and strings as data.\nNOTE: If you pass invalid data to a service, Miranda might crash.]
+[Allows you to search/list contacts or open message windows for specified contacts.\nUsage:\n contacts list [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'.\n contacts open [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will open a message window for all contacts that match the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'. If no keyword is specified, the command will open a message window for all contacts that have unread messages.]
[Current global status: %s.%s]
['%s' doesn't seem to be a valid account.]
[Failed to change status for account '%s' to '%s'.]
diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index 02de8e529e..6d1a51c6bf 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -463,7 +463,7 @@ void CVkProto::OnReceiveAuthRequest(NETLIBHTTPREQUEST *reply, AsyncHttpRequest * int iRet = json_as_int(pResponse);
if (iRet == 2){
setByte(param->hContact, "friend", 1);
- MsgPopup(param->hContact, TranslateT("User was added as friend"), _T(""));
+ MsgPopup(param->hContact, TranslateT("User added as friend"), _T(""));
}
}
else{
|