From 9ed30d2f6385917e64277e3f958345b99a2590d7 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 11 Nov 2014 20:39:42 +0000 Subject: CmdLine help adjusted according to changes - langpacks/english: update; - langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@10962 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Plugins/CmdLine.txt | 2 +- langpacks/english/Plugins/CrashDumper.txt | 2 +- langpacks/russian/Plugins/CmdLine.txt | 4 ++-- langpacks/russian/Plugins/CrashDumper.txt | 4 ++-- plugins/CmdLine/src/mimcmd_data.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt index be57a6689d..634d0a6e2c 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|) [].\n is one of the following settings:\n status (disable | enable | toggle)\n server .] [Allows you to search/list contacts or open message windows for specified contacts.\nUsage:\n contacts list [ [account:] [id:] [status:] [ [...]]].\nThe command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:'. To search for contacts that have a certain ID use the keyword 'id:'. To search for contacts that have a certain status use 'status:'.\n contacts open [ [account:] [id:] [status:] [ [...]]].\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:'. To search for contacts that have a certain ID use the keyword 'id:'. To search for contacts that have a certain status use '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 .\n is one of the following commands:\n unread - show unread messages for that contact.\n show - show history from event number to . 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.] +[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.] [Changes the user's nickname on the given protocol to the new name.\nUsage: setnickname new_nickname.] [Ignores or removes ignore flags for specific contacts.\nUsage:\n ignore (block | unblock) [ [ [...]]].\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/CrashDumper.txt b/langpacks/english/Plugins/CrashDumper.txt index b520930080..8c7e7daa19 100644 --- a/langpacks/english/Plugins/CrashDumper.txt +++ b/langpacks/english/Plugins/CrashDumper.txt @@ -50,7 +50,7 @@ ;file \plugins\CrashDumper\src\ui.cpp [View Version Information (with DLLs)] ;file \plugins\CrashDumper\src\upload.cpp -[VersionInfo upload successful,\n %d old plugins] +[VersionInfo upload successful.] [Cannot upload VersionInfo. Incorrect username or password] [Cannot upload VersionInfo. User is banned] [Cannot upload VersionInfo. Daily upload limit exceeded] diff --git a/langpacks/russian/Plugins/CmdLine.txt b/langpacks/russian/Plugins/CmdLine.txt index 5517f77de2..9d2b5a4d82 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 .\n is one of the following commands:\n unread - show unread messages for that contact.\n show - show history from event number to . 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.] -Отображает информацию о версиях Miranda и плагина CmdLine. Если установлен плагин VersionInfo, будет использоваться отчёт этого плагина.\nИспользование: version.\nКоманда отобразит версии Miranda и плагина CmdLine или, если установлен плагин VersionInfo, будет отображён отчёт 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 VersionInfo's report.] +Отображает информацию о версиях Miranda и плагина CmdLine. Если установлен плагин CrashDumper, будет использоваться отчёт этого плагина.\nИспользование: version.\nКоманда отобразит версии Miranda и плагина CmdLine или, если установлен плагин CrashDumper, будет отображён отчёт VersionInfo. [Changes the user's nickname on the given protocol to the new name.\nUsage: setnickname new_nickname.] Меняет ник пользователя на указанном протоколе.\nИспользование: setnickname <протокол> новый_ник. [Ignores or removes ignore flags for specific contacts.\nUsage:\n ignore (block | unblock) [ [ [...]]].\nThe command will set or remove ignore flags for the specified contacts] diff --git a/langpacks/russian/Plugins/CrashDumper.txt b/langpacks/russian/Plugins/CrashDumper.txt index 89628fd73f..2e5146829a 100644 --- a/langpacks/russian/Plugins/CrashDumper.txt +++ b/langpacks/russian/Plugins/CrashDumper.txt @@ -83,8 +83,8 @@ Miranda NG была завершена аварийно. Отчёт сохранен в \n %s\n\n Хотите ли вы сохранить его в буфер обмена? [View Version Information (with DLLs)] Информация о версиях (с библиотеками) -[VersionInfo upload successful,\n %d old plugins] -Версии успешно загружены,\n%d старых плагинов +[VersionInfo upload successful.] +Версии успешно загружены. [Cannot upload VersionInfo. Incorrect username or password] Нельзя загрузить информацию о версиях. Неправильное имя пользователя или пароль [Cannot upload VersionInfo. User is banned] diff --git a/plugins/CmdLine/src/mimcmd_data.h b/plugins/CmdLine/src/mimcmd_data.h index 9c91fe1581..9a4f166a4e 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|) [].\n is one of the following settings:\n status (disable | enable | toggle)\n server .") #define MIMCMD_HELP_CONTACTS LPGEN("Allows you to search/list contacts or open message windows for specified contacts.\nUsage:\n contacts list [ [account:] [id:] [status:] [ [...]]].\nThe command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:'. To search for contacts that have a certain ID use the keyword 'id:'. To search for contacts that have a certain status use 'status:'.\n contacts open [ [account:] [id:] [status:] [ [...]]].\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:'. To search for contacts that have a certain ID use the keyword 'id:'. To search for contacts that have a certain status use '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 .\n is one of the following commands:\n unread - show unread messages for that contact.\n show - show history from event number to . 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 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.") +#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_SETNICKNAME LPGEN("Changes the user's nickname on the given protocol to the new name.\nUsage: setnickname new_nickname.") #define MIMCMD_HELP_IGNORE LPGEN("Ignores or removes ignore flags for specific contacts.\nUsage:\n ignore (block | unblock) [ [ [...]]].\nThe command will set or remove ignore flags for the specified contacts") -- cgit v1.2.3