JCF2: fixed IDE keybinding name (removed ampersand), improved resourcestrings names, regenerated translations and updated Russian translation. Bug #16418.

git-svn-id: trunk@25242 -
This commit is contained in:
maxim 2010-05-07 22:35:45 +00:00
parent 74e4aaeec6
commit f4f2668214
5 changed files with 62 additions and 29 deletions

View File

@ -51,24 +51,25 @@ uses
const
FORMAT_MENU_NAME = 'jcfJEDICodeFormat';
FORMAT_CURRENT_NAME = 'jcfCurrentEditorWindow';
FORMAT_PROJECT_NAME = 'jcfAllFilesinProject';
FORMAT_OPEN_NAME = 'jcfAllOpenWindows';
FORMAT_PROJECT_MENU_NAME = 'jcfAllFilesinProject';
FORMAT_OPEN_MENU_NAME = 'jcfAllOpenWindows';
FORMAT_REG_SETTINGS_MENU_NAME = 'jcfRegistrySettings';
FORMAT_SETTINGS_MENU_NAME = 'jcfFormatSettings';
FORMAT_ABOUT_MENU_NAME = 'jcfAbout';
FORMAT_CATEGORY_NAME = 'jcfFormat';
FORMAT_CATEGORY_IDECMD_NAME = 'jcfFormat';
FORMAT_MENU_SECTION1 = 'jcfSection1';
FORMAT_MENU_SECTION2 = 'jcfSection2';
resourcestring
FORMAT_MENU = 'JEDI Code &Format';
FORMAT_CURRENT = '&Current Editor Window';
FORMAT_PROJECT = '&All Files in Project';
FORMAT_OPEN = 'All &Open Windows';
FORMAT_CURRENT_MENU = '&Current Editor Window';
FORMAT_CURRENT_IDECMD = 'Format code in current editor window';
FORMAT_PROJECT_MENU = '&All Files in Project';
FORMAT_OPEN_MENU = 'All &Open Windows';
FORMAT_REG_SETTINGS_MENU = '&Registry Settings';
FORMAT_SETTINGS_MENU = '&Format Settings';
FORMAT_ABOUT_MENU = '&About';
FORMAT_CATEGORY = 'JEDI Code Format';
FORMAT_CATEGORY_IDECMD = 'JEDI Code Format';
const
DefaultJCFOptsFile = 'jcfsettings.cfg';
@ -115,22 +116,22 @@ begin
SetLazarusDefaultFileName;
GetDefaultSettingsFileName := IDEGetDefaultSettingsFileName;
Cat := IDECommandList.CreateCategory(nil, FORMAT_CATEGORY_NAME,
FORMAT_CATEGORY, IDECmdScopeSrcEditOnly);
Cat := IDECommandList.CreateCategory(nil, FORMAT_CATEGORY_IDECMD_NAME,
FORMAT_CATEGORY_IDECMD, IDECmdScopeSrcEditOnly);
// Ctrl + D ?
Key := IDEShortCut(VK_D, [SSctrl], VK_UNKNOWN, []);
CmdFormatFile := RegisterIDECommand(Cat, FORMAT_CURRENT_NAME, FORMAT_CURRENT, Key,
CmdFormatFile := RegisterIDECommand(Cat, FORMAT_CURRENT_NAME, FORMAT_CURRENT_IDECMD, Key,
lcJCFIDE.DoFormatCurrentIDEWindow);
fcMainMenu := RegisterIDESubMenu(itmSecondaryTools, FORMAT_MENU_NAME, FORMAT_MENU);
RegisterIDEMenuCommand(fcMainMenu, FORMAT_CURRENT_NAME, FORMAT_CURRENT,
RegisterIDEMenuCommand(fcMainMenu, FORMAT_CURRENT_NAME, FORMAT_CURRENT_MENU,
lcJCFIDE.DoFormatCurrentIDEWindow, nil, CmdFormatFile);
RegisterIDEMenuCommand(fcMainMenu, FORMAT_PROJECT_NAME, FORMAT_PROJECT,
RegisterIDEMenuCommand(fcMainMenu, FORMAT_PROJECT_MENU_NAME, FORMAT_PROJECT_MENU,
lcJCFIDE.DoFormatProject);
RegisterIDEMenuCommand(fcMainMenu, FORMAT_OPEN_NAME, FORMAT_OPEN,
RegisterIDEMenuCommand(fcMainMenu, FORMAT_OPEN_MENU_NAME, FORMAT_OPEN_MENU,
lcJCFIDE.DoFormatOpen);
// settings

View File

@ -13,11 +13,17 @@ msgstr ""
msgid "&About"
msgstr "Über"
#: jcfideregister.format_category
#: jcfideregister.format_category_idecmd
msgctxt "jcfideregister.format_category_idecmd"
msgid "JEDI Code Format"
msgstr "JEDI-Codeformatierer"
#: jcfideregister.format_current
#: jcfideregister.format_current_idecmd
msgid "Format code in current editor window"
msgstr ""
#: jcfideregister.format_current_menu
msgctxt "jcfideregister.format_current_menu"
msgid "&Current Editor Window"
msgstr "Aktuelles Editorfenster"
@ -25,11 +31,13 @@ msgstr "Aktuelles Editorfenster"
msgid "JEDI Code &Format"
msgstr "JEDI Code&formatierer"
#: jcfideregister.format_open
#: jcfideregister.format_open_menu
msgctxt "jcfideregister.format_open_menu"
msgid "All &Open Windows"
msgstr "Alle &offenen Fenster"
#: jcfideregister.format_project
#: jcfideregister.format_project_menu
msgctxt "jcfideregister.format_project_menu"
msgid "&All Files in Project"
msgstr "&Alle Dateien im Projekt"

View File

@ -13,11 +13,17 @@ msgstr ""
msgid "&About"
msgstr "&Sobre"
#: jcfideregister.format_category
#: jcfideregister.format_category_idecmd
msgctxt "jcfideregister.format_category_idecmd"
msgid "JEDI Code Format"
msgstr "Formatador de Código \"JEDI\""
#: jcfideregister.format_current
#: jcfideregister.format_current_idecmd
msgid "Format code in current editor window"
msgstr ""
#: jcfideregister.format_current_menu
msgctxt "jcfideregister.format_current_menu"
msgid "&Current Editor Window"
msgstr "&Janela do Editor Atual"
@ -25,11 +31,13 @@ msgstr "&Janela do Editor Atual"
msgid "JEDI Code &Format"
msgstr "&Formatador de Código \"JEDI\""
#: jcfideregister.format_open
#: jcfideregister.format_open_menu
msgctxt "jcfideregister.format_open_menu"
msgid "All &Open Windows"
msgstr "T&odas as Janelas Abertas"
#: jcfideregister.format_project
#: jcfideregister.format_project_menu
msgctxt "jcfideregister.format_project_menu"
msgid "&All Files in Project"
msgstr "Todos os &Arquivos no Projeto"

View File

@ -5,11 +5,17 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "&About"
msgstr ""
#: jcfideregister.format_category
#: jcfideregister.format_category_idecmd
msgctxt "jcfideregister.format_category_idecmd"
msgid "JEDI Code Format"
msgstr ""
#: jcfideregister.format_current
#: jcfideregister.format_current_idecmd
msgid "Format code in current editor window"
msgstr ""
#: jcfideregister.format_current_menu
msgctxt "jcfideregister.format_current_menu"
msgid "&Current Editor Window"
msgstr ""
@ -17,11 +23,13 @@ msgstr ""
msgid "JEDI Code &Format"
msgstr ""
#: jcfideregister.format_open
#: jcfideregister.format_open_menu
msgctxt "jcfideregister.format_open_menu"
msgid "All &Open Windows"
msgstr ""
#: jcfideregister.format_project
#: jcfideregister.format_project_menu
msgctxt "jcfideregister.format_project_menu"
msgid "&All Files in Project"
msgstr ""

View File

@ -13,11 +13,17 @@ msgstr ""
msgid "&About"
msgstr "&О программе"
#: jcfideregister.format_category
#: jcfideregister.format_category_idecmd
msgctxt "jcfideregister.format_category_idecmd"
msgid "JEDI Code Format"
msgstr "Форматирование кода JEDI"
#: jcfideregister.format_current
#: jcfideregister.format_current_idecmd
msgid "Format code in current editor window"
msgstr "Форматировать код в текущей вкладке редактора"
#: jcfideregister.format_current_menu
msgctxt "jcfideregister.format_current_menu"
msgid "&Current Editor Window"
msgstr "&Текущая вкладка редактора"
@ -25,11 +31,13 @@ msgstr "&Текущая вкладка редактора"
msgid "JEDI Code &Format"
msgstr "&Форматирование кода JEDI"
#: jcfideregister.format_open
#: jcfideregister.format_open_menu
msgctxt "jcfideregister.format_open_menu"
msgid "All &Open Windows"
msgstr "&Все открытые вкладки"
#: jcfideregister.format_project
#: jcfideregister.format_project_menu
msgctxt "jcfideregister.format_project_menu"
msgid "&All Files in Project"
msgstr "Все файлы &проекта"