From b10de2b8f39dcabd5bafd74f1989d8ed75e20c51 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 30 Apr 2007 14:53:36 +0000 Subject: [PATCH] PATCH: [ 1704904 ] Korean Translation 2.6.X - Submitted by Sukjoon, Hwang --- Src/Changes.txt | 5 + Src/Languages/Korean/MergeKorean.rc | 727 ++++++++++++++++++------------------ 2 files changed, 368 insertions(+), 364 deletions(-) diff --git a/Src/Changes.txt b/Src/Changes.txt index 703dbd5d8..e0c52bfac 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -2,6 +2,11 @@ Src\Changes.txt Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2007-04-30 Kimmo + PATCH: [ 1704904 ] Korean Translation 2.6.X + Submitted by Sukjoon, Hwang + Src/Languages/Korean: MergeKorean.rc + 2007-04-28 Kimmo PATCH: [ 1703350 ] Update of Swedish MergeSwedish.rc Submitted by Hans Eriksson diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index 4b70b4739..1a7bb0cf8 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -71,7 +71,7 @@ BEGIN MENUITEM "¿À¸¥ÂÊÀ¸·Î º¹»ç(&O)", ID_L2R MENUITEM "¿ÞÂÊÀ¸·Î º¹»ç(&Y)", ID_R2L MENUITEM SEPARATOR - MENUITEM "&Select Line Difference", ID_SELECTLINEDIFF + MENUITEM "Line Difference ¼±ÅÃ(&S)", ID_SELECTLINEDIFF MENUITEM SEPARATOR MENUITEM "»ìÇà Ãë¼Ò(&U)", ID_EDIT_UNDO MENUITEM "´Ù½Ã ½ÇÇà(&R)", ID_EDIT_REDO @@ -82,11 +82,11 @@ BEGIN MENUITEM SEPARATOR MENUITEM "À̵¿(&G)", ID_EDIT_WMGOTO MENUITEM SEPARATOR - POPUP "Op&en" + POPUP "¿­±â(&E)" BEGIN - MENUITEM "with &Registered Application", ID_FILE_OPEN_REGISTERED - MENUITEM "with &External Editor", ID_FILE_OPEN_WITHEDITOR - MENUITEM "&with...", ID_FILE_OPEN_WITH + MENUITEM "¿¬°á ÇÁ·Î±×·¥(&R)", ID_FILE_OPEN_REGISTERED + MENUITEM "¿ÜºÎ ÆíÁý±â(&E)", ID_FILE_OPEN_WITHEDITOR + MENUITEM "ÇÁ·Î±×·¥ ¼±ÅÃ(&W)...", ID_FILE_OPEN_WITH END END END @@ -95,12 +95,12 @@ IDR_POPUP_MERGEDETAILVIEW MENU BEGIN POPUP "_POPUP_" BEGIN - MENUITEM "C&opy to Right", ID_L2R - MENUITEM "Cop&y to Left", ID_R2L + MENUITEM "¿À¸¥ÂÊÀ¸·Î º¹»ç(&O)", ID_L2R + MENUITEM "¿ÞÂÊÀ¸·Î º¹»ç(&Y)", ID_R2L MENUITEM SEPARATOR - MENUITEM "Cu&t", ID_EDIT_CUT - MENUITEM "&Copy", ID_EDIT_COPY - MENUITEM "&Paste", ID_EDIT_PASTE + MENUITEM "À߶󳻱â(&T)", ID_EDIT_CUT + MENUITEM "º¹»ç(&C)", ID_EDIT_COPY + MENUITEM "ºÙ¿©³Ö±â(&P)", ID_EDIT_PASTE END END @@ -108,11 +108,11 @@ IDR_MAINFRAME MENU BEGIN POPUP "ÆÄÀÏ(&F)" BEGIN - MENUITEM "»õ·Î ¸¸µé±â&(N)\tCtrl+N", ID_FILE_NEW + MENUITEM "»õ·Î ¸¸µé±â(&N)\tCtrl+N", ID_FILE_NEW MENUITEM "¿­±â(&O)...\tCtrl+O", ID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT - MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT + MENUITEM "ÇÁ·ÎÁ§Æ® ¿­±â...\tCtrl+J", ID_FILE_OPENPROJECT + MENUITEM "ÇÁ·ÎÁ§Æ® ÀúÀå(&V)...", ID_FILE_SAVEPROJECT MENUITEM SEPARATOR MENUITEM "³¡³»±â(&X)", ID_APP_EXIT END @@ -157,10 +157,10 @@ BEGIN END POPUP "â(&W)" BEGIN - MENUITEM "´Ý±â", ID_FILE_CLOSE - MENUITEM "Clo&se All", ID_WINDOW_CLOSEALL + MENUITEM "´Ý±â(&O)", ID_FILE_CLOSE + MENUITEM "¸ðµÎ ´Ý±â(&S)", ID_WINDOW_CLOSEALL MENUITEM SEPARATOR - MENUITEM "â(pane) À̵¿(&P)\tF6", ID_WINDOW_CHANGE_PANE + MENUITEM "â(pane) Àüȯ(&P)\tF6", ID_WINDOW_CHANGE_PANE MENUITEM SEPARATOR MENUITEM "¼öÁ÷ Á¤·Ä(&H)", ID_WINDOW_TILE_HORZ MENUITEM "¼öÆò Á¤·Ä(&V)", ID_WINDOW_TILE_VERT @@ -169,11 +169,11 @@ BEGIN POPUP "µµ¿ò¸»(&H)" BEGIN MENUITEM "¸ñÂ÷(&C)...\tF1", ID_HELP_CONTENTS - MENUITEM "&Index...", ID_HELP_INDEX - MENUITEM "&Search...", ID_HELP_SEARCH + MENUITEM "»öÀÎ(&I)...", ID_HELP_INDEX + MENUITEM "°Ë»ö(&S)...", ID_HELP_SEARCH MENUITEM SEPARATOR MENUITEM "¼³Á¤(&O)...", ID_HELP_GETCONFIG - MENUITEM "¾ÐÃàÆÄÀÏ Áö¿ø¿¡ ´ëÇÏ¿©(&R)...", ID_HELP_MERGE7ZMISMATCH + MENUITEM "¾ÐÃàÆÄÀÏ Áö¿ø(&R)", ID_HELP_MERGE7ZMISMATCH MENUITEM SEPARATOR MENUITEM "&GNU Public License...", ID_HELP_GNULICENSE MENUITEM "WinMerge Á¤º¸(&A)...", ID_APP_ABOUT @@ -184,16 +184,16 @@ IDR_DIRVIEWMENU MENU BEGIN POPUP "ÆÄÀÏ(&F)" BEGIN - MENUITEM "»õ·Î ¸¸µé±â&(N)\tCtrl+N", ID_FILE_NEW + MENUITEM "»õ·Î ¸¸µé±â(&N)\tCtrl+N", ID_FILE_NEW MENUITEM "¿­±â(&O)...\tCtrl+O", ID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT - MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT + MENUITEM "ÇÁ·ÎÁ§Æ® ¿­±â...\tCtrl+J", ID_FILE_OPENPROJECT + MENUITEM "ÇÁ·ÎÁ§Æ® ÀúÀå(&V)...", ID_FILE_SAVEPROJECT MENUITEM SEPARATOR MENUITEM "¿ÞÂÊÀ» ÀбâÀü¿ëÀ¸·Î(E&)", ID_FILE_LEFT_READONLY MENUITEM "¿À¸¥ÂÊÀ» ÀбâÀü¿ëÀ¸·Î(&G)", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File En&coding", ID_FILE_ENCODING + MENUITEM "ÆÄÀÏ ÀÎÄÚµù(&C)", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "³¡³»±â(&X)", ID_APP_EXIT END @@ -205,14 +205,14 @@ BEGIN END POPUP "º¸±â(&V)" BEGIN - MENUITEM "Show &Identical Items", ID_OPTIONS_SHOWIDENTICAL - MENUITEM "Show &Different Items", ID_OPTIONS_SHOWDIFFERENT - MENUITEM "Show L&eft Unique Items", ID_OPTIONS_SHOWUNIQUELEFT - MENUITEM "Show Ri&ght Unique Items", ID_OPTIONS_SHOWUNIQUERIGHT - MENUITEM "Show S&kipped Items", ID_OPTIONS_SHOWSKIPPED - MENUITEM "S&how Binary Files", ID_OPTIONS_SHOWBINARIES + MENUITEM "µ¿ÀÏ ÆÄÀÏ º¸±â(&I)", ID_OPTIONS_SHOWIDENTICAL + MENUITEM "´Ù¸¥ ÆÄÀÏ º¸±â(&D)", ID_OPTIONS_SHOWDIFFERENT + MENUITEM "¿ÞÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸±â(&E)", ID_OPTIONS_SHOWUNIQUELEFT + MENUITEM "¿À¸¥ÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸±â(&G)", ID_OPTIONS_SHOWUNIQUERIGHT + MENUITEM "ÇÊÅ͸µµÈ ÆÄÀÏ º¸±â(&H)", ID_OPTIONS_SHOWSKIPPED + MENUITEM "¹ÙÀ̳ʸ® ÆÄÀÏ º¸±â(&H)", ID_OPTIONS_SHOWBINARIES MENUITEM SEPARATOR - MENUITEM "Show Hidd&en Items", ID_VIEW_SHOWHIDDENITEMS + MENUITEM "°¨ÃçµÐ ÆÄÀÏ º¸±â(&E)", ID_VIEW_SHOWHIDDENITEMS MENUITEM SEPARATOR MENUITEM "ÆùÆ® ¼±ÅÃ(&F)...", ID_VIEW_SELECTFONT MENUITEM "±âº» ÆùÆ® »ç¿ë(&O)", ID_VIEW_USEDEFAULTFONT @@ -234,26 +234,26 @@ BEGIN END POPUP "Merge(&M)" BEGIN - MENUITEM "Co&mpare\tEnter", ID_MERGE_COMPARE + MENUITEM "ºñ±³(&M)\tEnter", ID_MERGE_COMPARE MENUITEM SEPARATOR - MENUITEM "´ÙÀ½ ´Ù¸¥ ºÎºÐ(&X)\tAlt+Down", ID_NEXTDIFF - MENUITEM "ÀÌÀü ´Ù¸¥ ºÎºÐ(&V)\tAlt+Up", ID_PREVDIFF + MENUITEM "´ÙÀ½ ´Ù¸¥ ºÎºÐ(&N)\tAlt+Down", ID_NEXTDIFF + MENUITEM "ÀÌÀü ´Ù¸¥ ºÎºÐ(&P)\tAlt+Up", ID_PREVDIFF MENUITEM SEPARATOR MENUITEM "óÀ½ ´Ù¸¥ ºÎºÐ(&F)\tAlt+Home", ID_FIRSTDIFF - MENUITEM "ÇöÀç ¼±ÅÃµÈ ´Ù¸¥ ºÎºÐ(&N)\tAlt+Enter", ID_CURDIFF - MENUITEM "¸¶Áö¸· ´Ù¸¥ ºÎºÐ(&D)\tAlt+End", ID_LASTDIFF + MENUITEM "ÇöÀç ¼±ÅÃµÈ ´Ù¸¥ ºÎºÐ(&C)\tAlt+Enter", ID_CURDIFF + MENUITEM "¸¶Áö¸· ´Ù¸¥ ºÎºÐ(&L)\tAlt+End", ID_LASTDIFF MENUITEM SEPARATOR - MENUITEM "¿À¸¥ÂÊÀ¸·Î º¹»ç(&G)\tAlt+Right", ID_L2R - MENUITEM "¿ÞÂÊÀ¸·Î º¹»ç(&L)\tAlt+Left", ID_R2L + MENUITEM "¿À¸¥ÂÊÀ¸·Î º¹»ç(&R)\tAlt+Right", ID_L2R + MENUITEM "¿ÞÂÊÀ¸·Î º¹»ç(&E)\tAlt+Left", ID_R2L MENUITEM SEPARATOR - MENUITEM "&Delete\tDel", ID_MERGE_DELETE + MENUITEM "»èÁ¦(&D)\tDel", ID_MERGE_DELETE END POPUP "µµ±¸(&T)" BEGIN MENUITEM "µð·ºÅ丮 ºñ±³ ¼³Á¤(&Customize Columns)", ID_TOOLS_CUSTOMIZECOLUMNS MENUITEM "ÇÊÅÍ(&F)", ID_TOOLS_FILTERS MENUITEM "ÆÐÄ¡ »ý¼º(&G)", ID_TOOLS_GENERATEPATCH - MENUITEM "Generate &Report...", ID_TOOLS_GENERATEREPORT + MENUITEM "¸®Æ÷Æ® »ý¼º(&R)...", ID_TOOLS_GENERATEREPORT END POPUP "Ç÷¯±×ÀÎ(&P)" BEGIN @@ -271,8 +271,8 @@ BEGIN END POPUP "â(&W)" BEGIN - MENUITEM "´Ý±â", ID_FILE_CLOSE - MENUITEM "Clo&se All", ID_WINDOW_CLOSEALL + MENUITEM "´Ý±â(&O)", ID_FILE_CLOSE + MENUITEM "¸ðµÎ ´Ý±â(&S)", ID_WINDOW_CLOSEALL MENUITEM SEPARATOR MENUITEM "â(pane) À̵¿(&P)\tF6", ID_WINDOW_CHANGE_PANE MENUITEM SEPARATOR @@ -283,11 +283,11 @@ BEGIN POPUP "µµ¿ò¸»(&H)" BEGIN MENUITEM "¸ñÂ÷(&C)...\tF1", ID_HELP_CONTENTS - MENUITEM "&Index...", ID_HELP_INDEX - MENUITEM "&Search...", ID_HELP_SEARCH + MENUITEM "»öÀÎ(&I)...", ID_HELP_INDEX + MENUITEM "°Ë»ö(&S)...", ID_HELP_SEARCH MENUITEM SEPARATOR MENUITEM "¼³Á¤(&O)...", ID_HELP_GETCONFIG - MENUITEM "¾ÐÃàÆÄÀÏ Áö¿ø¿¡ ´ëÇÏ¿©(&R)...", ID_HELP_MERGE7ZMISMATCH + MENUITEM "¾ÐÃàÆÄÀÏ Áö¿ø(&R)", ID_HELP_MERGE7ZMISMATCH MENUITEM SEPARATOR MENUITEM "&GNU Public License...", ID_HELP_GNULICENSE MENUITEM "WinMerge Á¤º¸(&A)...", ID_APP_ABOUT @@ -298,11 +298,11 @@ IDR_MERGEVIEWMENU MENU BEGIN POPUP "ÆÄÀÏ(&F)" BEGIN - MENUITEM "»õ·Î ¸¸µé±â&(N)\tCtrl+N", ID_FILE_NEW + MENUITEM "»õ·Î ¸¸µé±â(&N)\tCtrl+N", ID_FILE_NEW MENUITEM "¿­±â(&O)...\tCtrl+O", ID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT - MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT + MENUITEM "ÇÁ·ÎÁ§Æ® ¿­±â...\tCtrl+J", ID_FILE_OPENPROJECT + MENUITEM "ÇÁ·ÎÁ§Æ® ÀúÀå(&V)...", ID_FILE_SAVEPROJECT MENUITEM SEPARATOR MENUITEM "ÀúÀå(&S)\tCtrl+S", ID_FILE_SAVE POPUP "¿ÞÂÊ ÀúÀå(&L)" @@ -316,14 +316,14 @@ BEGIN MENUITEM "´Ù¸¥ À̸§À¸·Î ÀúÀå(&A)...", ID_FILE_SAVEAS_RIGHT END MENUITEM SEPARATOR - MENUITEM "&Print...", ID_FILE_PRINT + MENUITEM "Àμâ(&P)...", ID_FILE_PRINT MENUITEM "Page Se&tup", ID_FILE_PAGE_SETUP - MENUITEM "Print Previe&w", ID_FILE_PRINT_PREVIEW + MENUITEM "¹Ì¸®º¸±â(&R)", ID_FILE_PRINT_PREVIEW MENUITEM SEPARATOR - MENUITEM "¿ÞÂÊÀ» ÀбâÀü¿ëÀ¸·Î(E&)", ID_FILE_LEFT_READONLY + MENUITEM "¿ÞÂÊÀ» ÀбâÀü¿ëÀ¸·Î(&E)", ID_FILE_LEFT_READONLY MENUITEM "¿À¸¥ÂÊÀ» ÀбâÀü¿ëÀ¸·Î(&G)", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "&Convert Line Endings to" + POPUP "EOL º¯È¯(&C)" BEGIN MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX @@ -354,17 +354,17 @@ BEGIN MENUITEM "< Empty >", ID_NO_EDIT_SCRIPTS END MENUITEM SEPARATOR - POPUP "Advanced" + POPUP "°í±Þ" BEGIN - MENUITEM "&Copy With Line Numbers\tCtrl+Shift+C", + MENUITEM "Çà¹øÈ£ Æ÷ÇÔ º¹»ç(&C)\tCtrl+Shift+C", ID_EDIT_COPY_LINENUMBERS END - POPUP "&Bookmarks" + POPUP "ºÏ¸¶Å©(&B)" BEGIN - MENUITEM "&Toggle Bookmark\tCtrl+F2", ID_EDIT_TOGGLE_BOOKMARK - MENUITEM "&Next Bookmark\tF2", ID_EDIT_GOTO_NEXT_BOOKMARK - MENUITEM "&Previous bookmark\tShift+F2", ID_EDIT_GOTO_PREV_BOOKMARK - MENUITEM "&Clear All Bookmarks", ID_EDIT_CLEAR_ALL_BOOKMARKS + MENUITEM "ºÏ¸¶Å© Åä±Û(&T)\tCtrl+F2", ID_EDIT_TOGGLE_BOOKMARK + MENUITEM "´ÙÀ½ ºÏ¸¶Å©(&N)\tF2", ID_EDIT_GOTO_NEXT_BOOKMARK + MENUITEM "ÀÌÀü ºÏ¸¶Å©(&P)\tShift+F2", ID_EDIT_GOTO_PREV_BOOKMARK + MENUITEM "¸ðµç ºÏ¸¶Å© »èÁ¦(&C)", ID_EDIT_CLEAR_ALL_BOOKMARKS END MENUITEM "À̵¿(&G)...\tCtrl+G", ID_EDIT_WMGOTO MENUITEM SEPARATOR @@ -380,12 +380,12 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "°ø¹é º¸±â(&V)", ID_VIEW_WHITESPACE - MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS - MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS + MENUITEM "Line Difference º¸±â(&W)", ID_VIEW_LINEDIFFS + MENUITEM "Çà¹øÈ£ º¸±â(&N)", ID_VIEW_LINENUMBERS MENUITEM "View &Margins", ID_VIEW_FILEMARGIN - MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP + MENUITEM "ÀÚµ¿ ÁٹٲÞ(&R)", ID_VIEW_WORDWRAP MENUITEM SEPARATOR - MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES + MENUITEM "â(pane) À§Ä¡ ¹Ù²Ù±â(&A)", ID_VIEW_SWAPPANES MENUITEM SEPARATOR POPUP "&Toolbar" BEGIN @@ -414,8 +414,8 @@ BEGIN MENUITEM "¿À¸¥ÂÊÀ¸·Î º¹»ç(&G)\tAlt+Right", ID_L2R MENUITEM "¿ÞÂÊÀ¸·Î º¹»ç(&L)\tAlt+Left", ID_R2L MENUITEM SEPARATOR - MENUITEM "¿À¸¥ÂÊÀ¸·Î º¹»ç - Advance(&O)\tAlt+Ctrl+Right", ID_L2RNEXT - MENUITEM "¿ÞÂÊÀ¸·Î º¹»ç - Advance(&T)\tAlt+Ctrl+Left", ID_R2LNEXT + MENUITEM "¿À¸¥ÂÊÀ¸·Î º¹»çÈÄ ´ÙÀ½ ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿(&O)\tAlt+Ctrl+Right", ID_L2RNEXT + MENUITEM "¿ÞÂÊÀ¸·Î º¹»çÈÄ ´ÙÀ½ ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿(&T)\tAlt+Ctrl+Left", ID_R2LNEXT MENUITEM SEPARATOR MENUITEM "¸ðµÎ ¿À¸¥ÂÊÀ¸·Î º¹»ç(&A)", ID_ALL_RIGHT MENUITEM "¸ðµÎ ¿ÞÂÊÀ¸·Î º¹»ç(&E)", ID_ALL_LEFT @@ -447,9 +447,9 @@ BEGIN POPUP "â(&W)" BEGIN MENUITEM "´Ý±â", ID_FILE_CLOSE - MENUITEM "Clo&se All", ID_WINDOW_CLOSEALL + MENUITEM "¸ðµÎ ´Ý±â(&S)", ID_WINDOW_CLOSEALL MENUITEM SEPARATOR - MENUITEM "â(pane) À̵¿(&P)\tF6", ID_WINDOW_CHANGE_PANE + MENUITEM "â(pane) Àüȯ(&P)\tF6", ID_WINDOW_CHANGE_PANE MENUITEM SEPARATOR MENUITEM "¼öÁ÷ Á¤·Ä(&H)", ID_WINDOW_TILE_HORZ MENUITEM "¼öÆò Á¤·Ä(&V)", ID_WINDOW_TILE_VERT @@ -458,11 +458,11 @@ BEGIN POPUP "µµ¿ò¸»(&H)" BEGIN MENUITEM "¸ñÂ÷(&C)...\tF1", ID_HELP_CONTENTS - MENUITEM "&Index...", ID_HELP_INDEX - MENUITEM "&Search...", ID_HELP_SEARCH + MENUITEM "»öÀÎ(&I)...", ID_HELP_INDEX + MENUITEM "°Ë»ö(&S)...", ID_HELP_SEARCH MENUITEM SEPARATOR MENUITEM "¼³Á¤(&O)...", ID_HELP_GETCONFIG - MENUITEM "¾ÐÃàÆÄÀÏ Áö¿ø¿¡ ´ëÇÏ¿©(&R)...", ID_HELP_MERGE7ZMISMATCH + MENUITEM "¾ÐÃàÆÄÀÏ Áö¿ø(&R)", ID_HELP_MERGE7ZMISMATCH MENUITEM SEPARATOR MENUITEM "&GNU Public License...", ID_HELP_GNULICENSE MENUITEM "WinMerge Á¤º¸(&A)...", ID_APP_ABOUT @@ -473,7 +473,7 @@ IDR_POPUP_DIRVIEW MENU BEGIN POPUP "_ITEM_POPUP_" BEGIN - MENUITEM "Comp&are", ID_MERGE_COMPARE + MENUITEM "ºñ±³(&A)", ID_MERGE_COMPARE MENUITEM SEPARATOR POPUP "º¹»ç(&C)" BEGIN @@ -493,8 +493,8 @@ BEGIN MENUITEM "¿À¸¥Âʸ¸(&R)", ID_DIR_DEL_RIGHT MENUITEM "¸ðµÎ(&B)", ID_DIR_DEL_BOTH END - MENUITEM "Re&name", ID_DIR_ITEM_RENAME - MENUITEM "&Hide Items", ID_DIR_HIDE_FILENAMES + MENUITEM "À̸§ ¹Ù²Ù±â(&N)", ID_DIR_ITEM_RENAME + MENUITEM "°¨Ãß±â(&H)", ID_DIR_HIDE_FILENAMES MENUITEM SEPARATOR POPUP "¿ÞÂÊ ÆÄÀÏ ¿­±â(&O)" BEGIN @@ -525,7 +525,7 @@ BEGIN MENUITEM "´Ù¸¥ ÆÄÀϸ¸(&D)... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY END MENUITEM SEPARATOR - MENUITEM "&Refresh", ID_DIR_RESCAN + MENUITEM "»õ·Î°íħ(&R)", ID_DIR_RESCAN END POPUP "_HDR_POPUP_" BEGIN @@ -560,7 +560,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "À̵¿¿µ¿ª Ç¥½ÃÇÏÁö ¾ÊÀ½(&N)", ID_DISPLAY_MOVED_NONE MENUITEM "¸ðµç À̵¿¿µ¿ª Ç¥½Ã(&A)", ID_DISPLAY_MOVED_ALL - MENUITEM "¼±ÅÃµÈ À̵¿¿µ¿ª¸¸ Ç¥½Ã(&C)", ID_DISPLAY_MOVED_FOLLOW_DIFF + MENUITEM "ÇöÀç ¼±ÅÃµÈ À̵¿¿µ¿ª¸¸ Ç¥½Ã(&C)", ID_DISPLAY_MOVED_FOLLOW_DIFF END END @@ -634,29 +634,29 @@ BEGIN LTEXT "Version 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 LTEXT "All rights reserved.",IDC_STATIC,7,60,170,8 - LTEXT "Visit the WinMerge HomePage!",IDC_WWW,7,79,209,8 + LTEXT "WinMerge ȨÆäÀÌÁö¿¡ µé·Áº¸¼¼¿ä!",IDC_WWW,7,79,209,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,95,209,1 LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 - DEFPUSHBUTTON "OK",IDOK,166,103,50,14 + DEFPUSHBUTTON "È®ÀÎ",IDOK,166,103,50,14 PUSHBUTTON "Contributors",IDC_OPEN_CONTRIBUTORS,7,103,65,14 END IDD_OPEN DIALOGEX 0, 0, 374, 126 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "µð·ºÅ丮/ÆÄÀÏ ¼±ÅÃ..." +CAPTION "µð·ºÅ丮/ÆÄÀÏ ¼±ÅÃ" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN RTEXT "¿ÞÂÊ(&L):",IDC_STATIC,13,24,65,8 COMBOBOX IDC_LEFT_COMBO,81,22,167,94,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES - PUSHBUTTON "ã¾Æº¸±â(&B)...",IDC_LEFT_BUTTON,242,22,50,14 + PUSHBUTTON "ã¾Æº¸±â(&B)",IDC_LEFT_BUTTON,252,22,50,14 RTEXT "¿À¸¥ÂÊ(&R):",IDC_STATIC,13,40,65,8 COMBOBOX IDC_RIGHT_COMBO,81,38,167,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES - PUSHBUTTON "ã¾Æº¸±â(&W)...",IDC_RIGHT_BUTTON,252,38,50,14 + PUSHBUTTON "ã¾Æº¸±â(&W)",IDC_RIGHT_BUTTON,252,38,50,14 RTEXT "ÇÊÅÍ(&F):",IDC_STATIC,13,56,65,8 COMBOBOX IDC_EXT_COMBO,81,54,167,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -670,7 +670,7 @@ BEGIN LTEXT "»óÅÂ:",IDC_OPEN_STATUS,15,102,192,8 DEFPUSHBUTTON "È®ÀÎ",IDOK,316,11,50,14 PUSHBUTTON "Ãë¼Ò",IDCANCEL,316,28,50,14 - PUSHBUTTON "Help",ID_HELP,316,45,50,14 + PUSHBUTTON "µµ¿ò¸»",ID_HELP,316,45,50,14 GROUPBOX "ºñ±³ÇÒ µð·ºÅ丮/ÆÄÀÏ",IDC_FILES_DIRS_GROUP,7, 7,302,111 END @@ -704,15 +704,15 @@ END IDD_PROP_VSS DIALOGEX 0, 0, 235, 157 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "¹öÀü °ü¸® ½Ã½ºÅÛ" +CAPTION "Çü»ó °ü¸® ½Ã½ºÅÛ" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "¹öÀü °ü¸® ½Ã½ºÅÛ(&V) :",IDC_STATIC,7,7,221,10 + LTEXT "Çü»ó °ü¸® ½Ã½ºÅÛ(&V) :",IDC_STATIC,7,7,221,10 COMBOBOX IDC_VER_SYS,7,18,166,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "cleartool.exe °æ·Î(&P) :",IDC_VSS_L1,7,37,221,10 EDITTEXT IDC_PATH_EDIT,7,48,166,14,ES_AUTOHSCROLL - PUSHBUTTON "ã¾Æº¸±â(&B)...",IDC_BROWSE_BUTTON,178,48,50,14 + PUSHBUTTON "ã¾Æº¸±â(&B)",IDC_BROWSE_BUTTON,178,48,50,14 END IDD_PROPPAGE_LARGE DIALOGEX 0, 0, 235, 222 @@ -730,18 +730,18 @@ BEGIN CONTROL "¿­±â ´ëÈ­»óÀÚ¿¡¼­ ÀÚµ¿À¸·Î ¿Ã¹Ù¸¥ °æ·ÎÀÎÁö °Ë»ç", IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10 - CONTROL "&Allow only one instance to run",IDC_SINGLE_INSTANCE, + CONTROL "Winmerge ½Ì±Û ÀνºÅϽº¸¸ Çã¿ëÇÔ(&A)",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10 - LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8 + LTEXT "¿­±â ´ëÈ­»óÀÚ ÀÚµ¿¿Ï¼º ±â´É(&P):",IDC_STATIC,19,62,125,8 COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,90, + GROUPBOX "´ÙÁß À©µµ¿ì ±â´É Àû¿ë",IDC_STATIC,7,90, 221,37 - CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP, + CONTROL "µð·ºÅ丮 ºñ±³(&F)",IDC_MULTIDOC_DIRCMP, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10 - CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP, + CONTROL "ÆÄÀÏ ºñ±³(&E)",IDC_MULTIDOC_FILECMP, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 - LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", + LTEXT "¸î¸î °æ°í ¸Þ¼¼Áö´Â º¸ÀÌÁö ¾Ê°Ô ÇÒ ¼ö ÀÖ½À´Ï´Ù. ÃʱâÈ­ Çϸé ÇØ´ç ¸Þ¼¼Áö´Â ´Ù½Ã ³ªÅ¸³³´Ï´Ù", IDC_STATIC,7,143,168,31 PUSHBUTTON "ÃʱâÈ­",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT WS_TABSTOP @@ -775,7 +775,7 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10 CONTROL "Á¤±Ô Ç¥Çö½Ä(&E)",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10 - CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button", + CONTROL "EOF·¦(Wrap End of File) ÇÏÁö ¾Ê±â(&O)",IDC_FINDDLG_DONTWRAP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,57,135,10 GROUPBOX "¹æÇâ",IDC_STATIC,148,23,70,36,WS_GROUP CONTROL "À§·Î(&U)",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | @@ -829,9 +829,9 @@ BEGIN EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL LTEXT "ÄÚ¸àÆ®",IDC_STATIC,18,7,80,10 - CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", + CONTROL "¸ðµç ¾ÆÀÌÅÛ¿¡ Àû¿ë",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,83,235,8 - CONTROL "CheckIn after checkout",IDC_CHECKIN,"Button", + CONTROL "checkout ÈÄ¿¡ checkin",IDC_CHECKIN,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8 END @@ -870,7 +870,7 @@ BEGIN WS_TABSTOP,113,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "¹è°æ»ö",IDC_STATIC,96,15,50,8 - CTEXT "Áö¿öÁü",IDC_STATIC,145,15,38,8 + CTEXT "»èÁ¦¿µ¿ª",IDC_STATIC,145,15,38,8 CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,156,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE @@ -914,14 +914,14 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + RTEXT "´Ü¾î´ÜÀ§ ´Ù¸¥ ºÎºÐ:",IDC_STATIC,7,129,90,8 CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + RTEXT "¼±ÅÃµÈ ´Ü¾î´ÜÀ§ ´Ù¸¥ ºÎºÐ:",IDC_STATIC,7,149,90,8 CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE @@ -949,22 +949,22 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "»èÁ¦ÇÑ ÆÄÀÏÀº ÈÞÁöÅëÀ¸·Î(&P)",IDC_USE_RECYCLE_BIN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,222,10 - CONTROL "Ign&ore time differences less than 3 seconds", + CONTROL "3ÃÊ À̳» ½Ã°£ Â÷ÀÌ´Â ¹«½ÃÇϱâ(&O)", IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,222,10 GROUPBOX "Integration",IDC_STATIC,7,30,218,46 - CONTROL "Ž»ö±â ¸Þ´º¿¡ Ãß°¡(&A)",IDC_EXPLORER_CONTEXT, + CONTROL "Ž»ö±â Æ˾÷ ¸Þ´º¿¡ Ãß°¡(&A)",IDC_EXPLORER_CONTEXT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10 - CONTROL "Advanced ¸Þ´º È°¼ºÈ­(&N)",IDC_EXPLORER_ADVANCED,"Button", + CONTROL "°í±Þ ¸Þ´º È°¼ºÈ­(&N)",IDC_EXPLORER_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10 - CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS, + CONTROL "ÇÏÀ§ µð·ºÅ丮 Æ÷ÇÔÀ» ±âº»À¸·Î »ç¿ë(&C)",IDC_EXPLORER_SUBFOLDERS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10 LTEXT "¿ÜºÎ ÆíÁý±â(&E):",IDC_STATIC,7,83,222,8 EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL PUSHBUTTON "ã¾Æº¸±â(&B)...",IDC_EXT_EDITOR_BROWSE,179,93,50,14 - LTEXT "&Filter folder:",IDC_STATIC,7,111,166,8 + LTEXT "µð·ºÅ丮 ÇÊÅ͸µ(&F):",IDC_STATIC,7,111,166,8 EDITTEXT IDC_FILTER_USER_PATH,7,121,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_FILTER_USER_BROWSE,179,121,50,14 + PUSHBUTTON "ã¾Æº¸±â...",IDC_FILTER_USER_BROWSE,179,121,50,14 END IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 180 @@ -976,20 +976,20 @@ BEGIN LTEXT "ÆÄÀÏ&1:",IDC_STATIC,7,10,36,8 COMBOBOX IDC_DIFF_FILE1,48,7,230,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "ã¾Æº¸±â(&B)...",IDC_DIFF_BROWSE_FILE1,283,7,52,14 + PUSHBUTTON "ã¾Æº¸±â(&B)",IDC_DIFF_BROWSE_FILE1,283,7,52,14 LTEXT "ÆÄÀÏ&2:",IDC_STATIC,7,27,36,8 COMBOBOX IDC_DIFF_FILE2,48,24,230,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "ã¾Æº¸±â(&O)...",IDC_DIFF_BROWSE_FILE2,283,24,52,14 + PUSHBUTTON "ã¾Æº¸±â(&O)",IDC_DIFF_BROWSE_FILE2,283,24,52,14 PUSHBUTTON "À§Ä¡¹Ù²Ù±â(&S)",IDC_DIFF_SWAPFILES,283,41,52,14 CONTROL "Á¸ÀçÇÏ´Â ÆÄÀÏ¿¡ µ¡ºÙÀ̱â(&A)",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,48,51,230,10 LTEXT "°á°ú(&R):",IDC_STATIC,7,66,37,8 COMBOBOX IDC_DIFF_FILERESULT,48,63,230,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "ã¾Æº¸±â(&W)...",IDC_DIFF_BROWSE_RESULT,283,63,52,14 - GROUPBOX "&Format",IDC_STATIC,7,81,142,46 - LTEXT "St&yle:",IDC_STATIC,13,95,46,8 + PUSHBUTTON "ã¾Æº¸±â(&W)",IDC_DIFF_BROWSE_RESULT,283,63,52,14 + GROUPBOX "Çü½Ä(&F)",IDC_STATIC,7,81,142,46 + LTEXT "½ºÅ¸ÀÏ(&Y):",IDC_STATIC,13,95,46,8 COMBOBOX IDC_DIFF_STYLE,63,92,80,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&Context:",IDC_STATIC,13,109,46,8 @@ -1006,9 +1006,9 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,134,142,10 CONTROL "´ë¼Ò¹®ÀÚ ±¸ºÐ(&T)",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,145,142,10 - CONTROL "Inclu&de command line",IDC_DIFF_INCLCMDLINE,"Button", + CONTROL "Ä¿¸Çµå ¶óÀο¡¼­ ½ÇÇà½Ã¿¡µµ Àû¿ë(&D)",IDC_DIFF_INCLCMDLINE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,155,134,170,10 - CONTROL "¿ÜºÎ ¿¡µðÅÍ·Î ¿­±â(&X)",IDC_DIFF_OPENTOEDITOR,"Button", + CONTROL "¿ÜºÎ ÆíÁý±â·Î ¿­±â(&X)",IDC_DIFF_OPENTOEDITOR,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,155,145,170,10 PUSHBUTTON "±âº»°ª",IDC_DIFF_DEFAULTS,7,159,50,14 DEFPUSHBUTTON "È®ÀÎ",IDOK,230,159,50,14 @@ -1036,8 +1036,8 @@ BEGIN GROUPBOX "Ç¥½Ã",IDC_GROUP_SHOW,7,7,145,102 LISTBOX IDC_LIST_SHOW,52,18,92,83,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "À§·Î(&U)",IDC_UP,15,45,30,14 - PUSHBUTTON "¾Æ·¡·Î(&D)",IDC_DOWN,15,63,30,14 + PUSHBUTTON "À§·Î(&U)",IDC_UP,13,45,32,14 + PUSHBUTTON "¾Æ·¡·Î(&D)",IDC_DOWN,13,63,32,14 GROUPBOX "¼û±â±â",IDC_GROUP_HIDE,193,7,108,102 LISTBOX IDC_LIST_HIDE,201,18,92,83,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP @@ -1075,17 +1075,17 @@ IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 256, 60 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION EXSTYLE WS_EX_TOOLWINDOW -CAPTION " Folder Compare Progress" +CAPTION "µð·ºÅ丮 ºñ±³ »óȲ" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,167,15,83,14 + DEFPUSHBUTTON "ÁßÁö",IDC_COMPARISON_STOP,167,15,83,14 CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,9, 44,241,9 RTEXT "0",IDC_ITEMSCOMPARED,95,29,30,8 RTEXT "0",IDC_ITEMSTOTAL,95,19,30,8 - LTEXT "Comparing items...",IDC_STATIC,7,7,150,8 - LTEXT "Items compared:",IDC_STATIC,7,29,85,8 - LTEXT "Items total:",IDC_STATIC,7,19,85,8 + LTEXT "ºñ±³ ÁøÇàÁß...",IDC_STATIC,7,7,150,8 + LTEXT "ºñ±³ ¿Ï·áµÈ ÆÄÀÏ :",IDC_STATIC,7,29,85,8 + LTEXT "¸ðµç ÆÄÀÏ :",IDC_STATIC,7,19,85,8 END IDD_WMGOTO DIALOGEX 0, 0, 210, 70 @@ -1136,10 +1136,10 @@ BEGIN LTEXT "ÆÄÀÏ ºñ±³ ¹æ½Ä(&F):",IDC_STATIC,7,115,100,9 COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST, + CONTROL "´Ù¸¥ ºÎºÐ ¹ß°ß½Ã ¹Ù·Î ÁßÁö(&T)",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10 - GROUPBOX "Comments",IDC_STATIC,7,144,221,32 - CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button", + GROUPBOX "ÁÖ¼®",IDC_STATIC,7,144,221,32 + CONTROL "ÁÖ¼® ºñ±³ ¾ÈÇÔ",IDC_FILTERCOMMENTS_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10 PUSHBUTTON "±âº»°ª",IDC_COMPARE_DEFAULTS,7,189,50,14 END @@ -1165,11 +1165,11 @@ BEGIN BS_AUTORADIOBUTTON,85,62,137,10 GROUPBOX "Line Difference Coloring",IDC_LINE_COLORING_GROUP,7,87, 221,61 - CONTROL "View line differences",IDC_VIEW_LINE_DIFFERENCES,"Button", + CONTROL "line differences º¸±â",IDC_VIEW_LINE_DIFFERENCES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,14,98,100,8 - CONTROL "&Character level",IDC_EDITOR_CHARLEVEL,"Button", + CONTROL "¹®ÀÚ ´ÜÀ§(&C)",IDC_EDITOR_CHARLEVEL,"Button", BS_AUTORADIOBUTTON | WS_GROUP,14,108,138,10 - CONTROL "&Word-level:",IDC_EDITOR_WORDLEVEL,"Button", + CONTROL "´Ü¾î ´ÜÀ§(&W):",IDC_EDITOR_WORDLEVEL,"Button", BS_AUTORADIOBUTTON,14,118,122,10 COMBOBOX IDC_BREAK_TYPE,24,130,143,34,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP @@ -1190,11 +1190,11 @@ BEGIN CONTROL "List1",IDC_FILTERFILE_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,342,100 - PUSHBUTTON "Test",IDC_FILTERFILE_TEST_BTN,7,114,50,14 - PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14 - PUSHBUTTON "New...",IDC_FILTERFILE_NEWBTN,192,114,50,14 + PUSHBUTTON "Å×½ºÆ®",IDC_FILTERFILE_TEST_BTN,7,114,50,14 + PUSHBUTTON "¼³Ä¡...",IDC_FILTERFILE_INSTALL,137,114,50,14 + PUSHBUTTON "»õ·Î »ý¼º...",IDC_FILTERFILE_NEWBTN,192,114,50,14 PUSHBUTTON "ÆíÁý...",IDC_FILTERFILE_EDITBTN,246,114,50,14 - PUSHBUTTON "Delete...",IDC_FILTERFILE_DELETEBTN,300,114,50,14 + PUSHBUTTON "»èÁ¦...",IDC_FILTERFILE_DELETEBTN,300,114,50,14 END IDD_SAVECLOSING DIALOGEX 0, 0, 262, 154 @@ -1208,16 +1208,16 @@ BEGIN ES_READONLY CONTROL "ÀúÀå(&S)",IDC_SAVECLOSING_SAVELEFT,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,36,230,10 - CONTROL "ÀúÀåÇÏÁö ¾ÊÀ½(&D)",IDC_SAVECLOSING_DISCARDLEFT,"Button", + CONTROL "ÀúÀå ¾ÈÇÔ(&D)",IDC_SAVECLOSING_DISCARDLEFT,"Button", BS_AUTORADIOBUTTON,16,46,230,10 GROUPBOX "¿À¸¥ÂÊ ÆÄÀÏ",IDC_SAVECLOSING_RIGHTFRAME,7,70,248,55 EDITTEXT IDC_SAVECLOSING_RIGHTFILE,16,82,230,14,ES_AUTOHSCROLL | ES_READONLY CONTROL "ÀúÀå(&A)",IDC_SAVECLOSING_SAVERIGHT,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10 - CONTROL "ÀúÀåÇÏÁö ¾ÊÀ½(&C)",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 + PUSHBUTTON "¸ðµÎ ÀúÀå ¾ÈÇÔ",IDC_SAVECLOSING_DISCARDALL,7,133,65,14 DEFPUSHBUTTON "È®ÀÎ",IDOK,149,133,50,14 PUSHBUTTON "Ãë¼Ò",IDCANCEL,205,133,50,14 END @@ -1227,15 +1227,15 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Default Codepage",IDC_STATIC,7,7,221,79 - LTEXT "Select the default codepage assumed when loading non-Unicode files:", + GROUPBOX "±âº» Codepage",IDC_STATIC,7,7,221,79 + LTEXT "unicode ÆÄÀÏÀÌ ¾Æ´Ñ ÆÄÀÏÀ» ¿­ ¶§ ±âº»À¸·Î »ç¿ëÇÒ codepage ¸¦ ¼±ÅÃÇÕ´Ï´Ù", IDC_STATIC,14,20,208,19 - CONTROL "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session", + CONTROL "´ÙÀ½ ÆÄÀϵéÀº codepage¸¦ °ËÃâ ÇÕ´Ï´Ù : .html, .rc, .xml \nÀç½ÃÀÛ ÇÊ¿äÇÕ´Ï´Ù", IDC_DETECT_CODEPAGE,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,92,210,29 CONTROL "½Ã½ºÅÛ codepage",IDC_CP_SYSTEM,"Button", BS_AUTORADIOBUTTON | WS_GROUP,13,42,210,10 - CONTROL "WinMerge À¯ÀúÀÎÅÍÆäÀ̽º¸¦ µû¸§",IDC_CP_UI,"Button", + CONTROL "WinMerge UI¸¦ µû¸§",IDC_CP_UI,"Button", BS_AUTORADIOBUTTON,13,55,210,10 CONTROL "ÀϹÝÀûÀÎ codepage :",IDC_CP_CUSTOM,"Button", BS_AUTORADIOBUTTON,13,68,77,10 @@ -1245,46 +1245,46 @@ END IDD_MERGE7ZMISMATCH DIALOGEX 0, 0, 300, 245 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_NOPARENTNOTIFY -CAPTION "WinMerge - Archive support disabled" +CAPTION "WinMerge - ¾ÐÃàÆÄÀÏ Áö¿ø ±â´É ºñÈ°¼ºÈ­ »óÅÂ" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Unable to detect 7-Zip version (not installed?)",107,2, + LTEXT "7-Zip ¹öÀüÀ» ¾Ë¾Æ³¾ ¼ö ¾ø½À´Ï´Ù (¼³Ä¡¸¦ ¾ÈÇϼ̳ª¿ä?)",107,2, 2,296,18 CONTROL "",IDC_STATIC,"Static",SS_GRAYRECT,2,22,296,1 - LTEXT "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation.", + LTEXT "¾ÐÃàÆÄÀÏÀº 7-zip(¹öÀü 3.11 ÀÌ»ó)ÀÌ ¼³Ä¡µÇ¾î Àְųª,\n´Üµ¶ ½ÇÇàÀ» À§ÇÑ Çʼö ÄÄÆ÷³ÍÆ®¶óµµ ÇÁ·Î±×·¥ µð·ºÅ丮³»¿¡ Á¸ÀçÇؾßÇÕ´Ï´Ù", IDC_STATIC,2,26,296,26 - LTEXT "There must also be an appropriate interface plugin (Merge7z*.dll) on the path.", + LTEXT "¶ÇÇÑ È£È¯µÇ´Â ÀÎÅÍÆäÀ̽º Ç÷¯±×ÀÎ(Merge7z*.dll)µµ ¼³Ä¡µÇ ÀÖ¾î¾ß ÇÕ´Ï´Ù", IDC_STATIC,2,52,296,18 - LTEXT "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available.", + LTEXT "¾Æ·¡¿¡¼­ ÃßõÇÏ´Â ÀÎÅÍÆäÀ̽º Ç÷¯±×ÀÎÀ» »ç¿ëÇϽñ⠹ٶø´Ï´Ù", IDC_STATIC,2,70,296,26 - CTEXT "Version",IDC_STATIC,146,98,56,20,SS_CENTERIMAGE | + CTEXT "¹öÀü",IDC_STATIC,146,98,56,20,SS_CENTERIMAGE | SS_SUNKEN - CTEXT "Plugin required\n(dllbuild %04u)",102,204,98,94,20, + CTEXT "ÇÊ¿äÇÑ Ç÷¯±×ÀÎ\n(dllbuild %04u)",102,204,98,94,20, SS_SUNKEN - LTEXT "Recommended version of 7-Zip:",IDC_STATIC,2,120,142,10, + LTEXT "ÃßõÇÏ´Â 7-ZipÀÇ ¹öÀü:",IDC_STATIC,2,120,142,10, SS_CENTERIMAGE CTEXT "0.00",110,146,120,20,10,SS_CENTERIMAGE | SS_SUNKEN - CTEXT "present",109,168,120,34,10,SS_CENTERIMAGE | SS_SUNKEN + CTEXT "ÀÖÀ½",109,168,120,34,10,SS_CENTERIMAGE | SS_SUNKEN CTEXT "Merge7z000U.dll",111,204,120,58,10,SS_CENTERIMAGE | SS_SUNKEN - CTEXT "present",112,264,120,34,10,SS_CENTERIMAGE | SS_SUNKEN - LTEXT "7-Zip software installed on your computer:",IDC_STATIC, + CTEXT "ÀÖÀ½",112,264,120,34,10,SS_CENTERIMAGE | SS_SUNKEN + LTEXT "ÇöÀç ¼³Ä¡µÇ¾î ÀÖ´Â 7-Zip:",IDC_STATIC, 2,132,142,10,SS_CENTERIMAGE - CTEXT "none",120,146,132,56,10,SS_CENTERIMAGE | SS_SUNKEN + CTEXT "¾øÀ½",120,146,132,56,10,SS_CENTERIMAGE | SS_SUNKEN CTEXT "",121,204,132,58,10,SS_CENTERIMAGE | SS_SUNKEN - CTEXT "missing",122,264,132,34,10,SS_CENTERIMAGE | SS_SUNKEN - LTEXT "7-Zip components for standalone operation:",IDC_STATIC, + CTEXT "¾øÀ½",122,264,132,34,10,SS_CENTERIMAGE | SS_SUNKEN + LTEXT "´Üµ¶ ½ÇÇàÀ» À§ÇÑ 7-Zip ÄÄÆ÷³ÍÆ®:",IDC_STATIC, 2,144,142,10,SS_CENTERIMAGE - CTEXT "none",130,146,144,56,10,SS_CENTERIMAGE | SS_SUNKEN + CTEXT "¾øÀ½",130,146,144,56,10,SS_CENTERIMAGE | SS_SUNKEN CTEXT "",131,204,144,58,10,SS_CENTERIMAGE | SS_SUNKEN - CTEXT "outdated",132,264,144,34,10,SS_CENTERIMAGE | SS_SUNKEN - LTEXT "Plugins on path:",9001,2,160,100,8 - CONTROL "Don't display this &message again.\n(You can always recall this message from help menu.)", + CTEXT "±¸¹öÀü",132,264,144,34,10,SS_CENTERIMAGE | SS_SUNKEN + LTEXT "Ç÷¯±×ÀÎ °æ·Î:",9001,2,160,100,8 + CONTROL "ÀÌ ¸Þ¼¼Áö¸¦ ´Ù½Ã Ç¥½ÃÇÏÁö ¾Ê½À´Ï´Ù(&M).\n(µµ¿ò¸» ¸Þ´º¿¡¼­ ¾ðÁ¦µçÁö ´Ù½Ã ºÒ·¯³¾ ¼ö ÀÖ½À´Ï´Ù.)", 106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,2,225,218,18 - DEFPUSHBUTTON "OK",IDOK,236,226,50,14,WS_GROUP - CONTROL "Plugin Download",108,"Button",BS_OWNERDRAW | WS_TABSTOP, - 236,160,62,10 + DEFPUSHBUTTON "È®ÀÎ",IDOK,236,226,50,14,WS_GROUP + CONTROL "Ç÷¯±×ÀÎ ´Ù¿î·Îµå",108,"Button",BS_OWNERDRAW | WS_TABSTOP, + 226,160,72,10 LISTBOX 105,2,170,296,52,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_GROUP | WS_TABSTOP END @@ -1292,21 +1292,21 @@ END IDD_PREFERENCES DIALOGEX 0, 0, 352, 260 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Options" +CAPTION "¿É¼Ç" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,187,237,50,14 - PUSHBUTTON "Cancel",IDCANCEL,241,237,50,14 - PUSHBUTTON "Help",IDC_TREEOPT_HELP,295,237,50,14 + DEFPUSHBUTTON "È®ÀÎ",IDOK,187,237,50,14 + PUSHBUTTON "Ãë¼Ò",IDCANCEL,241,237,50,14 + PUSHBUTTON "µµ¿ò¸»",IDC_TREEOPT_HELP,295,237,50,14 CONTROL "Tree1",IDC_TREEOPT_PAGES,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,20,96,202 CONTROL "",IDC_TREEOPT_HOSTFRAME,"Static",SS_BLACKFRAME | NOT WS_VISIBLE | WS_DISABLED,110,0,235,222 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,230,338,1 - LTEXT " Categories",IDC_STATIC,7,7,96,13,SS_CENTERIMAGE | + LTEXT " Ä«Å×°í¸®",IDC_STATIC,7,7,96,13,SS_CENTERIMAGE | SS_SUNKEN - PUSHBUTTON "Import...",IDC_TREEOPT_IMPORT,7,237,50,14 - PUSHBUTTON "Export...",IDC_TREEOPT_EXPORT,62,237,50,14 + PUSHBUTTON "°¡Á®¿À±â...",IDC_TREEOPT_IMPORT,7,237,50,14 + PUSHBUTTON "³»º¸³»±â...",IDC_TREEOPT_EXPORT,62,237,50,14 END IDD_PROPPAGE_COLORS_SYNTAX DIALOGEX 0, 0, 235, 214 @@ -1314,15 +1314,15 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Dialog" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - RTEXT "Keywords:",IDC_STATIC,0,20,70,8 - RTEXT "Function names:",IDC_STATIC,0,40,70,8 - RTEXT "Comments:",IDC_STATIC,0,60,70,8 - RTEXT "Numbers:",IDC_STATIC,0,80,70,8 - RTEXT "Operators:",IDC_STATIC,0,100,70,8 - RTEXT "Strings:",IDC_STATIC,0,120,70,8 - RTEXT "Preprocessor:",IDC_STATIC,0,140,70,8 - RTEXT "User 1:",IDC_STATIC,0,160,70,8 - RTEXT "User 2:",IDC_STATIC,0,180,70,8 + RTEXT "Å°¿öµå:",IDC_STATIC,0,20,70,8 + RTEXT "ÇÔ¼ö:",IDC_STATIC,0,40,70,8 + RTEXT "ÁÖ¼®:",IDC_STATIC,0,60,70,8 + RTEXT "¼ýÀÚ:",IDC_STATIC,0,80,70,8 + RTEXT "¿¬»êÀÚ:",IDC_STATIC,0,100,70,8 + RTEXT "¹®ÀÚ¿­:",IDC_STATIC,0,120,70,8 + RTEXT "Àü󸮱â:",IDC_STATIC,0,140,70,8 + RTEXT "»ç¿ëÀÚ ¼³Á¤ 1:",IDC_STATIC,0,160,70,8 + RTEXT "»ç¿ëÀÚ ¼³Á¤ 2:",IDC_STATIC,0,180,70,8 CTEXT "Text",IDC_STATIC,73,7,34,8 CONTROL "Button1",IDC_SCOLOR_KEYWORDS,"Button",BS_OWNERDRAW | WS_TABSTOP,83,19,17,14,WS_EX_TRANSPARENT | @@ -1375,40 +1375,40 @@ END IDD_DIRCMP_REPORT DIALOGEX 0, 0, 268, 81 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Directory Compare Report" +CAPTION "µð·ºÅ丮 ºñ±³°á°ú ¸®Æ÷Æ®" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Report &File:",IDC_STATIC,7,7,100,8 + LTEXT "¸®Æ÷Æ® ÆÄÀÏ(&F):",IDC_STATIC,7,7,100,8 COMBOBOX IDC_REPORT_FILE,7,17,197,70,CBS_DROPDOWN | WS_VSCROLL | CBS_AUTOHSCROLL | WS_TABSTOP - PUSHBUTTON "Browse...",IDC_REPORT_BROWSEFILE,211,18,50,14 - LTEXT "&Style:",IDC_STATIC,7,37,35,8 + PUSHBUTTON "ã±â...",IDC_REPORT_BROWSEFILE,211,18,50,14 + LTEXT "Çü½Ä(&S):",IDC_STATIC,7,37,35,8 COMBOBOX IDC_REPORT_STYLECOMBO,46,35,158,70,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "&Copy to Clipboard",IDC_REPORT_COPYCLIPBOARD,"Button", + CONTROL "Ŭ¸³º¸µå·Î º¹»ç(&C)",IDC_REPORT_COPYCLIPBOARD,"Button", BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,53,133,10 - DEFPUSHBUTTON "OK",IDOK,157,60,50,14 - PUSHBUTTON "Cancel",IDCANCEL,211,60,50,14 + DEFPUSHBUTTON "È®ÀÎ",IDOK,157,60,50,14 + PUSHBUTTON "Ãë¼Ò",IDCANCEL,211,60,50,14 END IDD_SHARED_FILTER DIALOGEX 0, 0, 250, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Shared or Private Filter" +CAPTION "Shared / Private Filter" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Which type of filter do you want to create?",IDC_STATIC, + LTEXT "»ý¼ºÇÒ ÇÊÅÍ Å¸ÀÔÀ» ¼±ÅÃÇϼ¼¿ä",IDC_STATIC, 14,7,229,11 - CONTROL "Shared Filter (for all users on this machine)",IDC_SHARED,"Button", + CONTROL "Shared Filter (¸ðµç »ç¿ëÀÚ)",IDC_SHARED,"Button", BS_AUTORADIOBUTTON,20,22,223,10 - CONTROL "Private Filter (only for current user)",IDC_PRIVATE,"Button", + CONTROL "Private Filter (ÇöÀç »ç¿ëÀÚ)",IDC_PRIVATE,"Button", BS_AUTORADIOBUTTON,20,37,223,10 - DEFPUSHBUTTON "OK",IDOK,65,55,50,14 - PUSHBUTTON "Cancel",IDCANCEL,135,55,50,14 + DEFPUSHBUTTON "È®ÀÎ",IDOK,65,55,50,14 + PUSHBUTTON "Ãë¼Ò",IDCANCEL,135,55,50,14 END IDD_PROP_ARCHIVE DIALOGEX 0, 0, 235, 126 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Archive Support" +CAPTION "¾ÐÃà ÆÄÀÏ Áö¿ø" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN LTEXT "Archive support requires 7-Zip plugin installed:", @@ -1429,35 +1429,35 @@ END IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Compare Statistics" +CAPTION "ºñ±³ ¿ä¾à" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Folders:",IDC_STATIC,72,7,38,8 - LTEXT "Files:",IDC_STATIC,131,7,39,8 - GROUPBOX "Different",IDC_STATIC,7,15,186,40 - RTEXT "Text:",IDC_STATIC,11,26,56,8 + LTEXT "Æú´õ:",IDC_STATIC,72,7,38,8 + LTEXT "ÆÄÀÏ:",IDC_STATIC,131,7,39,8 + GROUPBOX "´Ù¸§",IDC_STATIC,7,15,186,40 + RTEXT "ÅؽºÆ®:",IDC_STATIC,11,26,56,8 ICON "",IDC_STAT_INOTEQUAL,131,24,16,16 RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN - RTEXT "Binary:",IDC_STATIC,10,40,56,8 + RTEXT "¹ÙÀ̳ʸ®:",IDC_STATIC,10,40,56,8 ICON "",IDC_STAT_IDIFFBINFILE, 131,37,16,16 RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN - GROUPBOX "Unique",IDC_STATIC,7,55,186,40 - RTEXT "Left:",IDC_STATIC,11,66,56,8 + GROUPBOX "ÇÑÂʸ¸ Á¸Àç",IDC_STATIC,7,55,186,40 + RTEXT "¿ÞÂÊ:",IDC_STATIC,11,66,56,8 ICON "",IDC_STAT_ILUNIQFOLDER,72,64,16,16 RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN ICON "",IDC_STAT_ILUNIQFILE,131,64,16,16 RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN - RTEXT "Right:",IDC_STATIC,11,79,56,8 + RTEXT "¿À¸¥ÂÊ:",IDC_STATIC,11,79,56,8 ICON "",IDC_STAT_IRUNIQFOLDER,72,77,16,16 RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN ICON "",IDC_STAT_IRUNIQFILE,131,77,16,16 RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN - GROUPBOX "Identical",IDC_STATIC,7,95,186,37 + GROUPBOX "µ¿ÀÏ",IDC_STATIC,7,95,186,37 ICON "",IDC_STAT_IIDENTICFOLDER,72,102,16,16 RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN ICON "",IDC_STAT_IEQUALFILE,131,102,16,16 RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN - RTEXT "Binary:",IDC_STATIC,10,117,56,8 + RTEXT "¹ÙÀ̳ʸ®:",IDC_STATIC,10,117,56,8 ICON "",IDC_STAT_IEQUALBINFILE,131,115,16,16 RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1 @@ -1466,7 +1466,7 @@ BEGIN RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN ICON "",IDC_STAT_ITOTALFILES,131,140,16,16 RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN - DEFPUSHBUTTON "Close",IDOK,200,140,50,14 + DEFPUSHBUTTON "´Ý±â",IDOK,200,140,50,14 END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 @@ -1475,44 +1475,44 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Affects",IDC_AFFECTS_GROUP,5,7,166,36 - CONTROL "&Left",IDC_AFFECTS_LEFT_BTN,"Button",BS_AUTOCHECKBOX | + GROUPBOX "Àû¿ë",IDC_AFFECTS_GROUP,5,7,166,36 + CONTROL "¿ÞÂÊ(&L)",IDC_AFFECTS_LEFT_BTN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,18,54,8 LTEXT "(Affects)",IDC_LEFT_FILES_LABEL,70,18,93,8 - CONTROL "&Right",IDC_AFFECTS_RIGHT_BTN,"Button",BS_AUTOCHECKBOX | + CONTROL "¿À¸¥ÂÊ(&R)",IDC_AFFECTS_RIGHT_BTN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,29,54,8 LTEXT "(Affects)",IDC_RIGHT_FILES_LABEL,70,29,93,8 GROUPBOX "Select Codepage for",IDC_LOADING_GROUP,5,48,166,63 - LTEXT "&File Loading:",IDC_LOAD_FILES_LABEL,12,64,72,10 + LTEXT "ºÒ·¯¿Ã¶§ÀÇ codepage(&F):",IDC_LOAD_FILES_LABEL,12,64,72,10 EDITTEXT IDC_LOAD_CODEPAGE_TEXTBOX,86,63,45,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_LOAD_CODEPAGE_BROWSE,139,64,23,10 - LTEXT "File &Saving:",IDC_SAVE_FILES_LABEL,12,79,67,10 + LTEXT "ÀúÀåÇÒ codepage(&S):",IDC_SAVE_FILES_LABEL,12,79,67,10 EDITTEXT IDC_SAVE_CODEPAGE_TEXTBOX,86,79,45,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_SAVE_CODEPAGE_BROWSE,139,80,23,10 - CONTROL "&Use same codepage for both", + CONTROL "¾çÂÊ ¸ðµÎ µ¿ÀÏ codepage Àû¿ë(&U)", IDC_LOAD_SAVE_SAME_CODEPAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,96,150,10 - DEFPUSHBUTTON "&Apply",IDOK,65,117,50,14 - PUSHBUTTON "&Cancel",IDCANCEL,121,117,50,14 + DEFPUSHBUTTON "Àû¿ë(&A)",IDOK,65,117,50,14 + PUSHBUTTON "Ãë¼Ò(&C)",IDCANCEL,121,117,50,14 END IDD_TEST_FILTER DIALOGEX 0, 0, 249, 142 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Test Filter" +CAPTION "ÇÊÅÍ Å×½ºÆ®" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Testing filter ...",IDC_HEADER,7,7,82,8 + LTEXT "ÇÊÅÍ ...",IDC_HEADER,7,7,82,8 LTEXT "(filter name)",IDC_HEADER_FILTER_NAME,90,6,152,8 - LTEXT "&Enter text to test:",IDC_PROMPT_LABEL,7,21,80,8 + LTEXT "Å×½ºÆ®ÇÒ ÅؽºÆ® ÀÔ·Â(&T)",IDC_PROMPT_LABEL,7,21,80,8 EDITTEXT IDC_TEST_TEXT,90,19,152,12,ES_AUTOHSCROLL - CONTROL "&Folder Name",IDC_IS_DIRECTORY,"Button",BS_AUTOCHECKBOX | + CONTROL "Æú´õ¸í(&F)",IDC_IS_DIRECTORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,36,92,8 - LTEXT "Result:",IDC_STATIC,7,49,34,8 + LTEXT "°á°ú:",IDC_STATIC,7,49,34,8 EDITTEXT IDC_RESULTS,7,59,235,57,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL | NOT WS_TABSTOP - DEFPUSHBUTTON "&Test",IDC_TEST_BTN,133,121,50,14 - PUSHBUTTON "&Close",IDCANCEL,192,121,50,14 + DEFPUSHBUTTON "Å×½ºÆ®(&T)",IDC_TEST_BTN,133,121,50,14 + PUSHBUTTON "´Ý±â(&C)",IDCANCEL,192,121,50,14 END IDD_PROPPAGE_COLORS_TEXT DIALOGEX 0, 0, 197, 157 @@ -1520,16 +1520,16 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Dialog" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "&Use customized text colors", + CONTROL "»ç¿ëÀÚ »ö»ó »ç¿ë(&U)", IDC_DEFAULT_STANDARD_COLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,14,161,10 - GROUPBOX "Custom text colors",IDC_CUSTOM_COLORS_GROUP,27,33,159, + GROUPBOX "»ç¿ëÀÚ »ö»ó",IDC_CUSTOM_COLORS_GROUP,27,33,159, 111 - LTEXT "Whitespace:",IDC_WHITESPACE_COLOR_LABEL,31,58,46,10 - LTEXT "Regular text:",IDC_TEXT_COLOR_LABEL,31,87,61,8 - LTEXT "Selection:",IDC_SELECTION_COLOR_LABEL,31,116,61,8 - CTEXT "Background",IDC_BACKGROUND_COLUMN_LABEL,96,44,50,8 - CTEXT "Text",IDC_TEXT_COLUMN_LABEL,145,44,29,8 + LTEXT "°ø¹é:",IDC_WHITESPACE_COLOR_LABEL,31,58,46,10 + LTEXT "ÅؽºÆ®:",IDC_TEXT_COLOR_LABEL,31,87,61,8 + LTEXT "¼±Åÿµ¿ª:",IDC_SELECTION_COLOR_LABEL,31,116,61,8 + CTEXT "¹è°æ»ö",IDC_BACKGROUND_COLUMN_LABEL,96,44,50,8 + CTEXT "±ÛÀÚ»ö",IDC_TEXT_COLUMN_LABEL,145,44,29,8 CONTROL "Btn",IDC_WHITESPACE_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,58,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE @@ -1550,24 +1550,24 @@ END IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Paths" +CAPTION "°æ·Î" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - RTEXT "&Left:",IDC_STATIC,7,11,40,8 + RTEXT "¿ÞÂÊ(&L):",IDC_STATIC,7,11,40,8 EDITTEXT IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14 - CONTROL "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10 - RTEXT "&Right:",IDC_STATIC,7,42,40,8 + PUSHBUTTON "ã±â...",IDC_PROJ_LFILE_BROWSE,265,8,50,14 + CONTROL "ÀбâÀü¿ë(&E)",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10 + RTEXT "¿À¸¥ÂÊ(&R):",IDC_STATIC,7,42,40,8 EDITTEXT IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14 - CONTROL "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10 - RTEXT "&Filter:",IDC_STATIC,7,74,40,8 + PUSHBUTTON "ã±â...",IDC_PROJ_RFILE_BROWSE,265,40,50,14 + CONTROL "ÀбâÀü¿ë(&A)",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10 + RTEXT "ÇÊÅÍ(&F):",IDC_STATIC,7,74,40,8 EDITTEXT IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL - PUSHBUTTON "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14 - CONTROL "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button", + PUSHBUTTON "¼±ÅÃ...",IDC_PROJ_FILTER_SELECT,265,72,50,14 + CONTROL "ÇÏÀ§Æú´õ Æ÷ÇÔ(&I)",IDC_PROJ_INC_SUBFOLDERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10 - PUSHBUTTON "Open...",IDC_PROJ_OPEN,211,103,50,14 - PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14 + PUSHBUTTON "¿­±â...",IDC_PROJ_OPEN,211,103,50,14 + PUSHBUTTON "ÀúÀå...",IDC_PROJ_SAVE,265,103,50,14 END IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222 @@ -1622,7 +1622,7 @@ END VS_VERSION_INFO VERSIONINFO FILEVERSION 2,1,10,0 - PRODUCTVERSION 2,1,10,0 + PRODUCTVERSION 2,6,4,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -1739,13 +1739,13 @@ END // WinMerge Project Files STRINGTABLE BEGIN - ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)" - IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file" - IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file" - IDS_PROJFILEDLG_CAPTION "Project File" - IDS_PROJFILE_LOAD_SUCCESS "Project file successfully loaded." - IDS_PROJFILE_SAVE_SUCCESS "Project file successfully saved." - ID_FILE_SAVEPROJECT "Save current paths and options to project file\nSave Project File" + ID_FILE_OPENPROJECT "ÇÁ·ÎÁ§Æ® ¿­±â\nÇÁ·ÎÁ§Æ® ÆÄÀÏ (Ctrl+J)" + IDS_UNK_ERROR_READING_PROJECT "ÇÁ·ÎÁ§Æ®¸¦ ¿©´Â Áß ¾Ë ¼ö ¾ø´Â ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù" + IDS_UNK_ERROR_SAVING_PROJECT "ÇÁ·ÎÁ§Æ®¸¦ ÀúÀåÇÏ´Â Áß ¾Ë ¼ö ¾ø´Â ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù" + IDS_PROJFILEDLG_CAPTION "ÇÁ·ÎÁ§Æ® ÆÄÀÏ" + IDS_PROJFILE_LOAD_SUCCESS "ÇÁ·ÎÁ§Æ®°¡ Á¤»óÀûÀ¸·Î ¿­·È½À´Ï´Ù." + IDS_PROJFILE_SAVE_SUCCESS "ÇÁ·ÎÁ§Æ®°¡ Á¤»óÀûÀ¸·Î ÀúÀåµÇ¾ú½À´Ï´Ù." + ID_FILE_SAVEPROJECT "ÇöÀç °æ·Î¿Í ¿É¼ÇÀ» ÇÁ·ÎÁ§Æ® ÆÄÀÏ¿¡ ÀúÀåÇÕ´Ï´Ù\nÇÁ·ÎÁ§Æ® ÀúÀå" END STRINGTABLE @@ -1872,7 +1872,7 @@ END // SPLASH SCREEN TEXTS STRINGTABLE BEGIN - IDS_SPLASH_DEVELOPERS "Developers:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" + IDS_SPLASH_DEVELOPERS "°³¹ßÀÚ:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" IDS_SPLASH_GPLTEXT "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details." END @@ -1905,16 +1905,16 @@ END // Options-dialog page captions STRINGTABLE BEGIN - IDS_OPTIONSPG_GENERAL "General" - IDS_OPTIONSPG_COMPARE "Compare" - IDS_OPTIONSPG_EDITOR "Editor" - IDS_OPTIONSPG_COLORS "Colors" - IDS_OPTIONSPG_SYNTAXCOLORS "Syntax colors" - IDS_OPTIONSPG_TEXTCOLORS "Text Colors" - IDS_OPTIONSPG_SYSTEM "System" - IDS_OPTIONSPG_VERSIONCONTROL "Version Control" + IDS_OPTIONSPG_GENERAL "ÀϹÝ" + IDS_OPTIONSPG_COMPARE "ºñ±³" + IDS_OPTIONSPG_EDITOR "ÆíÁý" + IDS_OPTIONSPG_COLORS "»ö»ó" + IDS_OPTIONSPG_SYNTAXCOLORS "±¸¹® »ö»ó" + IDS_OPTIONSPG_TEXTCOLORS "ÅؽºÆ® »ö»ó" + IDS_OPTIONSPG_SYSTEM "½Ã½ºÅÛ" + IDS_OPTIONSPG_VERSIONCONTROL "Çü»ó °ü¸®" IDS_OPTIONSPG_CODEPAGE "Codepage" - IDS_OPTIONSPG_ARCHIVE "Archive Support" + IDS_OPTIONSPG_ARCHIVE "¾ÐÃàÆÄÀÏ Áö¿ø" IDS_OPTIONSPG_BACKUPS "Backup Files" END @@ -1955,9 +1955,9 @@ BEGIN IDS_OPEN_TITLE "¿­±â" IDS_PROGRAMFILES "ÇÁ·Î±×·¥|*.exe;*.bat;*.cmd|¸ðµç ÆÄÀÏ (*.*)|*.*||" IDS_ALLFILES "¸ðµç ÆÄÀÏ (*.*)|*.*||" - IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||" + IDS_PROJECTFILES "WinMerge ÇÁ·ÎÁ§Æ® ÆÄÀÏ (*.WinMerge)|*.WinMerge||" IDS_PROJECTFILES_EXT "WinMerge" - IDS_INIFILES "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" + IDS_INIFILES "¼³Á¤ ÆÄÀÏ (*.ini)|*.ini|All Files (*.*)|*.*||" END // REPORT FILES @@ -1971,11 +1971,11 @@ END // COMPARE OPTIONS STRINGTABLE BEGIN - IDS_COMPMETHOD_FULL_CONTENTS "Full Contents" - IDS_COMPMETHOD_QUICK_CONTENTS "Quick Contents" + IDS_COMPMETHOD_FULL_CONTENTS "Àüü ³»¿ë ºñ±³" + IDS_COMPMETHOD_QUICK_CONTENTS "ºü¸¥ ³»¿ë ºñ±³" IDS_COMPMETHOD_MODDATE "º¯°æµÈ ³¯Â¥" - IDS_COMPMETHOD_DATESIZE "Modified Date and Size" - IDS_COMPMETHOD_SIZE "Size" + IDS_COMPMETHOD_DATESIZE "º¯°æµÈ ³¯Â¥ & ÆÄÀÏ Å©±â" + IDS_COMPMETHOD_SIZE "ÆÄÀÏ Å©±â" END // FILTER OPTIONS @@ -1985,11 +1985,11 @@ BEGIN IDS_FILTERFILE_PATHTITLE "°æ·Î" IDS_FILTER_TITLE "ÇÊÅÍ" IDS_FILTER_PREFIX "[F] " - IDS_FILTERFILE_DESCTITLE "Description" - IDS_FILEFILTER_SAVENEW "Select filename for new filter" + IDS_FILTERFILE_DESCTITLE "¼³¸í" + IDS_FILEFILTER_SAVENEW "»ý¼ºÇÒ ÇÊÅÍÀÇ ÆÄÀϸíÀ» ÀÔ·ÂÇϼ¼¿ä" IDS_FILEFILTER_FILEMASK "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" IDS_FILEFILTER_TMPL_MISSING - "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2." + "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder." IDS_FILEFILTER_TMPL_COPY "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable." IDS_FILEFILTER_NO_USERFOLDER @@ -2028,7 +2028,7 @@ END // STATUS BAR : CURRENT OPERATION STATUS STRINGTABLE BEGIN - IDS_STATUS_RESCANNING "ÆÄÀÏÀ» ´Ù½Ã ½ºÄµÁßÀÔ´Ï´Ù..." + IDS_STATUS_RESCANNING "´Ù½Ã ½ºÄµÁßÀÔ´Ï´Ù..." IDS_STATUS_OPENING_SELECTION "¼±Åà ÆÄÀÏ ¿©´ÂÁß" IDS_STATUS_COPYL2R "¿ÞÂÊ¿¡¼­ ¿À¸¥ÂÊÀ¸·Î º¹»çÁß" IDS_STATUS_COPYR2L "¿À¸¥ÂÊ¿¡¼­ ¿ÞÂÊÀ¸·Î º¹»çÁß" @@ -2037,7 +2037,7 @@ BEGIN IDS_STATUS_COPYFILES "ÆÄÀÏ º¹»çÁß..." IDS_STATUS_DELETEFILES "ÆÄÀÏ »èÁ¦Áß..." IDS_STATUS_MOVEFILES "ÆÄÀÏ À̵¿Áß..." - IDS_STATUS_CREATEREPORT "Creating the report..." + IDS_STATUS_CREATEREPORT "¸®Æ÷Æ® »ý¼ºÁß..." END // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR) @@ -2063,7 +2063,7 @@ END // OPEN DIALOG STRINGTABLE BEGIN - IDS_ERROR_INCOMPARABLE "ºñ±³ÇÒ µÎ µð·ºÅ丮 ¶Ç´Â ÆÄÀÏÀ» ¼±ÅÃÇϼ¼¿ä." + IDS_ERROR_INCOMPARABLE "ºñ±³ÇÒ µð·ºÅ丮 ¶Ç´Â ÆÄÀÏÀ» ¼±ÅÃÇϼ¼¿ä." IDS_DIRSEL_TAG "µð·ºÅ丮 ¼±ÅÃ" IDS_OPEN_FILESDIRS "ºñ±³ÇÒ µð·ºÅ丮/ÆÄÀÏ ¼±ÅÃ" IDS_OPEN_LEFTINVALID "¿ÞÂÊÀº À߸øµÈ °æ·ÎÀÔ´Ï´Ù!" @@ -2088,16 +2088,16 @@ END STRINGTABLE BEGIN IDS_SAVE_AS_TITLE "´Ù¸¥ À̸§À¸·Î ÀúÀå" - IDS_SAVE_FMT "%1 ÀÇ º¯°æµÈ ºÎºÐÀ» ÀúÀåÇϽðڽÀ´Ï±î?" - IDS_SAVEREADONLY_FMT "%1 Àº ÀбâÀü¿ë ÆÄÀÏÀÔ´Ï´Ù. µ¤¾î¾²½Ã°Ú½À´Ï±î ? (´Ù¸¥À̸§À¸·Î ÀúÀåÇÏ·Á¸é ¾Æ´Ï¿À¸¦ ¼±ÅÃÇϼ¼¿ä.)" + IDS_SAVE_FMT "%1 ÀÇ º¯°æµÈ ºÎºÐÀ» ÀúÀåÇÒ±î¿ä?" + IDS_SAVEREADONLY_FMT "%1 Àº ÀбâÀü¿ë ÆÄÀÏÀÔ´Ï´Ù. µ¤¾î ¾µ±î¿ä? (´Ù¸¥À̸§À¸·Î ÀúÀåÇÏ·Á¸é ¾Æ´Ï¿À¸¦ ¼±ÅÃÇϼ¼¿ä.)" IDS_ERROR_FILE_WRITEABLE "º¹»ç °¡´É üũ ½ÇÆÐ" - IDS_ERROR_BACKUP "ÆÄÀÏ ¹é¾÷À» ½ÇÆÐÇÏ¿´½À´Ï´Ù" + IDS_ERROR_BACKUP "ÆÄÀÏ ¹é¾÷À» ÇÒ ¼ö ¾ø½À´Ï´Ù" IDS_BACKUP_FAILED_PROMPT - "Unable to backup original file:\n%1\n\nContinue anyway?" - IDS_FILESAVE_FAILED "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?" + "¿øº» ÆÄÀÏÀ» ¹é¾÷ÇÒ ¼ö ¾ø½À´Ï´Ù:\n%1\n\n°è¼Ó ÁøÇàÇÒ±î¿ä?" + IDS_FILESAVE_FAILED "ÆÄÀÏ ÀúÀåÀ» ÇÒ ¼ö ¾ø½À´Ï´Ù.\n%1\n%2\n\t- ´Ù¸¥À̸§À¸·Î ÀúÀå(È®ÀÎ)\n\t- ÀúÀå Ãë¼Ò(Ãë¼Ò)?" IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" - IDS_FILECHANGED_ONDISK "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" + IDS_FILECHANGED_ONDISK "¿ÜºÎ ÇÁ·Î±×·¥¿¡ ÀÇÇØ ÆÄÀÏÀÌ º¯°æµÇ¾ú½À´Ï\n%1\n\nµ¤¾î¾µ±î¿ä?" IDS_SAVEREADONLY_MULTI "%1\nÀбâ Àü¿ë ÆÄÀÏÀÔ´Ï´Ù. µ¤¾î¾²½Ã°Ú½À´Ï±î?" IDS_FILECHANGED_RESCAN "WinMerge°¡ ¸¶Áö¸·À¸·Î ½ºÄµÇÑ ÀÌÈÄ\n¿ÜºÎ¿¡¼­ ÆÄÀÏÀÌ º¯°æµÇ¾ú½À´Ï´Ù .\n\nº¯°æµÈ ÆÄÀÏ ³»¿ëÀ» º¸·Á¸é Áö±Ý ÆÄÀÏÀ» ´Ý°í ´Ù½Ã ¿­¾îÁÖ¼¼¿ä." IDS_SAVE_LEFT_AS "¿ÞÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå" @@ -2107,7 +2107,7 @@ END // Editing/Merging file STRINGTABLE BEGIN - IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." + IDS_VIEWS_OUTOFSYNC "¹®¼­°¡ ½ÌÅ©°¡ ¸ÂÁö ¾Ê¾Æ merge ÀÛ¾÷À» ÁøÇàÇÒ ¼ö ¾ø½À´Ï´Ù.\n\°è¼ÓÇϱâ Àü¿¡ »õ·Î°íħÀ» ÇØÁÖ¼¼¿ä." END // VSS @@ -2127,26 +2127,26 @@ END // VSS system STRINGTABLE BEGIN - IDS_VCS_NONE "None" + IDS_VCS_NONE "»ç¿ë¾ÈÇÔ" IDS_VCS_VSS4 "Visual SourceSafe (less than 5.0)" IDS_VCS_VSS5 "Visual SourceSafe (5.0 and above)" IDS_VCS_CLEARCASE "Rational ClearCase" - IDS_BREAK_ON_WHITESPACE "Break at whitespace" - IDS_BREAK_ON_PUNCTUATION "Break at whitespace or punctuation" + IDS_BREAK_ON_WHITESPACE "°ø¹é ¹ß°ß½Ã ¸ØÃã" + IDS_BREAK_ON_PUNCTUATION "°ø¹é ¶Ç´Â ±¸µÎÁ¡ ¹ß°ß½Ã ¸ØÃã" END // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK) STRINGTABLE BEGIN - ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory" - ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory" - ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory" - ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory" + ID_DIR_COPY_LEFT_TO_RIGHT "¼±Åà ÆÄÀÏÀ» ¿À¸¥ÂÊ µð·ºÅ丮·Î º¹»çÇÕ´Ï´Ù" + ID_DIR_COPY_LEFT_TO_BROWSE "¼±Å ÆÄÀÏÀ» ƯÁ¤ µð·ºÅ丮·Î º¹»çÇÕ´Ï´Ù" + ID_DIR_COPY_RIGHT_TO_LEFT "¼±Åà ÆÄÀÏÀ» ¿ÞÂÊ µð·ºÅ丮·Î º¹»çÇÕ´Ï´Ù" + ID_DIR_COPY_RIGHT_TO_BROWSE "¼±Å ÆÄÀÏÀ» ƯÁ¤ µð·ºÅ丮·Î º¹»çÇÕ´Ï´Ù" ID_DIR_DEL_LEFT "¼±ÅÃÇÑ ÆÄÀÏ Áß ¿ÞÂÊ ÆÄÀϸ¸ »èÁ¦ÇÕ´Ï´Ù." ID_DIR_DEL_RIGHT "¼±ÅÃÇÑ ÆÄÀÏ Áß ¿À¸¥ÂÊ ÆÄÀϸ¸ »èÁ¦ÇÕ´Ï´Ù." ID_DIR_DEL_BOTH "¼±ÅÃÇÑ ÆÄÀÏÀ» ¾çÂÊ ¸ðµÎ¿¡¼­ »èÁ¦ÇÕ´Ï´Ù." - ID_DIR_HIDE_FILENAMES "Hide selected item(s) (on the fly filter)" - ID_DIR_ITEM_RENAME "Rename selected item on both sides" + ID_DIR_HIDE_FILENAMES "¼±Åà ÆÄÀÏÀ» °¨Ãä´Ï´Ù (on the fly filter)" + ID_DIR_ITEM_RENAME "¾çÂÊÀÇ ¼±Åà ÆÄÀÏ ¸ðµÎ À̸§À» ¹Ù²ß´Ï´Ù" IDS_COPY_TO_LEFT "¿ÞÂÊÀ¸·Î (%1)" IDS_COPY_TO_RIGHT "¿À¸¥ÂÊÀ¸·Î (%1)" IDS_COPY_TO_LEFT2 "¿ÞÂÊÀ¸·Î (%1 of %2)" @@ -2171,8 +2171,8 @@ BEGIN IDS_MOVE_RIGHT_TO "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿ (%1)" IDS_MOVE_LEFT_TO2 "¿ÞÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿ (%1 of %2)" IDS_MOVE_RIGHT_TO2 "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿ (%1 of %2)" - IDS_SELECT_DEST_LEFT "Left side - select destination folder:" - IDS_SELECT_DEST_RIGHT "Right side - select destination folder:" + IDS_SELECT_DEST_LEFT "¿ÞÂÊ - À̵¿ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:" + IDS_SELECT_DEST_RIGHT "¿À¸¥ÂÊ - À̵¿ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:" IDS_FILES_AFFECTED_FMT "(%1 Files Affected)" IDS_FILES_AFFECTED_FMT2 "(%1 of %2 Files Affected)" END @@ -2180,11 +2180,11 @@ END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION STRINGTABLE BEGIN - IDS_CONFIRM_ALL_LEFT "Á¤¸» ¸ðµç ´Ù¸¥ ºÎºÐÀ» ¿ÞÂÊ ÆÄÀÏ·Î º¹»çÇϽðڽÀ´Ï±î?" - IDS_CONFIRM_ALL_RIGHT "Á¤¸» ¸ðµç ´Ù¸¥ ºÎºÐÀ» ¿À¸¥ÂÊ ÆÄÀÏ·Î º¹»çÇϽðڽÀ´Ï±î?" + IDS_CONFIRM_ALL_LEFT "¸ðµç ´Ù¸¥ ºÎºÐÀ» ¿ÞÂÊ ÆÄÀÏ·Î º¹»çÇÒ±î¿ä?" + IDS_CONFIRM_ALL_RIGHT "¸ðµç ´Ù¸¥ ºÎºÐÀ» ¿À¸¥ÂÊ ÆÄÀÏ·Î º¹»çÇÒ±î¿ä?" IDS_CONFIRM_COPY_SINGLE "%1\nÀ»\n%2\n·Î º¹»çÇϽðڽÀ´Ï±î?" - IDS_CONFIRM_COPY2DIR "¼±ÅÃÇÑ ÆÄÀÏÀ» Á¤¸» º¹»çÇϽðڽÀ´Ï±î(%1 Áß %2)" - IDS_CONFIRM_DELETE_ITEMS "Á¤¸» »èÁ¦ÇϽðڽÀ´Ï±î(%1 Áß %2)?" + IDS_CONFIRM_COPY2DIR "¼±ÅÃÇÑ ÆÄÀÏÀ» Á¤¸» º¹»çÇϽðڽÀ´Ï±î(%1 of %2)" + IDS_CONFIRM_DELETE_ITEMS "Á¤¸» »èÁ¦ÇϽðڽÀ´Ï±î(%1 of %2)?" IDS_CONFIRM_DELETE_DIR "%1\nµð·ºÅ丮¸¦ »èÁ¦ÇϽðڽÀ´Ï±î?" IDS_CONFIRM_DELETE_SINGLE "Á¤¸» »èÁ¦ÇϽðڽÀ´Ï±î\n\n%1 ?" IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:" @@ -2200,8 +2200,8 @@ BEGIN ID_DIR_OPEN_RIGHT "¿À¸¥ÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù." ID_DIR_OPEN_RIGHT_WITHEDITOR "¿ÜºÎ ¿¡µðÅ͸¦ ÀÌ¿ëÇؼ­ ¿À¸¥ÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù" ID_DIR_OPEN_RIGHT_WITH "¿À¸¥ÂÊ ÆÄÀÏÀ» ¿¬°á ÇÁ·Î±×·¥À» ¼±ÅÃÇؼ­ ¿±´Ï´Ù. ..." - IDS_ERROR_EXECUTE_FILE "Failed to execute external editor: %1" - IDS_UNKNOWN_EXECUTE_FILE "Unknown extension on external editor: %1" + IDS_ERROR_EXECUTE_FILE "¿ÜºÎ ÆíÁý±â ½ÇÇà ½ÇÆÐ: %1" + IDS_UNKNOWN_EXECUTE_FILE "¾Ë ¼ö ¾ø´Â È®ÀåÀÚ: %1" ID_DIR_COPY_FILENAMES "ÆÄÀϸíÀ» Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù" ID_DIR_COPY_PATHNAMES_LEFT "¿ÞÂÊ °æ·Î¸¦ Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù" ID_DIR_COPY_PATHNAMES_RIGHT "¿À¸¥ÂÊ °æ·Î¸¦ Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù" @@ -2225,7 +2225,7 @@ END // DIRECTORY DIFFING : COLUMN TITLES #1 STRINGTABLE BEGIN - IDS_COLHDR_FILENAME "ÆÄÀÏ À̸§" + IDS_COLHDR_FILENAME "À̸§" IDS_COLHDR_DIR "µð·ºÅ丮" IDS_COLHDR_RESULT "ºñ±³ °á°ú" IDS_COLHDR_LTIMEM "¿ÞÂÊ ³¯Â¥" @@ -2233,8 +2233,8 @@ BEGIN IDS_COLHDR_EXTENSION "È®ÀåÀÚ" IDS_COLHDR_LSIZE "¿ÞÂÊ Å©±â" IDS_COLHDR_RSIZE "¿À¸¥ÂÊ Å©±â" - IDS_COLHDR_RSIZE_SHORT "Right Size (Short)" - IDS_COLHDR_LSIZE_SHORT "Left Size (Short)" + IDS_COLHDR_RSIZE_SHORT "¿À¸¥ÂÊ Å©±â (ª°Ô)" + IDS_COLHDR_LSIZE_SHORT "¿ÞÂÊ Å©±â (ª°Ô)" END // DIRECTORY DIFFING : COLUMN TITLES #2 @@ -2248,8 +2248,8 @@ BEGIN IDS_COLHDR_RESULT_ABBR "¿ä¾à °á°ú" IDS_COLHDR_LATTRIBUTES "¿ÞÂÊ ¼Ó¼º" IDS_COLHDR_RATTRIBUTES "¿À¸¥ÂÊ ¼Ó¼º" - IDS_COLHDR_LEOL_TYPE "Left EOL" - IDS_COLHDR_REOL_TYPE "Right EOL" + IDS_COLHDR_LEOL_TYPE "¿ÞÂÊ EOL" + IDS_COLHDR_REOL_TYPE "¿À¸¥ÂÊ EOL" END // DIRECTORY DIFFING : COLUMN TITLES #3 @@ -2257,8 +2257,8 @@ STRINGTABLE BEGIN IDS_COLHDR_LENCODING "¿ÞÂÊ ÀÎÄÚµù" IDS_COLHDR_RENCODING "¿À¸¥ÂÊ ÀÎÄÚµù" - IDS_COLHDR_NIDIFFS "Ignored Diff." - IDS_COLHDR_NSDIFFS "Differences" + IDS_COLHDR_NIDIFFS "ºñ±³ÇÏÁö ¾ÊÀº ´Ù¸¥ ºÎºÐ" + IDS_COLHDR_NSDIFFS "´Ù¸¥ ºÎºÐ" IDS_COLHDR_BINARY "¹ÙÀ̳ʸ®" END @@ -2266,7 +2266,7 @@ END STRINGTABLE BEGIN IDS_CANT_COMPARE_FILES "ÆÄÀÏÀ» ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù" - IDS_ABORTED_ITEM "Item aborted" + IDS_ABORTED_ITEM "ºñ±³ ÁßÁöµÈ ÆÄÀÏ" IDS_FILE_SKIPPED "ÇÊÅ͸µµÈ ÆÄÀÏ" IDS_DIR_SKIPPED "ÇÊÅ͸µµÈ µð·ºÅ丮" IDS_LEFT_ONLY_IN_FMT "Left only: %1" @@ -2300,8 +2300,8 @@ BEGIN IDS_COLDESC_EXTENSION "ÆÄÀÏ È®ÀåÀÚ." IDS_COLDESC_LSIZE "¿ÞÂÊ ÆÄÀÏ Å©±â(byte)." IDS_COLDESC_RSIZE "¿À¸¥ÂÊ ÆÄÀÏ Å©±â(byte)." - IDS_COLDESC_LSIZE_SHORT "Left file size abbreviated." - IDS_COLDESC_RSIZE_SHORT "Right file size abbreviated." + IDS_COLDESC_LSIZE_SHORT "¿ÞÂÊ ÆÄÀÏ Å©±â(ª°Ô)" + IDS_COLDESC_RSIZE_SHORT "¿À¸¥ÂÊ ÆÄÀÏ Å©±â(ª°Ô)" END // DIRECTORY DIFFING : COLUMN DESCRIPTIONS#2 @@ -2315,8 +2315,8 @@ BEGIN IDS_COLDESC_RESULT_ABBR "°£·«ÇÑ ¿ä¾à °á°ú." IDS_COLDESC_LATTRIBUTES "¿ÞÂÊ ¼Ó¼º." IDS_COLDESC_RATTRIBUTES "¿À¸¥ÂÊ ¼Ó¼º." - IDS_COLDESC_LEOL_TYPE "Left side file EOL type" - IDS_COLDESC_REOL_TYPE "Right side file EOL type" + IDS_COLDESC_LEOL_TYPE "¿ÞÂÊ EOL" + IDS_COLDESC_REOL_TYPE "¿À¸¥ÂÊ EOL" END // DIRECTORY DIFFING : COLUMN DESCRIPTIONS (2) @@ -2324,8 +2324,8 @@ STRINGTABLE BEGIN IDS_COLDESC_LENCODING "¿ÞÂÊ ÀÎÄÚµù." IDS_COLDESC_RENCODING "¿À¸¥ÂÊ ÀÎÄÚµù." - IDS_COLDESC_NIDIFFS "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." - IDS_COLDESC_NSDIFFS "Number of differences in file. This number does not include ignored differences." + IDS_COLDESC_NIDIFFS "ÆÄÀÏ ³» ºñ±³ÇÏÁö ¾ÊÀº ºÎºÐÀÇ °³¼ö. winmerge ¿¡¼­ À̺κÐÀº ¹«½ÃµÇ¸ç, merge µÇÁö ¾Ê½À´Ï´Ù." + IDS_COLDESC_NSDIFFS "ÆÄÀϳ» ´Ù¸¥ ºÎºÐÀÇ °³¼ö. ÀÌ´Â ºñ±³ÇÏÁö ¾ÊÀº ºÎºÐÀÇ °³¼ö¸¦ Æ÷ÇÔÇÏÁö ¾Ê½À´Ï´Ù." IDS_COLDESC_BINARY "¹ÙÀ̳ʸ® ÆÄÀÏÀ̸é * Ç¥½Ã." END @@ -2338,9 +2338,9 @@ BEGIN IDS_REPORT_SIMPLEHTML "Simple HTML" IDS_REPORT_SIMPLEXML "Simple XML" IDS_REPORT_FILEOVERWRITE - "The report file already exists. Do you want to overwrite existing file?" - IDS_REPORT_ERROR "Error creating the report:\n%1" - IDS_REPORT_SUCCESS "The report has been created successfully." + "¸®Æ÷Æ® ÆÄÀÏÀÌ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?" + IDS_REPORT_ERROR "¸®Æ÷Æ® »ý¼º ½ÇÆÐ:\n%1" + IDS_REPORT_SUCCESS "¸®Æ÷Æ® »ý¼º ¼º°ø" END // FILE COMPARISON RESULT : MESSAGES @@ -2348,28 +2348,27 @@ STRINGTABLE BEGIN IDS_FILE_TO_ITSELF "¾çÂÊ Ã¢¿¡ µ¿ÀÏÇÑ ÆÄÀÏÀÌ ¿­·ÁÀÖ½À´Ï´Ù." IDS_FILESSAME "¼±ÅÃÇÑ ÆÄÀϵéÀº ³»¿ëÀÌ µ¿ÀÏÇÕ´Ï´Ù.." - IDS_FOLDERUNIQUE "The selected folder exists only in other side and therefore cannot be opened." + IDS_FOLDERUNIQUE "ÇÑÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â µð·ºÅ丮ÀÔ´Ï´Ù." IDS_FILEERROR "ÆÄÀÏ ºñ±³ µµÁß ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù." IDS_FILEBINARY "¹ÙÀ̳ʸ® ÆÄÀÏÀº ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù." IDS_TEMP_FILEERROR "Àӽà ÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù. Àӽà ÆÄÀÏ ¼³Á¤À» È®ÀÎÇϼ¼¿ä." IDS_FILEISDIR "µð·ºÅ丮´Â ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù." - IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\ - Do you want to treat all carriage return types as equivalent for this comparison?\n\n\ - Note: If you always want to treat all carriage return types \ - as equivalent, set the option 'Ignore carriage return \ - differences..' in the Compare tab of the options dialog\ - (available under Edit/Options)." + IDS_SUGGEST_IGNOREEOL "Áö±Ý ºñ±³ÇÏ·Á´Â ÆÄÀÏÀº ´Ù¸¥ CR(Carriage return)À» °¡Áý´Ï´Ù.\n\n\ + À̹ø ºñ±³ ÀÛ¾÷¿¡¼­ ¸ðµç CRÀ» µ¿ÀÏÇÏ°Ô Ã³¸®ÇÒ±î¿ä?n?\n\n\ + Âü°í: ¸ðµç CRÀ» Ç×»ó µ¿ÀÏÇÏ°Ô ÀÛ¾÷ÇÏ±æ ¿øÇϽŴٸé, \ + ºñ±³ÅÇ¿¡¼­ 'carriage return ¹«½Ã' ¿É¼ÇÀ» ¼±ÅÂÇÏ¸é µË´Ï´Ù \ + (ÆíÁý/¿É¼Ç ¿¡¼­ ¼±Åà °¡´É)." IDS_SUGGEST_PRESERVEEOL "'%1'Àº ¼­·Î ´Ù¸¥ EOL(DOS/UNIX/MAC)·Î ÀÛ¼ºµÇ¾ú½À´Ï´Ù.\n ÇöÀç ¿É¼ÇÀ¸·Î´Â ¸ðµç EOLÀÌ Çϳª·Î ¹Ù²î°Ô µË´Ï´Ù.\n ¿øº» EOLÀ» À¯ÁöÇϱ⠿øÇϽʴϱî ?" IDS_PREDIFFER_ERROR "'%2' Ç÷¯±×ÀÎÀ¸·Î '%1'À» prediffÇÏ´Â Áß ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù. ´õ ÀÌ»ó prediff°¡ ¼öÇàµÇÁö ¾Ê½À´Ï´Ù." - IDS_INVALID_DIRECTORY "The selected folder is invalid." - IDS_CANNOT_OPEN_BINARYFILE "Cannot open a binary file to editor." + IDS_INVALID_DIRECTORY "¼±Åà µð·ºÅ丮 °æ·Î ¿À·ùÀÔ´Ï´Ù." + IDS_CANNOT_OPEN_BINARYFILE "¹ÙÀ̳ʸ® ÆÄÀÏÀº ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù." END // Encoding issues STRINGTABLE BEGIN - IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?" - IDS_DIFFERENT_UNICODINGS "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." + IDS_SUGGEST_IGNORECODEPAGE "µÎ ÆÄÀÏÀÇ codepage °¡ Ʋ¸³´Ï´Ù. ¿ÞÂÊ (cp%d) /¿À¸¥ÂÊ (cp%d) \n°¢°¢ÀÇ codepage¸¦ À¯ÁöÇÏ´Â °ÍÀÌ ÀÛ¾÷½Ã º¸±â´Â ÁÁÀ¸³ª À§ÇèÇÒ ¼ö ÀÖ½À´Ï.\n±âÁ¸ À©µµ¿ì codepage ¸¦ »ç¿ëÇÒ±î¿ä(Ãßõ)?" + IDS_DIFFERENT_UNICODINGS "°æ°í: ¾çÂÊ ÆÄÀÏÀÌ ÀÎÄÚµùÀÌ Æ²¸³´Ï´Ù, ¿ÞÂÊ=%s and ¿À¸¥ÂÊ=%s, merge ÀÛ¾÷ ÁøÇà½Ã Á¤º¸¸¦ ÀÒ¾î¹ö¸± ¼ö ÀÖ½À´Ï´Ù." IDS_LOSSY_TRANSCODING_BOTH "Information lost due to encoding errors: both files" IDS_LOSSY_TRANSCODING_RIGHT "Information lost due to encoding errors: right file" IDS_LOSSY_TRANSCODING_LEFT "Information lost due to encoding errors: left file" @@ -2399,8 +2398,8 @@ END // FILE COMPARE: PANE CAPTIONS STRINGTABLE BEGIN - IDS_LOCBAR_CAPTION "Location Pane" - IDS_DIFFBAR_CAPTION "Diff Pane" + IDS_LOCBAR_CAPTION "À§Ä¡Ã¢" + IDS_DIFFBAR_CAPTION "ºñ±³Ã¢" END // CREATE PATCH @@ -2409,24 +2408,24 @@ BEGIN IDS_DIFF_SUCCEEDED "Patch ÆÄÀÏÀÌ ÀÛ¼ºµÇ¾ú½À´Ï´Ù." IDS_DIFF_ITEM1NOTFOUND "1. ÆÄÀÏÀÌ ¾ø°Å³ª µð·ºÅ丮ÀÔ´Ï´Ù!" IDS_DIFF_ITEM2NOTFOUND "2. ÆÄÀÏÀÌ ¾ø°Å³ª µð·ºÅ丮ÀÔ´Ï´Ù!" - IDS_DIFF_FILEOVERWRITE "°°Àº À̸§ÀÇ patch ÆÄÀÏÀÌ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?" + IDS_DIFF_FILEOVERWRITE "°°Àº À̸§ÀÇ ÆÐÄ¡°¡ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?" IDS_DIFF_SELECTEDFILES "[%1 °³ÀÇ ÆÄÀÏ ¼±ÅõÊ]" IDS_DIFF_NORMAL "Normal" IDS_DIFF_CONTEXT "Context" IDS_DIFF_UNIFIED "Unified" IDS_FILEWRITE_ERROR "%1 ÆÄÀÏ¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù." - IDS_PATH_NOT_ABSOLUTE "The specified output path is not an absolute path: %1" + IDS_PATH_NOT_ABSOLUTE "Àý´ë°æ·Î°¡ ¾Æ´Õ´Ï´Ù: %1" IDS_MUST_SPECIFY_OUTPUT "Specify an output file" - IDS_CANNOT_CREATE_BINARYPATCH "¹ÙÀ̳ʸ® ÆÄÀÏ¿¡¼­´Â patch ÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." - IDS_CANNOT_CREATE_DIRPATCH "µð·ºÅ丮¿¡¼­´Â patch ÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." - IDS_SAVEFILES_FORPATCH "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." - IDS_FOLDER_NOTEXIST "Folder does not exist." + IDS_CANNOT_CREATE_BINARYPATCH "¹ÙÀ̳ʸ® ÆÄÀÏ¿¡¼­´Â ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." + IDS_CANNOT_CREATE_DIRPATCH "µð·ºÅ丮¿¡¼­´Â ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." + IDS_SAVEFILES_FORPATCH "ÆÄÀÏ ÀúÀåÀ» ÇØÁÖ¼¼¿ä.\n\nÀúÀå¾ÈµÈ ÆÄÀÏÀÌ ÀÖÀ¸¸é ÆÐÄ¡¸¦ ¼º¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." + IDS_FOLDER_NOTEXIST "Á¸ÀçÇÏÁö ¾Ê´Â µð·ºÅ丮ÀÔ´Ï´Ù." END STRINGTABLE BEGIN - IDS_DIR_RESULTS_EMPTIED "ÇöÀç µð·ºÅ丮 ºñ±³ °á°ú°¡ Áö¿öÁý´Ï´Ù." - IDS_NO_ZIP_SUPPORT "¾ÐÃà Áö¿ø ±â´ÉÀÌ ²¨Á®ÀÖ½À´Ï´Ù.\n \n¾ÐÃà Áö¿ø ±â´É¿¡ ÇÊ¿äÇÑ ÄÄÆ÷³ÍÆ®(7-zip and/or Merge7z*.dll)°¡ ¾ø½À´Ï. ´Ù. \n¾ÐÃà Áö¿ø ±â´É¿¡ ´ëÇØ ´õ ¸¹Àº Á¤º¸¸¦ ¿øÇÏ½Ã¸é ¸Þ´º¾óÀ» ÂüÁ¶Çϼ¼¿ä." + IDS_DIR_RESULTS_EMPTIED "ÇöÀç µð·ºÅ丮 ºñ±³ °á°ú°¡ ´ÝÈü´Ï´Ù." + IDS_NO_ZIP_SUPPORT "¾ÐÃà Áö¿ø ±â´ÉÀÌ ²¨Á®ÀÖ½À´Ï´Ù.\n \n¾ÐÃà Áö¿ø ±â´É¿¡ ÇÊ¿äÇÑ ÄÄÆ÷³ÍÆ®(7-zip and/or Merge7z*.dll)°¡ ¾ø½À´Ï´Ù. \n¾ÐÃà Áö¿ø ±â´É¿¡ ´ëÇØ ´õ ¸¹Àº Á¤º¸¸¦ ¿øÇÏ½Ã¸é ¸Þ´º¾óÀ» ÂüÁ¶Çϼ¼¿ä." IDS_MERGE7Z_ENABLE_0 "\nNote: 7-Zip integration is disabled in WinMerge settings." IDS_MERGE7Z_ENABLE_2 "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings." IDS_OPT_EXPORT_CAPTION "Select file for export" @@ -2490,10 +2489,10 @@ BEGIN IDS_ARABIC_BAHRAIN "¾Æ¶ø¾î (Bahrain)" IDS_ARABIC_QATAR "¾Æ¶ø¾î (Qatar)" IDS_ARMENIAN "¾Æ¸£¸Þ´Ï¾Æ¾î" - IDS_AZERI_LATIN "Azeri (Latin)" - IDS_AZERI_CYRILLIC "Azeri (Cyrillic)" + IDS_AZERI_LATIN "¾ÆÁ¦¸£¾î (Latin)" + IDS_AZERI_CYRILLIC "¾ÆÁ¦¸£¾î (Cyrillic)" IDS_BASQUE "¹Ù½ºÅ©¾î" - IDS_BELARUSIAN "Belarusian" + IDS_BELARUSIAN "º§·Î·ç½Ã¾î" IDS_BULGARIAN "ºÒ°¡¸®¾Æ¾î" IDS_CATALAN "Ä«Å»·ç³Ä¾î" IDS_CHINESE_TRADITIONAL "Áß±¹¾î (Traditional)" @@ -2529,7 +2528,7 @@ BEGIN IDS_ENGLISH_TRINIDAD "¿µ¾î (Trinidad)" IDS_ENGLISH_ZIMBABWE "¿µ¾î (Zimbabwe)" IDS_ENGLISH_PHILIPPINES "¿µ¾î (Philippines)" - IDS_ESTONIAN "Eesti" + IDS_ESTONIAN "¿¡½ºÅä´Ï¾Æ¾î" IDS_FAEROESE "Æä·Î¾î" IDS_FARSI "Æ丣½Ã¾Æ¾î" IDS_FINNISH "Çɶõµå¾î" @@ -2555,11 +2554,11 @@ BEGIN IDS_HINDI "ÈùµÎ¾î" IDS_HUNGARIAN "Çë°¡¸®¾î" IDS_ICELANDIC "¾ÆÀ̽½¶õµå¾î" - IDS_INDONESIAN "Indonesian" + IDS_INDONESIAN "Àεµ³×½Ã¾Æ¾î" IDS_ITALIAN "ÀÌÅ»¸®¾Æ¾î" IDS_ITALIAN_SWISS "ÀÌÅ»¸®¾Æ¾î (Swiss)" IDS_JAPANESE "ÀϺ»¾î" - IDS_KASHMIRI "Kashmiri (India)" + IDS_KASHMIRI "Ä«½¬¹Ì¸£¾î (India)" IDS_KAZAK "Ä«ÀÚÈ彺ź¾î / Ä«ÀÛ¾î" IDS_KOREAN "Çѱ¹¾î" IDS_KOREAN_JOHAB "Çѱ¹¾î(Á¶ÇÕ)" @@ -2570,8 +2569,8 @@ STRINGTABLE BEGIN IDS_LATVIAN "¶óÆ®ºñ¾Æ¾î" IDS_LITHUANIAN "¸®Åõ¾Æ´Ï¾Æ¾î" - IDS_MALAY_MALAYSIA "Malay (Malaysian)" - IDS_MALAY_BRUNEI_DARUSSALAM "Malay (Brunei Darussalam)" + IDS_MALAY_MALAYSIA "¸»·¹À̾î (Malaysian)" + IDS_MALAY_BRUNEI_DARUSSALAM "¸»·¹À̾î (Brunei Darussalam)" IDS_MANIPURI "Manipuri" IDS_NORWEGIAN_BOKMAL "³ë¸£¿þÀ̾î (Bokmal)" IDS_NORWEGIAN_NYNORSK "³ë¸£¿þÀ̾î (Nynorsk)" @@ -2776,43 +2775,43 @@ END // EDIT MENU STRINGTABLE BEGIN - ID_SELECTLINEDIFF "Select difference area in the current line\nDifference in the Current Line" + ID_SELECTLINEDIFF "ÇöÀç ¶óÀο¡¼­ ´Ù¸¥ ºÎºÐÀ» ¼±ÅÃÇÕ´Ï´Ù\nÇöÀç ¶óÀο¡¼­ ´Ù¸¥ ºÎºÐ" ID_EDIT_WMGOTO "¼±Åà ¶óÀÎÀ̳ª ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿ÇÕ´Ï´Ù\nÀ̵¿ (Ctrl+G)" ID_OPTIONS "¿É¼ÇÀ» ¼³Á¤ÇÕ´Ï´Ù.\n¿É¼Ç" ID_REFRESH "»õ·Î °íħ\n»õ·Î °íħ (F5)" - ID_EDIT_COPY_LINENUMBERS "Copy selected lines to clipboard adding linenumbers to line begin" - ID_DIR_RESCAN "Refresh selected items" - ID_EDIT_TOGGLE_BOOKMARK "Toggle bookmark" - ID_EDIT_GOTO_NEXT_BOOKMARK "Go to next bookmark" - ID_EDIT_GOTO_PREV_BOOKMARK "Go to previous bookmark" - ID_EDIT_CLEAR_ALL_BOOKMARKS "Clear all bookmarks" + ID_EDIT_COPY_LINENUMBERS "ÇöÀç ¶óÀÎ ¾Õ¿¡ Çà¹øÈ£¸¦ ºÙ¿©¼­ Ŭ¸³º¸µå·Î º¹»çÇÕ´Ï´Ù" + ID_DIR_RESCAN "¼±ÅÃµÈ ÆÄÀÏÀ» »õ·Î°íħ" + ID_EDIT_TOGGLE_BOOKMARK "ºÏ¸¶Å© Åä±Û" + ID_EDIT_GOTO_NEXT_BOOKMARK "´ÙÀ½ ºÏ¸¶Å©·Î À̵¿" + ID_EDIT_GOTO_PREV_BOOKMARK "ÀÌÀü ºÏ¸¶Å©·Î À̵¿" + ID_EDIT_CLEAR_ALL_BOOKMARKS "¸ðµç ºÏ¸¶Å© »èÁ¦" END // VIEW MENU (ITEM TYPE) STRINGTABLE BEGIN - ID_OPTIONS_SHOWIDENTICAL "Displays items that are exactly the same\nShow Identical Items" - ID_OPTIONS_SHOWDIFFERENT "Displays items that have differences\nShow Different Items" - ID_OPTIONS_SHOWUNIQUELEFT "Displays items that exist in only on the left side\nShow Left Unique Items" - ID_OPTIONS_SHOWUNIQUERIGHT "Displays items that exist in only on the right side\nShow Right Unique Items" - ID_OPTIONS_SHOWBINARIES "Displays binary files\nShow Binary Files" - ID_OPTIONS_SHOWSKIPPED "Displays skipped items\nShow Skipped Items" + ID_OPTIONS_SHOWIDENTICAL "µ¿ÀÏÇÑ ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\nµ¿ÀÏÇÑ ÆÄÀÏ º¸À̱â" + ID_OPTIONS_SHOWDIFFERENT "´Ù¸¥ ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n´Ù¸¥ ÆÄÀÏ º¸À̱â" + ID_OPTIONS_SHOWUNIQUELEFT "¿ÞÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\¿ÞÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸À̱â" + ID_OPTIONS_SHOWUNIQUERIGHT "¿À¸¥ÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\¿À¸¥ÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸À̱â" + ID_OPTIONS_SHOWBINARIES "¹ÙÀ̳ʸ® ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n¹ÙÀ̳ʸ® ÆÄÀÏ º¸À̱â" + ID_OPTIONS_SHOWSKIPPED "ºñ±³ÇÏÁö ¾ÊÀº ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\nºñ±³ÇÏÁö ¾ÊÀº ÆÄÀÏ º¸À̱â" END // VIEW MENU STRINGTABLE BEGIN - ID_VIEW_SELECTFONT "Select the font for the view\nSelect View Font" - ID_VIEW_USEDEFAULTFONT "Revert to using the default system font for view\nDefault Font" + ID_VIEW_SELECTFONT "ÆùÆ®¸¦ ¼±ÅÃÇÕ´Ï´Ù\nÆùÆ® ¼±ÅÃ" + ID_VIEW_USEDEFAULTFONT "½Ã½ºÅÛ ±âº» ÆùÆ®·Î ¼³Á¤ÇÕ´Ï´Ù.\n±âº» ÆùÆ®" ID_VIEW_WHITESPACE "°ø¹é¹®ÀÚ¸¦ Ç¥½ÃÇÕ´Ï´Ù." ID_VIEW_DETAIL_BAR "¼±Åà ºñ±³Ã¢À» º¸°Å³ª ¼û±é´Ï´Ù." ID_VIEW_LOCATION_BAR "À§Ä¡ Ç¥½ÃâÀº Àüü ºñ±³ »óȲÀ» À̹ÌÁö·Î º¸¿©ÁÝ´Ï´Ù." - ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog" + ID_VIEW_DIR_STATISTICS "µð·ºÅ丮 ºñ±³ »óȲÀ» Ç¥½ÃÇÕ´Ï´Ù." ID_VIEW_LANGUAGE "¾ð¾î¸¦ ¼±ÅÃÇÕ´Ï´Ù.\n¾ð¾î" - ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" - ID_VIEW_SWAPPANES "Swap the positions of the two panes" - ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers" - ID_VIEW_WORDWRAP "Enable word wrap\nWrap Lines" + ID_VIEW_LINEDIFFS "ÇöÀç ¶óÀο¡¼­ ´Ù¸¥ ºÎºÐÀ» ´Ù¸¥»öÀ¸·Î º¸¿©ÁÝ´Ï´Ù.\nLine Diff º¸À̱â" + ID_VIEW_SWAPPANES "µÎ â(pane)ÀÇ À§Ä¡¸¦ ¼­·Î ¹Ù²ß´Ï´Ù." + ID_VIEW_LINENUMBERS "Çà¹øÈ£¸¦ Ç¥½ÃÇÕ´Ï´Ù.\nÇà¹øÈ£ º¸À̱â" + ID_VIEW_WORDWRAP "ÀÚµ¿ÁÙ¹Ù²Þ ±â´ÉÀ» »ç¿ëÇÕ´Ï´Ù.\nÀÚµ¿ÁٹٲÞ" ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins" END @@ -2830,8 +2829,8 @@ BEGIN ID_R2LNEXT "´Ù¸¥ ºÎºÐÀ» ¿ÞÂÊÀ¸·Î º¹»çÇÏ°í, ´ÙÀ½ ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿ÇÕ´Ï´Ù\n¿ÞÂÊÀ¸·Î º¹»ç - Advance (Ctrl+Alt+Left)" ID_ALL_RIGHT "¸ðµç ´Ù¸¥ ºÎºÐÀ» ¿À¸¥ÂÊ ÆÄÀÏ·Î º¹»çÇÕ´Ï´Ù.\n¸ðµÎ ¿À¸¥ÂÊÀ¸·Î" ID_ALL_LEFT "¸ðµç ´Ù¸¥ ºÎºÐÀ» ¿ÞÂÊ ÆÄÀÏ·Î º¹»çÇÕ´Ï´Ù.\n¸ðµÎ ¿ÞÂÊÀ¸·Î" - ID_MERGE_DELETE "Delete selected items from both directories" - ID_MERGE_COMPARE "Compare selected item (compare first item if multiple items selected)" + ID_MERGE_DELETE "¾çÂÊ ÆÄÀÏÀ» ¸ðµÎ »èÁ¦ÇÕ´Ï´Ù." + ID_MERGE_COMPARE "¼±ÅÃµÈ ÆÄÀϵéÀ» ºñ±³ÇÕ´Ï´Ù (¿©·¯°³°¡ ¼±ÅõǾî ÀÖÀ¸¸é ù¹ø° ÆÄÀÏÀ» ¸ÕÀú ºñ±³ÇÕ´Ï´Ù)" END // TOOLS MENU @@ -2840,7 +2839,7 @@ BEGIN ID_TOOLS_CUSTOMIZECOLUMNS "µð·ºÅ丮 ºñ±³ ¼³Á¤ ¼±ÅÃ/¼ø¼­ º¯°æ" ID_TOOLS_GENERATEPATCH "patch ÆÄÀÏ »ý¼º" ID_TOOLS_FILTERS "ÇÊÅÍ ¼±ÅÃ/¼öÁ¤" - ID_TOOLS_GENERATEREPORT "Generates a report from compare results" + ID_TOOLS_GENERATEREPORT "ºñ±³°á°ú ¸®Æ÷Æ® »ý¼º" END // PLUGINS MENU @@ -2859,7 +2858,7 @@ END STRINGTABLE BEGIN ID_WINDOW_CHANGE_PANE "´ÙÀ½ ÆÄÀÏÀ» È°¼ºÈ­ÇÕ´Ï´Ù\n´ÙÀ½ ÆÄÀÏ È°¼ºÈ­" - ID_WINDOW_CLOSEALL "Closes all open windows" + ID_WINDOW_CLOSEALL "¸ðµç ⠴ݱâ" END // HELP MENU @@ -2869,8 +2868,8 @@ BEGIN ID_HELP_GETCONFIG "WinMerge ¹öÀüÁ¤º¸ ¹× ¼³Á¤À» ÅؽºÆ® ÆÄÀÏ·Î Ãâ·ÂÇÕ´Ï´Ù" ID_HELP_GNULICENSE "GNU public license º¾´Ï´Ù." IDS_PRIVATEBUILD_FMT "Private Build: %1" - ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index" - ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search" + ID_HELP_INDEX "µµ¿ò¸»(»öÀÎ)À» º¾´Ï´Ù.\nµµ¿ò¸» »öÀÎ" + ID_HELP_SEARCH "µµ¿ò¸»(°Ë»ö)À» º¾´Ï´Ù.\nµµ¿ò¸» °Ë»ö" END // PLUGINS DIALOGS AND DYNAMIC MENUS @@ -2879,18 +2878,18 @@ BEGIN ID_TITLE_PLUGINS_SETTINGS "Ç÷¯±×ÀÎ ¼¼ÆÃ" ID_PREDIFF_MANUAL "prediffer »ç¿ë¾ÈÇÔ" ID_PREDIFF_AUTO "prediff »ç¿ë °¡´ÉÇÏ¸é »ç¿ëÇϱâ" - ID_NO_EDIT_SCRIPTS "< Empty >" + ID_NO_EDIT_SCRIPTS "< ºñ¾îÀÖÀ½ >" ID_NO_SCT_SCRIPTS "WSH Á¸Àç ÇÏÁö ¾ÊÀ½ - .sct ½ºÅ©¸³Æ®¸¦ »ç¿ëÇÏÁö ¾ÊÀ½" - IDS_USERCHOICE_NONE "" - IDS_USERCHOICE_AUTOMATIC "" + IDS_USERCHOICE_NONE "<»ç¿ë¾ÈÇÔ>" + IDS_USERCHOICE_AUTOMATIC "<ÀÚµ¿>" END // FILE COMPARE CONTEXT MENU STRINGTABLE BEGIN - ID_FILE_OPEN_REGISTERED "Open the file with registered application" - ID_FILE_OPEN_WITHEDITOR "Open the file with external editor" - ID_FILE_OPEN_WITH "Open the file with a particular program" + ID_FILE_OPEN_REGISTERED "¼³Á¤µÈ ÇÁ·Î±×·¥À¸·Î ÆÄÀÏÀ» ¿±´Ï´Ù" + ID_FILE_OPEN_WITHEDITOR "¿ÜºÎ ÆíÁý±â·Î ÆÄÀÏÀ» ¿±´Ï´Ù" + ID_FILE_OPEN_WITH "ÆÄÀÏÀ» ¿­ ƯÁ¤ ÇÁ·Î±×·¥À» ¼±ÅÃÇÕ´Ï´Ù" END // LOCATIONBAR CONTEXT MENU @@ -2907,9 +2906,9 @@ END // AUTOCOMPLETE COMBOBOX OPTIONS STRINGTABLE BEGIN - IDS_AUTOCOMPLETE_DISABLED "Disabled" - IDS_AUTOCOMPLETE_FILE_SYS "From file system" - IDS_AUTOCOMPLETE_MRU "From MRU list" + IDS_AUTOCOMPLETE_DISABLED "»ç¿ë¾ÈÇÔ" + IDS_AUTOCOMPLETE_FILE_SYS "ÆÄÀÏ ½Ã½ºÅÛ ÀÌ¿ë" + IDS_AUTOCOMPLETE_MRU "MRU(Most Recently Used) list ÀÌ¿ë" END // COLOR SCHEMES -- 2.11.0