diff options
| -rw-r--r-- | langpacks/english/Plugins/CmdLine.txt | 2 | ||||
| -rw-r--r-- | langpacks/english/Plugins/Sametime.txt | 8 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/CmdLine.txt | 4 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/Sametime.txt | 4 | ||||
| -rw-r--r-- | langpacks/russian/Untranslated/Sametime.txt | 6 | ||||
| -rw-r--r-- | plugins/CmdLine/src/mimcmd_data.h | 2 |
6 files changed, 12 insertions, 14 deletions
diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt index 634d0a6e2c..b97e5ca473 100644 --- a/langpacks/english/Plugins/CmdLine.txt +++ b/langpacks/english/Plugins/CmdLine.txt @@ -37,7 +37,7 @@ [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 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 CrashDumper plugin is installed, it will use its report instead.\nUsage: version.\nThe command will print Miranda's and CmdLine's version numbers or, if CrashDumper plugin is installed, it will show VersionInfo's report.]
+[Shows version information for Miranda and CmdLine plugin. If CrashDumper plugin is installed, it will use its report instead.\nUsage: version.\nThe command will print Miranda's and CmdLine's version numbers or, if CrashDumper plugin is installed, it will show Version Info report.]
[Changes the user's nickname on the given protocol to the new name.\nUsage: setnickname <protocol> new_nickname.]
[Ignores or removes ignore flags for specific contacts.\nUsage:\n ignore (block | unblock) <contact> [<contact> [<contact> [...]]].\nThe command will set or remove ignore flags for the specified contacts]
;file \plugins\CmdLine\src\mimcmd_handlers.cpp
diff --git a/langpacks/english/Plugins/Sametime.txt b/langpacks/english/Plugins/Sametime.txt index c58f0ce9c3..10fa4ae792 100644 --- a/langpacks/english/Plugins/Sametime.txt +++ b/langpacks/english/Plugins/Sametime.txt @@ -47,8 +47,8 @@ [No common encryption method. Try to enable encryption in protocol options.]
[SERVICE NOT IMPLEMENTED. %s]
;file \protocols\Sametime\src\options.cpp
-[Client proto version: %03d.%03d]
-[Server proto version: %03d.%03d]
+[Client protocol version: %03d.%03d]
+[Server protocol version: %03d.%03d]
[Network]
;file \protocols\Sametime\src\sametime.cpp
[Protocol icon]
@@ -139,7 +139,7 @@ [User relogin]
[Bad name]
[Registration error]
-[Privilage error]
+[Privilege error]
[Need email]
[DNS error]
[DNS fatal error]
@@ -236,7 +236,7 @@ [Disconnected due to login in two Sametime servers concurrently (2)]
[Disconnected due to login from another computer.]
[Unable to log in because you are already logged on from another computer]
-[Unable to log in because the server is eother unreachable, or not configured properly.]
+[Unable to log in because the server is either unreachable, or not configured properly.]
[Unable to log in to home Sametime server through the requested server, since your home server needs to be upgraded.]
[The applet was logged out with this reason. Perform relogin and you will return to the former state.]
[The user is not online]
diff --git a/langpacks/russian/Plugins/CmdLine.txt b/langpacks/russian/Plugins/CmdLine.txt index 9d2b5a4d82..27440bf319 100644 --- a/langpacks/russian/Plugins/CmdLine.txt +++ b/langpacks/russian/Plugins/CmdLine.txt @@ -53,8 +53,8 @@ Miranda была закрыта или произошла ошибка при о Настраивает прокси сервер для учётной записи или глобально.\nИспользование: proxy (global|<учётная запись>) <настройка> [<параметры>].\n<Настройка> - одно из следующих значений:\n status (disable | enable | toggle)*\n server <тип прокси> <сервер> <порт>.\n*disable - выключить.\n*enable - включить\n*toggle - переключить состояние.
[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 CrashDumper plugin is installed, it will use its report instead.\nUsage: version.\nThe command will print Miranda's and CmdLine's version numbers or, if CrashDumper plugin is installed, it will show VersionInfo's report.]
-Отображает информацию о версиях Miranda и плагина CmdLine. Если установлен плагин CrashDumper, будет использоваться отчёт этого плагина.\nИспользование: version.\nКоманда отобразит версии Miranda и плагина CmdLine или, если установлен плагин CrashDumper, будет отображён отчёт VersionInfo.
+[Shows version information for Miranda and CmdLine plugin. If CrashDumper plugin is installed, it will use its report instead.\nUsage: version.\nThe command will print Miranda's and CmdLine's version numbers or, if CrashDumper plugin is installed, it will show Version Info report.]
+Отображает информацию о версиях Miranda и плагина CmdLine. Если установлен плагин CrashDumper, будет использоваться отчёт этого плагина.\nИспользование: version.\nКоманда отобразит версии Miranda и плагина CmdLine или, если установлен плагин CrashDumper, будет отображён отчёт информации о версиях.
[Changes the user's nickname on the given protocol to the new name.\nUsage: setnickname <protocol> new_nickname.]
Меняет ник пользователя на указанном протоколе.\nИспользование: setnickname <протокол> новый_ник.
[Ignores or removes ignore flags for specific contacts.\nUsage:\n ignore (block | unblock) <contact> [<contact> [<contact> [...]]].\nThe command will set or remove ignore flags for the specified contacts]
diff --git a/langpacks/russian/Plugins/Sametime.txt b/langpacks/russian/Plugins/Sametime.txt index d1bd4789a4..200dc3d026 100644 --- a/langpacks/russian/Plugins/Sametime.txt +++ b/langpacks/russian/Plugins/Sametime.txt @@ -75,10 +75,6 @@ Шифрование недоступно. Попробуйте включить шифрование в настройках протокола.
[SERVICE NOT IMPLEMENTED. %s]
СЛУЖБА НЕ РЕАЛИЗОВАНА. %s
-[Client proto version: %03d.%03d]
-Клиентская версия протокола: %03d.%03d
-[Server proto version: %03d.%03d]
-Серверная версия протокола: %03d.%03d
[Network]
Сеть
[Protocol icon]
diff --git a/langpacks/russian/Untranslated/Sametime.txt b/langpacks/russian/Untranslated/Sametime.txt index b823816616..c6c33d1cdd 100644 --- a/langpacks/russian/Untranslated/Sametime.txt +++ b/langpacks/russian/Untranslated/Sametime.txt @@ -1,5 +1,7 @@ [ID:]
[Client ID and version]
+[Client protocol version: %03d.%03d]
+[Server protocol version: %03d.%03d]
[ID]
[%s\n\nSametime error %S\n%s]
[Success]
@@ -65,7 +67,7 @@ [User relogin]
[Bad name]
[Registration error]
-[Privilage error]
+[Privilege error]
[Need email]
[DNS error]
[DNS fatal error]
@@ -162,7 +164,7 @@ [Disconnected due to login in two Sametime servers concurrently (2)]
[Disconnected due to login from another computer.]
[Unable to log in because you are already logged on from another computer]
-[Unable to log in because the server is eother unreachable, or not configured properly.]
+[Unable to log in because the server is either unreachable, or not configured properly.]
[Unable to log in to home Sametime server through the requested server, since your home server needs to be upgraded.]
[The applet was logged out with this reason. Perform relogin and you will return to the former state.]
[The user is not online]
diff --git a/plugins/CmdLine/src/mimcmd_data.h b/plugins/CmdLine/src/mimcmd_data.h index 9a4f166a4e..9379af70a5 100644 --- a/plugins/CmdLine/src/mimcmd_data.h +++ b/plugins/CmdLine/src/mimcmd_data.h @@ -105,7 +105,7 @@ typedef TSharedData *PSharedData; #define MIMCMD_HELP_PROXY LPGEN("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>.")
#define MIMCMD_HELP_CONTACTS LPGEN("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.")
#define MIMCMD_HELP_HISTORY LPGEN("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).")
-#define MIMCMD_HELP_VERSION LPGEN("Shows version information for Miranda and CmdLine plugin. If CrashDumper plugin is installed, it will use its report instead.\nUsage: version.\nThe command will print Miranda's and CmdLine's version numbers or, if CrashDumper plugin is installed, it will show VersionInfo's report.")
+#define MIMCMD_HELP_VERSION LPGEN("Shows version information for Miranda and CmdLine plugin. If CrashDumper plugin is installed, it will use its report instead.\nUsage: version.\nThe command will print Miranda's and CmdLine's version numbers or, if CrashDumper plugin is installed, it will show Version Info report.")
#define MIMCMD_HELP_SETNICKNAME LPGEN("Changes the user's nickname on the given protocol to the new name.\nUsage: setnickname <protocol> new_nickname.")
#define MIMCMD_HELP_IGNORE LPGEN("Ignores or removes ignore flags for specific contacts.\nUsage:\n ignore (block | unblock) <contact> [<contact> [<contact> [...]]].\nThe command will set or remove ignore flags for the specified contacts")
|