From: Perry Rapp Date: Fri, 9 Dec 2005 02:35:22 +0000 (+0000) Subject: 2005-12-09 Perry X-Git-Tag: 2.16.5~5516 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5427260bce6836fb17f110a3c1e297c7461aaf69;p=winmerge-jp%2Fwinmerge-jp.git 2005-12-09 Perry PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476) Remainder of dialogs Src/Languages/ChineseTraditional: MergeChineseTraditional.rc --- diff --git a/Src/Changes.txt b/Src/Changes.txt index 0f1d9db1f..f7701e49d 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -1,3 +1,8 @@ +2005-12-09 Perry + PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476) + Remainder of dialogs + Src/Languages/ChineseTraditional: MergeChineseTraditional.rc + 2005-12-08 Perry PATCH: [1374728 ] Fix filter dialog delete Src: FileFilterMgr.cpp diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index b3f40e886..fcf6d2764 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -193,7 +193,7 @@ BEGIN MENUITEM "Åã¥Ü¥ªÃä³æ¤@ªºÀÉ®×(&F)", ID_OPTIONS_SHOWUNIQUELEFT MENUITEM "Åã¥Ü¥kÃä³æ¤@ªºÀÉ®×(&G)", ID_OPTIONS_SHOWUNIQUERIGHT MENUITEM "Åã¥Ü¤G¶i¨îÀÉ®×(&H)", ID_OPTIONS_SHOWBINARIES - MENUITEM "Show S&kipped Files", ID_OPTIONS_SHOWSKIPPED + MENUITEM "Åã¥Ü²¤¹LªºÀÉ®×(&K)", ID_OPTIONS_SHOWSKIPPED MENUITEM SEPARATOR MENUITEM "Show Hidd&en Items", ID_VIEW_SHOWHIDDENITEMS MENUITEM SEPARATOR @@ -435,7 +435,7 @@ BEGIN MENUITEM "¥kÃä(&R)", ID_DIR_DEL_RIGHT MENUITEM "¨â³o(&B)", ID_DIR_DEL_BOTH END - MENUITEM "&Hide Items", ID_DIR_HIDE_FILENAMES + MENUITEM "ÁôÂÃÀÉ®×(&H)", ID_DIR_HIDE_FILENAMES MENUITEM SEPARATOR POPUP "¶}±Ò¥ªÃä(&O)" BEGIN @@ -577,7 +577,7 @@ BEGIN CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,95,209,1 LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 DEFPUSHBUTTON "½T©w",IDOK,166,103,50,14 - PUSHBUTTON "Contributors",IDC_OPEN_CONTRIBUTORS,7,103,65,14 + PUSHBUTTON "Åã¥Ü",IDC_OPEN_CONTRIBUTORS,7,103,65,14 END IDD_OPEN DIALOGEX 0, 0, 364, 126 @@ -941,41 +941,41 @@ END IDD_DIRCOLS DIALOGEX 0, 0, 283, 170 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Display Columns" +CAPTION "Åã¥ÜÄæ¦ì" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 + GROUPBOX "Åã¥ÜÄæ¦ì",IDC_GROUP_SHOW,7,7,129,109 LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Up",IDC_UP,14,45,27,14 - PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 - GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 + PUSHBUTTON "¤W²¾(&U)",IDC_UP,14,45,27,14 + PUSHBUTTON "¤U²¾(&D)",IDC_DOWN,14,63,27,14 + GROUPBOX "ÁôÂÃÄæ¦ì",IDC_GROUP_HIDE,180,7,96,109 LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 EDITTEXT IDC_COLDLG_DESC,7,122,269,22,ES_MULTILINE | ES_READONLY - PUSHBUTTON "Defaults",IDC_COLDLG_DEFAULTS,7,149,50,14 - DEFPUSHBUTTON "OK",IDOK,172,149,50,14 - PUSHBUTTON "Cancel",IDCANCEL,226,149,50,14 + PUSHBUTTON "¹w³]­È",IDC_COLDLG_DEFAULTS,7,149,50,14 + DEFPUSHBUTTON "½T©w",IDOK,172,149,50,14 + PUSHBUTTON "¨ú®ø",IDCANCEL,226,149,50,14 END IDD_SELECTUNPACKER DIALOGEX 0, 0, 293, 126 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Select Unpacker" +CAPTION "¿ï¨ú¸Ñ«Ê¥]" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,87,99,50,14 - PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 - LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 + DEFPUSHBUTTON "½T©w",IDOK,87,99,50,14 + PUSHBUTTON "¨ú®ø",IDCANCEL,156,99,50,14 + LTEXT "Àɮ׸ѫʥ]:",IDC_STATIC,7,18,50,10 COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Display all unpackers, don't check the extension", + CONTROL "Åã¥Ü©Ò¦³¸Ñ«Ê¥], ¤£­nÀˬd°ÆÀɦW", IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 - LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 - LTEXT "Description:",IDC_STATIC,7,52,47,10 + LTEXT "°ÆÀɦW²M³æ:",IDC_STATIC,7,36,49,10 + LTEXT "´y­z:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | @@ -1002,31 +1002,31 @@ END IDD_WMGOTO DIALOGEX 0, 0, 210, 70 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Go To" +CAPTION "²¾¦Ü" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "G&oto:",IDC_STATIC,7,9,36,8 + LTEXT "²¾¦Ü(&O):",IDC_STATIC,7,9,36,8 EDITTEXT IDC_WMGOTO_PARAM,45,7,102,14,ES_AUTOHSCROLL | ES_NUMBER - GROUPBOX "File",IDC_STATIC,7,27,57,35 - CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON | + GROUPBOX "ÀÉ®×",IDC_STATIC,7,27,57,35 + CONTROL "¥ªÃä(&L)",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,38,48,10 - CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button", + CONTROL "¥kÃä(&R)",IDC_WMGOTO_FILERIGHT,"Button", BS_AUTORADIOBUTTON,13,48,47,10 - GROUPBOX "Goto what",IDC_STATIC,69,27,78,35 - CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON | + GROUPBOX "²¾¦Ü¨º¸Ì",IDC_STATIC,69,27,78,35 + CONTROL "¦C(&N)",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,76,38,68,10 - CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button", + CONTROL "¤£¦P(&D)",IDC_WMGOTO_TODIFF,"Button", BS_AUTORADIOBUTTON,76,48,68,10 - DEFPUSHBUTTON "&Go To",IDOK,153,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,153,24,50,14 + DEFPUSHBUTTON "²¾¦Ü(&G)",IDOK,153,7,50,14 + PUSHBUTTON "¨ú®ø",IDCANCEL,153,24,50,14 END IDD_PROPPAGE_COMPARE DIALOGEX 0, 0, 235, 156 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Compare" +CAPTION "¤ñ¸û" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Whitespaces",IDC_STATIC,7,7,221,50 + GROUPBOX "ªÅ®æ",IDC_STATIC,7,7,221,50 CONTROL "¤ñ¹ïªÅ¥Õ©M¸õ®æ(&W)",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,19,206,10 CONTROL "©¿²¤ªÅ¥Õ©M¸õ®æ§ó§ï(&H)",IDC_WHITE_CHANGE,"Button", @@ -1037,32 +1037,32 @@ BEGIN WS_TABSTOP,7,60,221,10 CONTROL "©¿²¤¤j¤p¼g(&C)",IDC_IGNCASE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,70,221,10 - CONTROL "Igno&re carriage return differences (DOS/UNIX/MAC)", + CONTROL "©¿²¤´«¦æ¤£¦P(DOS/UNIX/MAC)(&R)", IDC_EOL_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 7,80,221,10 - CONTROL "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button", + CONTROL "±Ò¥Î²¾°Ê°Ï¶ô°»´ú(&N)",IDC_MOVED_BLOCKS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10 - LTEXT "&File Compare method:",IDC_STATIC,7,105,100,9 + LTEXT "Àɮפñ¸û¤èªk(&F):",IDC_STATIC,7,105,100,9 COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,84,52,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 - PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,7,139,50,14 + PUSHBUTTON "¹w³]­È",IDC_COMPARE_DEFAULTS,7,139,50,14 END IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 156 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Editor" +CAPTION "½s¿è¾¹" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "·s²Ó©úÅé",IDC_HILITE_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,7,215,10 - CONTROL "Apply to &unrecognized side", + CONTROL "®M¥Î¨ì¥¼¯à¿ëÃѪºÃä(&U)", IDC_UNREC_APPLYSYNTAX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,18,204,10 CONTROL "¦Û°Ê­«·s±½´y(&R)",IDC_AUTOMRESCAN_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,28,215,10 - CONTROL "&Preserve original EOL chars",IDC_MIXED_EOL,"Button", + CONTROL "«O¯d­ì©l EOL ¦r¤¸(&P)",IDC_MIXED_EOL,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,38,215,10 GROUPBOX "¸õ®æ",IDC_STATIC,7,54,221,33,WS_GROUP LTEXT "¸õ®æ¤j¤p(&T):",IDC_STATIC,10,68,42,8 @@ -1091,58 +1091,58 @@ END IDD_FILEFILTERS DIALOGEX 0, 0, 356, 135 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Filefilters" +CAPTION "ÀÉ®×ÂoÃè" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "List1",IDC_FILTERFILE_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,342,100 - PUSHBUTTON "New...",IDC_FILTERFILE_NEWBTN,188,114,50,14 - PUSHBUTTON "Edit...",IDC_FILTERFILE_EDITBTN,244,114,50,14 - PUSHBUTTON "Delete...",IDC_FILTERFILE_DELETEBTN,299,114,50,14 + PUSHBUTTON "·s¼W...",IDC_FILTERFILE_NEWBTN,188,114,50,14 + PUSHBUTTON "½s¿è...",IDC_FILTERFILE_EDITBTN,244,114,50,14 + PUSHBUTTON "§R°£...",IDC_FILTERFILE_DELETEBTN,299,114,50,14 END IDD_SAVECLOSING DIALOGEX 0, 0, 262, 154 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Save modified files?" +CAPTION "­nÀx¦s­×§ïªºÀɮ׶Ü?" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Left side file",IDC_SAVECLOSING_LEFTFRAME,7,7,248,55 + GROUPBOX "¥ªÃäÀÉ®×",IDC_SAVECLOSING_LEFTFRAME,7,7,248,55 EDITTEXT IDC_SAVECLOSING_LEFTFILE,16,19,230,14,ES_AUTOHSCROLL | ES_READONLY - CONTROL "&Save changes",IDC_SAVECLOSING_SAVELEFT,"Button", + CONTROL "Àx¦sÅܧó(&S)",IDC_SAVECLOSING_SAVELEFT,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,36,230,10 - CONTROL "&Discard changes",IDC_SAVECLOSING_DISCARDLEFT,"Button", + CONTROL "©ñ±óÅܧó(&D)",IDC_SAVECLOSING_DISCARDLEFT,"Button", BS_AUTORADIOBUTTON,16,46,230,10 - GROUPBOX "Right side file",IDC_SAVECLOSING_RIGHTFRAME,7,70,248,55 + GROUPBOX "¥kÃäÀÉ®×",IDC_SAVECLOSING_RIGHTFRAME,7,70,248,55 EDITTEXT IDC_SAVECLOSING_RIGHTFILE,16,82,230,14,ES_AUTOHSCROLL | ES_READONLY - CONTROL "S&ave changes",IDC_SAVECLOSING_SAVERIGHT,"Button", + CONTROL "Àx¦sÅܧó(&A)",IDC_SAVECLOSING_SAVERIGHT,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10 - CONTROL "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button", + CONTROL "©ñ±óÅܧó(&C)",IDC_SAVECLOSING_DISCARDRIGHT,"Button", BS_AUTORADIOBUTTON,16,109,230,10 PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14 - DEFPUSHBUTTON "OK",IDOK,149,133,50,14 - PUSHBUTTON "Cancel",IDCANCEL,205,133,50,14 + DEFPUSHBUTTON "½T©w",IDOK,149,133,50,14 + PUSHBUTTON "¨ú®ø",IDCANCEL,205,133,50,14 END IDD_PROPPAGE_CODEPAGE DIALOGEX 0, 0, 235, 138 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Codepage" +CAPTION "½X­¶" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Default Codepage",IDC_STATIC,7,7,221,79 + GROUPBOX "¹w³]ªº½X­¶©ó ANSI ÀÉ®×",IDC_STATIC,7,7,221,79 LTEXT "Select the default codepage assumed when loading non-Unicode files:", IDC_STATIC,14,20,208,19 CONTROL "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session", IDC_DETECT_CODEPAGE,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,92,210,29 - CONTROL "System codepage",IDC_CP_SYSTEM,"Button", + CONTROL "¨t²Î½X­¶",IDC_CP_SYSTEM,"Button", BS_AUTORADIOBUTTON | WS_GROUP,13,42,210,10 - CONTROL "According to WinMerge User Interface",IDC_CP_UI,"Button", + CONTROL "®Ú¾Ú WinMerge ¥Î¤á¤¶­±",IDC_CP_UI,"Button", BS_AUTORADIOBUTTON,13,55,210,10 - CONTROL "Custom codepage :",IDC_CP_CUSTOM,"Button", + CONTROL "¦Û­q½X­¶ :",IDC_CP_CUSTOM,"Button", BS_AUTORADIOBUTTON,13,68,77,10 EDITTEXT IDC_CUSTOM_CP_NUMBER,123,67,56,13,ES_AUTOHSCROLL END