diff --git a/language/language_menus.hpp b/language/language_menus.hpp index 64e1413e2..8cd817e9b 100644 --- a/language/language_menus.hpp +++ b/language/language_menus.hpp @@ -5,7 +5,7 @@ static LNG_MENU_T s_LanguageMenu[] = { { MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), L"English (United States)\t\t\t[%s]" }, { MAKELANGID(LANG_AFRIKAANS, SUBLANG_AFRIKAANS_SOUTH_AFRICA), L"Afrikaans (Suid-Afrika)\t\t\t[%s]" }, - { MAKELANGID(LANG_BELARUSIAN, SUBLANG_BELARUSIAN_BELARUS), L"Беларускі (Беларусь)\t\t\t[%s]" }, + { MAKELANGID(LANG_BELARUSIAN, SUBLANG_BELARUSIAN_BELARUS), L"Беларуская (Беларусь)\t\t\t[%s]" }, { MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), L"Deutsch (Deutschland)\t\t\t[%s]" }, { MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK), L"English (United Kingdom)\t\t\t[%s]" }, { MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), L"Español (España)\t\t\t[%s]" }, diff --git a/language/np3_be_by/dialogs_be_by.rc b/language/np3_be_by/dialogs_be_by.rc index c8eca2451..551fef167 100644 --- a/language/np3_be_by/dialogs_be_by.rc +++ b/language/np3_be_by/dialogs_be_by.rc @@ -96,7 +96,7 @@ BEGIN CONTROL "& ",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,49,94,10 CONTROL " &",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,61,99,10 CONTROL "&Wildcard ",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,85,63,10 - CONTROL "Transparent mode on losing focus", IDC_TRANSPARENT, + CONTROL ", ", IDC_TRANSPARENT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 118, 124, 10 DEFPUSHBUTTON " &",IDOK,246,7,60,14 PUSHBUTTON "&",IDC_FINDPREV,246,23,60,14 @@ -129,7 +129,7 @@ BEGIN CONTROL "& ",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,78,93,10 CONTROL " &",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,90,99,10 CONTROL "&Wildcard ",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,114,67,10 - CONTROL "Transparent mode on losing focus", IDC_TRANSPARENT, + CONTROL ", ", IDC_TRANSPARENT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 144, 124, 10 DEFPUSHBUTTON " &",IDOK,246,7,60,14 PUSHBUTTON "&",IDC_FINDPREV,246,23,60,14 @@ -185,7 +185,7 @@ BEGIN GROUPBOX " :",IDC_STATIC,7,58,197,88,0,WS_EX_TRANSPARENT CONTROL " 7- A&SCII UTF-8",IDC_ASCIIASUTF8, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,70,163,10 - CONTROL "Use &reliable detection results only.", IDC_RELIABLE_DETECTION_RES, + CONTROL " & ", IDC_RELIABLE_DETECTION_RES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,14,82,122,10 CONTROL " 8- *.&nfo/diz DOS-437",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,182,10 @@ -205,7 +205,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT " &:",IDC_STATIC,7,7,116,8 COMBOBOX IDC_EOLMODELIST,7,20,98,196,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Show inconsistent line-breaks warning.",IDC_WARN_INCONSISTENT_EOLS, + CONTROL " ",IDC_WARN_INCONSISTENT_EOLS, "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,40,186,10 CONTROL "& ",IDC_CONSISTENT_EOLS, "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,52,154,10 @@ -215,24 +215,24 @@ BEGIN PUSHBUTTON "",IDCANCEL,139,24,50,14 END -IDD_MUI_WARNLINEENDS DIALOGEX 0, 0, 196, 100 +IDD_MUI_WARNLINEENDS DIALOGEX 0, 0, 211, 100 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Inconsistent Line Endings" +CAPTION " " FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Inconsistent line endings found in file:",IDC_STATIC,7,7,180,8 + LTEXT " :",IDC_STATIC,7,7,183,8 LTEXT "CR+LF:",IDC_STATIC,10,18,34,8,SS_RIGHT LTEXT "CR:",IDC_STATIC,10,28,34,8,SS_RIGHT LTEXT "LF:",IDC_STATIC,10,38,34,8,SS_RIGHT - LTEXT "%s line(s).",IDC_EOL_SUM_CRLF,48,18,136,8 - LTEXT "%s line(s).",IDC_EOL_SUM_CR,48,28,136,8 - LTEXT "%s line(s).",IDC_EOL_SUM_LF,48,38,136,8 - LTEXT "&Do you want to normalize the line endings?",IDC_STATIC,7,52,180,8 - COMBOBOX IDC_EOLMODELIST,7,64,118,81,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Yes",IDOK,138,63,50,14 - PUSHBUTTON "&No",IDCANCEL,138,80,50,14 - CONTROL "&Always show this dialog.", IDC_WARN_INCONSISTENT_EOLS, - "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,82,118,10 + LTEXT "%s",IDC_EOL_SUM_CRLF,48,18,136,8 + LTEXT "%s",IDC_EOL_SUM_CR,48,28,136,8 + LTEXT "%s",IDC_EOL_SUM_LF,48,38,136,8 + LTEXT "& ?",IDC_STATIC,7,52,141,8 + COMBOBOX IDC_EOLMODELIST,7,64,133,81,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&",IDOK,153,63,50,14 + PUSHBUTTON "&",IDCANCEL,153,80,50,14 + CONTROL "& ",IDC_WARN_INCONSISTENT_EOLS, + "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,82,125,10 END IDD_MUI_LINENUM DIALOGEX 0, 0, 115, 95 @@ -332,35 +332,35 @@ BEGIN CONTROL "& Tab ",IDC_TAB_INDENTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,59,150,10 CONTROL " Backspace & ",IDC_BACKTAB_INDENTS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,71,170,10 - CONTROL "&Warning on inconsistent indentation.",IDC_WARN_INCONSISTENT_INDENTS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,83,150,100 - CONTROL "&Autodetect Tab or Space Indentation.",IDC_AUTO_DETECT_INDENTS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,150,10 + CONTROL "& ",IDC_WARN_INCONSISTENT_INDENTS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,83,167,100 + CONTROL "& ",IDC_AUTO_DETECT_INDENTS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,159,10 DEFPUSHBUTTON "OK",IDOK,128,7,50,14 PUSHBUTTON "",IDCANCEL,128,27,50,14 END -IDD_MUI_WARNINDENTATION DIALOGEX 0, 0, 196, 138 +IDD_MUI_WARNINDENTATION DIALOGEX 0, 0, 231, 138 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Inconsistent Indentation" +CAPTION " " FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "Statistics: ",IDC_STATIC,7,7,182,48,WS_GROUP - LTEXT "Tabs[%i]:",IDC_INDENT_WIDTH_TAB,54,18,30,8,SS_LEFT - LTEXT "Blanks[%i]:",IDC_INDENT_WIDTH_SPC,54,30,30,8,SS_LEFT - LTEXT "Mixed[x]:",IDC_STATIC,54,42,30,8,SS_LEFT - LTEXT "%s line(s)",IDC_INDENT_SUM_TAB,84,18,52,8,SS_RIGHT - LTEXT "%s line(s)",IDC_INDENT_SUM_SPC,84,30,52,8,SS_RIGHT - LTEXT "%s line(s)",IDC_INDENT_SUM_MIX,84,42,52,8,SS_RIGHT - GROUPBOX "Re-Indent All ? ",IDC_STATIC,7,60,182,56,WS_GROUP - CONTROL "&Tabs",IDC_INDENT_BY_TABS,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,72,25,10 - CONTROL "&Blanks",IDC_INDENT_BY_SPCS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,84,25,10 - LTEXT "%s line(s) w/ irregular indent depth",IDC_INDENT_TAB_MODX,40,72,124,8,SS_RIGHT - LTEXT "%s line(s) w/ irregular indent depth",IDC_INDENT_SPC_MODX,40,84,124,8,SS_RIGHT - PUSHBUTTON "&Yes",IDOK,80,98,50,14 - PUSHBUTTON "&No",IDCANCEL,134,98,50,14 - CONTROL "&Always show this dialog.", IDC_WARN_INCONSISTENT_INDENTS, - "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,122,122,10 + GROUPBOX " : ",IDC_STATIC,7,7,217,48,WS_GROUP + LTEXT "[%i]:",IDC_INDENT_WIDTH_TAB,18,18,66,8,SS_RIGHT + LTEXT "[%i]:",IDC_INDENT_WIDTH_SPC,18,30,66,8,SS_RIGHT + LTEXT "[x]:",IDC_STATIC,18,42,66,8,SS_RIGHT + LTEXT "%s",IDC_INDENT_SUM_TAB,90,18,46,8 + LTEXT "%s",IDC_INDENT_SUM_SPC,90,30,46,8 + LTEXT "%s",IDC_INDENT_SUM_MIX,90,42,46,8 + GROUPBOX " ? ",IDC_STATIC,7,60,217,56,WS_GROUP + CONTROL "&",IDC_INDENT_BY_TABS,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,72,52,10 + CONTROL "&",IDC_INDENT_BY_SPCS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,84,52,10 + LTEXT " : %s",IDC_INDENT_TAB_MODX,71,72,145,8 + LTEXT " : %s",IDC_INDENT_SPC_MODX,71,84,145,8 + PUSHBUTTON "&",IDOK,115,98,50,14 + PUSHBUTTON "&",IDCANCEL,169,98,50,14 + CONTROL "& ",IDC_WARN_INCONSISTENT_INDENTS, + "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,122,125,10 END IDD_MUI_LONGLINES DIALOGEX 0, 0, 184, 55 @@ -733,7 +733,7 @@ BEGIN IDD_MUI_WARNLINEENDS, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 189 + RIGHTMARGIN, 204 TOPMARGIN, 7 BOTTOMMARGIN, 93 END @@ -789,7 +789,7 @@ BEGIN IDD_MUI_WARNINDENTATION, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 189 + RIGHTMARGIN, 224 TOPMARGIN, 7 BOTTOMMARGIN, 131 END diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index eb22e8392..dd62d0a70 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -88,12 +88,12 @@ BEGIN MENUITEM "UTF-8 BO&M", IDM_ENCODING_UTF8SIGN MENUITEM "&...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM " ", CMD_RELOADFORCEDETECTION + MENUITEM " ", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM " &\tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM " A&NSI\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM " &OEM\tCtrl+Shift+O", CMD_RECODEOEM - MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM " &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM SEPARATOR MENUITEM " ASCII & UTF-8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM " & \tAlt+F8", CMD_RELOADNOFILEVARS @@ -110,7 +110,7 @@ BEGIN MENUITEM "&...", IDM_LINEENDINGS_SETDEFAULT END MENUITEM SEPARATOR - MENUITEM "Check &Indentation..." CMD_CHECK_INDENTATION + MENUITEM " &..." CMD_CHECK_INDENTATION MENUITEM SEPARATOR MENUITEM " &...", IDM_FILE_PAGESETUP MENUITEM "&...\tCtrl+P", IDM_FILE_PRINT @@ -311,9 +311,9 @@ BEGIN MENUITEM " &\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES POPUP " & \tCtrl+Shift+I" BEGIN - MENUITEM "&No Highlight", IDM_VIEW_HILITCURLN_NONE - MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK - MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME + MENUITEM "& ", IDM_VIEW_HILITCURLN_NONE + MENUITEM "& ", IDM_VIEW_HILITCURLN_BACK + MENUITEM "&", IDM_VIEW_HILITCURLN_FRAME END POPUP "& " BEGIN @@ -344,9 +344,9 @@ BEGIN POPUP " &" BEGIN MENUITEM " & ", IDM_VIEW_TOOLBAR - MENUITEM "To&ggle ", IDM_VIEW_TOGGLETB + MENUITEM "& ", IDM_VIEW_TOGGLETB MENUITEM "& ...", IDM_VIEW_CUSTOMIZETB - MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB + MENUITEM "& ...", IDM_VIEW_LOADTHEMETB MENUITEM " & ", IDM_VIEW_STATUSBAR END POPUP "&" @@ -464,9 +464,9 @@ BEGIN POPUP "+" BEGIN MENUITEM " & ", IDM_VIEW_TOOLBAR - MENUITEM "To&ggle ", IDM_VIEW_TOGGLETB + MENUITEM "& ", IDM_VIEW_TOGGLETB MENUITEM "& ...", IDM_VIEW_CUSTOMIZETB - MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB + MENUITEM "& ...", IDM_VIEW_LOADTHEMETB MENUITEM " & ", IDM_VIEW_STATUSBAR END POPUP "+" diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index edcad12c1..02ddae62c 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -58,7 +58,7 @@ BEGIN IDT_FILE_OPEN "" IDT_FILE_BROWSE "" IDT_FILE_SAVE "" - IDT_FILE_RECENT "History" + IDT_FILE_RECENT "ó" IDT_EDIT_UNDO "" IDT_EDIT_REDO "" IDT_EDIT_CUT "" @@ -112,7 +112,7 @@ BEGIN IDS_MUI_FILTER_ALL " (*.*)|*.*|" IDS_MUI_FILTER_EXE " (*.exe;*.com;*.bat;*.cmd;*.lnk;*.pif)|*.exe;*.com;*.bat;*.cmd;*.lnk;*.pif| (*.*)|*.*|" IDS_MUI_FILTER_INI " (*.ini)|*.ini| (*.*)|*.*|" - IDS_MUI_FILTER_BITMAP "Bitmap files (*.bmp)|*.bmp|All files (*.*)|*.*|" + IDS_MUI_FILTER_BITMAP "Bitmap (*.bmp)|*.bmp| (*.*)|*.*|" IDS_MUI_OPENWITH " ." IDS_MUI_FAVORITES " ." IDS_MUI_BACKSLASHHELP "ѳ \n\n\\a\tAlert (BEL, Ascii 7)\n\\b\tBackspace (BS, Ascii 8)\n\\f\tFormfeed (FF, Ascii 12)\n\\n\tNewline (LF, Ascii 10)\n\\r\tCarriage return (CR, Ascii 13)\n\\t\tHorizontal Tab (HT, Ascii 9)\n\\v\tVertical Tab (VT, Ascii 11)\n\\0oo\tOctal Value\n\\u####\tHexadecimal Value\n\\xhh\tHexadecimal Value\n\\\\\tBackslash" @@ -131,7 +131,7 @@ BEGIN " Notepad3 , .\n Notepad3?" IDS_MUI_ERR_ENCODINGNA " ." IDS_MUI_ERR_UNICODE " Unicode-.\n !" - IDS_MUI_ERR_BITMAP "Error loading bitmap ""%s"".\nNeed dimensions: %i x %i (width >= %i x height)." + IDS_MUI_ERR_BITMAP " bitmap ""%s"".\n : %i x %i (width >= %i x height)." END STRINGTABLE @@ -145,7 +145,7 @@ BEGIN " , ?" IDS_MUI_WARN_UNKNOWN_EXT " (%s)!\n ?" - IDS_MUI_INDENT_CONSISTENT "The file has a consistent indentation!" + IDS_MUI_INDENT_CONSISTENT " !" IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" IDS_MUI_EOLMODENAME_CR "Old Mac (CR)" @@ -222,16 +222,16 @@ BEGIN IDS_MUI_ASSOCIATED_EXT " :" IDS_MUI_EXAMPLE_TEXT " ' , 0123456789." IDS_MUI_ZERO_LEN_MATCH "^ " - IDS_MUI_GOTO_LINE "Line (1 - %lli):" - IDS_MUI_GOTO_COLUMN "Column (1 - %lli):" + IDS_MUI_GOTO_LINE " (1 - %lli):" + IDS_MUI_GOTO_COLUMN " (1 - %lli):" END STRINGTABLE BEGIN - IDS_MUI_MENU_LANGUAGE "" - IDS_MUI_MENU_THEMES "Themes" - IDM_THEMES_DEFAULT "Factory Default" - IDM_THEMES_FILE_ITEM "Standard Settings" + IDS_MUI_MENU_LANGUAGE "" + IDS_MUI_MENU_THEMES "" + IDM_THEMES_DEFAULT " " + IDM_THEMES_FILE_ITEM " " END STRINGTABLE @@ -269,7 +269,7 @@ Notepad3 \t[/?] [...[ /u\t .\r\n\ /v\t .\r\n\ /vd\t ( ).\r\n\ -/y\tSearch environment PATH in case of relative filename.\r\n\ +/y\t PATH .\r\n\ /z\t ( ).\r\n\r\n\ :\r\n\ Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\ diff --git a/language/np3_ru_ru/dialogs_ru_ru.rc b/language/np3_ru_ru/dialogs_ru_ru.rc index 5837034f8..90e87cc84 100644 --- a/language/np3_ru_ru/dialogs_ru_ru.rc +++ b/language/np3_ru_ru/dialogs_ru_ru.rc @@ -96,8 +96,8 @@ BEGIN CONTROL "& ",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,49,92,10 CONTROL " &",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,61,89,10 CONTROL "&Wildcard ",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,85,63,10 - CONTROL "Transparent mode on losing focus",IDC_TRANSPARENT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,118,124,10 + CONTROL " ",IDC_TRANSPARENT, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,118,130,10 DEFPUSHBUTTON " &",IDOK,246,7,60,14 PUSHBUTTON "&",IDC_FINDPREV,246,23,60,14 PUSHBUTTON "",IDCANCEL,246,99,60,14 @@ -129,8 +129,8 @@ BEGIN CONTROL "& ",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,78,93,10 CONTROL " &",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,90,89,10 CONTROL "&Wildcard ",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,114,65,10 - CONTROL "Transparent mode on losing focus",IDC_TRANSPARENT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,144,124,10 + CONTROL " ",IDC_TRANSPARENT, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,144,130,10 DEFPUSHBUTTON " &",IDOK,246,7,60,14 PUSHBUTTON "&",IDC_FINDPREV,246,23,60,14 PUSHBUTTON "&",IDC_REPLACE,246,43,60,14 @@ -185,8 +185,8 @@ BEGIN GROUPBOX " : ",IDC_STATIC,7,58,197,88,0,WS_EX_TRANSPARENT CONTROL " 7- A&SCII UTF-8",IDC_ASCIIASUTF8, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,70,169,10 - CONTROL "Use &reliable detection results only.", IDC_RELIABLE_DETECTION_RES, - "Button", BS_AUTOCHECKBOX | WS_TABSTOP,14,82,122,10 + CONTROL " & ",IDC_RELIABLE_DETECTION_RES, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,82,167,10 CONTROL " 8- *.&nfo/diz DOS-437",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,189,10 CONTROL " & ",IDC_ENCODINGFROMFILEVARS, @@ -205,8 +205,8 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "& :",IDC_STATIC,7,7,116,8 COMBOBOX IDC_EOLMODELIST,7,20,98,196,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Show inconsistent line-breaks warning.",IDC_WARN_INCONSISTENT_EOLS, - "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,40,186,10 + CONTROL " ",IDC_WARN_INCONSISTENT_EOLS, + "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,40,167,10 CONTROL "& ",IDC_CONSISTENT_EOLS, "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,52,154,10 CONTROL "& ",IDC_AUTOSTRIPBLANKS, @@ -215,24 +215,24 @@ BEGIN PUSHBUTTON "",IDCANCEL,139,24,50,14 END -IDD_MUI_WARNLINEENDS DIALOGEX 0, 0, 196, 100 +IDD_MUI_WARNLINEENDS DIALOGEX 0, 0, 211, 100 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Inconsistent Line Endings" +CAPTION " " FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Inconsistent line endings found in file:",IDC_STATIC,7,7,180,8 + LTEXT " :",IDC_STATIC,7,7,183,8 LTEXT "CR+LF:",IDC_STATIC,10,18,34,8,SS_RIGHT LTEXT "CR:",IDC_STATIC,10,28,34,8,SS_RIGHT LTEXT "LF:",IDC_STATIC,10,38,34,8,SS_RIGHT - LTEXT "%s line(s).",IDC_EOL_SUM_CRLF,48,18,136,8 - LTEXT "%s line(s).",IDC_EOL_SUM_CR,48,28,136,8 - LTEXT "%s line(s).",IDC_EOL_SUM_LF,48,38,136,8 - LTEXT "&Do you want to normalize the line endings?",IDC_STATIC,7,52,180,8 - COMBOBOX IDC_EOLMODELIST,7,64,118,81,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Yes",IDOK,138,63,50,14 - PUSHBUTTON "&No",IDCANCEL,138,80,50,14 - CONTROL "&Always show this dialog.", IDC_WARN_INCONSISTENT_EOLS, - "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,82,118,10 + LTEXT "%s",IDC_EOL_SUM_CRLF,48,18,136,8 + LTEXT "%s",IDC_EOL_SUM_CR,48,28,136,8 + LTEXT "%s",IDC_EOL_SUM_LF,48,38,136,8 + LTEXT "& ?",IDC_STATIC,7,52,141,8 + COMBOBOX IDC_EOLMODELIST,7,64,133,81,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&",IDOK,153,63,50,14 + PUSHBUTTON "&",IDCANCEL,153,80,50,14 + CONTROL "& ",IDC_WARN_INCONSISTENT_EOLS, + "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,82,125,10 END IDD_MUI_LINENUM DIALOGEX 0, 0, 115, 95 @@ -332,35 +332,35 @@ BEGIN CONTROL " &Tab ",IDC_TAB_INDENTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,59,150,10 CONTROL " &Backspace ",IDC_BACKTAB_INDENTS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,71,170,10 - CONTROL "&Warning on inconsistent indentation.",IDC_WARN_INCONSISTENT_INDENTS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,83,150,10 - CONTROL "&Autodetect Tab or Space Indentation.",IDC_AUTO_DETECT_INDENTS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,150,10 + CONTROL "& ",IDC_WARN_INCONSISTENT_INDENTS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,83,167,10 + CONTROL "& ",IDC_AUTO_DETECT_INDENTS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,159,10 DEFPUSHBUTTON "OK",IDOK,128,7,50,14 PUSHBUTTON "",IDCANCEL,128,27,50,14 END -IDD_MUI_WARNINDENTATION DIALOGEX 0, 0, 196, 138 +IDD_MUI_WARNINDENTATION DIALOGEX 0, 0, 231, 138 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Inconsistent Indentation" +CAPTION " " FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "Statistics: ",IDC_STATIC,7,7,182,48,WS_GROUP - LTEXT "Tabs[%i]:",IDC_INDENT_WIDTH_TAB,54,18,30,8,SS_LEFT - LTEXT "Blanks[%i]:",IDC_INDENT_WIDTH_SPC,54,30,30,8,SS_LEFT - LTEXT "Mixed[x]:",IDC_STATIC,54,42,30,8,SS_LEFT - LTEXT "%s line(s)",IDC_INDENT_SUM_TAB,84,18,52,8,SS_RIGHT - LTEXT "%s line(s)",IDC_INDENT_SUM_SPC,84,30,52,8,SS_RIGHT - LTEXT "%s line(s)",IDC_INDENT_SUM_MIX,84,42,52,8,SS_RIGHT - GROUPBOX "Re-Indent All ? ",IDC_STATIC,7,60,182,56,WS_GROUP - CONTROL "&Tabs",IDC_INDENT_BY_TABS,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,72,25,10 - CONTROL "&Blanks",IDC_INDENT_BY_SPCS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,84,25,10 - LTEXT "%s line(s) w/ irregular indent depth",IDC_INDENT_TAB_MODX,40,72,124,8,SS_RIGHT - LTEXT "%s line(s) w/ irregular indent depth",IDC_INDENT_SPC_MODX,40,84,124,8,SS_RIGHT - PUSHBUTTON "&Yes",IDOK,80,98,50,14 - PUSHBUTTON "&No",IDCANCEL,134,98,50,14 - CONTROL "&Always show this dialog.", IDC_WARN_INCONSISTENT_INDENTS, - "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,122,122,10 + GROUPBOX " : ",IDC_STATIC,7,7,217,48,WS_GROUP + LTEXT "[%i]:",IDC_INDENT_WIDTH_TAB,18,18,66,8,SS_RIGHT + LTEXT "[%i]:",IDC_INDENT_WIDTH_SPC,18,30,66,8,SS_RIGHT + LTEXT "[x]:",IDC_STATIC,18,42,66,8,SS_RIGHT + LTEXT "%s",IDC_INDENT_SUM_TAB,90,18,46,8 + LTEXT "%s",IDC_INDENT_SUM_SPC,90,30,46,8 + LTEXT "%s",IDC_INDENT_SUM_MIX,90,42,46,8 + GROUPBOX " ? ",IDC_STATIC,7,60,217,56,WS_GROUP + CONTROL "&",IDC_INDENT_BY_TABS,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,72,52,10 + CONTROL "&",IDC_INDENT_BY_SPCS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,84,52,10 + LTEXT "C : %s",IDC_INDENT_TAB_MODX,71,72,145,8 + LTEXT "C : %s",IDC_INDENT_SPC_MODX,71,84,145,8 + PUSHBUTTON "&",IDOK,115,98,50,14 + PUSHBUTTON "&",IDCANCEL,169,98,50,14 + CONTROL "& ",IDC_WARN_INCONSISTENT_INDENTS, + "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,122,125,10 END IDD_MUI_LONGLINES DIALOGEX 0, 0, 184, 55 @@ -719,7 +719,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 204 TOPMARGIN, 7 - BOTTOMMARGIN, 152 + BOTTOMMARGIN, 165 END IDD_MUI_DEFEOLMODE, DIALOG @@ -733,7 +733,7 @@ BEGIN IDD_MUI_WARNLINEENDS, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 189 + RIGHTMARGIN, 204 TOPMARGIN, 7 BOTTOMMARGIN, 93 END @@ -789,7 +789,7 @@ BEGIN IDD_MUI_WARNINDENTATION, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 189 + RIGHTMARGIN, 224 TOPMARGIN, 7 BOTTOMMARGIN, 131 END diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 01d43fe8b..421ee77df 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -93,7 +93,7 @@ BEGIN MENUITEM " & \tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM " A&NSI\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM " &OEM\tCtrl+Shift+O", CMD_RECODEOEM - MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM " &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM SEPARATOR MENUITEM " ASCII & UTF-8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM " & \tAlt+F8", CMD_RELOADNOFILEVARS @@ -110,7 +110,7 @@ BEGIN MENUITEM "& ...", IDM_LINEENDINGS_SETDEFAULT END MENUITEM SEPARATOR - MENUITEM "Check &Indentation..." CMD_CHECK_INDENTATION + MENUITEM "& ..." CMD_CHECK_INDENTATION MENUITEM SEPARATOR MENUITEM " &...", IDM_FILE_PAGESETUP MENUITEM "&...\tCtrl+P", IDM_FILE_PRINT @@ -311,9 +311,9 @@ BEGIN MENUITEM "& \tCtrl+Shift+V", IDM_VIEW_MATCHBRACES POPUP " & \tCtrl+Shift+I" BEGIN - MENUITEM "&No Highlight", IDM_VIEW_HILITCURLN_NONE - MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK - MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME + MENUITEM "& ", IDM_VIEW_HILITCURLN_NONE + MENUITEM "& ", IDM_VIEW_HILITCURLN_BACK + MENUITEM "&", IDM_VIEW_HILITCURLN_FRAME END POPUP "& " BEGIN @@ -344,9 +344,9 @@ BEGIN POPUP " &" BEGIN MENUITEM " & ", IDM_VIEW_TOOLBAR - MENUITEM "To&ggle ", IDM_VIEW_TOGGLETB + MENUITEM "& ", IDM_VIEW_TOGGLETB MENUITEM "& ...", IDM_VIEW_CUSTOMIZETB - MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB + MENUITEM "& ...", IDM_VIEW_LOADTHEMETB MENUITEM " & ", IDM_VIEW_STATUSBAR END POPUP "&" @@ -464,9 +464,9 @@ BEGIN POPUP "+" BEGIN MENUITEM " & ", IDM_VIEW_TOOLBAR - MENUITEM "To&ggle ", IDM_VIEW_TOGGLETB + MENUITEM "& ", IDM_VIEW_TOGGLETB MENUITEM "& ...", IDM_VIEW_CUSTOMIZETB - MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB + MENUITEM "& ...", IDM_VIEW_LOADTHEMETB MENUITEM " & ", IDM_VIEW_STATUSBAR END POPUP "+" diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index 8ea2fa73d..c44acd43c 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -58,7 +58,7 @@ BEGIN IDT_FILE_OPEN "" IDT_FILE_BROWSE "" IDT_FILE_SAVE "" - IDT_FILE_RECENT "History" + IDT_FILE_RECENT "" IDT_EDIT_UNDO "" IDT_EDIT_REDO "" IDT_EDIT_CUT "" @@ -112,7 +112,7 @@ BEGIN IDS_MUI_FILTER_ALL " (*.*)|*.*|" IDS_MUI_FILTER_EXE " (*.exe;*.com;*.bat;*.cmd;*.lnk;*.pif)|*.exe;*.com;*.bat;*.cmd;*.lnk;*.pif| (*.*)|*.*|" IDS_MUI_FILTER_INI " (*.ini)|*.ini| (*.*)|*.*|" - IDS_MUI_FILTER_BITMAP "Bitmap files (*.bmp)|*.bmp|All files (*.*)|*.*|" + IDS_MUI_FILTER_BITMAP "Bitmap (*.bmp)|*.bmp| (*.*)|*.*|" IDS_MUI_OPENWITH " ." IDS_MUI_FAVORITES " ." IDS_MUI_BACKSLASHHELP " \n\n\\a\tAlert (BEL, Ascii 7)\n\\b\tBackspace (BS, Ascii 8)\n\\f\tFormfeed (FF, Ascii 12)\n\\n\tNewline (LF, Ascii 10)\n\\r\tCarriage return (CR, Ascii 13)\n\\t\tHorizontal Tab (HT, Ascii 9)\n\\v\tVertical Tab (VT, Ascii 11)\n\\0oo\tOctal Value\n\\u####\tHexadecimal Value\n\\xhh\tHexadecimal Value\n\\\\\tBackslash" @@ -131,7 +131,7 @@ BEGIN " Notepad3 , .\n Notepad3?" IDS_MUI_ERR_ENCODINGNA " ." IDS_MUI_ERR_UNICODE " Unicode-.\n , !" - IDS_MUI_ERR_BITMAP "Error loading bitmap ""%s"".\nNeed dimensions: %i x %i (width >= %i x height)." + IDS_MUI_ERR_BITMAP " bitmap ""%s"".\n : %i x %i (width >= %i x height)." END STRINGTABLE @@ -145,7 +145,7 @@ BEGIN " , ?" IDS_MUI_WARN_UNKNOWN_EXT " (%s)!\n ?" - IDS_MUI_INDENT_CONSISTENT "The file has a consistent indentation!" + IDS_MUI_INDENT_CONSISTENT " !" IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" IDS_MUI_EOLMODENAME_CR "Old Mac (CR)" @@ -222,16 +222,16 @@ BEGIN IDS_MUI_ASSOCIATED_EXT " :" IDS_MUI_EXAMPLE_TEXT " , 0123456789." IDS_MUI_ZERO_LEN_MATCH "^ " - IDS_MUI_GOTO_LINE "Line (1 - %lli):" - IDS_MUI_GOTO_COLUMN "Column (1 - %lli):" + IDS_MUI_GOTO_LINE " (1 - %lli):" + IDS_MUI_GOTO_COLUMN " (1 - %lli):" END STRINGTABLE BEGIN IDS_MUI_MENU_LANGUAGE "" - IDS_MUI_MENU_THEMES "Themes" - IDM_THEMES_DEFAULT "Factory Default" - IDM_THEMES_FILE_ITEM "Standard Settings" + IDS_MUI_MENU_THEMES "" + IDM_THEMES_DEFAULT " " + IDM_THEMES_FILE_ITEM " " END STRINGTABLE @@ -269,7 +269,7 @@ Notepad3 \t[/?] [...[ /u\t .\r\n\ /v\t .\r\n\ /vd\t ( ).\r\n\ -/y\tSearch environment PATH in case of relative filename.\r\n\ +/y\t PATH .\r\n\ /z\t ( \r\n\t ).\r\n\r\n\ :\r\n\ Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\