From: Takashi Sawanaka Date: Tue, 16 May 2017 15:54:26 +0000 (+0900) Subject: Korean translation update submitted by sheppaul X-Git-Tag: 2.16.5~991 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9cf6c159fdba5dd49282fcc08893be5e5d83440a;p=winmerge-jp%2Fwinmerge-jp.git Korean translation update submitted by sheppaul --- diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index 06ae163cc..7456222da 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -14,15 +14,17 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2008-05-26 08:29+0000\n" +"PO-Revision-Date: 2017-05-16 08:22+0900\n" "Last-Translator: Sushizang \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP949\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Korean\n" "X-Poedit-SourceCharset: CP949\n" -"X-Poedit-Basepath: ../../Src/\n" +"X-Poedit-Basepath: ../../Src\n" +"Language: ko\n" +"X-Generator: Poedit 1.8.7\n" +"X-Poedit-Bookmarks: 308,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" #. LANGUAGE, SUBLANGUAGE #: Merge.rc:5F458438 @@ -49,17 +51,17 @@ msgstr " #: Merge.rc:6FC398B6 #, c-format msgid "Copy &from Left" -msgstr "" +msgstr "¿ÞÂÊ¿¡¼ º¹»ç(&F)" #: Merge.rc:8AF7E68 #, c-format msgid "Copy fro&m Right" -msgstr "" +msgstr "¿À¸¥ÂÊ¿¡¼ º¹»ç(&M)" #: Merge.rc:381D79E4 #, c-format msgid "&Select Line Difference" -msgstr "¶óÀÎ Â÷ÀÌÁ¡ ¼±ÅÃ(&S)" +msgstr "ÁÙ Â÷ÀÌÁ¡ ¼±ÅÃ(&S)" #: Merge.rc:43017E40 #, c-format @@ -99,12 +101,12 @@ msgstr " #: Merge.rc:37625055 #, c-format msgid "with &Registered Application" -msgstr "¿¬°á ÇÁ·Î±×·¥(&R)" +msgstr "¿¬°á ÇÁ·Î±×·¥À¸·Î(&R)" #: Merge.rc:321D741E #, c-format msgid "with &External Editor\tCtrl+Alt+E" -msgstr "" +msgstr "¿ÜºÎ ÆíÁý±â·Î(&E)\tCtrl+Alt+E" #: Merge.rc:AC3AA12 #, c-format @@ -114,32 +116,32 @@ msgstr " #: Merge.rc:1A8FADD3 #, c-format msgid "View &Differences" -msgstr "" +msgstr "Â÷ÀÌÁ¡ º¸±â(&D)" #: Merge.rc:71E3C8E3 #, c-format msgid "Diff &Block Size" -msgstr "" +msgstr "Â÷ÀÌÁ¡ ºí·° Å©±â(&B)" #: Merge.rc:67D67717 #, c-format msgid "&Ignore Color Difference (Color Distance Threshold)" -msgstr "" +msgstr "»ö Â÷ÀÌ(»ö °Å¸® ÀÓ°è°ª) ¹«½Ã(&I)" #: Merge.rc:5A9A7139 #, c-format msgid "&Previous Page" -msgstr "" +msgstr "ÀÌÀü ÆäÀÌÁö(&P)" #: Merge.rc:68816EE1 #, c-format msgid "&Next Page" -msgstr "" +msgstr "´ÙÀ½ ÆäÀÌÁö(&N)" #: Merge.rc:4DE14271 #, c-format msgid "&Active Pane" -msgstr "" +msgstr "È°¼º Ã¢(&A)" #: Merge.rc:43017E43 #, c-format @@ -149,7 +151,7 @@ msgstr "È® #: Merge.rc:AC3AA13 #, c-format msgid "&Overlay" -msgstr "" +msgstr "¿À¹ö·¹ÀÌ(&O)" #: Merge.rc:43017E44 #, c-format @@ -159,17 +161,17 @@ msgstr " #: Merge.rc:4DE14272 #, c-format msgid "&Alpha Blend" -msgstr "" +msgstr "¾ËÆÄ ºí·»µå(&A)" #: Merge.rc:237A0532 #, c-format msgid "Alpha &Blend Animation" -msgstr "" +msgstr "¾ËÆÄ ºí·»µå ¾Ö´Ï¸ÞÀÌ¼Ç(&B)" #: Merge.rc:5806E58F #, c-format msgid "Dragging &Mode" -msgstr "" +msgstr "²ø±â ¸ðµå(&M)" #: Merge.rc:43017E45 #, c-format @@ -179,12 +181,12 @@ msgstr " #: Merge.rc:5A9A713A #, c-format msgid "&Adjust Offset" -msgstr "" +msgstr "¿ÀÇÁ¼Â ¸ÂÃß±â(&A)" #: Merge.rc:100AAFAC #, c-format msgid "&Set Background Color" -msgstr "" +msgstr "¹è°æ»ö ¼³Á¤(&S)" #: Merge.rc:43017E46 #, c-format @@ -199,7 +201,7 @@ msgstr " #: Merge.rc:2C8061AC #, c-format msgid "New (&3 panes)" -msgstr "" +msgstr "»õ·Î ¸¸µé±â (&3°³ Ã¢)" #: Merge.rc:1DC30E61 #, c-format @@ -209,12 +211,12 @@ msgstr " #: Merge.rc:6829F68F #, c-format msgid "Op&en Conflict File..." -msgstr "ºÒÀÏÄ¡ ÆÄÀÏ ¿±â(&E)..." +msgstr "Ãæµ¹ ÆÄÀÏ ¿±â(&E)..." #: Merge.rc:5869BBD #, c-format msgid "Open Pro&ject...\tCtrl+J" -msgstr "ÇÁ·ÎÁ§Æ® ¿±â...\tCtrl+J" +msgstr "ÇÁ·ÎÁ§Æ® ¿±â(&J)...\tCtrl+J" #: Merge.rc:1BF42625 #, c-format @@ -229,7 +231,7 @@ msgstr " #: Merge.rc:73E9B1DA #, c-format msgid "Recent F&iles Or Folders" -msgstr "" +msgstr "ÃÖ±Ù ÆÄÀÏ/Æú´õ(&I)" #: Merge.rc:29D50B4A #, c-format @@ -239,7 +241,7 @@ msgstr "< #: Merge.rc:79AB21E0 #, c-format msgid "E&xit" -msgstr "³¡³»±â(&X)" +msgstr "Á¾·á(&X)" #: Merge.rc:43017E47 #, c-format @@ -249,7 +251,7 @@ msgstr " #: Merge.rc:27AC6D7E #, c-format msgid "&Options..." -msgstr "¼³Á¤(&O)..." +msgstr "¿É¼Ç(&O)..." #: Merge.rc:43017E48 #, c-format @@ -274,7 +276,7 @@ msgstr "Å© #: Merge.rc:43017E49 #, c-format msgid "&Huge" -msgstr "" +msgstr "¸Å¿ì Å©°Ô(&H)" #: Merge.rc:27AC6D7F #, c-format @@ -299,7 +301,7 @@ msgstr " #: Merge.rc:3938FFC0 #, c-format msgid "&Generate Patch..." -msgstr "ÆÐÄ¡ »ý¼º(&G)" +msgstr "ÆÐÄ¡ ¸¸µé±â(&G)" #: Merge.rc:AC3AA15 #, c-format @@ -309,37 +311,37 @@ msgstr " #: Merge.rc:4C6CFD95 #, c-format msgid "P&lugin Settings..." -msgstr "" +msgstr "ÇÃ·¯±×ÀÎ ¼³Á¤(&L)..." #: Merge.rc:729280D7 #, c-format msgid "Ma&nual Prediffer" -msgstr "" +msgstr "¼öµ¿ Prediffer(&N)" #: Merge.rc:7CF93368 #, c-format msgid "A&utomatic Prediffer" -msgstr "" +msgstr "ÀÚµ¿ Prediffer(&U)" #: Merge.rc:1A9EBDEC #, c-format msgid "&Manual Unpacking" -msgstr "¼öµ¿ ¾ðÆÑ(&M)" +msgstr "¼öµ¿ ¾ðÆÐÅ·(&M)" #: Merge.rc:4EF8162D #, c-format msgid "&Automatic Unpacking" -msgstr "ÀÚµ¿ ¾ðÆÑ(&A)" +msgstr "ÀÚµ¿ ¾ðÆÐÅ·(&A)" #: Merge.rc:714B45FD #, c-format msgid "&Edit with Unpacker..." -msgstr "" +msgstr "¾ðÆÐÄ¿·Î ÆíÁý(E)..." #: Merge.rc:78B3B622 #, c-format msgid "&Reload plugins" -msgstr "ÇÃ·¯±×ÀÎ ´Ù½Ã ·Îµå(&R)" +msgstr "ÇÃ·¯±×ÀÎ ´Ù½Ã ºÒ·¯¿À±â(&R)" #: Merge.rc:89AF4F7 #, c-format @@ -364,17 +366,17 @@ msgstr "Ã¢ #: Merge.rc:5CCED707 #, c-format msgid "Tile &Horizontally" -msgstr "¼öÁ÷ Á¤·Ä(&H)" +msgstr "¼öÆò ¹è¿(&H)" #: Merge.rc:52870A1 #, c-format msgid "Tile &Vertically" -msgstr "¼öÆò Á¤·Ä(&V)" +msgstr "¼öÁ÷ ¹è¿(&V)" #: Merge.rc:AC3AA16 #, c-format msgid "&Cascade" -msgstr "°è´Ü½Ä Á¤·Ä(&C)" +msgstr "°è´Ü½Ä(&C)" #: Merge.rc:43017E4A #, c-format @@ -389,17 +391,17 @@ msgstr "WinMerge #: Merge.rc:3938FFC2 #, c-format msgid "&Check For Updates" -msgstr "" +msgstr "¾÷µ¥ÀÌÆ® È®ÀÎ(&C)" #: Merge.rc:1C6125F4 #, c-format msgid "C&onfiguration" -msgstr "¼³Á¤(&O)" +msgstr "¼³Á¤ ·Î±×(&O)" #: Merge.rc:175DEEEB #, c-format msgid "&GNU General Public License" -msgstr "GNU ¶óÀÌ¼¾½º(&G)" +msgstr "GNU ÀÏ¹Ý °øÁß ¶óÀÌ¼±½º(&G)" #: Merge.rc:3938FFC3 #, c-format @@ -409,62 +411,62 @@ msgstr "WinMerge #: Merge.rc:68816EE2 #, c-format msgid "&Read-only" -msgstr "" +msgstr "ÀÐ±â Àü¿ë(&R)" #: Merge.rc:71676C45 #, c-format msgid "L&eft Read-only" -msgstr "¿ÞÂÊÀ» ÀÐ±â Àü¿ëÀ¸·Î(E&)" +msgstr "¿ÞÂÊ ÀÐ±â Àü¿ë(&E)" #: Merge.rc:729280D8 #, c-format msgid "M&iddle Read-only" -msgstr "" +msgstr "°¡¿îµ¥ ÀÐ±â Àü¿ë" #: Merge.rc:32BFDBA9 #, c-format msgid "Ri&ght Read-only" -msgstr "¿À¸¥ÂÊÀ» ÀÐ±â Àü¿ëÀ¸·Î(&G)" +msgstr "¿À¸¥ÂÊ ÀÐ±â Àü¿ë(&G)" #: Merge.rc:453F5DDB #, c-format msgid "File En&coding..." -msgstr "" +msgstr "ÆÄÀÏ ÀÎÄÚµù(&C)..." #: Merge.rc:E44718 #, c-format msgid "Select &All\tCtrl+A" -msgstr "¸ðµÎ ¼±ÅÃ(&A)\tCtrl+A" +msgstr "ÀüÃ¼ ¼±ÅÃ(&A)\tCtrl+A" #: Merge.rc:58EEEB7E #, c-format msgid "Show &Identical Items" -msgstr "µ¿ÀÏ ÆÄÀÏ º¸±â(&I)" +msgstr "°°Àº Ç×¸ñ º¸±â(&I)" #: Merge.rc:58EEEB7F #, c-format msgid "Show &Different Items" -msgstr "´Ù¸¥ ÆÄÀÏ º¸±â(&D)" +msgstr "´Ù¸¥ Ç×¸ñ º¸±â(&D)" #: Merge.rc:58E210F9 #, c-format msgid "Show L&eft Unique Items" -msgstr "¿ÞÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸±â(&E)" +msgstr "¿ÞÂÊ¿¡¸¸ ÀÖ´Â Ç×¸ñ º¸±â(&E)" #: Merge.rc:28A1C3B4 #, c-format msgid "Show Midd&le Unique Items" -msgstr "" +msgstr "°¡¿îµ¥¿¡¸¸ ÀÖ´Â Ç×¸ñ º¸±â(&L)" #: Merge.rc:43600E8F #, c-format msgid "Show Ri&ght Unique Items" -msgstr "¿À¸¥ÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸±â(&G)" +msgstr "¿À¸¥ÂÊ¿¡¸¸ ÀÖ´Â Ç×¸ñ º¸±â(&G)" #: Merge.rc:E44719 #, c-format msgid "Show S&kipped Items" -msgstr "ÇÊÅÍ¸µµÈ ÆÄÀÏ º¸±â(&H)" +msgstr "°Ç³Ê¶Ú Ç×¸ñ º¸±â(&H)" #: Merge.rc:6F833C16 #, c-format @@ -479,17 +481,17 @@ msgstr " #: Merge.rc:311E1D87 #, c-format msgid "Tree &Mode" -msgstr "" +msgstr "Æ®¸® ¸ðµå(&M)" #: Merge.rc:3E934D #, c-format msgid "E&xpand All Subfolders" -msgstr "" +msgstr "¸ðµç ÇÏÀ§ Æú´õ È®Àå(&X)" #: Merge.rc:4B91C2CF #, c-format msgid "&Collapse All Subfolders" -msgstr "" +msgstr "¸ðµç ÇÏÀ§ Æú´õ Á¢±â(&C)" #: Merge.rc:E6D7EE #, c-format @@ -519,7 +521,7 @@ msgstr " #: Merge.rc:2E2C5206 #, c-format msgid "&Refresh Selected\tCtrl+F5" -msgstr "¼±ÅÃ ºÎºÐ »õ·Î °íÄ§(&R)\tCtrl+F5" +msgstr "¼±ÅÃ ¿µ¿ª »õ·Î °íÄ§(&R)\tCtrl+F5" #: Merge.rc:1D2E49F9 #, c-format @@ -549,7 +551,7 @@ msgstr "Ã³ #: Merge.rc:3C1ECDD9 #, c-format msgid "&Current Difference\tAlt+Enter" -msgstr "ÇöÀç ¼±ÅÃµÈ Â÷ÀÌÁ¡(&C)\tAlt+Enter" +msgstr "ÇöÀç Â÷ÀÌÁ¡(&C)\tAlt+Enter" #: Merge.rc:26A69749 #, c-format @@ -574,7 +576,7 @@ msgstr " #: Merge.rc:100AAFAD #, c-format msgid "&Customize Columns..." -msgstr "µð·ºÅä¸® ºñ±³ ¼³Á¤(&Customize Columns)" +msgstr "¿ »ç¿ëÀÚ Á¤ÀÇ(&C)..." #: Merge.rc:2F07210E #, c-format @@ -589,7 +591,7 @@ msgstr " #: Merge.rc:125AD721 #, c-format msgid "Sav&e" -msgstr "" +msgstr "ÀúÀå(&E)" #: Merge.rc:751AB58E #, c-format @@ -599,7 +601,7 @@ msgstr " #: Merge.rc:194397DD #, c-format msgid "Save &Middle" -msgstr "" +msgstr "°¡¿îµ¥ ÀúÀå(&M)" #: Merge.rc:2E3BFCA2 #, c-format @@ -609,22 +611,22 @@ msgstr " #: Merge.rc:79321BE1 #, c-format msgid "Save &As" -msgstr "" +msgstr "´Ù¸¥ ÀÌ¸§À¸·Î(&A)" #: Merge.rc:1BF42626 #, c-format msgid "Save &Left As..." -msgstr "" +msgstr "¿ÞÂÊ ÀúÀå(&L)..." #: Merge.rc:6F833C18 #, c-format msgid "Save &Middle As..." -msgstr "" +msgstr "°¡¿îµ¥ ÀúÀå(&M)..." #: Merge.rc:62909ED4 #, c-format msgid "Save &Right As..." -msgstr "" +msgstr "¿À¸¥ÂÊ ÀúÀå(&R)..." #: Merge.rc:4DB19837 #, c-format @@ -639,12 +641,12 @@ msgstr " #: Merge.rc:23CBE0E5 #, c-format msgid "Print Previe&w" -msgstr "¹Ì¸® º¸±â(&R)" +msgstr "ÀÎ¼â ¹Ì¸®º¸±â(&R)" #: Merge.rc:4B91C2D0 #, c-format msgid "&Convert Line Endings to" -msgstr "EOL º¯È¯(&C)" +msgstr "ÁÙ ³¡ º¯È¯(&C)" #: Merge.rc:78B3B623 #, c-format @@ -654,7 +656,7 @@ msgstr " #: Merge.rc:32BFDBAA #, c-format msgid "Re&load\tCtrl+F5" -msgstr "" +msgstr "´Ù½Ã ºÒ·¯¿À±â(&L)\tCtrl+F5" #: Merge.rc:1A9EBDED #, c-format @@ -664,7 +666,7 @@ msgstr " #: Merge.rc:507A4C03 #, c-format msgid "Recompare As" -msgstr "" +msgstr "´Ù½Ã ºñ±³" #: Merge.rc:22956A7 #, c-format @@ -674,7 +676,7 @@ msgstr "&XML" #: Merge.rc:89AF4F8 #, c-format msgid "&Binary" -msgstr "" +msgstr "¹ÙÀÌ³Ê¸®(&B)" #: Merge.rc:6E470BE8 #, c-format @@ -704,7 +706,7 @@ msgstr " #: Merge.rc:73FB245 #, c-format msgid "Select Line &Difference\tF4" -msgstr "¶óÀÎ Â÷ÀÌÁ¡ ¼±ÅÃ(&D)\tF4" +msgstr "ÁÙ Â÷ÀÌÁ¡ ¼±ÅÃ(&D)\tF4" #: Merge.rc:444C5DDB #, c-format @@ -724,32 +726,32 @@ msgstr " #: Merge.rc:45A190D #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" -msgstr "Çà ¹øÈ£ Æ÷ÇÔ º¹»ç(&C)\tCtrl+Shift+C" +msgstr "ÁÙ ¹øÈ£ Æ÷ÇÔ º¹»ç(&C)\tCtrl+Shift+C" #: Merge.rc:68816EE3 #, c-format msgid "&Bookmarks" -msgstr "ºÏ¸¶Å©(&B)" +msgstr "Ã¥°¥ÇÇ(&B)" #: Merge.rc:26A6974A #, c-format msgid "&Toggle Bookmark\tCtrl+F2" -msgstr "ºÏ¸¶Å© Åä±Û(&T)\tCtrl+F2" +msgstr "Ã¥°¥ÇÇ Åä±Û(&T)\tCtrl+F2" #: Merge.rc:3938FFC4 #, c-format msgid "&Next Bookmark\tF2" -msgstr "´ÙÀ½ ºÏ¸¶Å©(&N)\tF2" +msgstr "´ÙÀ½ Ã¥°¥ÇÇ(&N)\tF2" #: Merge.rc:545FEEA1 #, c-format msgid "&Previous bookmark\tShift+F2" -msgstr "ÀÌÀü ºÏ¸¶Å©(&P)\tShift+F2" +msgstr "ÀÌÀü Ã¥°¥ÇÇ(&P)\tShift+F2" #: Merge.rc:4EF8162E #, c-format msgid "&Clear All Bookmarks" -msgstr "¸ðµç ºÏ¸¶Å© »èÁ¦(&C)" +msgstr "ÀüÃ¼ Ã¥°¥ÇÇ Áö¿ì±â(&C)" #: Merge.rc:1A9EBDEE #, c-format @@ -770,7 +772,7 @@ msgstr " #: Merge.rc:78B3B624 #, c-format msgid "&Normal\tCtrl+*" -msgstr "Ç¥ÁØ(&N)\tCtrl+*" +msgstr "º¸Åë(&N)\tCtrl+*" #: Merge.rc:1BF42627 #, c-format @@ -780,47 +782,47 @@ msgstr " #: Merge.rc:6E470BEB #, c-format msgid "&Diff Context" -msgstr "" +msgstr "Â÷ÀÌÁ¡ ÀüÈÄ(&D)" #: Merge.rc:68816EE4 #, c-format msgid "&All Lines" -msgstr "" +msgstr "ÀüÃ¼ ÁÙ(&A)" #: Merge.rc:AC3AA17 #, c-format msgid "&0 Lines" -msgstr "" +msgstr "&0 ÁÙ" #: Merge.rc:89AF4F9 #, c-format msgid "&1 Line" -msgstr "" +msgstr "&1 ÁÙ" #: Merge.rc:AC3AA18 #, c-format msgid "&3 Lines" -msgstr "" +msgstr "&3 ÁÙ" #: Merge.rc:AC3AA19 #, c-format msgid "&5 Lines" -msgstr "" +msgstr "&5 ÁÙ" #: Merge.rc:AC3AA1A #, c-format msgid "&7 Lines" -msgstr "" +msgstr "&7 ÁÙ" #: Merge.rc:AC3AA1B #, c-format msgid "&9 Lines" -msgstr "" +msgstr "&9 ÁÙ" #: Merge.rc:44B58195 #, c-format msgid "&Toggle All and 0-9 Lines\tCtrl+D" -msgstr "" +msgstr "ÀüÃ¼¿Í 0-9 ÁÙ Åä±Û\tCtrl+D" #: Merge.rc:27AC6D81 #, c-format @@ -835,12 +837,12 @@ msgstr " #: Merge.rc:4A81EF3E #, c-format msgid "Vie&w Line Differences" -msgstr "¶óÀÎ Â÷ÀÌÁ¡ º¸±â(&W)" +msgstr "ÁÙ Â÷ÀÌÁ¡ º¸±â(&W)" #: Merge.rc:37660CE9 #, c-format msgid "View Line &Numbers" -msgstr "Çà ¹øÈ£ º¸±â(&N)" +msgstr "ÁÙ ¹øÈ£ º¸±â(&N)" #: Merge.rc:4FF286 #, c-format @@ -855,137 +857,137 @@ msgstr " #: Merge.rc:62909ED5 #, c-format msgid "Split V&ertically" -msgstr "" +msgstr "¼öÁ÷ ºÐÇÒ" #: Merge.rc:70E79DFF #, c-format msgid "Diff &Pane" -msgstr "¼±ÅÃ ºñ±³Ã¢ º¸±â(&P)" +msgstr "Â÷ÀÌÁ¡ Ã¢(&P)" #: Merge.rc:3534E273 #, c-format msgid "Lo&cation Pane" -msgstr "À§Ä¡ Ç¥½ÃÃ¢(&C)" +msgstr "À§Ä¡ Ã¢(&C)" #: Merge.rc:59B87E1C #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" -msgstr "" +msgstr "´ÙÀ½ Ãæµ¹(&X)\tAlt+Shift+Down" #: Merge.rc:3BDD62C2 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" -msgstr "" +msgstr "ÀÌÀü Ãæµ¹(&V)\tAlt+Shift+Up" #: Merge.rc:6D5176E5 #, c-format msgid "A&dvanced" -msgstr "" +msgstr "°í±Þ(&A)" #: Merge.rc:9DA4F24 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" -msgstr "" +msgstr "´ÙÀ½ Â÷ÀÌÁ¡: ¿ÞÂÊ°ú °¡¿îµ¥ »çÀÌ\tAlt+1" #: Merge.rc:2EBE17F8 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" -msgstr "" +msgstr "ÀÌÀü Â÷ÀÌÁ¡: ¿ÞÂÊ°ú °¡¿îµ¥ »çÀÌ\tAlt+Shift+1" #: Merge.rc:21599F72 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" -msgstr "" +msgstr "´ÙÀ½ Â÷ÀÌÁ¡: ¿ÞÂÊ°ú ¿À¸¥ÂÊ »çÀÌ\tAlt+2" #: Merge.rc:5416A5EC #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" -msgstr "" +msgstr "ÀÌÃµ Â÷ÀÌÁ¡: ¿ÞÂÊ°ú ¿À¸¥ÂÊ »çÀÌ\tAlt+Shift+2" #: Merge.rc:316F95AC #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" -msgstr "" +msgstr "´ÙÀ½ Â÷ÀÌÁ¡: °¡¿îµ¥¿Í ¿À¸¥ÂÊ »çÀÌ\tAlt+3" #: Merge.rc:2904E763 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" -msgstr "" +msgstr "ÀÌÀü Â÷ÀÌÁ¡: °¡¿îµ¥¿Í ¿À¸¥ÂÊ »çÀÌ\tAlt+Shift+3" #: Merge.rc:4D91737D #, c-format msgid "Next Left Only Difference\tAlt+7" -msgstr "" +msgstr "´ÙÀ½ Â÷ÀÌÁ¡: ¿ÞÂÊ¸¸\tAlt+7" #: Merge.rc:4BFD42D #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" -msgstr "" +msgstr "ÀÌÀü Â÷ÀÌÁ¡: ¿ÞÂÊ¸¸\tAlt+Shift+7" #: Merge.rc:2F029443 #, c-format msgid "Next Middle Only Difference\tAlt+8" -msgstr "" +msgstr "´ÙÀ½ Â÷ÀÌÁ¡: °¡¿îµ¥¸¸\tAlt+8" #: Merge.rc:541B8710 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" -msgstr "" +msgstr "ÀÌÀü Â÷ÀÌÁ¡: °¡¿îµ¥¸¸\tAlt+Shift+8" #: Merge.rc:649CFC83 #, c-format msgid "Next Right Only Difference\tAlt+9" -msgstr "" +msgstr "´ÙÀ½ Â÷ÀÌÁ¡: ¿À¸¥ÂÊ¸¸\tAlt+9" #: Merge.rc:133AB1C4 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" -msgstr "" +msgstr "ÀÌÀü Â÷ÀÌÁ¡: ¿À¸¥ÂÊ¸¸\tAlt+Shift+9" #: Merge.rc:30FF7A4C #, c-format msgid "Copy from Left\tAlt+Shift+Right" -msgstr "" +msgstr "¿ÞÂÊ¿¡¼ º¹»ç\tAlt+Shift+Right" #: Merge.rc:30FF7A4D #, c-format msgid "Copy from Right\tAlt+Shift+Left" -msgstr "" +msgstr "¿À¸¥ÂÊ¿¡¼ º¹»ç\tAlt+Shift+Left" #: Merge.rc:28C70E7F #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" -msgstr "¿À¸¥ÂÊÀ¸·Î º¹»ç ÈÄ ´ÙÀ½ Â÷ÀÌÁ¡À¸·Î ÀÌµ¿(&O)\tAlt+Ctrl+Right" +msgstr "¿À¸¥ÂÊÀ¸·Î º¹»ç ÈÄ ÀüÁø(&O)\tAlt+Ctrl+Right" #: Merge.rc:4A3B5872 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" -msgstr "¿ÞÂÊÀ¸·Î º¹»ç ÈÄ ´ÙÀ½ Â÷ÀÌÁ¡À¸·Î ÀÌµ¿(&T)\tAlt+Ctrl+Left" +msgstr "¿ÞÂÊÀ¸·Î º¹»ç ÈÄ ÀüÁø(&T)\tAlt+Ctrl+Left" #: Merge.rc:1AC98D09 #, c-format msgid "Copy &All to Right" -msgstr "¸ðµÎ ¿À¸¥ÂÊÀ¸·Î º¹»ç(&A)" +msgstr "ÀüºÎ ¿À¸¥ÂÊÀ¸·Î º¹»ç(&A)" #: Merge.rc:D404EDD #, c-format msgid "Cop&y All to Left" -msgstr "¸ðµÎ ¿ÞÂÊÀ¸·Î º¹»ç(&E)" +msgstr "ÀüºÎ ¿ÞÂÊÀ¸·Î º¹»ç(&E)" #: Merge.rc:4BC6A157 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" -msgstr "" +msgstr "ÀÚµ¿ º´ÇÕ(&U)\tAlt+Ctrl+M" #: Merge.rc:13D827C3 #, c-format msgid "Add &Synchronization Point\tAlt+S" -msgstr "" +msgstr "µ¿±âÈ ÁöÁ¡ Ãß°¡(&S)\tAlt+S" #: Merge.rc:6F88EC67 #, c-format msgid "Clear Sync&hronization Points" -msgstr "" +msgstr "µ¿±âÈ ÁöÁ¡ Áö¿ì±â(&H)" #: Merge.rc:68816EE5 #, c-format @@ -1005,77 +1007,77 @@ msgstr " #: Merge.rc:334E25B1 #, c-format msgid "Compare Non-hor&izontally" -msgstr "" +msgstr "¼öÆòÀÌ ¾Æ´Ñ ¹æ½ÄÀ¸·Î ºñ±³(&I)" #: Merge.rc:20F0A449 #, c-format msgid "First &left item with second left item" -msgstr "" +msgstr "Ã¹ ¹øÂ° ¿ÞÂÊ Ç×¸ñÀ» µÎ ¹øÂ° ¿ÞÂÊ Ç×¸ñÀ¸·Î(&L)" #: Merge.rc:2758BFC0 #, c-format msgid "First &right item with second right item" -msgstr "" +msgstr "Ã¹ ¹øÂ° ¿À¸¥ÂÊ Ç×¸ñÀ» µÎ ¹øÂ° ¿À¸¥ÂÊ Ç×¸ñÀ¸·Î(&R)" #: Merge.rc:56380EAD #, c-format msgid "&First left item with second right item" -msgstr "" +msgstr "Ã¹ ¹øÂ° ¿ÞÂÊ Ç×¸ñÀ» µÎ ¹øÂ° ¿À¸¥ÂÊ Ç×¸ñÀ¸·Î(&F)" #: Merge.rc:56380EAE #, c-format msgid "&Second left item with first right item" -msgstr "" +msgstr "µÎ ¹øÂ° ¿ÞÂÊ Ç×¸ñÀ» Ã¹ ¹øÂ° ¿À¸¥ÂÊ Ç×¸ñÀ¸·Î(&S)" #: Merge.rc:67A28B28 #, c-format msgid "Co&mpare As" -msgstr "" +msgstr "´Ù¸¥ ¹æ½ÄÀ¸·Î ºñ±³(&M)" #: Merge.rc:4D4D2E92 #, c-format msgid "Left to Middle (%1 of %2)" -msgstr "" +msgstr "¿ÞÂÊ¿¡¼ °¡¿îµ¥·Î (%1 / %2)" #: Merge.rc:1723859F #, c-format msgid "Left to Right (%1 of %2)" -msgstr "¿À¸¥ÂÊÀ¸·Î (%1 / %2)" +msgstr "¿ÞÂÊ¿¡¼ ¿À¸¥ÂÊÀ¸·Î (%1 / %2)" #: Merge.rc:20155F58 #, c-format msgid "Left to... (%1 of %2)" -msgstr "¿ÞÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 / %2)" +msgstr "¿ÞÂÊ¿¡¼... (%1 / %2)" #: Merge.rc:6CA26872 #, c-format msgid "Middle to Left (%1 of %2)" -msgstr "" +msgstr "°¡¿îµ¥¿¡¼ ¿ÞÂÊÀ¸·Î (%1 / %2)" #: Merge.rc:27AAA635 #, c-format msgid "Middle to Right (%1 of %2)" -msgstr "" +msgstr "°¡¿îµ¥¿¡¼ ¿À¸¥ÂÊÀ¸·Î (%1 / %2)" #: Merge.rc:7F2E4118 #, c-format msgid "Middle to... (%1 of %2)" -msgstr "" +msgstr "°¡¿îµ¥¿¡¼... (%1 / %2)" #: Merge.rc:2044B100 #, c-format msgid "Right to Middle (%1 of %2)" -msgstr "" +msgstr "¿À¸¥ÂÊ¿¡¼ °¡¿îµ¥·Î (%1 / %2)" #: Merge.rc:73E9B1DB #, c-format msgid "Right to Left (%1 of %2)" -msgstr "¿ÞÂÊÀ¸·Î (%1 / %2)" +msgstr "¿À¸¥ÂÊ¿¡¼ ¿ÞÂÊÀ¸·Î (%1 / %2)" #: Merge.rc:6DBD6123 #, c-format msgid "Right to... (%1 of %2)" -msgstr "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 / %2)" +msgstr "¿À¸¥ÂÊ¿¡¼... (%1 / %2)" #: Merge.rc:89AF4FA #, c-format @@ -1085,27 +1087,27 @@ msgstr " #: Merge.rc:43017E4B #, c-format msgid "&Left" -msgstr "¿ÞÂÊ¸¸(&L)" +msgstr "¿ÞÂÊ(&L)" #: Merge.rc:89AF4FB #, c-format msgid "&Middle" -msgstr "" +msgstr "°¡¿îµ¥(&M)" #: Merge.rc:1D2E49FA #, c-format msgid "&Right" -msgstr "¿À¸¥ÂÊ¸¸(&R)" +msgstr "¿À¸¥ÂÊ(&R)" #: Merge.rc:43017E4C #, c-format msgid "&Both" -msgstr "¸ðµÎ(&B)" +msgstr "¾çÂÊ(&B)" #: Merge.rc:22956A8 #, c-format msgid "&All" -msgstr "" +msgstr "ÀüÃ¼(&A)" #: Merge.rc:4876CD3D #, c-format @@ -1115,32 +1117,32 @@ msgstr " #: Merge.rc:27AC6D82 #, c-format msgid "&Hide Items" -msgstr "¼û±â±â(&H)" +msgstr "Ç×¸ñ ¼û±â±â(&H)" #: Merge.rc:68816EE6 #, c-format msgid "&Open Left" -msgstr "¿ÞÂÊ ÆÄÀÏ ¿±â(&O)" +msgstr "¿ÞÂÊ ¿±â(&O)" #: Merge.rc:46724E8D #, c-format msgid "with &External Editor" -msgstr "¿ÜºÎ ÆíÁý±â(&E)" +msgstr "¿ÜºÎ ÆíÁý±â·Î(&E)" #: Merge.rc:5A9A713C #, c-format msgid "&Parent Folder" -msgstr "" +msgstr "»óÀ§ Æú´õ(&P)" #: Merge.rc:761E6872 #, c-format msgid "Open Midd&le" -msgstr "" +msgstr "°¡¿îµ¥ ¿±â(&L)" #: Merge.rc:1C95A043 #, c-format msgid "O&pen Right" -msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¿±â(&O)" +msgstr "¿À¸¥ÂÊ ¿±â(&P)" #: Merge.rc:6FC398B8 #, c-format @@ -1155,7 +1157,7 @@ msgstr " #: Merge.rc:729280D9 #, c-format msgid "Middle (%1 of %2)" -msgstr "" +msgstr "°¡¿îµ¥ (%1 / %2)" #: Merge.rc:32BFDBAB #, c-format @@ -1165,42 +1167,42 @@ msgstr " #: Merge.rc:36B164C3 #, c-format msgid "Both (%1 of %2)" -msgstr "¸ðµÎ (%1 / %2)" +msgstr "¾çÂÊ (%1 / %2)" #: Merge.rc:2515A6BA #, c-format msgid "All (%1 of %2)" -msgstr "" +msgstr "ÀüÃ¼ (%1 / %2)" #: Merge.rc:6FC398B9 #, c-format msgid "Copy &Filenames" -msgstr "ÆÄÀÏ¸í º¹»ç(&F)" +msgstr "ÆÄÀÏ ÀÌ¸§ º¹»ç(&F)" #: Merge.rc:4BFA4345 #, c-format msgid "Copy Items To Clip&board" -msgstr "" +msgstr "Ç×¸ñÀ» Å¬¸³º¸µå·Î º¹»ç(&B)" #: Merge.rc:22956A9 #, c-format msgid "&Zip" -msgstr "¾ÐÃà(&Z)" +msgstr "Zip ¾ÐÃà(&Z)" #: Merge.rc:7370E045 #, c-format msgid "Both to... (%1 of %2)" -msgstr "" +msgstr "¾çÂÊ... (%1 / %2)" #: Merge.rc:7CF93369 #, c-format msgid "All to... (%1 of %2)" -msgstr "" +msgstr "ÀüºÎ... (%1 / %2)" #: Merge.rc:31EF0955 #, c-format msgid "Differences to... (%1 of %2)" -msgstr "" +msgstr "Â÷ÀÌÁ¡... (%1 / %2)" #: Merge.rc:AC3AA1D #, c-format @@ -1210,22 +1212,22 @@ msgstr " #: Merge.rc:71676C47 #, c-format msgid "Left Shell menu" -msgstr "" +msgstr "¿ÞÂÊ ½© ¸Þ´º" #: Merge.rc:729280DA #, c-format msgid "Middle Shell menu" -msgstr "" +msgstr "°¡¿îµ¥ ½© ¸Þ´º" #: Merge.rc:32BFDBAC #, c-format msgid "Right Shell menu" -msgstr "" +msgstr "¿À¸¥ÂÊ ½© ¸Þ´º" #: Merge.rc:3CF9F84 #, c-format msgid "Copy" -msgstr "" +msgstr "º¹»ç" #: Merge.rc:78B3B625 #, c-format @@ -1235,7 +1237,7 @@ msgstr " #: Merge.rc:1C6125F5 #, c-format msgid "Copy &Filename" -msgstr "ÆÄÀÏ¸í º¹»ç(&F)" +msgstr "ÆÄÀÏ ÀÌ¸§ º¹»ç(&F)" #: Merge.rc:27A06B44 #, c-format @@ -1245,12 +1247,12 @@ msgstr "Prediffer #: Merge.rc:6E470BEC #, c-format msgid "&No prediffer" -msgstr "prediffer »ç¿ë ¾È ÇÔ(&N)" +msgstr "prediffer ¾øÀ½(&N)" #: Merge.rc:2515A6BB #, c-format msgid "Auto prediffer" -msgstr "prediffer ÀÚµ¿ ¼±ÅÃ" +msgstr "ÀÚµ¿ prediffer" #: Merge.rc:24F1D5E9 #, c-format @@ -1260,72 +1262,72 @@ msgstr " #: Merge.rc:1DC30E63 #, c-format msgid "&No Moved Blocks" -msgstr "ÀÌµ¿¿µ¿ª Ç¥½ÃÇÏÁö ¾ÊÀ½(&N)" +msgstr "ÀÌµ¿µÈ ºí·° ¾øÀ½(&N)" #: Merge.rc:1A9EBDEF #, c-format msgid "&All Moved Blocks" -msgstr "¸ðµç ÀÌµ¿¿µ¿ª Ç¥½Ã(&A)" +msgstr "¸ðµç ÀÌµ¿µÈ ºí·°(&A)" #: Merge.rc:BA50068 #, c-format msgid "Moved Block for &Current Diff" -msgstr "ÇöÀç ¼±ÅÃµÈ ÀÌµ¿¿µ¿ª¸¸ Ç¥½Ã(&C)" +msgstr "ÇöÀç Â÷ÀÌÁ¡¿¡ ´ëÇØ ÀÌµ¿µÈ ºí·°(&C)" #: Merge.rc:3C68C747 #, c-format msgid "W&hitespaces" -msgstr "°ø¹é ¹®ÀÚ" +msgstr "°ø¹é ¹®ÀÚ(&H)" #: Merge.rc:4C3E0A2C #, c-format msgid "Com&pare" -msgstr "¸ðµÎ ºñ±³(&P)" +msgstr "ºñ±³ÇÏ±â(&P)" #: Merge.rc:4630D06B #, c-format msgid "I&gnore changes" -msgstr "º¯°æµÈ ºÎºÐ ¹«½Ã(&G)" +msgstr "º¯°æ»çÇ× ¹«½ÃÇÏ±â(&G)" #: Merge.rc:21C15B6 #, c-format msgid "Ig&nore all" -msgstr "¸ðµÎ ºñ±³ ¾È ÇÔ(&N)" +msgstr "¸ðµÎ ¹«½ÃÇÏ±â(&N)" #: Merge.rc:6FC398BA #, c-format msgid "Case sensi&tive" -msgstr "´ë¼Ò¹®ÀÚ ±¸ºÐ(&T)" +msgstr "´ë¼Ò¹®ÀÚ ±¸ºÐÇÏ±â(&T)" #: Merge.rc:620FF1AC #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" -msgstr "ÄÉ¸®Áö ¸®ÅÏ Â÷ÀÌ ¹«½Ã(&R) (Windows/Unix/Mac)" +msgstr "ÄÉ¸®Áö ¸®ÅÏ Â÷ÀÌ ¹«½ÃÇÏ±â (À©µµ¿ì/À¯´Ð½º/¸Æ)(&R)" #: Merge.rc:6DE6F873 #, c-format msgid "&Include Subfolders" -msgstr "ÇÏÀ§ µð·ºÅä¸® Æ÷ÇÔ(&I)" +msgstr "ÇÏÀ§ Æú´õ Æ÷ÇÔÇÏ±â(&I)" #: Merge.rc:1DC30E64 #, c-format msgid "&Compare method:" -msgstr "" +msgstr "ºñ±³ ¹æ¹ý(&C):" #: Merge.rc:7A4CFAFB #, c-format msgid "Full Contents" -msgstr "ÀüÃ¼ ³»¿ë ºñ±³" +msgstr "ÀüÃ¼ ³»¿ë" #: Merge.rc:5F71A081 #, c-format msgid "Quick Contents" -msgstr "ºü¸¥ ³»¿ë ºñ±³" +msgstr "ºü¸¥ ³»¿ë" #: Merge.rc:36B164C4 #, c-format msgid "Binary Contents" -msgstr "" +msgstr "¹ÙÀÌ³Ê¸® ³»¿ë" #: Merge.rc:2CEE4748 #, c-format @@ -1335,12 +1337,12 @@ msgstr " #: Merge.rc:39C7AF82 #, c-format msgid "Modified Date and Size" -msgstr "º¯°æµÈ ³¯Â¥ ¹× ÆÄÀÏ Å©±â" +msgstr "º¯°æµÈ ³¯Â¥ ¹× Å©±â" #: Merge.rc:4B89B93 #, c-format msgid "Size" -msgstr "ÆÄÀÏ Å©±â" +msgstr "Å©±â" #: Merge.rc:2515A6BC #, c-format @@ -1355,7 +1357,7 @@ msgstr "( #: Merge.rc:1D44E628 #, c-format msgid "Visit the WinMerge HomePage!" -msgstr "WinMerge È¨ÆäÀÌÁö ¹æ¹®!" +msgstr "WinMerge È¨ÆäÀÌÁö ¹æ¹®¤¾!" #: Merge.rc:1326F #, c-format @@ -1365,12 +1367,12 @@ msgstr "È® #: Merge.rc:CAEDA35 #, c-format msgid "Contributors" -msgstr "¹èÆ÷ÀÚ" +msgstr "°øÇåÀÚ" #: Merge.rc:58E210FA #, c-format msgid "Select Files or Folders" -msgstr "µð·ºÅä¸®/ÆÄÀÏ ¼±ÅÃ" +msgstr "Æú´õ/ÆÄÀÏ ¼±ÅÃ" #: Merge.rc:68816EE7 #, c-format @@ -1380,12 +1382,12 @@ msgstr "Ã£ #: Merge.rc:78E0CE0E #, c-format msgid "B&rowse..." -msgstr "Ã£¾Æº¸±â(&R)..." +msgstr "Ã£¾Æº¸±â(&R)" #: Merge.rc:6E470BED #, c-format msgid "&3(Optional):" -msgstr "" +msgstr "&3(¼±ÅÃ »çÇ×):" #: Merge.rc:78E0CE0F #, c-format @@ -1395,7 +1397,7 @@ msgstr "Ã£ #: Merge.rc:64ABCD7D #, c-format msgid "Fi<er:" -msgstr "" +msgstr "ÇÊÅÍ(&L):" #: Merge.rc:2D1160AF #, c-format @@ -1405,7 +1407,7 @@ msgstr " #: Merge.rc:68816EE8 #, c-format msgid "&Unpacker:" -msgstr "¾ðÆÑÄ¿(&U):" +msgstr "¾ðÆÐÄ¿(&U):" #: Merge.rc:68816EE9 #, c-format @@ -1430,7 +1432,7 @@ msgstr " #: Merge.rc:75264C52 #, c-format msgid "Files or Folders to Compare" -msgstr "ºñ±³ÇÒ µð·ºÅä¸®/ÆÄÀÏ" +msgstr "ºñ±³ÇÒ ÆÄÀÏ ¶Ç´Â Æú´õ" #: Merge.rc:39174D96 #, c-format @@ -1440,12 +1442,12 @@ msgstr " #: Merge.rc:39174D97 #, c-format msgid "Rea&d-only" -msgstr "" +msgstr "ÀÐ±â Àü¿ë(&D)" #: Merge.rc:39174D98 #, c-format msgid "Read-o&nly" -msgstr "" +msgstr "ÀÐ±â Àü¿ë(&N)" #: Merge.rc:629C1DDC #, c-format @@ -1470,12 +1472,12 @@ msgstr " #: Merge.rc:F75DAF7 #, c-format msgid "Link to Destination VSS project" -msgstr "VSS ÇÁ·ÎÁ§Æ®¿¡ ¿¬°á" +msgstr "´ë»ó VSS ÇÁ·ÎÁ§Æ®¿¡ ¿¬°á" #: Merge.rc:40325727 #, c-format msgid "Apply to all items" -msgstr "¸ðµç Ç×¸ñ¿¡ Àû¿ë" +msgstr "ÀüÃ¼ Ç×¸ñ¿¡ Àû¿ë" #: Merge.rc:3B833B8A #, c-format @@ -1490,17 +1492,17 @@ msgstr " #: Merge.rc:1A8FADD4 #, c-format msgid "Versioning System" -msgstr "Çü»ó °ü¸® ½Ã½ºÅÛ" +msgstr "¹öÀü °ü¸® ½Ã½ºÅÛ" #: Merge.rc:6DE6F874 #, c-format msgid "&Versioning System:" -msgstr "Çü»ó °ü¸® ½Ã½ºÅÛ(&V) :" +msgstr "¹öÀü °ü¸® ½Ã½ºÅÛ(&V) :" #: Merge.rc:381D79E5 #, c-format msgid "&Path to cleartool.exe:" -msgstr "cleartool.exe °æ·Î(&P) :" +msgstr "cleartool.exe °æ·Î(&P):" #: Merge.rc:787FD72B #, c-format @@ -1510,7 +1512,7 @@ msgstr " #: Merge.rc:237AB485 #, c-format msgid "Automatically &scroll to first difference" -msgstr "Ã³À½ Â÷ÀÌÁ¡À¸·Î ÀÚµ¿ ½ºÅ©·Ñ(&S)" +msgstr "Ã³À½ Â÷ÀÌÁ¡À¸·Î ÀÚµ¿ ½ºÅ©·ÑÇÏ±â(&S)" #: Merge.rc:69AD3BF8 #, c-format @@ -1520,12 +1522,12 @@ msgstr "ESC #: Merge.rc:6574B7FB #, c-format msgid "&Automatically verify paths in Open-dialog" -msgstr "¿±â ´ëÈ »óÀÚ¿¡¼ ÀÚµ¿À¸·Î ¿Ã¹Ù¸¥ °æ·ÎÀÎÁö °Ë»ç" +msgstr "¿±â ´ëÈ »óÀÚ¿¡¼ °æ·Î ÀÚµ¿ È®ÀÎÇÏ±â" #: Merge.rc:631E0F7B #, c-format msgid "All&ow only one instance to run" -msgstr "Winmerge ½Ì±Û ÀÎ½ºÅÏ½º¸¸ Çã¿ëÇÔ(&A)" +msgstr "Áßº¹ ½ÇÇà ±ÝÁöÇÏ±â(&A)" #: Merge.rc:672CD0E2 #, c-format @@ -1535,32 +1537,32 @@ msgstr " #: Merge.rc:6D5B7718 #, c-format msgid "&Preserve file time in file compare" -msgstr "ºñ±³ ½Ã ÆÄÀÏ ½Ã°£ º¸È£(&P)" +msgstr "ÆÄÀÏ ºñ±³½Ã ÆÄÀÏ ½Ã°£ º¸Á¸ÇÏ±â(&P)" #: Merge.rc:17F0E759 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" -msgstr "" +msgstr "½ÃÀÛ½Ã \"ÆÄÀÏ ¶Ç´Â Æú´õ ¼±ÅÃ\" ´ëÈ »óÀÚ º¸ÀÌ±â" #: Merge.rc:1AD99579 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" -msgstr "" +msgstr "È®ÀÎ ¹öÆ° ´©¸¦ ¶§ \"ÆÄÀÏ ¶Ç´Â Æú´õ ¼±ÅÃ\" ´ëÈ »óÀÚ ´Ý±â" #: Merge.rc:44776ACE #, c-format msgid "O&pen-dialog Auto-Completion:" -msgstr "¿±â ´ëÈ »óÀÚ ÀÚµ¿¿Ï¼º ±â´É(&P):" +msgstr "¿±â ´ëÈ »óÀÚ ÀÚµ¿ ¿Ï¼º(&P):" #: Merge.rc:1B63306F #, c-format msgid "Language:" -msgstr "" +msgstr "¾ð¾î:" #: Merge.rc:516450B #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." -msgstr "ÀÏºÎ °æ°í ¸Þ½ÃÁö´Â º¸ÀÌÁö ¾Ê°Ô ÇÒ ¼ö ÀÖ½À´Ï´Ù. ÃÊ±âÈÇÏ¸é ÇØ´ç ¸Þ½ÃÁö´Â ´Ù½Ã Ç¥½ÃµË´Ï´Ù." +msgstr "WinMergeÀÇ ÀÏºÎ ¸Þ½ÃÁö »óÀÚ´Â °¨Ãâ ¼ö ÀÖ½À´Ï´Ù. ÃÊ±âÈ ¹öÆ°À» ´·¯ ÀüÃ¼ ¸Þ½ÃÁö »óÀÚ¸¦ ´Ù½Ã º¼ ¼ö ÀÖ½À´Ï´Ù." #: Merge.rc:10976EC1 #, c-format @@ -1580,7 +1582,7 @@ msgstr "Ã£ #: Merge.rc:39C7AF83 #, c-format msgid "Match &whole word only" -msgstr "´Ü¾î ´ÜÀ§·Î(&W)" +msgstr "¿ÂÀüÇÑ ´Ü¾î¸¸ Ã£±â(&W)" #: Merge.rc:13C27214 #, c-format @@ -1590,22 +1592,22 @@ msgstr " #: Merge.rc:44BC83ED #, c-format msgid "Regular &expression" -msgstr "Á¤±Ô Ç¥Çö½Ä(&E)" +msgstr "Á¤±Ô½Ä »ç¿ë(&E)" #: Merge.rc:78A08947 #, c-format msgid "D&on't wrap end of file" -msgstr "EOF ·¦ ¾È ÇÔ(&O)" +msgstr "ÆÄÀÏ ³¡ÀÇ ÁÙ ¹Ù²ÞÇÏÁö ¾Ê±â(&O)" #: Merge.rc:545FEEA2 #, c-format msgid "&Don't close this dialog box" -msgstr "" +msgstr "ÀÌ ´ëÈ »óÀÚ¸¦ ´ÝÁö ¾ÊÀ½(&D)" #: Merge.rc:68EE6DF0 #, c-format msgid "Find &Prev" -msgstr "" +msgstr "ÀÌÀü Ã£±â(&P)" #: Merge.rc:68816EEA #, c-format @@ -1625,12 +1627,12 @@ msgstr " #: Merge.rc:1B17601E #, c-format msgid "Re&place with:" -msgstr "º¯°æ ³»¿ë(&P):" +msgstr "¹Ù²Ü ³»¿ë(&P):" #: Merge.rc:381D79E6 #, c-format msgid "&Don't wrap end of file" -msgstr "EOF ·¦ ¾È ÇÔ(&D)" +msgstr "ÆÄÀÏ ³¡ÀÇ ÁÙ ¹Ù²ÞÇÏÁö ¾Ê±â(&D)" #: Merge.rc:39174D99 #, c-format @@ -1640,12 +1642,12 @@ msgstr " #: Merge.rc:68816EEB #, c-format msgid "&Selection" -msgstr "ÇöÀç ÆÄÀÏ(&S)" +msgstr "¼±ÅÃ(&S)" #: Merge.rc:3FE25900 #, c-format msgid "Wh&ole file" -msgstr "¸ðµç ÆÄÀÏ(&O)" +msgstr "ÀüÃ¼ ÆÄÀÏ(&O)" #: Merge.rc:AC3AA1E #, c-format @@ -1655,7 +1657,7 @@ msgstr " #: Merge.rc:507A4C04 #, c-format msgid "Replace &All" -msgstr "¸ðµÎ ¹Ù²Ù±â(&A)" +msgstr "¸ðµÎ ¹Ù²Þ(&A)" #: Merge.rc:4C3E0A2D #, c-format @@ -1665,7 +1667,7 @@ msgstr "Ã¼Å© #: Merge.rc:4C3E0A2E #, c-format msgid "Comments" -msgstr "ÁÖ¼®" +msgstr "ÄÚ¸àÆ®" #: Merge.rc:51DC4C3F #, c-format @@ -1675,17 +1677,17 @@ msgstr "Ã¼Å© #: Merge.rc:4F58DAFC #, c-format msgid "Linefilters" -msgstr "¶óÀÎ ÇÊÅÍ" +msgstr "ÁÙ ÇÊÅÍ" #: Merge.rc:36B79AB7 #, c-format msgid "Enable Line Filters" -msgstr "¶óÀÎ ÇÊÅÍ »ç¿ë" +msgstr "ÁÙ ÇÊÅÍ »ç¿ë" #: Merge.rc:5E8200FF #, c-format msgid "Regular Expressions (one per line):" -msgstr "Á¤±Ô Ç¥Çö½Ä (¸Å ¶óÀÎ¸¶´Ù Àû¿ë):" +msgstr "Á¤±Ô½Ä (¸Å ÁÙ¸¶´Ù Àû¿ë):" #: Merge.rc:24A380 #, c-format @@ -1725,7 +1727,7 @@ msgstr " #: Merge.rc:1CDF6584 #, c-format msgid "Deleted" -msgstr "»èÁ¦ ºÎºÐ" +msgstr "»èÁ¦µÊ" #: Merge.rc:4C72B54 #, c-format @@ -1740,32 +1742,32 @@ msgstr " #: Merge.rc:7106378D #, c-format msgid "Moved:" -msgstr "ÀÌµ¿ÇÑ ºÎºÐ:" +msgstr "ÀÌµ¿µÈ ¿µ¿ª:" #: Merge.rc:E6D7EF #, c-format msgid "Selected Moved:" -msgstr "¼±ÅÃµÈ ÀÌµ¿ÇÑ ºÎºÐ:" +msgstr "¼±ÅÃµÈ ÀÌµ¿µÈ ¿µ¿ª:" #: Merge.rc:6B96B328 #, c-format msgid "Same As The Next(3 panes):" -msgstr "" +msgstr "´ÙÀ½°ú °°À½ (3°³ Ã¢):" #: Merge.rc:73FB246 #, c-format msgid "Same As The Next(Selected):" -msgstr "" +msgstr "´ÙÀ½°ú °°À½ (¼±ÅÃ):" #: Merge.rc:40C55014 #, c-format msgid "Word Difference:" -msgstr "´Ü¾î ´ÜÀ§ Â÷ÀÌÁ¡:" +msgstr "´Ü¾î Â÷ÀÌÁ¡:" #: Merge.rc:E4471A #, c-format msgid "Selected Word Diff:" -msgstr "¼±ÅÃµÈ ´Ü¾î ´ÜÀ§ Â÷ÀÌÁ¡:" +msgstr "¼±ÅÃµÈ ´Ü¾î Â÷ÀÌÁ¡:" #: Merge.rc:7F0D4B46 #, c-format @@ -1780,7 +1782,7 @@ msgstr " #: Merge.rc:51FAB141 #, c-format msgid "&Send deleted files to Recycle Bin" -msgstr "»èÁ¦ÇÑ ÆÄÀÏÀº ÈÞÁöÅëÀ¸·Î(&P)" +msgstr "»èÁ¦ÇÑ ÆÄÀÏÀº ÈÞÁöÅëÀ¸·Î º¸³»±â(&P)" #: Merge.rc:1A9EBDF0 #, c-format @@ -1790,7 +1792,7 @@ msgstr " #: Merge.rc:78B3B626 #, c-format msgid "&Filter folder:" -msgstr "µð·ºÅä¸® ÇÊÅÍ¸µ(&F):" +msgstr "ÇÊÅÍ Æú´õ(&F):" #: Merge.rc:1C1FA831 #, c-format @@ -1830,7 +1832,7 @@ msgstr " #: Merge.rc:4B91C2D1 #, c-format msgid "&Append to existing file" -msgstr "Á¸ÀçÇÏ´Â ÆÄÀÏ¿¡ µ¡ºÙÀÌ±â(&A)" +msgstr "±âÁ¸ ÆÄÀÏ¿¡ µ¡ºÙÀÌ±â(&A)" #: Merge.rc:AC3AA1F #, c-format @@ -1855,17 +1857,17 @@ msgstr " #: Merge.rc:4DB19838 #, c-format msgid "&Context:" -msgstr "ÄÁÅØ½ºÆ®(&C):" +msgstr "Â÷ÀÌÁ¡ÀüÈÄ:" #: Merge.rc:2756A766 #, c-format msgid "Ignor&e blank lines" -msgstr "°ø¹é ¶óÀÎ ¹«½Ã(&E)" +msgstr "°ø¹é ÁÙ ¹«½ÃÇÏ±â(&E)" #: Merge.rc:2C4A6C6C #, c-format msgid "Inclu&de command line" -msgstr "Ä¿¸Çµå ¶óÀÎ¿¡¼ ½ÇÇà½Ã¿¡µµ Àû¿ë(&D)" +msgstr "¸í·ÉÇà Æ÷ÇÔÇÏ±â(&D)" #: Merge.rc:5869BBE #, c-format @@ -1875,7 +1877,7 @@ msgstr " #: Merge.rc:28D5CCAA #, c-format msgid "Display Columns" -msgstr "µð·ºÅä¸® ºñ±³ Ç¥½Ã Ç×¸ñ" +msgstr "¿ Ç¥½ÃÇÏ±â" #: Merge.rc:4856953D #, c-format @@ -1890,17 +1892,17 @@ msgstr " #: Merge.rc:E6D7F0 #, c-format msgid "Select Unpacker" -msgstr "¾ðÆÑÄ¿ ¼±ÅÃ" +msgstr "¾ðÆÐÄ¿ ¼±ÅÃ" #: Merge.rc:4F5264C8 #, c-format msgid "File unpacker:" -msgstr "ÆÄÀÏ ¾ðÆÑÄ¿:" +msgstr "ÆÄÀÏ ¾ðÆÐÄ¿:" #: Merge.rc:34C1157D #, c-format msgid "Display all unpackers, don't check the extension" -msgstr "¸ðµç ¾ðÆÑÄ¿ Ç¥½Ã, È®ÀåÀÚ¸¦ È®ÀÎÇÏÁö ¾ÊÀ½" +msgstr "¸ðµç ¾ðÆÐÄ¿¸¦ Ç¥½ÃÇÏ°í, È®ÀåÀÚ¸¦ È®ÀÎÇÏÁö ¾Ê±â" #: Merge.rc:5B18135F #, c-format @@ -1920,17 +1922,17 @@ msgstr " #: Merge.rc:1AC98D0A #, c-format msgid "Comparing items..." -msgstr "ºñ±³ ÁøÇà Áß..." +msgstr "Ç×¸ñ ºñ±³ Áß..." #: Merge.rc:4630D06C #, c-format msgid "Items compared:" -msgstr "ºñ±³ ¿Ï·áµÈ ÆÄÀÏ :" +msgstr "ºñ±³µÈ Ç×¸ñ :" #: Merge.rc:4166A153 #, c-format msgid "Items total:" -msgstr "¸ðµç ÆÄÀÏ :" +msgstr "ÀüÃ¼ Ç×¸ñ :" #: Merge.rc:7D31F2A0 #, c-format @@ -1950,12 +1952,12 @@ msgstr " #: Merge.rc:57E6C4D3 #, c-format msgid "Goto what" -msgstr "ÀÌµ¿ÇÒ °÷" +msgstr "ÀÌµ¿ À§Ä¡" #: Merge.rc:602FC81 #, c-format msgid "Li&ne" -msgstr "¶óÀÎ(&N)" +msgstr "ÁÙ(&N)" #: Merge.rc:27AC6D83 #, c-format @@ -1975,52 +1977,52 @@ msgstr " #: Merge.rc:65285570 #, c-format msgid "Whitespace" -msgstr "°ø¹é" +msgstr "°ø¹é ¹®ÀÚ" #: Merge.rc:AC3AA20 #, c-format msgid "&Compare" -msgstr "°ø¹é ºñ±³(&W)" +msgstr "ºñ±³ÇÏ±â(&W)" #: Merge.rc:5A9A713D #, c-format msgid "&Ignore change" -msgstr "º¯°æ ³»¿ë ¹«½Ã(&H)" +msgstr "º¯°æ»çÇ× ¹«½ÃÇÏ±â(&H)" #: Merge.rc:21C15B7 #, c-format msgid "I&gnore all" -msgstr "¸ðµç °ø¹é ¹«½Ã(&A)" +msgstr "¸ðµÎ ¹«½ÃÇÏ±â(&G)" #: Merge.rc:2756A767 #, c-format msgid "Ignore blan&k lines" -msgstr "°ø¹é ¶óÀÎ ¹«½Ã(&K)" +msgstr "°ø¹é ÁÙ ¹«½ÃÇÏ±â(&K)" #: Merge.rc:4166A154 #, c-format msgid "Ignore &case" -msgstr "´ë¼Ò¹®ÀÚ ¹«½Ã(&C)" +msgstr "´ë¼Ò¹®ÀÚ ¹«½ÃÇÏ±â(&C)" #: Merge.rc:6C318DC8 #, c-format msgid "Ignore codepage &differences" -msgstr "" +msgstr "ÄÚµåÆäÀÌÁö Â÷ÀÌ ¹«½ÃÇÏ±â(&D)" #: Merge.rc:285B56CE #, c-format msgid "E&nable moved block detection" -msgstr "ÀÌµ¿¿µ¿ª Ã£±â È°¼ºÈ" +msgstr "ÀÌµ¿µÈ ºí·° °¨Áö »ç¿ëÇÏ±â" #: Merge.rc:4EF8162F #, c-format msgid "&Match similar lines" -msgstr "ºñ½ÁÇÑ ¶óÀÎ ´ëÁ¶(&M)" +msgstr "ºñ½ÁÇÑ ÁÙ ÀÏÄ¡½ÃÅ°±â(&M)" #: Merge.rc:1AFA3491 #, c-format msgid "Filter Comments" -msgstr "ÁÖ¼® ÇÊÅÍ¸µ" +msgstr "ÄÚ¸àÆ® ÇÊÅÍ¸µÇÏ±â" #: Merge.rc:3BB91A82 #, c-format @@ -2030,17 +2032,17 @@ msgstr " #: Merge.rc:1A9EBDF1 #, c-format msgid "&Highlight syntax" -msgstr "±¸¹® °Á¶" +msgstr "±¸¹® °Á¶ Ç¥½ÃÇÏ±â(&H)" #: Merge.rc:1A9EBDF2 #, c-format msgid "&Automatic rescan" -msgstr "ÀÚµ¿ ¸®½ºÄµ(&R)" +msgstr "ÀÚµ¿À¸·Î ´Ù½Ã ½ºÄµÇÏ±â(&R)" #: Merge.rc:545FEEA3 #, c-format msgid "&Preserve original EOL chars" -msgstr "¿øº» EOL º¸Á¸(&P)" +msgstr "¿øº» ÁÙ³¡ ¹®ÀÚ º¸Á¸ÇÏ±â(&P)" #: Merge.rc:4C72B55 #, c-format @@ -2055,22 +2057,22 @@ msgstr " #: Merge.rc:4DE14275 #, c-format msgid "&Insert Tabs" -msgstr "ÅÇ »ðÀÔ(&T)" +msgstr "ÅÇ »ðÀÔÇÏ±â(&T)" #: Merge.rc:243A39E #, c-format msgid "Insert &Spaces" -msgstr "°ø¹é »ðÀÔ(&N)" +msgstr "°ø¹é »ðÀÔÇÏ±â(&N)" #: Merge.rc:172385A0 #, c-format msgid "Line Difference Coloring" -msgstr "¶óÀÎ Â÷ÀÌÁ¡ »ö ºÎ¿©" +msgstr "ÁÙ Â÷ÀÌÁ¡ Ã¤»ö" #: Merge.rc:4CB9DE6A #, c-format msgid "View line differences" -msgstr "¶óÀÎ Â÷ÀÌÁ¡ º¸±â" +msgstr "ÁÙ Â÷ÀÌÁ¡ º¸±â" #: Merge.rc:1DC30E65 #, c-format @@ -2085,7 +2087,7 @@ msgstr " #: Merge.rc:14AF463A #, c-format msgid "W&ord break characters:" -msgstr "" +msgstr "´Ü¾î ºÐ¸® ¹®ÀÚ(&O):" #: Merge.rc:34DF5070 #, c-format @@ -2120,7 +2122,7 @@ msgstr " #: Merge.rc:1BA49C3C #, c-format msgid "Save modified files?" -msgstr "¼öÁ¤ ÆÄÀÏ ÀúÀå" +msgstr "º¯°æµÈ ÆÄÀÏÀ» ÀúÀåÇÒ±î¿ä?" #: Merge.rc:3534E274 #, c-format @@ -2130,27 +2132,27 @@ msgstr " #: Merge.rc:6E470BEE #, c-format msgid "&Save changes" -msgstr "ÀúÀå(&S)" +msgstr "º¯°æ»çÇ× ÀúÀå(&S)" #: Merge.rc:1DC30E66 #, c-format msgid "&Discard changes" -msgstr "ÀúÀå ¾È ÇÔ(&D)" +msgstr "º¯°æ»çÇ× Ãë¼Ò(&D)" #: Merge.rc:24BA673E #, c-format msgid "Middle side file" -msgstr "" +msgstr "°¡¿îµ¥ ÆÄÀÏ" #: Merge.rc:F2F641C #, c-format msgid "Sa&ve changes" -msgstr "" +msgstr "º¯°æ»çÇ× ÀúÀå(&V)" #: Merge.rc:71E3C8E4 #, c-format msgid "Disca&rd changes" -msgstr "" +msgstr "º¯°æ»çÇ× Ãë¼Ò(&R)" #: Merge.rc:47D4A3FB #, c-format @@ -2160,17 +2162,17 @@ msgstr " #: Merge.rc:F2F641D #, c-format msgid "S&ave changes" -msgstr "ÀúÀå(&A)" +msgstr "º¯°æ»çÇ× ÀúÀå(&A)" #: Merge.rc:71E3C8E5 #, c-format msgid "Dis&card changes" -msgstr "ÀúÀå ¾È ÇÔ(&C)" +msgstr "º¯°æ»çÇ× Ãë¼Ò(&C)" #: Merge.rc:5578260F #, c-format msgid "Disca&rd All" -msgstr "" +msgstr "ÀüºÎ Ãë¼Ò(&R)" #: Merge.rc:4C3E0A2F #, c-format @@ -2185,17 +2187,25 @@ msgstr " #: Merge.rc:132D699F #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" -msgstr "À¯´ÏÄÚµå ÆÄÀÏÀÌ ¾Æ´Ñ ÆÄÀÏÀ» ¿ ¶§ ±âº»À¸·Î »ç¿ëÇÒ ÄÚµåÆäÀÌÁö ¼±ÅÃ:" +msgstr "ºñÀ¯´ÏÄÚµå ÆÄÀÏ ¿ ¶§ »ç¿ëÇÒ ±âº» ÄÚµåÆäÀÌÁö:" #: Merge.rc:5CC85DF4 #, c-format -msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" +msgid "" +"Detect codepage info for these files: .html, .rc, .xml \n" +"need to restart session" msgstr "" +"´ÙÀ½ ÆÄÀÏÀÇ ÄÚµåÆäÀÌÁö Á¤º¸ °¨Áö: .html, .rc, .xml\n" +"¼¼¼ÇÀ» Àç½ÃÀÛÇØ¾ß ÇÔ" #: Merge.rc:3BCD5104 #, c-format -msgid "Detect codepage for text files using mlang.dll\nneed to restart session" +msgid "" +"Detect codepage for text files using mlang.dll\n" +"need to restart session" msgstr "" +"mlang.dllÀ» ÀÌ¿ëÇØ ÅØ½ºÆ® ÆÄÀÏÀÇ ÄÚµåÆäÀÌÁö °¨Áö\n" +"¼¼¼ÇÀ» Àç½ÃÀÛÇØ¾ß ÇÔ" #: Merge.rc:E6D7F1 #, c-format @@ -2205,17 +2215,17 @@ msgstr " #: Merge.rc:4F3C2B88 #, c-format msgid "According to WinMerge User Interface" -msgstr "WinMerge UI¸¦ µû¸§" +msgstr "WinMerge »ç¿ëÀÚ ÀÎÅÍÆäÀÌ½º¸¦ µû¸§" #: Merge.rc:8AF7E6A #, c-format msgid "Custom codepage:" -msgstr "" +msgstr "»ç¿ëÀÚ ÄÚµåÆäÀÌÁö:" #: Merge.rc:6CD65B95 #, c-format msgid "Options" -msgstr "¼³Á¤" +msgstr "¿É¼Ç" #: Merge.rc:D32E2F1 #, c-format @@ -2245,12 +2255,12 @@ msgstr "Å° #: Merge.rc:1AFA3492 #, c-format msgid "Function names:" -msgstr "ÇÔ¼ö:" +msgstr "ÇÔ¼ö ÀÌ¸§:" #: Merge.rc:3B833B8B #, c-format msgid "Comments:" -msgstr "ÁÖ¼®:" +msgstr "ÄÚ¸àÆ®:" #: Merge.rc:7B25D658 #, c-format @@ -2275,12 +2285,12 @@ msgstr " #: Merge.rc:24173EE5 #, c-format msgid "User 1:" -msgstr "»ç¿ëÀÚ ¼³Á¤ 1:" +msgstr "»ç¿ëÀÚ 1:" #: Merge.rc:24173EE6 #, c-format msgid "User 2:" -msgstr "»ç¿ëÀÚ ¼³Á¤ 2:" +msgstr "»ç¿ëÀÚ 2:" #: Merge.rc:3C10FC2 #, c-format @@ -2290,7 +2300,7 @@ msgstr " #: Merge.rc:387F7980 #, c-format msgid "Folder Compare Report" -msgstr "µð·ºÅä¸® ºñ±³ °á°ú ¸®Æ÷Æ®" +msgstr "Æú´õ ºñ±³ º¸°í¼" #: Merge.rc:3ECF34A3 #, c-format @@ -2305,12 +2315,12 @@ msgstr "Ã£ #: Merge.rc:89AF4FD #, c-format msgid "&Style:" -msgstr "Çü½Ä(&S):" +msgstr "½ºÅ¸ÀÏ(&S):" #: Merge.rc:545FEEA4 #, c-format msgid "&Include File Compare Report" -msgstr "" +msgstr "ÆÄÀÏ ºñ±³ º¸°í¼ Æ÷ÇÔ(&I)" #: Merge.rc:3938FFC5 #, c-format @@ -2320,42 +2330,42 @@ msgstr "Å¬ #: Merge.rc:43600E90 #, c-format msgid "Shared or Private Filter" -msgstr "°øÀ¯ / °³ÀÎ ÇÊÅÍ" +msgstr "°øÀ¯/°³ÀÎ ÇÊÅÍ" #: Merge.rc:74E96E1E #, c-format msgid "Which type of filter do you want to create?" -msgstr "»ý¼ºÇÒ ÇÊÅÍ Çü½ÄÀ» ¼±ÅÃÇÏ½Ê½Ã¿À" +msgstr "¾î¶² Çü½ÄÀÇ ÇÊÅÍ¸¦ ¸¸µé±î¿ä?" #: Merge.rc:444EF527 #, c-format msgid "Shared Filter (for all users on this machine)" -msgstr "°øÀ¯ ÇÊÅÍ (¸ðµç »ç¿ëÀÚ)" +msgstr "°øÀ¯ ÇÊÅÍ (¸ðµç »ç¿ëÀÚ¿ë)" #: Merge.rc:11304E6 #, c-format msgid "Private Filter (only for current user)" -msgstr "°³ÀÎ ÇÊÅÍ (ÇöÀç »ç¿ëÀÚ)" +msgstr "°³ÀÎ ÇÊÅÍ (ÇöÀç »ç¿ëÀÚ¸¸)" #: Merge.rc:7D9F30CF #, c-format msgid "Archive Support" -msgstr "¾ÐÃà ÆÄÀÏ Áö¿ø" +msgstr "¾ÐÃà Áö¿ø" #: Merge.rc:545FEEA5 #, c-format msgid "&Enable archive file support" -msgstr "¾ÐÃà ÆÄÀÏ Áö¿ø »ç¿ë(&E)" +msgstr "¾ÐÃà ÆÄÀÏ Áö¿ø »ç¿ëÇÏ±â(&E)" #: Merge.rc:70C9C72D #, c-format msgid "&Detect archive type from file signature" -msgstr "ÆÄÀÏ ¼¸íÀ¸·ÎºÎÅÍ ¾ÐÃà Çü½Ä °¨Áö(&D)" +msgstr "ÆÄÀÏ ¼¸í¿¡¼ ¾ÐÃà Çü½Ä °¨ÁöÇÏ±â(&D)" #: Merge.rc:1AC98D0B #, c-format msgid "Compare Statistics" -msgstr "ºñ±³ ¿ä¾à" +msgstr "Åë°è ºñ±³" #: Merge.rc:64ABCD7E #, c-format @@ -2385,7 +2395,7 @@ msgstr " #: Merge.rc:26535499 #, c-format msgid "Unique" -msgstr "ÇÑÂÊ¸¸ Á¸Àç" +msgstr "°íÀ¯ÇÑ" #: Merge.rc:602FC82 #, c-format @@ -2415,22 +2425,22 @@ msgstr " #: Merge.rc:2FC0BA7B #, c-format msgid "Middle:" -msgstr "" +msgstr "°¡¿îµ¥:" #: Merge.rc:2CEE4749 #, c-format msgid "Missing Left:" -msgstr "" +msgstr "¿ÞÂÊ ¾øÀ½:" #: Merge.rc:2A79A039 #, c-format msgid "Missing Middle:" -msgstr "" +msgstr "°¡¿îµ¥ ¾øÀ½:" #: Merge.rc:70DAA20F #, c-format msgid "Missing Right:" -msgstr "" +msgstr "¿À¸¥ÂÊ ¾øÀ½:" #: Merge.rc:413EF3DC #, c-format @@ -2445,22 +2455,22 @@ msgstr "( #: Merge.rc:E4471B #, c-format msgid "Select Codepage for" -msgstr "ÄÚµåÆäÀÌÁö ¼±ÅÃ:" +msgstr "ÄÚµåÆäÀÌÁö ¼±ÅÃ" #: Merge.rc:5A9A713E #, c-format msgid "&File Loading:" -msgstr "¿ ¶§ÀÇ ÄÚµåÆäÀÌÁö(&F):" +msgstr "ÆÄÀÏ ºÒ·¯¿À±â(&F):" #: Merge.rc:7A4CFAFC #, c-format msgid "File &Saving:" -msgstr "ÀúÀå½Ã ÄÚµåÆäÀÌÁö(&S):" +msgstr "ÆÄÀÏ ÀúÀåÇÏ±â(&S):" #: Merge.rc:175DEEED #, c-format msgid "&Use same codepage for both" -msgstr "¾çÂÊ ¸ðµÎ µ¿ÀÏ ÄÚµåÆäÀÌÁö Àû¿ë(&U)" +msgstr "¾çÂÊ¿¡ °°Àº ÄÚµåÆäÀÌÁö »ç¿ë(&U)" #: Merge.rc:1D2E49FC #, c-format @@ -2475,12 +2485,12 @@ msgstr " #: Merge.rc:72A593B8 #, c-format msgid "Test Filter" -msgstr "ÇÊÅÍ ½ÃÇè" +msgstr "ÇÊÅÍ Å×½ºÆ®" #: Merge.rc:5CCED708 #, c-format msgid "Testing filter ..." -msgstr "ÇÊÅÍ ..." +msgstr "ÇÊÅÍ Å×½ºÆ® Áß..." #: Merge.rc:4EF81630 #, c-format @@ -2490,7 +2500,7 @@ msgstr " #: Merge.rc:4DE14277 #, c-format msgid "&Folder Name" -msgstr "Æú´õ¸í(&F)" +msgstr "Æú´õ ÀÌ¸§(&F)" #: Merge.rc:4876CD3F #, c-format @@ -2500,7 +2510,7 @@ msgstr " #: Merge.rc:43017E4E #, c-format msgid "&Test" -msgstr "½ÃÇè(&T)" +msgstr "Å×½ºÆ®(&T)" #: Merge.rc:1D2E49FD #, c-format @@ -2510,32 +2520,32 @@ msgstr " #: Merge.rc:175DEEEE #, c-format msgid "&Use customized text colors" -msgstr "»ç¿ëÀÚ »ö»ó »ç¿ë(&U)" +msgstr "»ç¿ëÀÚ ÅØ½ºÆ® »ö»ó »ç¿ëÇÏ±â(&U)" #: Merge.rc:1AC98D0C #, c-format msgid "Custom text colors" -msgstr "»ç¿ëÀÚ »ö»ó" +msgstr "»ç¿ëÀÚ ÅØ½ºÆ® »ö»ó" #: Merge.rc:3FE25901 #, c-format msgid "Whitespace:" -msgstr "°ø¹é:" +msgstr "°ø¹é ¹®ÀÚ:" #: Merge.rc:3ECF34A4 #, c-format msgid "Regular text:" -msgstr "ÅØ½ºÆ®:" +msgstr "ÀÏ¹Ý ÅØ½ºÆ®:" #: Merge.rc:751AB590 #, c-format msgid "Selection:" -msgstr "¼±ÅÃ ºÎºÐ:" +msgstr "¼±ÅÃ:" #: Merge.rc:2FC0BA7C #, c-format msgid "Margin:" -msgstr "" +msgstr "¿©¹é:" #: Merge.rc:D109E01 #, c-format @@ -2580,47 +2590,47 @@ msgstr " #: Merge.rc:69AD3BF9 #, c-format msgid "Create backup files in:" -msgstr "´ÙÀ½¿¡ ¹é¾÷ ÆÄÀÏ »ý¼º:" +msgstr "¹é¾÷ ÆÄÀÏ ¸¸µé±â:" #: Merge.rc:78B3B627 #, c-format msgid "&Folder compare" -msgstr "µð·ºÅä¸® ºñ±³(&F)" +msgstr "Æú´õ ºñ±³¿¡¼(&F)" #: Merge.rc:7A4CFAFD #, c-format msgid "Fil&e compare" -msgstr "ÆÄÀÏ ºñ±³(&E)" +msgstr "ÆÄÀÏ ºñ±³¿¡¼(&E)" #: Merge.rc:334E25B2 #, c-format msgid "Create backup files into:" -msgstr "´ÙÀ½À¸·Î ¹é¾÷ ÆÄÀÏ »ý¼º:" +msgstr "¹é¾÷ ÆÄÀÏ ¸¸µé±â:" #: Merge.rc:381D79E7 #, c-format msgid "&Original file's folder" -msgstr "¿øº» ÆÄÀÏ Æú´õ(&O)" +msgstr "¿øº» ÆÄÀÏ Æú´õ·Î(&O)" #: Merge.rc:714B45FE #, c-format msgid "&Global backup folder:" -msgstr "Àü¿ª ¹é¾÷ Æú´õ(&G):" +msgstr "Àü¿ª ¹é¾÷ Æú´õ·Î(&G):" #: Merge.rc:1F7B33EC #, c-format msgid "Backup filename:" -msgstr "¹é¾÷ ÆÄÀÏ¸í:" +msgstr "¹é¾÷ ÆÄÀÏ ÀÌ¸§:" #: Merge.rc:381D79E8 #, c-format msgid "&Append .bak -extension" -msgstr ".bak È®ÀåÀÚ Ãß°¡(&A)" +msgstr ".bak È®ÀåÀÚ µ¡ºÙÀÌ±â(&A)" #: Merge.rc:129644DE #, c-format msgid "A&ppend timestamp" -msgstr "ÆÄÀÏ ½Ã°£ Ãß°¡(&P)" +msgstr "Å¸ÀÓ½ºÅÆÇÁ µ¡ºÙÀÌ±â(&P)" #: Merge.rc:CAEDA36 #, c-format @@ -2630,12 +2640,12 @@ msgstr " #: Merge.rc:36D268E9 #, c-format msgid "Are you sure you want to copy XXX items?" -msgstr "Á¤¸» XXX Ç×¸ñÀ» º¹»çÇÏ½Ã°Ú½À´Ï±î?" +msgstr "XXX Ç×¸ñÀ» Á¤¸» º¹»çÇÒ±î¿ä?" #: Merge.rc:30CDE281 #, c-format msgid "From left" -msgstr "¿ÞÂÊÀ¸·ÎºÎÅÍ" +msgstr "¿ÞÂÊ¿¡¼" #: Merge.rc:2C015CFE #, c-format @@ -2655,82 +2665,82 @@ msgstr " #: Merge.rc:B612C23 #, c-format msgid "Plugins" -msgstr "" +msgstr "ÇÃ·¯±×ÀÎ" #: Merge.rc:78B3B628 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "ÇÃ·¯±×ÀÎ »ç¿ë" #: Merge.rc:62909ED6 #, c-format msgid "Shell Integration" -msgstr "" +msgstr "½© ÅëÇÕ" #: Merge.rc:31DC8C62 #, c-format msgid "Explorer" -msgstr "" +msgstr "Å½»ö±â" #: Merge.rc:673BD331 #, c-format msgid "E&nable advanced menu" -msgstr "°í±Þ ¸Þ´º È°¼ºÈ(&N)" +msgstr "°í±Þ ¸Þ´º »ç¿ëÇÏ±â(&N)" #: Merge.rc:4EF81631 #, c-format msgid "&Add to context menu" -msgstr "" +msgstr "¿ìÅ¬¸¯ ¸Þ´º¿¡ Ãß°¡ÇÏ±â(&A)" #: Merge.rc:26A6974B #, c-format msgid "&Register shell extension" -msgstr "" +msgstr "½© È®ÀåÀÚ µî·ÏÇÏ±â(&R)" #: Merge.rc:175DEEEF #, c-format msgid "&Unregister shell extension" -msgstr "" +msgstr "½© È®ÀåÀÚ µî·Ï ÇØÁ¦(&U)" #: Merge.rc:7262BE24 #, c-format msgid "Folder" -msgstr "µð·ºÅä¸®" +msgstr "Æú´õ" #: Merge.rc:60B696AF #, c-format msgid "S&top after first difference" -msgstr "Â÷ÀÌÁ¡ ¹ß°ß½Ã ¹Ù·Î ÁßÁö(&T)" +msgstr "Ã¹ Â÷ÀÌÁ¡ ÀÌÈÄ ÁßÁöÇÏ±â(&T)" #: Merge.rc:7FF2B80B #, c-format msgid "Ign&ore time differences less than 3 seconds" -msgstr "3ÃÊ ÀÌ³» ½Ã°£ Â÷ÀÌ´Â ¹«½ÃÇÏ±â(&O)" +msgstr "3ÃÊ ÀÌ³»ÀÇ ½Ã°£ Â÷ÀÌÁ¡ ¹«½ÃÇÏ±â(&O)" #: Merge.rc:6D5B7719 #, c-format msgid "&Include unique subfolders contents" -msgstr "" +msgstr "À¯ÀÏÇÑ ÇÏÀ§ Æú´õ ³»¿ë Æ÷ÇÔÇÏ±â(&I)" #: Merge.rc:3E136C28 #, c-format msgid "&Automatically expand all subfolders" -msgstr "" +msgstr "ÀüÃ¼ ÇÏÀ§ Æú´õ ÀÚµ¿ È®ÀåÇÏ±â(&A)" #: Merge.rc:5D032167 #, c-format msgid "Ignore &Reparse Points" -msgstr "" +msgstr "ÀçºÐ¼® ÁöÁ¡ ¹«½ÃÇÏ±â(&R)" #: Merge.rc:2E2C5208 #, c-format msgid "&Quick compare limit (MB):" -msgstr "" +msgstr "ºü¸¥ ºñ±³ Á¦ÇÑ (MB):" #: Merge.rc:2188DD49 #, c-format msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):" -msgstr "" +msgstr "ºñ±³ ¾²·¹µå °³¼ö (À½¼ö°ªÀº »ç¿ë °¡´ÉÇÑ CPU ÄÚ¾î °³¼öÀÇ Ãß°¡¸¦ ¶æÇÕ´Ï´Ù):" #: Merge.rc:17BC2F9E #, c-format @@ -2740,42 +2750,42 @@ msgstr " #: Merge.rc:7AAB28B8 #, c-format msgid "Binary File &Patterns:" -msgstr "" +msgstr "¹ÙÀÌ³Ê¸® ÆÄÀÏ ÆÐÅÏ(&P):" #: Merge.rc:4F5264C9 #, c-format msgid "Frhed settings" -msgstr "" +msgstr "Frhed ¼³Á¤" #: Merge.rc:1A8FADD5 #, c-format msgid "View &Settings..." -msgstr "" +msgstr "º¸±â ¼³Á¤(&S)..." #: Merge.rc:78B3B629 #, c-format msgid "&Binary Mode..." -msgstr "" +msgstr "¹ÙÀÌ³Ê¸® ¸ðµå(&B)..." #: Merge.rc:1A9EBDF3 #, c-format msgid "&Character Set..." -msgstr "" +msgstr "¹®ÀÚ¼Â(&C)..." #: Merge.rc:B8C361 #, c-format msgid "Image" -msgstr "" +msgstr "ÀÌ¹ÌÁö" #: Merge.rc:2C4A6C6D #, c-format msgid "Image File &Patterns:" -msgstr "" +msgstr "ÀÌ¹ÌÁö ÆÄÀÏ ÆÐÅÏ(&P):" #: Merge.rc:4DB19839 #, c-format msgid "&Hex View" -msgstr "" +msgstr "16Áø¼ö º¸±â(&H)" #: Merge.rc:206940 #, c-format @@ -2809,18 +2819,30 @@ msgstr "REC" #: Merge.rc:E8950E9 #, c-format -msgid "\nNew Documents (Ctrl+N)" +msgid "" +"\n" +"New Documents (Ctrl+N)" msgstr "" +"\n" +"»õ ¹®¼ (Ctrl+N)" #: Merge.rc:28AAB7D #, c-format -msgid "\nOpen (Ctrl+O)" +msgid "" +"\n" +"Open (Ctrl+O)" msgstr "" +"\n" +"¿±â (Ctrl+O)" #: Merge.rc:28AAB7E #, c-format -msgid "\nSave (Ctrl+S)" +msgid "" +"\n" +"Save (Ctrl+S)" msgstr "" +"\n" +"ÀúÀå (Ctrl+S)" #: Merge.rc:524AB109 #, c-format @@ -2840,22 +2862,30 @@ msgstr " #: Merge.rc:3FCEF5DC #, c-format msgid "Project file successfully loaded." -msgstr "ÇÁ·ÎÁ§Æ®°¡ Á¤»óÀûÀ¸·Î ¿·È½À´Ï´Ù." +msgstr "ÇÁ·ÎÁ§Æ® ÆÄÀÏÀ» ¼º°øÀûÀ¸·Î ºÒ·¯¿Ô½À´Ï´Ù." #: Merge.rc:3BDD62C3 #, c-format msgid "Project file successfully saved." -msgstr "ÇÁ·ÎÁ§Æ®°¡ Á¤»óÀûÀ¸·Î ÀúÀåµÇ¾ú½À´Ï´Ù." +msgstr "ÇÁ·ÎÁ§Æ® ÆÄÀÏÀ» ¼º°øÀûÀ¸·Î ÀúÀåÇß½À´Ï´Ù." #: Merge.rc:28AAB7F #, c-format -msgid "\nUndo (Ctrl+Z)" +msgid "" +"\n" +"Undo (Ctrl+Z)" msgstr "" +"\n" +"½ÇÇà Ãë¼Ò (Ctrl+Z)" #: Merge.rc:28AAB80 #, c-format -msgid "\nRedo (Ctrl+Y)" +msgid "" +"\n" +"Redo (Ctrl+Y)" msgstr "" +"\n" +"´Ù½Ã ½ÇÇà (Ctrl+Y)" #: Merge.rc:2B78E95D #, c-format @@ -2907,12 +2937,12 @@ msgstr "" #: Merge.rc:3EF068BF #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." -msgstr "WinMerge´Â Àý´ëÀûÀ¸·Î º¸ÁõµÇÁö ¾Ê½À´Ï´Ù. ÀÌ ¼ÒÇÁÆ®¿þ¾î´Â ¹«·áÀÌ¸ç, ÀûÀýÇÑ È¯°æ ÇÏ¿¡¼ÀÇ ¹èÆ÷´Â È¯¿µÇÕ´Ï´Ù; ÀÚ¼¼ÇÑ ³»¿ëÀº µµ¿ò¸» ¸Þ´º¿¡¼ GNU ¶óÀÌ¼¾½º¸¦ ÂüÁ¶ÇÏ½Ê½Ã¿À." +msgstr "WinMerge´Â Àý´ë·Î º¸Áõ ¾øÀÌ Á¦°øµË´Ï´Ù. ÀÌ ¼ÒÇÁÆ®¿þ¾î´Â ¹«·áÀÌ¸ç, Æ¯Á¤ »óÈ²¿¡¼ Àç¹èÆ÷´Â È¯¿µÇÕ´Ï´Ù; ÀÚ¼¼ÇÑ ³»¿ëÀº µµ¿ò¸» ¸Þ´ºÀÇ GNU ÀÏ¹Ý °øÁß ¶óÀÌ¼±½º¸¦ È®ÀÎÇÏ¼¼¿ä." #: Merge.rc:1D2E49FF #, c-format msgid "&Abort" -msgstr "ÁßÁö(&A)" +msgstr "Ãë¼Ò(&A)" #: Merge.rc:1D2E4A00 #, c-format @@ -2937,7 +2967,7 @@ msgstr " #: Merge.rc:48B5872E #, c-format msgid "Yes to &all" -msgstr "¸ðµÎ Àû¿ë(&A)" +msgstr "¸ðµÎ ¿¹(&A)" #: Merge.rc:11D981 #, c-format @@ -2957,12 +2987,12 @@ msgstr " #: Merge.rc:43017E4F #, c-format msgid "&Skip" -msgstr "¹«½Ã(&S)" +msgstr "°Ç³Ê¶Ù±â(&S)" #: Merge.rc:2D1160B0 #, c-format msgid "Skip &all" -msgstr "¸ðµÎ ¹«½Ã(&A)" +msgstr "ÀüºÎ °Ç³Ê¶Ù±â(&A)" #: Merge.rc:77C09B82 #, c-format @@ -2977,12 +3007,12 @@ msgstr " #: Merge.rc:39000D57 #, c-format msgid "Syntax" -msgstr "" +msgstr "±¸¹®" #: Merge.rc:2C1D73C8 #, c-format msgid "Version Control" -msgstr "Çü»ó °ü¸®" +msgstr "¹öÀü °ü¸®" #: Merge.rc:2C0C2241 #, c-format @@ -2997,7 +3027,7 @@ msgstr "->" #: Merge.rc:68EE6DF1 #, c-format msgid "From left:" -msgstr "¿ÞÂÊÀ¸·ÎºÎÅÍ:" +msgstr "¿ÞÂÊ¿¡¼:" #: Merge.rc:2C015CFF #, c-format @@ -3007,7 +3037,7 @@ msgstr " #: Merge.rc:34DF5071 #, c-format msgid "From right:" -msgstr "¿À¸¥ÂÊÀ¸·ÎºÎÅÍ:" +msgstr "¿À¸¥ÂÊ¿¡¼:" #: Merge.rc:542A4301 #, c-format @@ -3027,17 +3057,17 @@ msgstr " #: Merge.rc:295600 #, c-format msgid "X64" -msgstr "" +msgstr "X64" #: Merge.rc:761E6873 #, c-format msgid "Options (%1)" -msgstr "¼³Á¤ (%1)" +msgstr "¿É¼Ç (%1)" #: Merge.rc:4BDBDC64 #, c-format msgid "All message boxes are now displayed again." -msgstr "ÀÌÁ¦ ¸ðµç ¸Þ½ÃÁö ¹Ú½º°¡ È°¼ºÈµË´Ï´Ù." +msgstr "ÀÌÁ¦ ¸ðµç ¸Þ½ÃÁö ¹Ú½º¸¦ ´Ù½Ã Ç¥½ÃÇÕ´Ï´Ù." #: Merge.rc:37825D6A #, c-format @@ -3046,9 +3076,9 @@ msgid "" "\n" "Please use values 1 - %1." msgstr "" -"ÅÇ Å©±â °ª -ÇÊµå °ªÀÌ ¹üÀ§¸¦ ÃÊ°úÇß½À´Ï´Ù.\n" +"ÅÇ Å©±â ÇÊµåÀÇ °ªÀÌ WinMergeÀÇ Çã¿ë ¹üÀ§¿¡ ÀÖÁö ¾Ê½À´Ï´Ù.\n" "\n" -"°¡´É ¹üÀ§: 1 - %1." +"1 - %1ÀÇ °ªÀ» »ç¿ëÇÏ¼¼¿ä." #: Merge.rc:47E5C8F #, c-format @@ -3058,12 +3088,12 @@ msgstr " #: Merge.rc:3E105584 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" -msgstr "ÇÁ·Î±×·¥|*.exe;*.bat;*.cmd|¸ðµç ÆÄÀÏ (*.*)|*.*||" +msgstr "ÇÁ·Î±×·¥|*.exe;*.bat;*.cmd|ÀüÃ¼ ÆÄÀÏ (*.*)|*.*||" #: Merge.rc:222D39F7 #, c-format msgid "All Files (*.*)|*.*||" -msgstr "¸ðµç ÆÄÀÏ (*.*)|*.*||" +msgstr "ÀüÃ¼ ÆÄÀÏ (*.*)|*.*||" #: Merge.rc:237E9033 #, c-format @@ -3073,22 +3103,22 @@ msgstr "WinMerge #: Merge.rc:BEDA09D #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" -msgstr "¼³Á¤ ÆÄÀÏ (*.ini)|*.ini|All Files (*.*)|*.*||" +msgstr "¿É¼Ç ÆÄÀÏ (*.ini)|*.ini|ÀüÃ¼ ÆÄÀÏ (*.*)|*.*||" #: Merge.rc:3FF615A0 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" -msgstr "Text ÆÄÀÏ (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|¸ðµç ÆÄÀÏ (*.*)|*.*||" +msgstr "Text ÆÄÀÏ (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|ÀüÃ¼ ÆÄÀÏ (*.*)|*.*||" #: Merge.rc:59814668 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -msgstr "HTML ÆÄÀÏ (*.htm,*.html)|*.htm;*.html|¸ðµç ÆÄÀÏ (*.*)|*.*||" +msgstr "HTML ÆÄÀÏ (*.htm,*.html)|*.htm;*.html|ÀüÃ¼ ÆÄÀÏ (*.*)|*.*||" #: Merge.rc:67444ADC #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" -msgstr "XML ÆÄÀÏ (*.xml)|*.xml|¸ðµç ÆÄÀÏ (*.*)|*.*||" +msgstr "XML ÆÄÀÏ (*.xml)|*.xml|ÀüÃ¼ ÆÄÀÏ (*.*)|*.*||" #: Merge.rc:46FCCCE #, c-format @@ -3098,7 +3128,7 @@ msgstr " #: Merge.rc:15875422 #, c-format msgid "Location" -msgstr "°æ·Î" +msgstr "À§Ä¡" #: Merge.rc:59F506A0 #, c-format @@ -3118,12 +3148,12 @@ msgstr " #: Merge.rc:D6BB425 #, c-format msgid "Select filename for new filter" -msgstr "»ý¼ºÇÒ ÇÊÅÍÀÇ ÆÄÀÏ¸íÀ» ÀÔ·ÂÇÏ½Ê½Ã¿À." +msgstr "»õ ÇÊÅÍÀÇ ÆÄÀÏ ÀÌ¸§À» ¼±ÅÃÇÏ¼¼¿ä" #: Merge.rc:764E4AD3 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" -msgstr "ÆÄÀÏ ÇÊÅÍ (*.flt)|*.flt|¸ðµç ÇÊÅÍ (*.*)|*.*||" +msgstr "ÆÄÀÏ ÇÊÅÍ (*.flt)|*.flt|ÀüÃ¼ ÇÊÅÍ (*.*)|*.*||" #: Merge.rc:24B5241A #, c-format @@ -3135,7 +3165,8 @@ msgid "" msgstr "" "ÇÊÅÍ ÅÛÇÃ¸´ ÆÄÀÏÀ» Ã£À» ¼ö ¾ø½À´Ï´Ù!\n" "\n" -"%1 ÆÄÀÏÀ» WinMerge/Filters -Æú´õ·Î º¹»çÇÏ½Ê½Ã¿À." +"%1 ÆÄÀÏÀ» ´ÙÀ½ WinMerge/Filters Æú´õ¿¡ º¹»çÇÏ¼¼¿ä:\n" +"%2" #: Merge.rc:2A045B49 #, c-format @@ -3145,10 +3176,10 @@ msgid "" "\n" "Please make sure the folder exists and is writable." msgstr "" -"ÇÊÅÍ ÅÛÇÃ¸´ ÆÄÀÏÀ» ÇÊÅÍ Æú´õ·Î º¹»çÇÒ ¼ö ¾øÀ½:\n" +"ÇÊÅÍ ÅÛÇÃ¸´ ÆÄÀÏÀ» ÇÊÅÍ Æú´õ·Î º¹»çÇÒ ¼ö ¾ø½À´Ï´Ù:\n" "%1\n" "\n" -"Æú´õ°¡ Á¸ÀçÇÏ°í ¾²±â °¡´ÉÀÎÁö È®ÀÎÇÏ½Ê½Ã¿À." +"Æú´õ°¡ Á¸ÀçÇÏ°í ¾²±â °¡´ÉÇÑÁö È®ÀÎÇÏ¼¼¿ä." #: Merge.rc:4EA7BACD #, c-format @@ -3157,9 +3188,9 @@ msgid "" "\n" "Please select filter folder in Options/System." msgstr "" -"»ç¿ëÀÚ ÇÊÅÍ ÆÄÀÏ Æú´õ°¡ ÁöÁ¤µÇÁö ¾ÊÀ½!\n" +"»ç¿ëÀÚ ÇÊÅÍ ÆÄÀÏ Æú´õ¸¦ Á¤ÀÇÇÏÁö ¾Ê¾Ò½À´Ï´Ù!\n" "\n" -"¼³Á¤/½Ã½ºÅÛ ¸Þ´º¿¡¼ ÇÊÅÍ Æú´õ¸¦ ¼±ÅÃÇÏ½Ê½Ã¿À." +"¿É¼Ç/½Ã½ºÅÛ¿¡¼ ÇÊÅÍ Æú´õ¸¦ ¼±ÅÃÇÏ¼¼¿ä." #: Merge.rc:7DDEC9BD #, c-format @@ -3186,34 +3217,40 @@ msgid "" "\n" "Could not copy new filter file to filter folder." msgstr "" -"ÇÊÅÍ ÆÄÀÏ ¼³Ä¡ ½ÇÆÐ.\n" +"ÇÊÅÍ ÆÄÀÏ ¼³Ä¡¿¡ ½ÇÆÐÇß½À´Ï´Ù.\n" "\n" -"»õ ÇÊÅÍ ÆÄÀÏÀ» ÇÊÅÍ Æú´õ·Î º¹»çÇÒ ¼ö ¾ø½À´Ï´Ù." +"»õ ÇÊÅÍ ÆÄÀÏÀ» ÇÊÅÍ Æú´õ¿¡ º¹»çÇÒ ¼ö ¾ø½À´Ï´Ù." #: Merge.rc:5704C4AC #, c-format msgid "Filter file already exists. Overwrite existing filter?" -msgstr "ÇÊÅÍ ÆÄÀÏÀÌ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾²±â ÇÏ½Ã°Ú½À´Ï±î?" +msgstr "ÇÊÅÍ ÆÄÀÏÀÌ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù. ±âÁ¸ÀÇ ÇÊÅÍ¸¦ µ¤¾î¾µ±î¿ä?" #: Merge.rc:237A126 #, c-format msgid "Regular expression" -msgstr "Á¤±Ô Ç¥Çö½Ä" +msgstr "Á¤±Ô½Ä" #: Merge.rc:34BD4316 #, c-format -msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgid "" +"Filters were updated. Do you want to refresh all open folder compares?\n" +"\n" +"If you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" +"ÇÊÅÍ¸¦ ¾÷µ¥ÀÌÆ®Çß½À´Ï´Ù. ¿·Á ÀÖ´Â ¸ðµç Æú´õ ºñ±³¸¦ °»½ÅÇÒ±î¿ä?\n" +"\n" +"¸ðµç ºñ±³¸¦ °»½ÅÇÏ°í ½ÍÁö ¾ÊÀ¸¸é, ÀÌÁ¦ ¾Æ´Ï¿À¸¦ ¼±ÅÃÇÏ°í ³ªÁß¿¡ ºñ±³¸¦ °»½ÅÇÒ ¼ö ÀÖ½À´Ï´Ù." #: Merge.rc:1DC30E67 #, c-format msgid "&Path to SS.EXE:" -msgstr "" +msgstr "SS.EXE °æ·Î(&P):" #: Merge.rc:114DD351 #, c-format msgid "Folder Comparison Results" -msgstr "µð·ºÅä¸® ºñ±³ °á°ú" +msgstr "Æú´õ ºñ±³ °á°ú" #: Merge.rc:1AFA3493 #, c-format @@ -3223,17 +3260,17 @@ msgstr " #: Merge.rc:2FEFC30D #, c-format msgid "Untitled left" -msgstr "ÀÌ¸§¾ø´Â ¹®¼" +msgstr "¿ÞÂÊ Á¦¸ñ ¾øÀ½" #: Merge.rc:730B3FD4 #, c-format msgid "Untitled middle" -msgstr "" +msgstr "°¡¿îµ¥ Á¦¸ñ ¾øÀ½" #: Merge.rc:4E089EF3 #, c-format msgid "Untitled right" -msgstr "ÀÌ¸§¾ø´Â ¹®¼" +msgstr "¿À¸¥ÂÊ Á¦¸ñ ¾øÀ½" #: Merge.rc:72A593B9 #, c-format @@ -3243,22 +3280,22 @@ msgstr " #: Merge.rc:427C12C1 #, c-format msgid "Mine File" -msgstr "¸¶ÀÎ ÆÄÀÏ" +msgstr "³» ÆÄÀÏ" #: Merge.rc:DD21174 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" -msgstr "" +msgstr "ÁÙ: %s ¿: %d/%d ¹®ÀÚ: %d/%d ÁÙ³¡: %s" #: Merge.rc:15875423 #, c-format msgid "Line: %s" -msgstr "¶óÀÎ: %s" +msgstr "ÁÙ: %s" #: Merge.rc:6F3BCB35 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" -msgstr "" +msgstr "ÁÙ: %s ¿: %d/%d ¹®ÀÚ: %d/%d" #: Merge.rc:7C664E1 #, c-format @@ -3268,17 +3305,17 @@ msgstr " #: Merge.rc:7A8FD78B #, c-format msgid "Difference %1 of %2" -msgstr "´Ù¸¥ ÆÄÀÏ(%1 of %2)" +msgstr "Â÷ÀÌÁ¡ %1 / %2" #: Merge.rc:62773E9 #, c-format msgid "%1 Differences Found" -msgstr "%1°³ÀÇ Â÷ÀÌÁ¡ Á¸Àç" +msgstr "%1°³ Â÷ÀÌÁ¡ ¹ß°ß" #: Merge.rc:6B78A819 #, c-format msgid "1 Difference Found" -msgstr "1°³ÀÇ Â÷ÀÌÁ¡ Á¸Àç" +msgstr "1°³ Â÷ÀÌÁ¡ ¹ß°ß" #. Abbreviation from "Read Only" #: Merge.rc:13E12 @@ -3299,32 +3336,32 @@ msgstr " #: Merge.rc:6C6653C7 #, c-format msgid "Select two existing folders or files to compare" -msgstr "ºñ±³ÇÒ µð·ºÅä¸® ¶Ç´Â ÆÄÀÏÀ» ¼±ÅÃÇÏ½Ê½Ã¿À." +msgstr "ºñ±³ÇÒ ±âÁ¸ÀÇ Æú´õ³ª ÆÄÀÏ µÎ °³¸¦ ¼±ÅÃÇÏ¼¼¿ä" #: Merge.rc:444C5DDC #, c-format msgid "Folder Selection" -msgstr "µð·ºÅä¸® ¼±ÅÃ" +msgstr "Æú´õ ¼±ÅÃ" #: Merge.rc:73F34BA1 #, c-format msgid "Select two folders or two files to compare." -msgstr "ºñ±³ÇÒ µð·ºÅä¸®/ÆÄÀÏ ¼±ÅÃ" +msgstr "ºñ±³ÇÒ µÎ Æú´õ/ÆÄÀÏÀ» ¼±ÅÃÇÏ¼¼¿ä" #: Merge.rc:20155F59 #, c-format msgid "Left path is invalid!" -msgstr "¿ÞÂÊÀº Àß¸øµÈ °æ·ÎÀÔ´Ï´Ù!" +msgstr "¿ÞÂÊ °æ·Î´Â ¹«È¿ÇÕ´Ï´Ù!" #: Merge.rc:7F2E4119 #, c-format msgid "Middle path is invalid!" -msgstr "" +msgstr "°¡¿îµ¥ °æ·Î°¡ ¹«È¿ÇÕ´Ï´Ù!" #: Merge.rc:6DBD6124 #, c-format msgid "Right path is invalid!" -msgstr "¿À¸¥ÂÊÀº Àß¸øµÈ °æ·ÎÀÔ´Ï´Ù!" +msgstr "¿À¸¥ÂÊ °æ·Î´Â ¹«È¿ÇÕ´Ï´Ù!" #: Merge.rc:5AB9EEA7 #, c-format @@ -3334,42 +3371,42 @@ msgstr " #: Merge.rc:5F458439 #, c-format msgid "Left and middle path is invalid!" -msgstr "" +msgstr "¿ÞÂÊ°ú °¡¿îµ¥ °æ·Î´Â ¹«È¿ÇÕ´Ï´Ù!" #: Merge.rc:F75DAF8 #, c-format msgid "Left and right path is invalid!" -msgstr "" +msgstr "¿ÞÂÊ°ú ¿À¸¥ÂÊ °æ·Î´Â ¹«È¿ÇÕ´Ï´Ù!" #: Merge.rc:3703FFD7 #, c-format msgid "Middle and right path is invalid!" -msgstr "" +msgstr "°¡¿îµ¥¿Í ¿À¸¥ÂÊ °æ·Î°¡ ¹«È¿ÇÕ´Ï´Ù!" #: Merge.rc:237A0533 #, c-format msgid "All paths are invalid!" -msgstr "" +msgstr "ÀüÃ¼ °æ·Î°¡ ¹«È¿ÇÕ´Ï´Ù!" #: Merge.rc:39B1AD01 #, c-format msgid "Choose two files to enable unpacker selection." -msgstr "¾ðÆÑÄ¿ ¼±ÅÃ È°¼ºÈ¸¦ À§ÇØ µÎ ÆÄÀÏÀ» ¼±ÅÃÇÏ½Ê½Ã¿À." +msgstr "¾ðÆÐÄ¿ ¼±ÅÃÀ» È°¼ºÈÇÏ·Á¸é µÎ ÆÄÀÏÀ» ¼±ÅÃÇÏ¼¼¿ä." #: Merge.rc:30FF7A4E #, c-format msgid "Cannot compare file and folder!" -msgstr "µð·ºÅä¸®/ÆÄÀÏÀ» ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù!" +msgstr "ÆÄÀÏ ¹× Æú´õ¸¦ ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù!" #: Merge.rc:62AC5DDB #, c-format msgid "File not found: %1" -msgstr "ÇØ´çÇÏ´Â ÆÄÀÏÀÌ ¾ø½À´Ï´Ù : %1" +msgstr "ÆÄÀÏÀ» Ã£À» ¼ö ¾ø½À´Ï´Ù: %1" #: Merge.rc:387F7981 #, c-format msgid "File not unpacked: %1" -msgstr "unpack µÈ ÆÄÀÏ: %1" +msgstr "ÆÄÀÏÀÇ ÀÚ·á º¯È¯À» ÇÏÁö ¾Ê¾Ò½À´Ï´Ù: %1" #: Merge.rc:3676909F #, c-format @@ -3379,7 +3416,7 @@ msgid "" "\n" "%2" msgstr "" -"¿ ¼ö ¾ø´Â ÆÄÀÏÀÔ´Ï´Ù.\n" +"´ÙÀ½ ÆÄÀÏÀ» ¿ ¼ö ¾ø½À´Ï´Ù\n" "%1\n" "\n" "%2" @@ -3387,7 +3424,7 @@ msgstr "" #: Merge.rc:53CCF475 #, c-format msgid "Failed to parse conflict file." -msgstr "ºÒÀÏÄ¡ ÆÄÀÏ ÆÄ½Ì ½ÇÆÐ." +msgstr "ºÒÀÏÄ¡ ÆÄÀÏ ºÐ¼® ½ÇÆÐ" #: Merge.rc:5A765252 #, c-format @@ -3397,8 +3434,8 @@ msgid "" "is not a conflict file." msgstr "" "´ÙÀ½\n" -"%1 ÆÄÀÏÀº\n" -"ºÒÀÏÄ¡ ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù." +"%1\n" +"ÆÄÀÏÀº Ãæµ¹ ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù." #: Merge.rc:67019DCD #, c-format @@ -3408,17 +3445,17 @@ msgstr " #: Merge.rc:E4471C #, c-format msgid "Save changes to %1?" -msgstr "%1 ÀÇ º¯°æµÈ ºÎºÐÀ» ÀúÀåÇÒ±î¿ä?" +msgstr "%1ÀÇ º¯°æ»çÇ×À» ÀúÀåÇÒ±î¿ä?" #: Merge.rc:6A1C6855 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" -msgstr "%1 (Àº)´Â ÀÐ±â Àü¿ë ÆÄÀÏÀÔ´Ï´Ù. µ¤¾î ¾µ±î¿ä? (´Ù¸¥ ÀÌ¸§À¸·Î ÀúÀåÇÏ·Á¸é ¾Æ´Ï¿À¸¦ ¼±ÅÃÇÏ¼¼¿ä.)" +msgstr "%1Àº ÀÐ±â Àü¿ë ÆÄÀÏÀÔ´Ï´Ù. ÀÐ±â Àü¿ë ÆÄÀÏÀ» ¹«½ÃÇÒ±î¿ä? (»õ ÀÌ¸§À¸·Î ÀúÀåÇÏ·Á¸é ¾Æ´Ï¿À¸¦ ¼±ÅÃÇÏ¼¼¿ä.)" #: Merge.rc:673BD332 #, c-format msgid "Error backing up file" -msgstr "ÆÄÀÏ ¹é¾÷À» ÇÒ ¼ö ¾ø½À´Ï´Ù" +msgstr "ÆÄÀÏ ¹é¾÷ Áß ¿À·ù" #: Merge.rc:3958104B #, c-format @@ -3443,11 +3480,12 @@ msgid "" "\t-use a different filename (Press Ok)\n" "\t-abort the current operation (Press Cancel)?" msgstr "" -"ÆÄÀÏ ÀúÀåÀ» ÇÒ ¼ö ¾ø½À´Ï´Ù.\n" +"ÆÄÀÏ ÀúÀå¿¡ ½ÇÆÐÇß½À´Ï´Ù.\n" "%1\n" "%2\n" -"\t- ´Ù¸¥ ÀÌ¸§À¸·Î ÀúÀå(È®ÀÎ)\n" -"\t- ÀúÀå Ãë¼Ò(Ãë¼Ò)?" +"¾î¶»°Ô ÇÒ±î¿ä?\n" +"\t- ´Ù¸¥ ÀÌ¸§À¸·Î ÀúÀå (È®ÀÎ ¹öÆ°)\n" +"\t- ÆÄÀÏ ÀúÀåÇÏ±â ÁßÁö (Ãë¼Ò ¹öÆ°)" #: Merge.rc:3895053E #, c-format @@ -3458,6 +3496,11 @@ msgid "" "\n" "Do you want to save the unpacked version to another file?" msgstr "" +"'%2' ÇÃ·¯±×ÀÎÀº ¿ÞÂÊ ÆÄÀÏ¿¡¼ ´Ù½Ã '%1'À¸·Î º¯°æÇÑ »çÇ×À» ÀÚ·á º¯È¯ÇÒ ¼ö ¾ø½À´Ï´Ù.\n" +"\n" +"¿øº» ÆÄÀÏÀº º¯°æµÇÁö ¾ÊÀ» °ÍÀÔ´Ï´Ù.\n" +"\n" +"ÀÚ·á º¯È¯µÇÁö ¾ÊÀº ¹öÀüÀ» ´Ù¸¥ ÆÄÀÏ¿¡ ÀúÀåÇÒ±î¿ä?" #: Merge.rc:5A0BA2DF #, c-format @@ -3468,6 +3511,11 @@ msgid "" "\n" "Do you want to save the unpacked version to another file?" msgstr "" +"'%2' ÇÃ·¯±×ÀÎÀº ¿À¸¥ÂÊ ÆÄÀÏ¿¡¼ ´Ù½Ã '%1'À¸·Î º¯°æÇÑ »çÇ×À» ÀÚ·á º¯È¯ÇÒ ¼ö ¾ø½À´Ï´Ù.\n" +"\n" +"¿øº» ÆÄÀÏÀº º¯°æµÇÁö ¾ÊÀ» °ÍÀÔ´Ï´Ù.\n" +"\n" +"ÀÚ·á º¯È¯µÇÁö ¾ÊÀº ¹öÀüÀ» ´Ù¸¥ ÆÄÀÏ¿¡ ÀúÀåÇÒ±î¿ä?" #: Merge.rc:78367A47 #, c-format @@ -3478,10 +3526,11 @@ msgid "" "\n" "Overwrite changed file?" msgstr "" -"¿ÜºÎ ÇÁ·Î±×·¥¿¡ ÀÇÇØ ÆÄÀÏÀÌ º¯°æµÇ¾ú½À´Ï´Ù.\n" +"WinMerger¿¡¼ ºÒ·¯¿Í¼ »ç¿ë ÁßÀÎ\n" "%1\n" +"ÆÄÀÏÀ» ´Ù¸¥ ÇÁ·Î±×·¥¿¡¼ º¯°æÇß½À´Ï´Ù.\n" "\n" -"µ¤¾î¾µ±î¿ä?" +"º¯°æµÈ ÆÄÀÏÀ» µ¤¾î¾µ±î¿ä?" #: Merge.rc:462FB760 #, c-format @@ -3490,12 +3539,22 @@ msgid "" "is marked read-only. Would you like to override the read-only item?" msgstr "" "%1\n" -"ÀÐ±â Àü¿ë ÆÄÀÏÀÔ´Ï´Ù. µ¤¾î¾²½Ã°Ú½À´Ï±î?" +"Àº ÀÐ±â Àü¿ë ÆÄÀÏÀÔ´Ï´Ù. ÀÐ±â Àü¿ë Ç×¸ñÀ» ¹«½ÃÇÒ±î¿ä?" #: Merge.rc:B9192B #, c-format -msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" +msgid "" +"Another application has updated file\n" +"%1\n" +"since WinMerge scanned it last time.\n" +"\n" +"Do you want to reload the file?" msgstr "" +"WinMerge¿¡¼ Áö³¹ø¿¡ ½ºÄµÇÑ\n" +"%1\n" +"ÆÄÀÏÀ» ´Ù¸¥ ÇÁ·Î±×·¥¿¡¼ º¯°æÇß½À´Ï´Ù.\n" +"\n" +"±× ÆÄÀÏÀ» ´Ù½Ã ºÒ·¯¿Ã±î¿ä?" #: Merge.rc:62909ED7 #, c-format @@ -3505,7 +3564,7 @@ msgstr " #: Merge.rc:E4471D #, c-format msgid "Save Middle File As" -msgstr "" +msgstr "°¡¿îµ¥ ÆÄÀÏ ´Ù¸¥ ÀÌ¸§À¸·Î ÀúÀå" #: Merge.rc:6F833C19 #, c-format @@ -3514,8 +3573,14 @@ msgstr " #: Merge.rc:3C4620F #, c-format -msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." +msgid "" +"The file\n" +"%1\n" +"has disappeared. Please save a copy of the file to continue." msgstr "" +"ÆÄÀÏ\n" +"%1\n" +"ÀÌ »ç¶óÁ³½À´Ï´Ù. °è¼ÓÇÏ·Á¸é ÀÌ ÆÄÀÏÀÇ »çº»À» ÀúÀåÇÏ¼¼¿ä." #: Merge.rc:4BFC8F0D #, c-format @@ -3524,14 +3589,14 @@ msgid "" "\n" "Refresh documents before continuing." msgstr "" -"¹®¼°¡ ½ÌÅ©°¡ ¸ÂÁö ¾Ê¾Æ º´ÇÕ ÀÛ¾÷À» ÁøÇàÇÒ ¼ö ¾ø½À´Ï´Ù.\n" +"¹®¼°¡ µ¿±âÈµÇÁö ¾ÊÀ¸¸é Â÷ÀÌÁ¡À» º´ÇÕÇÒ ¼ö ¾ø½À´Ï´Ù.\n" "\n" -"°è¼ÓÇÏ±â Àü¿¡ »õ·Î °íÄ§À» ÇØ ÁÖ¼¼¿ä." +"°è¼ÓÇÏ±â Àü¿¡ ¹®¼¸¦ °»½ÅÇÏ¼¼¿ä." #: Merge.rc:5C264194 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" -msgstr "°è¼ÓÇÏ·Á¸é ¼Ò½º¼¼ÀÌÇÁ ÇÁ·ÎÁ§Æ® °æ·Î¸¦ ¼³Á¤ÇØ¾ß ÇÕ´Ï´Ù (¿¹: $/MyProject)" +msgstr "°è¼ÓÇÏ·Á¸é SourceSafe ÇÁ·ÎÁ§Æ® °æ·Î¸¦ ¼³Á¤ÇØ¾ß ÇÕ´Ï´Ù (¿¹: $/MyProject)" #: Merge.rc:367690A0 #, c-format @@ -3541,22 +3606,22 @@ msgstr "VSS Ã¼Å© #: Merge.rc:5CF52976 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." -msgstr "Ã¼Å©¾Æ¿ô ½ÇÇà Áß ¿À·ù°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù. ´õ ÀÌ»ó ÁøÇàÇÒ ¼ö ¾ø½À´Ï´Ù..." +msgstr "¹öÀü °ü¸® ½Ã½ºÅÛ¿¡¼ ÆÄÀÏ °Ë»ç¸¦ ½ÃµµÇÏ´Â Áß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù. ´õ ÀÌ»ó °è¼ÓÇÒ ¼ö ¾ø½À´Ï´Ù..." #: Merge.rc:5B2409A #, c-format msgid "Error executing versioning system command." -msgstr "¹öÀü °ü¸®½Ã½ºÅÛ ¸í·É ½ÇÇà ½ÇÆÐ." +msgstr "¹öÀü °ü¸® ½Ã½ºÅÛ ¸í·É¾î ½ÇÇà ¿À·ù." #: Merge.rc:3ECC9EC3 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" -msgstr "VSS ¿öÅ· Æú´õ¿Í ÇöÀç ÆÄÀÏÀÇ °æ·Î°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù. °è¼ÓÇÏ°Ú½À´Ï±î?" +msgstr "VSS ÀÛ¾÷ Æú´õ¿Í ÇöÀç ÆÄÀÏÀÇ À§Ä¡°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù. °è¼ÓÇÒ±î¿ä?" #: Merge.rc:BF7A253 #, c-format msgid "No VSS database(s) found!" -msgstr "VSS µ¥ÀÌÅÍº£ÀÌ½º°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù!" +msgstr "VSS µ¥ÀÌÅÍº£ÀÌ½º°¡ ¾ø½À´Ï´Ù!" #: Merge.rc:61E8009D #, c-format @@ -3570,6 +3635,9 @@ msgid "" " Please, check config spec of used view.\n" " Undo checkout operation?" msgstr "" +"¹öÀü °ü¸® ½Ã½ºÅÛ¿¡¼ ÆÄÀÏ °Ë»ç¸¦ ½ÃµµÇÏ´Â Áß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù.\n" +" »ç¿ëµÈ º¸±â ¼³Á¤ÀÇ ½ºÆåÀ» È®ÀÎÇØ º¸¼¼¿ä.\n" +" È®ÀÎ ÀÛ¾÷ÀÇ ½ÇÇàÀ» Ãë¼ÒÇÒ±î¿ä?" #: Merge.rc:1929D7D3 #, c-format @@ -3577,11 +3645,13 @@ msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" " Please, check config spec of used view. " msgstr "" +"¹öÀü °ü¸® ½Ã½ºÅÛ¿¡¼ ÆÄÀÏÀÇ È®ÀÎ ÀÛ¾÷ ½ÇÇàÀ» Ãë¼ÒÇÏ´Â Áß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù.\n" +" »ç¿ëµÈ º¸±â ¼³Á¤ÀÇ ½ºÆåÀ» È®ÀÎÇÏ¼¼¿ä." #: Merge.rc:46FCCCF #, c-format msgid "None" -msgstr "»ç¿ë ¾È ÇÔ" +msgstr "¾øÀ½" #: Merge.rc:5164E1E6 #, c-format @@ -3596,72 +3666,72 @@ msgstr "Visual SourceSafe (5.0 #: Merge.rc:2405135 #, c-format msgid "Break at whitespace" -msgstr "°ø¹é ¹ß°ß½Ã ¸ØÃã" +msgstr "°ø¹é¿¡¼ ¸ØÃã" #: Merge.rc:6CB369C2 #, c-format msgid "Break at whitespace or punctuation" -msgstr "°ø¹é ¶Ç´Â ±¸µÎÁ¡ ¹ß°ß½Ã ¸ØÃã" +msgstr "°ø¹é ¶Ç´Â ±¸µÎÁ¡¿¡¼ ¸ØÃã" #: Merge.rc:237A127 #, c-format msgid "Right to Left (%1)" -msgstr "¿ÞÂÊÀ¸·Î (%1)" +msgstr "¿À¸¥ÂÊ¿¡¼ ¿ÞÂÊÀ¸·Î (%1)" #: Merge.rc:52D3F9F6 #, c-format msgid "Right to Middle (%1)" -msgstr "" +msgstr "¿À¸¥ÂÊ¿¡¼ °¡¿îµ¥·Î (%1)" #: Merge.rc:17F5B413 #, c-format msgid "Middle to Left (%1)" -msgstr "" +msgstr "°¡¿îµ¥¿¡¼ ¿ÞÂÊÀ¸·Î (%1)" #: Merge.rc:66C0CE9F #, c-format msgid "Middle to Right (%1)" -msgstr "" +msgstr "°¡¿îµ¥¿¡¼ ¿À¸¥ÂÊÀ¸·Î (%1)" #: Merge.rc:7271FF80 #, c-format msgid "Left to Right (%1)" -msgstr "¿À¸¥ÂÊÀ¸·Î (%1)" +msgstr "¿ÞÂÊ¿¡¼ ¿À¸¥ÂÊÀ¸·Î (%1)" #: Merge.rc:5BCDF0E7 #, c-format msgid "Left to Middle (%1)" -msgstr "" +msgstr "¿ÞÂÊ¿¡¼ °¡¿îµ¥·Î (%1)" #: Merge.rc:71676C48 #, c-format msgid "Left to... (%1)" -msgstr "¿ÞÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1)" +msgstr "¿ÞÂÊ¿¡¼... (%1)" #: Merge.rc:729280DB #, c-format msgid "Middle to... (%1)" -msgstr "" +msgstr "°¡¿îµ¥¿¡¼... (%1)" #: Merge.rc:32BFDBAD #, c-format msgid "Right to... (%1)" -msgstr "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1)" +msgstr "¿À¸¥ÂÊ¿¡¼... (%1)" #: Merge.rc:36B164C5 #, c-format msgid "Both to... (%1)" -msgstr "" +msgstr "¾çÂÊ... (%1)" #: Merge.rc:2515A6BD #, c-format msgid "All to... (%1)" -msgstr "" +msgstr "ÀüºÎ... (%1)" #: Merge.rc:290D6FC6 #, c-format msgid "Differences to... (%1)" -msgstr "" +msgstr "Â÷ÀÌÁ¡... (%1)" #: Merge.rc:1B633070 #, c-format @@ -3671,7 +3741,7 @@ msgstr " #: Merge.rc:13C27215 #, c-format msgid "Middle (%1)" -msgstr "" +msgstr "°¡¿îµ¥ (%1)" #: Merge.rc:39174D9B #, c-format @@ -3681,27 +3751,27 @@ msgstr " #: Merge.rc:146A5939 #, c-format msgid "Both (%1)" -msgstr "¸ðµÎ (%1)" +msgstr "¾çÂÊ (%1)" #: Merge.rc:669F87F5 #, c-format msgid "All (%1)" -msgstr "" +msgstr "ÀüÃ¼ (%1)" #: Merge.rc:DD21175 #, c-format msgid "Left side - select destination folder:" -msgstr "¿ÞÂÊ - ÀÌµ¿ÇÒ µð·ºÅä¸®¸¦ ¼±ÅÃÇÏ¼¼¿ä:" +msgstr "¿ÞÂÊ - ´ë»ó Æú´õ¸¦ ¼±ÅÃÇÏ¼¼¿ä:" #: Merge.rc:2B480620 #, c-format msgid "Middle side - select destination folder:" -msgstr "" +msgstr "°¡¿îµ¥ - ´ë»ó Æú´õ¸¦ ¼±ÅÃÇÏ¼¼¿ä:" #: Merge.rc:5BBC5591 #, c-format msgid "Right side - select destination folder:" -msgstr "¿À¸¥ÂÊ - ÀÌµ¿ÇÒ µð·ºÅä¸®¸¦ ¼±ÅÃÇÏ¼¼¿ä:" +msgstr "¿À¸¥ÂÊ - ´ë»ó Æú´õ¸¦ ¼±ÅÃÇÏ¼¼¿ä:" #: Merge.rc:66367ECA #, c-format @@ -3720,19 +3790,19 @@ msgid "" "\n" "%1 ?" msgstr "" -"Á¤¸» »èÁ¦ÇÏ½Ã°Ú½À´Ï±î\n" +"´ÙÀ½À» Á¤¸» »èÁ¦ÇÒ±î¿ä?\n" "\n" -"%1 ?" +"%1" #: Merge.rc:2019BE6D #, c-format msgid "Are you sure you want to copy:" -msgstr "Á¤¸» º¹»çÇÏ½Ã°Ú½À´Ï±î:" +msgstr "Á¤¸» º¹»çÇÒ±î¿ä:" #: Merge.rc:2B0F0BA3 #, c-format msgid "Are you sure you want to copy %d items:" -msgstr "Á¤¸» %d Ç×¸ñÀ» º¹»çÇÏ½Ã°Ú½À´Ï±î:" +msgstr "%d Ç×¸ñÀ» Á¤¸» º¹»çÇÒ±î¿ä:" #: Merge.rc:59B96CF #, c-format @@ -3745,26 +3815,32 @@ msgid "" "\n" "Please refresh the compare." msgstr "" +"ÀÛ¾÷À» Ãë¼ÒÇß½À´Ï´Ù!\n" +"\n" +"µð½ºÅ©ÀÇ Æú´õ ³»¿ëÀÌ º¯°æµÇ¾ú½À´Ï´Ù, °æ·Î\n" +"%1\n" +"À» Ã£À» ¼ö ¾ø½À´Ï´Ù.\n" +"ºñ±³¸¦ »õ·Î °íÄ§ÇÏ¼¼¿ä." #: Merge.rc:2019BE6E #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr "Á¤¸» ÀÌµ¿ÇÒ±î¿ä:" #: Merge.rc:2B0F0BA4 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr "%d Ç×¸ñÀ» Á¤¸» ÀÌµ¿ÇÒ±î¿ä:" #: Merge.rc:CAEDA37 #, c-format msgid "Confirm Move" -msgstr "" +msgstr "ÀÌµ¿ È®ÀÎ" #: Merge.rc:1E9E7AFF #, c-format msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?" -msgstr "" +msgstr "Æú´õ ºñ±³ ÁßÀÎ Ã¢À» ´ÝÀ¸·Á°í ÇÕ´Ï´Ù. ÀÌ Ã¢À» Á¤¸» ´ÝÀ»±î¿ä?" #: Merge.rc:4B6299EF #, c-format @@ -3779,7 +3855,7 @@ msgstr " #: Merge.rc:64ABCD7F #, c-format msgid "Filename" -msgstr "ÀÌ¸§" +msgstr "ÆÄÀÏ ÀÌ¸§" #: Merge.rc:D404EDE #, c-format @@ -3799,7 +3875,7 @@ msgstr " #: Merge.rc:13C27216 #, c-format msgid "Middle Date" -msgstr "" +msgstr "°¡¿îµ¥ ³¯Â¥" #: Merge.rc:9B50030 #, c-format @@ -3819,7 +3895,7 @@ msgstr " #: Merge.rc:13C27217 #, c-format msgid "Middle Size" -msgstr "" +msgstr "°¡¿îµ¥ Å©±â" #: Merge.rc:237A128 #, c-format @@ -3834,7 +3910,7 @@ msgstr " #: Merge.rc:17F5B414 #, c-format msgid "Middle Size (Short)" -msgstr "" +msgstr "°¡¿îµ¥ Å©±â (Âª°Ô)" #: Merge.rc:7271FF81 #, c-format @@ -3849,7 +3925,7 @@ msgstr " #: Merge.rc:66C0CEA0 #, c-format msgid "Middle Creation Time" -msgstr "" +msgstr "°¡¿îµ¥ »ý¼º ½Ã°£" #: Merge.rc:4909ADB5 #, c-format @@ -3869,12 +3945,12 @@ msgstr " #: Merge.rc:17F5B415 #, c-format msgid "Middle File Version" -msgstr "" +msgstr "°¡¿îµ¥ ÆÄÀÏ ¹öÀü" #: Merge.rc:194397DE #, c-format msgid "Short Result" -msgstr "¿ä¾à °á°ú" +msgstr "ÂªÀº °á°ú" #: Merge.rc:71676C49 #, c-format @@ -3889,22 +3965,22 @@ msgstr " #: Merge.rc:729280DC #, c-format msgid "Middle Attributes" -msgstr "" +msgstr "°¡¿îµ¥ ¼Ó¼º" #: Merge.rc:15875424 #, c-format msgid "Left EOL" -msgstr "¿ÞÂÊ EOL" +msgstr "¿ÞÂÊ ÁÙ³¡" #: Merge.rc:D0645BD #, c-format msgid "Middle EOL" -msgstr "" +msgstr "°¡¿îµ¥ ÁÙ³¡" #: Merge.rc:5F87E5D #, c-format msgid "Right EOL" -msgstr "¿À¸¥ÂÊ EOL" +msgstr "¿À¸¥ÂÊ ÁÙ³¡" #: Merge.rc:5C8E17CF #, c-format @@ -3919,12 +3995,12 @@ msgstr " #: Merge.rc:2A79A03A #, c-format msgid "Middle Encoding" -msgstr "" +msgstr "°¡¿îµ¥ ÀÎÄÚµù" #: Merge.rc:6B6D8966 #, c-format msgid "Ignored Diff." -msgstr "ºñ±³ÇÏÁö ¾ÊÀº Â÷ÀÌÁ¡" +msgstr "¹«½ÃµÈ Â÷ÀÌÁ¡" #: Merge.rc:76C8AB99 #, c-format @@ -3934,17 +4010,17 @@ msgstr " #: Merge.rc:4166A155 #, c-format msgid "Item aborted" -msgstr "ºñ±³ ÁßÁöµÈ ÆÄÀÏ" +msgstr "Ãë¼ÒµÈ Ç×¸ñ" #: Merge.rc:670ABDC3 #, c-format msgid "File skipped" -msgstr "ÇÊÅÍ¸µµÈ ÆÄÀÏ" +msgstr "ÆÄÀÏÀ» °Ç³Ê¶Ù¾ú½À´Ï´Ù" #: Merge.rc:4F5264CA #, c-format msgid "Folder skipped" -msgstr "ÇÊÅÍ¸µµÈ µð·ºÅä¸®" +msgstr "°Ç³Ê¶Ú Æú´õ" #: Merge.rc:5C8E17D0 #, c-format @@ -3954,7 +4030,7 @@ msgstr " #: Merge.rc:2A79A03B #, c-format msgid "Middle only: %1" -msgstr "" +msgstr "°¡¿îµ¥¸¸: %1" #: Merge.rc:1B176020 #, c-format @@ -3964,57 +4040,57 @@ msgstr " #: Merge.rc:576B1A36 #, c-format msgid "Does not exist in %1" -msgstr "" +msgstr "%1¿¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù" #: Merge.rc:6B248E76 #, c-format msgid "Binary files are identical" -msgstr "µ¿ÀÏÇÑ ÆÄÀÏ(¹ÙÀÌ³Ê¸® ÆÄÀÏ)" +msgstr "¹ÙÀÌ³Ê¸® ÆÄÀÏÀÌ µ¿ÀÏÇÕ´Ï´Ù" #: Merge.rc:6B248E77 #, c-format msgid "Binary files are different" -msgstr "µ¿ÀÏÇÏÁö ¾ÊÀº ÆÄÀÏ(¹ÙÀÌ³Ê¸® ÆÄÀÏ)" +msgstr "¹ÙÀÌ³Ê¸® ÆÄÀÏÀÌ ´Ù¸¨´Ï´Ù" #: Merge.rc:72DF5DE2 #, c-format msgid "Files are different" -msgstr "µ¿ÀÏÇÏÁö ¾ÊÀº ÆÄÀÏ" +msgstr "ÆÄÀÏÀÌ ¼·Î ´Ù¸¨´Ï´Ù" #: Merge.rc:387F7982 #, c-format msgid "Folders are different" -msgstr "" +msgstr "Æú´õ°¡ ´Ù¸¨´Ï´Ù" #: Merge.rc:1B633073 #, c-format msgid "Left Only" -msgstr "¿ÞÂÊ¸¸ Á¸Àç" +msgstr "¿ÞÂÊ¸¸" #: Merge.rc:39174D9E #, c-format msgid "Right Only" -msgstr "¿À¸¥ÂÊ¸¸ Á¸Àç" +msgstr "¿À¸¥ÂÊ¸¸" #: Merge.rc:13C27218 #, c-format msgid "Middle Only" -msgstr "" +msgstr "°¡¿îµ¥¸¸" #: Merge.rc:638BD42C #, c-format msgid "No item in left" -msgstr "" +msgstr "¿ÞÂÊ¿¡ Ç×¸ñ ¾øÀ½" #: Merge.rc:DEEB1BA #, c-format msgid "No item in right" -msgstr "" +msgstr "¿À¸¥ÂÊ¿¡ Ç×¸ñ ¾øÀ½" #: Merge.rc:2FE785D7 #, c-format msgid "No item in middle" -msgstr "" +msgstr "°¡¿îµ¥¿¡ Ç×¸ñ ¾øÀ½" #: Merge.rc:79AB21E1 #, c-format @@ -4024,57 +4100,57 @@ msgstr " #: Merge.rc:12D66B44 #, c-format msgid "Text files are identical" -msgstr "" +msgstr "ÅØ½ºÆ® ÆÄÀÏÀÌ °°½À´Ï´Ù" #: Merge.rc:12D66B45 #, c-format msgid "Text files are different" -msgstr "" +msgstr "ÅØ½ºÆ® ÆÄÀÏÀÌ ´Ù¸¨´Ï´Ù" #: Merge.rc:203BBC7B #, c-format msgid "Elapsed time: %ld ms" -msgstr "¼Ò¿ä ½Ã°£: %ld ms" +msgstr "°æ°ú ½Ã°£: %ld ms" #: Merge.rc:6C7BF198 #, c-format msgid "1 item selected" -msgstr "1 Ç×¸ñ ¼±ÅÃ" +msgstr "1°³ Ç×¸ñ ¼±ÅÃ" #: Merge.rc:5D49B8EC #, c-format msgid "%1 items selected" -msgstr "%1 Ç×¸ñ ¼±ÅÃ" +msgstr "%1°³ Ç×¸ñ ¼±ÅÃ" #: Merge.rc:3A5D5963 #, c-format msgid "Filename or folder name." -msgstr "µð·ºÅä¸®¸í ¶Ç´Â ÆÄÀÏ¸í." +msgstr "ÆÄÀÏ ÀÌ¸§ ¶Ç´Â Æú´õ ÀÌ¸§." #: Merge.rc:A7628EE #, c-format msgid "Subfolder name when subfolders are included." -msgstr "ÇÏÀ§ µð·ºÅä¸®°¡ ÀÖÀ»¶§ ÇÏÀ§ µð·ºÅä¸® ÀÌ¸§." +msgstr "ÇÏÀ§ Æú´õ¸¦ Æ÷ÇÔÇÒ ¶§ ÇÏÀ§ Æú´õ ÀÌ¸§" #: Merge.rc:6F88EC68 #, c-format msgid "Comparison result, long form." -msgstr "ÀÚ¼¼ÇÑ ºñ±³ °á°ú." +msgstr "ºñ±³ °á°ú ¼¼ºÎ ³»¿ª." #: Merge.rc:28BFDD41 #, c-format msgid "Left side modification date." -msgstr "¿ÞÂÊ ¼öÁ¤ ½Ã°£." +msgstr "¿ÞÂÊ ¼öÁ¤ ³¯Â¥" #: Merge.rc:19B30A68 #, c-format msgid "Right side modification date." -msgstr "¿À¸¥ÂÊ ¼öÁ¤ ½Ã°£." +msgstr "¿À¸¥ÂÊ º¯°æ ³¯Â¥" #: Merge.rc:68FB0CE7 #, c-format msgid "Middle side modification date." -msgstr "" +msgstr "°¡¿îµ¥ º¯°æ ³¯Â¥" #: Merge.rc:453F5DDC #, c-format @@ -4084,47 +4160,47 @@ msgstr " #: Merge.rc:172385A1 #, c-format msgid "Left file size in bytes." -msgstr "¿ÞÂÊ ÆÄÀÏ Å©±â(byte)." +msgstr "¿ÞÂÊ ÆÄÀÏ Å©±â¸¦ ¹ÙÀÌÆ®·Î" #: Merge.rc:94C89D4 #, c-format msgid "Right file size in bytes." -msgstr "¿À¸¥ÂÊ ÆÄÀÏ Å©±â(byte)." +msgstr "¿À¸¥ÂÊ ÆÄÀÏ Å©±â¸¦ ¹ÙÀÌÆ®·Î" #: Merge.rc:27AAA636 #, c-format msgid "Middle file size in bytes." -msgstr "" +msgstr "°¡¿îµ¥ ÆÄÀÏ Å©±â¸¦ ¹ÙÀÌÆ®·Î" #: Merge.rc:2EBBDDD6 #, c-format msgid "Left file size abbreviated." -msgstr "¿ÞÂÊ ÆÄÀÏ Å©±â(Âª°Ô)" +msgstr "¿ÞÂÊ ÆÄÀÏ Å©±â¸¦ Ãà¾àµÊ" #: Merge.rc:21DC7C32 #, c-format msgid "Right file size abbreviated." -msgstr "¿À¸¥ÂÊ ÆÄÀÏ Å©±â(Âª°Ô)" +msgstr "¿À¸¥ÂÊ ÆÄÀÏ Å©±â Ãà¾àµÊ" #: Merge.rc:BA50069 #, c-format msgid "Middle file size abbreviated." -msgstr "" +msgstr "°¡¿îµ¥ ÆÄÀÏ Å©±â Ãà¾àµÊ" #: Merge.rc:172385A2 #, c-format msgid "Left side creation time." -msgstr "¿ÞÂÊ »ý¼º ½Ã°£." +msgstr "¿ÞÂÊ »ý¼º ½Ã°£" #: Merge.rc:94C89D5 #, c-format msgid "Right side creation time." -msgstr "¿À¸¥ÂÊ »ý¼º ½Ã°£." +msgstr "¿À¸¥ÂÊ »ý¼º ½Ã°£" #: Merge.rc:27AAA637 #, c-format msgid "Middle side creation time." -msgstr "" +msgstr "°¡¿îµ¥ »ý¼º ½Ã°£" #: Merge.rc:4B4CD318 #, c-format @@ -4134,87 +4210,87 @@ msgstr " #: Merge.rc:3AF5EAD7 #, c-format msgid "Left side file version, only for some filetypes." -msgstr "¿ÞÂÊ ÆÄÀÏ ¹öÀü(¸ðµç ÆÄÀÏ Á¾·ù¿¡ ´ëÇØ¼ ¾Ë ¼ö´Â ¾ø½À´Ï´Ù)." +msgstr "¿ÞÂÊ ÆÄÀÏ ¹öÀü, ¸î¸î ÆÄÀÏ Çü½Ä¸¸" #: Merge.rc:7413D0D6 #, c-format msgid "Right side file version, only for some filetypes." -msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¹öÀü(¸ðµç ÆÄÀÏ Á¾·ù¿¡ ´ëÇØ¼ ¾Ë ¼ö´Â ¾ø½À´Ï´Ù)." +msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¹öÀü, ¸î¸î ÆÄÀÏ Çü½Ä¸¸" #: Merge.rc:5EB13952 #, c-format msgid "Middle side file version, only for some filetypes." -msgstr "" +msgstr "°¡¿îµ¥ ÆÄÀÏ ¹öÀü, ¸î¸î ÆÄÀÏ Çü½Ä¸¸." #: Merge.rc:43600E91 #, c-format msgid "Short comparison result." -msgstr "°£·«ÇÑ ¿ä¾à °á°ú." +msgstr "ÂªÀº ºñ±³ °á°ú" #: Merge.rc:20155F5A #, c-format msgid "Left side attributes." -msgstr "¿ÞÂÊ ¼Ó¼º." +msgstr "¿ÞÂÊ ¼Ó¼º" #: Merge.rc:6DBD6125 #, c-format msgid "Right side attributes." -msgstr "¿À¸¥ÂÊ ¼Ó¼º." +msgstr "¿À¸¥ÂÊ ¼Ó¼º" #: Merge.rc:7F2E411A #, c-format msgid "Middle side attributes." -msgstr "" +msgstr "°¡¿îµ¥ ¼Ó¼º" #: Merge.rc:703AF3C8 #, c-format msgid "Left side file EOL type" -msgstr "¿ÞÂÊ EOL" +msgstr "¿ÞÂÊ ÆÄÀÏ ÁÙ³¡ Çü½Ä" #: Merge.rc:73E9B1DC #, c-format msgid "Right side file EOL type" -msgstr "¿À¸¥ÂÊ EOL" +msgstr "¿À¸¥ÂÊ ÆÄÀÏ ÁÙ³¡ Çü½Ä" #: Merge.rc:6CA26873 #, c-format msgid "Middle side file EOL type" -msgstr "" +msgstr "°¡¿îµ¥ ÆÄÀÏ ÁÙ³¡ Çü½Ä" #: Merge.rc:5BCDF0E8 #, c-format msgid "Left side encoding." -msgstr "¿ÞÂÊ ÀÎÄÚµù." +msgstr "¿ÞÂÊ ÀÎÄÚµù" #: Merge.rc:52D3F9F7 #, c-format msgid "Right side encoding." -msgstr "¿À¸¥ÂÊ ÀÎÄÚµù." +msgstr "¿À¸¥ÂÊ ÀÎÄÚµù" #: Merge.rc:715905A6 #, c-format msgid "Middle side encoding." -msgstr "" +msgstr "°¡¿îµ¥ ÀÎÄÚµù" #: Merge.rc:58398DFF #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." -msgstr "ÆÄÀÏ ³» ºñ±³ÇÏÁö ¾ÊÀº ºÎºÐÀÇ °³¼ö. Winmerg ¿¡¼ ÀÌ ºÎºÐÀº ¹«½ÃµÇ¸ç, º´ÇÕµÇÁö ¾Ê½À´Ï´Ù." +msgstr "ÆÄÀÏ ³» ¹«½ÃµÈ Â÷ÀÌÁ¡ °³¼ö. WinMerge¿¡¼ ¹«½ÃµÈ ÀÌ Â÷ÀÌÁ¡µéÀº º´ÇÕÇÒ ¼ö ¾ø½À´Ï´Ù." #: Merge.rc:6A6D5CB6 #, c-format msgid "Number of differences in file. This number does not include ignored differences." -msgstr "ÆÄÀÏ ³» Â÷ÀÌÁ¡ÀÇ °³¼ö. ÀÌ´Â ºñ±³ÇÏÁö ¾ÊÀº ºÎºÐÀÇ °³¼ö¸¦ Æ÷ÇÔÇÏÁö ¾Ê½À´Ï´Ù." +msgstr "ÆÄÀÏ ³» Â÷ÀÌÁ¡ÀÇ °³¼ö. ÀÌ ¼ýÀÚ´Â ¹«½ÃµÈ Â÷ÀÌÁ¡À» Æ÷ÇÔÇÏÁö ¾Ê½À´Ï´Ù." #: Merge.rc:A7628EF #, c-format msgid "Shows an asterisk (*) if the file is binary." -msgstr "¹ÙÀÌ³Ê¸® ÆÄÀÏÀÌ¸é * Ç¥½Ã." +msgstr "¹ÙÀÌ³Ê¸® ÆÄÀÏÀÌ¸é * Ç¥½Ã¸¦ º¸ÀÔ´Ï´Ù" #: Merge.rc:1AC98D0D #, c-format msgid "Compare %1 with %2" -msgstr "%1 & %2 ºñ±³" +msgstr "%1À» %2¿Í ºñ±³" #: Merge.rc:E9A77F2 #, c-format @@ -4229,17 +4305,17 @@ msgstr " #: Merge.rc:2E3BFCA3 #, c-format msgid "Simple HTML" -msgstr "´Ü¼ø HTML" +msgstr "´Ü¼øÇÑ HTML" #: Merge.rc:751AB591 #, c-format msgid "Simple XML" -msgstr "´Ü¼ø XML" +msgstr "´Ü¼øÇÑ XML" #: Merge.rc:67FDA050 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" -msgstr "º¸°í¼ ÆÄÀÏÀÌ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?" +msgstr "º¸°í¼ ÆÄÀÏÀÌ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù. ±âÁ¸ÀÇ ÆÄÀÏ¿¡ µ¤¾î¾µ±î¿ä?" #: Merge.rc:630F8340 #, c-format @@ -4247,23 +4323,23 @@ msgid "" "Error creating the report:\n" "%1" msgstr "" -"º¸°í¼ »ý¼º ½ÇÆÐ:\n" +"º¸°í¼ ÀÛ¼º ¿À·ù:\n" "%1" #: Merge.rc:37B243DF #, c-format msgid "The report has been created successfully." -msgstr "º¸°í¼ »ý¼º ¼º°ø" +msgstr "º¸°í¼¸¦ ¼º°øÀûÀ¸·Î ¸¸µé¾ú½À´Ï´Ù." #: Merge.rc:162B12F9 #, c-format msgid "The same file is opened in both panels." -msgstr "¾çÂÊ Ã¢¿¡ µ¿ÀÏÇÑ ÆÄÀÏÀÌ ¿·Á ÀÖ½À´Ï´Ù." +msgstr "°°Àº ÆÄÀÏÀ» ¾çÂÊ Ã¢¿¡ ¿¾ú½À´Ï´Ù." #: Merge.rc:7632E88D #, c-format msgid "The selected files are identical." -msgstr "¼±ÅÃÇÑ ÆÄÀÏµéÀº ³»¿ëÀÌ µ¿ÀÏÇÕ´Ï´Ù." +msgstr "¼±ÅÃÇÑ ÆÄÀÏµéÀº µ¿ÀÏÇÕ´Ï´Ù." #: Merge.rc:44565DBD #, c-format @@ -4273,7 +4349,7 @@ msgstr " #: Merge.rc:5F16D9DC #, c-format msgid "Temporary files could not be created. Check your temporary path settings." -msgstr "ÀÓ½Ã ÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù. ÀÓ½Ã ÆÄÀÏ ¼³Á¤À» È®ÀÎÇÏ¼¼¿ä." +msgstr "ÀÓ½Ã ÆÄÀÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù. ÀÓ½Ã °æ·Î ¼³Á¤À» È®ÀÎÇÏ¼¼¿ä." #: Merge.rc:11E6F584 #, c-format @@ -4284,21 +4360,21 @@ msgid "" "\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)." msgstr "" -"Áö±Ý ºñ±³ÇÏ·Á´Â ÆÄÀÏÀº ´Ù¸¥ Ä³¸®Áö ¸®ÅÏÀ» °¡Áý´Ï´Ù.\n" +"ÀÌ ÆÄÀÏµéÀº ´Ù¸¥ Ä³¸®Áö ¸®ÅÏ Çü½ÄÀ» »ç¿ëÇÕ´Ï´Ù.\n" "\n" -"ÀÌ¹ø ºñ±³ ÀÛ¾÷¿¡¼ ¸ðµç Ä³¸®Áö ¸®ÅÏÀ» µ¿ÀÏÇÏ°Ô Ã³¸®ÇÒ±î¿ä?n?\n" +"ÀÌ¹ø ºñ±³ ÀÛ¾÷½Ã¿¡ ¸ðµç Ä³¸®Áö ¸®ÅÏ Çü½ÄÀ» µ¿µîÇÏ°Ô Ã³¸®ÇÒ±î¿ä?\n" "\n" -"Âü°í: ¸ðµç Ä³¸®Áö ¸®ÅÏÀ» Ç×»ó µ¿ÀÏÇÏ°Ô ÀÛ¾÷ÇÏ·Á¸é, ºñ±³ÅÇ¿¡¼ 'Ä³¸®Áö ¸®ÅÏ ¹«½Ã' ¼³Á¤À» ¼±ÅÃÇÏ¸é µË´Ï´Ù (ÆíÁý/¼³Á¤¿¡¼ ¼±ÅÃ °¡´É)." +"Âü°í: ¸ðµç Ä³¸®Áö ¸®ÅÏÀ» Ç×»ó µ¿µîÇÏ°Ô Ã³¸®ÇÏ·Á¸é, ÆíÁý ¸Þ´º -> ¿É¼Ç ´ëÈ»óÀÚÀÇ ºñ±³ ÅÇ¿¡¼ 'Ä³¸®Áö ¸®ÅÏ Â÷ÀÌ ¹«½Ã..' ¿É¼ÇÀ» ¼³Á¤ÇÏ¸é µË´Ï´Ù." #: Merge.rc:46FB8639 #, c-format msgid "The selected folder is invalid." -msgstr "¼±ÅÃ µð·ºÅä¸® °æ·Î ¿À·ùÀÔ´Ï´Ù." +msgstr "¼±ÅÃÇÑ Æú´õ´Â ¹«È¿ÇÕ´Ï´Ù." #: Merge.rc:4BC3EDDB #, c-format msgid "Cannot open a binary file to editor." -msgstr "¹ÙÀÌ³Ê¸® ÆÄÀÏÀº ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù." +msgstr "¹ÙÀÌ³Ê¸® ÆÄÀÏÀº ÆíÁý±â·Î ¿ ¼ö ¾ø½À´Ï´Ù." #: Merge.rc:279EB840 #, c-format @@ -4309,31 +4385,31 @@ msgid "" "%1\n" "to the other side and open these folders?" msgstr "" -"Æú´õ°¡ ÇÑÂÊ¿¡¸¸ Á¸ÀçÇÏ¿© ¿ ¼ö ¾ø½À´Ï´Ù.\n" +"Æú´õ°¡ ´Ù¸¥ ÂÊ¿¡¸¸ Á¸ÀçÇÏ¿© ¿ ¼ö ¾ø½À´Ï´Ù.\n" "\n" -"¹Ý´ëÂÊ¿¡ ´ë»ó Æú´õ¸¦ »ý¼ºÇÑ ÈÄ ¿©½Ã°Ú½À´Ï±î:\n" +"ÀÏÄ¡ÇÏ´Â Æú´õ:\n" "%1\n" -"?" +"¸¦ ´Ù¸¥ ÂÊ¿¡ ¸¸µé°í ÀÌ Æú´õ¸¦ ¿±î¿ä?" #: Merge.rc:36F211E1 #, c-format msgid "Do you want to move to the next file?" -msgstr "" +msgstr "´ÙÀ½ ÆÄÀÏ·Î ÀÌµ¿ÇÒ±î¿ä?" #: Merge.rc:6A0A36F1 #, c-format msgid "Do you want to move to the previous file?" -msgstr "" +msgstr "ÀÌÀü ÆÄÀÏ·Î ÀÌµ¿ÇÒ±î¿ä?" #: Merge.rc:36F211E2 #, c-format msgid "Do you want to move to the next page?" -msgstr "" +msgstr "´ÙÀ½ ÆäÀÌÁö·Î ÀÌµ¿ÇÒ±î¿ä?" #: Merge.rc:6A0A36F2 #, c-format msgid "Do you want to move to the previous page?" -msgstr "" +msgstr "ÀÌÀü ÆäÀÌÁö·Î ÀÌµ¿ÇÒ±î¿ä?" #: Merge.rc:4A700AB0 #, c-format @@ -4342,109 +4418,113 @@ msgid "" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" "Would you like to treat both files as being in the default windows codepage (recommended)?" msgstr "" -"µÎ ÆÄÀÏÀÇ ÄÚµåÆäÀÌÁö°¡ ´Ù¸¨´Ï´Ù. ¿ÞÂÊ (cp%d) /¿À¸¥ÂÊ (cp%d) \n" -"°¢°¢ÀÇ ÄÚµåÆäÀÌÁö¸¦ À¯ÁöÇÏ´Â °ÍÀÌ ÀÛ¾÷½Ã º¸±â´Â ÁÁÀ¸³ª À§ÇèÇÒ ¼ö ÀÖ½À´Ï´Ù.\n" -"±âÁ¸ À©µµ¿ì ÄÚµåÆäÀÌÁö¸¦ »ç¿ëÇÒ±î¿ä(ÃßÃµ)?" +"¿ÞÂÊ(cp%d)°ú ¿À¸¥ÂÊ(cp%d) ÆÄÀÏÀÇ ÄÚµåÆäÀÌÁö°¡ ¼·Î ´Ù¸¨´Ï´Ù.\n" +"°¢ ÆÄÀÏÀÇ ÄÚµåÆäÀÌÁö·Î Ãâ·ÂÇÏ´Â °ÍÀÌ º¸±â´Â ÁÁÀ¸³ª º´ÇÕÀÌ³ª º¹»çÇÒ ¶§ ¹®Á¦°¡ »ý±æ ¼ö ÀÖ½À´Ï´Ù.\n" +"¾çÂÊ ÆÄÀÏÀ» ±âº» À©µµ¿ì ÄÚµåÆäÀÌÁö·Î ´Ù·ê±î¿ä (±ÇÀå)?" #: Merge.rc:5851E4C8 #, c-format msgid "Information lost due to encoding errors: both files" -msgstr "ÀÎÄÚµù ¿À·ù·Î Á¤º¸ ¼Õ½Ç: ¾çÂÊ ÆÄÀÏ" +msgstr "ÀÎÄÚµù ¿À·ù·Î Á¤º¸°¡ ¼Õ½ÇµÇ¾ú½À´Ï´Ù: ¾çÂÊ ÆÄÀÏ" #: Merge.rc:5851E4C9 #, c-format msgid "Information lost due to encoding errors: first file" -msgstr "" +msgstr "ÀÎÄÚµù ¿À·ù·Î Á¤º¸°¡ ¼Õ½ÇµÇ¾ú½À´Ï´Ù: Ã¹ ¹øÂ° ÆÄÀÏ" #: Merge.rc:31EAB496 #, c-format msgid "Information lost due to encoding errors: second file" -msgstr "" +msgstr "ÀÎÄÚµù ¿À·ù·Î Á¤º¸°¡ ¼Õ½ÇµÇ¾ú½À´Ï´Ù: µÎ ¹øÂ° ÆÄÀÏ" #: Merge.rc:5851E4CA #, c-format msgid "Information lost due to encoding errors: third file" -msgstr "" +msgstr "ÀÎÄÚµù ¿À·ù·Î Á¤º¸°¡ ¼Õ½ÇµÇ¾ú½À´Ï´Ù: ¼¼ ¹øÂ° ÆÄÀÏ" #: Merge.rc:7D4E76C0 #, c-format msgid "No difference" -msgstr "µ¿ÀÏÇÔ" +msgstr "Â÷ÀÌÁ¡ ¾øÀ½" #: Merge.rc:71676C4A #, c-format msgid "Line difference" -msgstr "¶óÀÎ ºñ±³" +msgstr "ÁÙ Â÷ÀÌÁ¡" #: Merge.rc:6DBD6126 #, c-format msgid "Replaced %1 string(s)." -msgstr "¸ðµÎ %1 °³¸¦ ¹Ù²Ù¾ú½À´Ï´Ù." +msgstr "%1°³ ¹®ÀÚ¿À» ¹Ù²å½À´Ï´Ù." #: Merge.rc:334E25B3 #, c-format msgid "Cannot find string \"%s\"" -msgstr "ÇØ´çÇÏ´Â ¹®ÀÚ¿À» Ã£À» ¼ö ¾ø½À´Ï´Ù : \"%s\"" +msgstr "´ÙÀ½ ¹®ÀÚ¿À» Ã£À» ¼ö ¾ø½À´Ï´Ù: \"%s\"" #: Merge.rc:34855CF1 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" -msgstr "" +msgstr "Áö±Ý º´ÇÕ ¸ðµå¿¡ ÁøÀÔ ÁßÀÔ´Ï´Ù. º´ÇÕ ¸ðµå¸¦ ²ô°í ½ÍÀ¸¸é F9 Å°¸¦ ´©¸£¼¼¿ä" #: Merge.rc:5E0C549 #, c-format -msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" +msgid "" +"The number of automatically merged changes: %1\n" +"The number of unresolved conflicts: %2" msgstr "" +"ÀÚµ¿ º´ÇÕµÈ º¯°æ»çÇ× °³¼ö: %1\n" +"¹ÌÇØ°á Ãæµ¹ °³¼ö: %2" #: Merge.rc:7453F857 #, c-format msgid "The change of codepage has been merged" -msgstr "" +msgstr "ÄÚµåÆäÀÌÁö º¯°æ»çÇ×À» º´ÇÕÇß½À´Ï´Ù" #: Merge.rc:162B12FA #, c-format msgid "The changes of codepage are conflicting" -msgstr "" +msgstr "ÄÚµåÆäÀÌÁö º¯°æ»çÇ×ÀÌ Ãæµ¹ÇÏ°í ÀÖ½À´Ï´Ù" #: Merge.rc:7632E88E #, c-format msgid "The change of EOL has been merged" -msgstr "" +msgstr "ÁÙ³¡ º¯°æ»çÇ×À» º´ÇÕÇß½À´Ï´Ù" #: Merge.rc:502A2983 #, c-format msgid "The changes of EOL are conflicting" -msgstr "" +msgstr "ÁÙ³¡ º¯°æ»çÇ×ÀÌ Ãæµ¹ÇÏ°í ÀÖ½À´Ï´Ù" #: Merge.rc:5C8E17D1 #, c-format msgid "Location Pane" -msgstr "À§Ä¡Ã¢" +msgstr "À§Ä¡ Ã¢" #: Merge.rc:629C1DDF #, c-format msgid "Diff Pane" -msgstr "ºñ±³Ã¢" +msgstr "Â÷ÀÌÁ¡ Ã¢" #: Merge.rc:3BDD62C4 #, c-format msgid "Patch file successfully written." -msgstr "ÆÐÄ¡ ÆÄÀÏÀÌ ÀÛ¼ºµÇ¾ú½À´Ï´Ù." +msgstr "ÆÐÄ¡ ÆÄÀÏÀ» ¼º°øÀûÀ¸·Î ±â·ÏÇß½À´Ï´Ù." #: Merge.rc:74C5055A #, c-format msgid "1. item is not found or is directory!" -msgstr "1. ÆÄÀÏÀÌ ¾ø°Å³ª µð·ºÅä¸®ÀÔ´Ï´Ù!" +msgstr "1. Ç×¸ñÀ» Ã£À» ¼ö ¾ø°Å³ª Æú´õÀÔ´Ï´Ù!" #: Merge.rc:7EFD4961 #, c-format msgid "2. item is not found or is directory!" -msgstr "2. ÆÄÀÏÀÌ ¾ø°Å³ª µð·ºÅä¸®ÀÔ´Ï´Ù!" +msgstr "2. Ç×¸ñÀ» Ã£À» ¼ö ¾ø°Å³ª Æú´õÀÔ´Ï´Ù!" #: Merge.rc:E611488 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" -msgstr "°°Àº ÀÌ¸§ÀÇ ÆÐÄ¡°¡ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?" +msgstr "ÆÐÄ¡ ÆÄÀÏÀÌ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?" #: Merge.rc:62226073 #, c-format @@ -4454,17 +4534,17 @@ msgstr "[%1 #: Merge.rc:27AFDB30 #, c-format msgid "Normal" -msgstr "Ç¥ÁØ" +msgstr "º¸Åë" #: Merge.rc:7E5494F7 #, c-format msgid "Context" -msgstr "ÄÁÅØ½ºÆ®" +msgstr "Â÷ÀÌÁ¡ ÀüÈÄ" #: Merge.rc:24173EE8 #, c-format msgid "Unified" -msgstr "ÅëÀÏµÊ" +msgstr "ÅëÇÕ" #: Merge.rc:185B8391 #, c-format @@ -4474,7 +4554,7 @@ msgstr "%1 #: Merge.rc:64D049AA #, c-format msgid "The specified output path is not an absolute path: %1" -msgstr "Àý´ë °æ·Î°¡ ¾Æ´Õ´Ï´Ù: %1" +msgstr "ÁöÁ¤ÇÑ Ãâ·Â °æ·Î´Â Àý´ë °æ·Î°¡ ¾Æ´Õ´Ï´Ù: %1" #: Merge.rc:44EE84AA #, c-format @@ -4484,12 +4564,12 @@ msgstr " #: Merge.rc:54711616 #, c-format msgid "Cannot create a patch file from binary files." -msgstr "¹ÙÀÌ³Ê¸® ÆÄÀÏ¿¡¼´Â ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." +msgstr "¹ÙÀÌ³Ê¸® ÆÄÀÏ¿¡¼´Â ÆÐÄ¡ ÆÄÀÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù." #: Merge.rc:133D7451 #, c-format msgid "Cannot create a patch file from directories." -msgstr "µð·ºÅä¸®¿¡¼´Â ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." +msgstr "Æú´õ¿¡¼´Â ÆÐÄ¡ ÆÄÀÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù." #: Merge.rc:34FF26C7 #, c-format @@ -4498,14 +4578,14 @@ msgid "" "\n" "Creating a patch requires that there are no unsaved changes in files." msgstr "" -"ÆÄÀÏÀ» ÀúÀåÇØ ÁÖ½Ê½Ã¿À.\n" +"ÀüÃ¼ ÆÄÀÏÀ» ¸ÕÀú ÀúÀåÇÏ¼¼¿ä.\n" "\n" -"ÀúÀå ¾È µÈ ÆÄÀÏÀÌ ÀÖÀ¸¸é ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." +"ÆÐÄ¡ ÆÄÀÏÀ» ¸¸µå·Á¸é ÆÄÀÏÀÇ º¯°æ»çÇ×ÀÌ ¸ðµÎ ÀúÀåµÇ¾î ÀÖ¾î¾ß ÇÕ´Ï´Ù." #: Merge.rc:576FB6D3 #, c-format msgid "Folder does not exist." -msgstr "Á¸ÀçÇÏÁö ¾Ê´Â µð·ºÅä¸®ÀÔ´Ï´Ù." +msgstr "Æú´õ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù." #: Merge.rc:3377B7B5 #, c-format @@ -4514,40 +4594,40 @@ msgid "" "All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n" "See manual for more info about archive support and how to enable it." msgstr "" -"¾ÐÃà Áö¿ø ±â´ÉÀÌ ²¨Á® ÀÖ½À´Ï´Ù.\n" -" \n" -"¾ÐÃà Áö¿ø ±â´É¿¡ ÇÊ¿äÇÑ ÄÄÆ÷³ÍÆ®(7-zip and/or Merge7z*.dll)°¡ ¾ø½À´Ï´Ù. \n" -"¾ÐÃà Áö¿ø ±â´É¿¡ ´ëÇØ ´õ ¸¹Àº Á¤º¸¸¦ ¿øÇÏ½Ã¸é ¸Þ´º¾óÀ» ÂüÁ¶ÇÏ¼¼¿ä." +"¾ÐÃà Áö¿øÀÌ ²¨Á® ÀÖ½À´Ï´Ù.\n" +"\n" +"¾ÐÃà Áö¿ø¿¡ ÇÊ¿äÇÑ ÄÄÆ÷³ÍÆ®(7-zip and/or Merge7z*.dll)¸¦ Ã£À» ¼ö ¾ø½À´Ï´Ù.\n" +"¾ÐÃà Áö¿ø¿¡ ´ëÇÑ Ãß°¡ Á¤º¸¿Í »ç¿ë¹ýÀº ¸Þ´º¾óÀ» ÂüÁ¶ÇÏ¼¼¿ä." #: Merge.rc:44EE84AB #, c-format msgid "Select file for export" -msgstr "³»º¸³¾ ÆÄÀÏ ¼±ÅÃ" +msgstr "³»º¸³¾ ÆÄÀÏÀ» ¼±ÅÃÇÏ¼¼¿ä" #: Merge.rc:44EE84AC #, c-format msgid "Select file for import" -msgstr "°¡Á®¿Ã ÆÄÀÏ ¼±ÅÃ" +msgstr "°¡Á®¿Ã ÆÄÀÏÀ» ¼±ÅÃÇÏ¼¼¿ä" #: Merge.rc:447FB30 #, c-format msgid "Options imported from the file." -msgstr "ÆÄÀÏ·ÎºÎÅÍ °¡Á®¿Â ¼³Á¤." +msgstr "ÆÄÀÏ¿¡¼ °¡Á®¿Â ¿É¼Ç." #: Merge.rc:44776ACF #, c-format msgid "Options exported to the file." -msgstr "ÆÄÀÏ·Î ³»º¸³½ ¼³Á¤." +msgstr "ÆÄÀÏ·Î ³»º¸³½ ¿É¼Ç." #: Merge.rc:7D23E524 #, c-format msgid "Failed to import options from the file." -msgstr "ÆÄÀÏ·ÎºÎÅÍ ¼³Á¤ °¡Á®¿À±â ½ÇÆÐÇÔ." +msgstr "ÆÄÀÏ¿¡¼ ¼³Á¤ °¡Á®¿À±â ½ÇÆÐ" #: Merge.rc:68F9158 #, c-format msgid "Failed to write options to the file." -msgstr "ÆÄÀÏ·ÎºÎÅÍ ¼³Á¤ ³»º¸³»±â ½ÇÆÐÇÔ." +msgstr "ÆÄÀÏ¿¡ ¿É¼Ç ¾²±â ½ÇÆÐ" #: Merge.rc:404DAD7D #, c-format @@ -4558,7 +4638,7 @@ msgid "" msgstr "" "¿©·¯ ºñ±³Ã¢À» ´ÝÀ¸·Á°í ÇÕ´Ï´Ù.\n" "\n" -"°è¼Ó ÇÏ½Ã°Ú½À´Ï±î?" +"°è¼ÓÇÒ±î¿ä?" #: Merge.rc:7C664E2 #, c-format @@ -4568,122 +4648,190 @@ msgstr "È¥ #: Merge.rc:4C72B57 #, c-format msgid "Type" -msgstr "" +msgstr "Çü½Ä" #: Merge.rc:5ED09E18 #, c-format msgid "Unpacker" -msgstr "" +msgstr "¾ðÆÐÄ¿" #: Merge.rc:37C6B9B9 #, c-format msgid "Prediffer" -msgstr "" +msgstr "Prediffer" #: Merge.rc:29ECCB83 #, c-format msgid "Editor script" -msgstr "" +msgstr "ÆíÁý±â ½ºÅ©¸³Æ®" #: Merge.rc:51A4FE5F #, c-format -msgid "\nDifference in the Current Line" +msgid "" +"\n" +"Difference in the Current Line" msgstr "" +"\n" +"ÇöÀç ÁÙÀÇ Â÷ÀÌÁ¡" #: Merge.rc:CF15594 #, c-format -msgid "\nOptions" +msgid "" +"\n" +"Options" msgstr "" +"\n" +"¿É¼Ç" #: Merge.rc:6F90DC3A #, c-format -msgid "\nRefresh (F5)" +msgid "" +"\n" +"Refresh (F5)" msgstr "" +"\n" +"»õ·Î °íÄ§ (F5)" #: Merge.rc:414AF01 #, c-format -msgid "\nPrevious Difference (Alt+Up)" +msgid "" +"\n" +"Previous Difference (Alt+Up)" msgstr "" +"\n" +"ÀÌÀü Â÷ÀÌÁ¡ (Alt+Up)" #: Merge.rc:16618519 #, c-format -msgid "\nNext Difference (Alt+Down)" +msgid "" +"\n" +"Next Difference (Alt+Down)" msgstr "" +"\n" +"´ÙÀ½ Â÷ÀÌÁ¡ (Alt+Down)" #: Merge.rc:7C5EF083 #, c-format -msgid "\nPrevious Conflict (Alt+Shift+Up)" +msgid "" +"\n" +"Previous Conflict (Alt+Shift+Up)" msgstr "" +"\n" +"ÀÌÀü Ãæµ¹ (Alt+Shift+Up)" #: Merge.rc:51A4FE60 #, c-format -msgid "\nNext Conflict (Alt+Shift+Down)" +msgid "" +"\n" +"Next Conflict (Alt+Shift+Down)" msgstr "" +"\n" +"´ÙÀ½ Ãæµ¹ (Alt+Shift+Down)" #: Merge.rc:35CF1E68 #, c-format -msgid "\nFirst Difference (Alt+Home)" +msgid "" +"\n" +"First Difference (Alt+Home)" msgstr "" +"\n" +"Ã³À½ Â÷ÀÌÁ¡ (Alt+Home)" #: Merge.rc:51A4FE61 #, c-format -msgid "\nCurrent Difference (Alt+Enter)" +msgid "" +"\n" +"Current Difference (Alt+Enter)" msgstr "" +"\n" +"ÇöÀç Â÷ÀÌÁ¡ (Alt+Enter)" #: Merge.rc:1DA00C8A #, c-format -msgid "\nLast Difference (Alt+End)" +msgid "" +"\n" +"Last Difference (Alt+End)" msgstr "" +"\n" +"¸¶Áö¸· Â÷ÀÌÁ¡ (Alt+End)" #: Merge.rc:E8950EA #, c-format -msgid "\nCopy Right (Alt+Right)" +msgid "" +"\n" +"Copy Right (Alt+Right)" msgstr "" +"\n" +"¿À¸¥ÂÊÀ¸·Î º¹»ç (Alt+Right)" #: Merge.rc:55A8C466 #, c-format -msgid "\nCopy Left (Alt+Left)" +msgid "" +"\n" +"Copy Left (Alt+Left)" msgstr "" +"\n" +"¿ÞÂÊÀ¸·Î º¹»ç (Alt+Left)" #: Merge.rc:1E864A56 #, c-format -msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" +msgid "" +"\n" +"Copy Right and Advance (Ctrl+Alt+Right)" msgstr "" +"\n" +"¿À¸¥ÂÊÀ¸·Î º¹»ç ÈÄ ÀüÁø (Ctrl+Alt+Right)" #: Merge.rc:7FE60896 #, c-format -msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" +msgid "" +"\n" +"Copy Left and Advance (Ctrl+Alt+Left)" msgstr "" +"\n" +"¿ÞÂÊÀ¸·Î º¹»ç ÈÄ ÀüÁø (Ctrl+Alt+Left)" #: Merge.rc:15F24C75 #, c-format -msgid "\nAll Right" +msgid "" +"\n" +"All Right" msgstr "" +"\n" +"ÀüºÎ ¿À¸¥ÂÊ" #: Merge.rc:11395D4B #, c-format -msgid "\nAll Left" +msgid "" +"\n" +"All Left" msgstr "" +"\n" +"ÀüºÎ ¿ÞÂÊ" #: Merge.rc:42A0CC96 #, c-format -msgid "\nAuto Merge (Ctrl+Alt+M)" +msgid "" +"\n" +"Auto Merge (Ctrl+Alt+M)" msgstr "" +"\n" +"ÀÚµ¿ º´ÇÕ (Ctrl+Alt+M)" #: Merge.rc:6107F02B #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" -msgstr "¾çÂÊ ÆÄÀÏ ¸ðµÎ¿¡ ¾ðÆÑÄ¿°¡ Àû¿ëµË´Ï´Ù (ÇÑ ÆÄÀÏ¸¸ÀÌ È®ÀåÀÚ°¡ ÇÊ¿äÇÔ)" +msgstr "Ã¤ÅÃÇÑ ¾ðÆÐÄ¿¸¦ ¾çÂÊ ÆÄÀÏ ¸ðµÎ¿¡ Àû¿ëÇÕ´Ï´Ï´Ù (ÇÑ ÆÄÀÏ¸¸ È®ÀåÀÚ°¡ ÇÊ¿äÇÔ)" #: Merge.rc:429CABF5 #, c-format msgid "No prediffer (normal)" -msgstr "prediffer »ç¿ë ¾È ÇÔ(Ç¥ÁØ)" +msgstr "prediffer ¾øÀ½ (º¸Åë)" #: Merge.rc:62909ED8 #, c-format msgid "Suggested plugins" -msgstr "±ÇÀåÇÏ´Â ÇÃ·¯±×ÀÎ" +msgstr "ÃßÃµ ÇÃ·¯±×ÀÎ" #: Merge.rc:4DAEA639 #, c-format @@ -4698,32 +4846,36 @@ msgstr " #: Merge.rc:40D543C8 #, c-format msgid "Your software is up to date" -msgstr "" +msgstr "ÃÖ½Å ¹öÀüÀ» »ç¿ë ÁßÀÔ´Ï´Ù" #: Merge.rc:43B4B204 #, c-format -msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?" +msgid "" +"A new version of WinMerge is available.\n" +"%1 is now available (you have %2). Would you like to download it now?" msgstr "" +"»õ ¹öÀüÀÇ WinMerge¸¦ »ç¿ëÇÒ ¼ö ÀÖ½À´Ï´Ù.\n" +"%1 ¹öÀüÀÌ ³ª¿Ô½À´Ï´Ù (ÇöÀç´Â %2). Áö±Ý ´Ù¿î·ÎµåÇÒ±î¿ä?" #: Merge.rc:696AAFE9 #, c-format msgid "Failed to download latest version information" -msgstr "" +msgstr "ÃÖ½Å ¹öÀü Á¤º¸ ´Ù¿î·Îµå ½ÇÆÐ" #: Merge.rc:55B03C14 #, c-format msgid "Plugin Settings" -msgstr "ÇÃ·¯±×ÀÎ ¼¼ÆÃ" +msgstr "ÇÃ·¯±×ÀÎ ¼³Á¤" #: Merge.rc:791F1E67 #, c-format msgid "WSH not found - .sct scripts disabled" -msgstr "WSH Á¸ÀçÇÏÁö ¾ÊÀ½ - .sct ½ºÅ©¸³Æ®¸¦ »ç¿ëÇÏÁö ¾ÊÀ½" +msgstr "WSHÀÌ ¾ø½À´Ï´Ù - .sct ½ºÅ©¸³Æ® ºñÈ°¼ºÈ" #: Merge.rc:4FC259D5 #, c-format msgid "" -msgstr "<»ç¿ë ¾È ÇÔ>" +msgstr "<¾øÀ½>" #: Merge.rc:8BF6984 #, c-format @@ -4733,7 +4885,7 @@ msgstr "< #: Merge.rc:4AAD2A74 #, c-format msgid "G&oto Line %1" -msgstr "%1 ÁÙ·Î ÀÌµ¿" +msgstr "%1ÁÙ·Î ÀÌµ¿(&O)" #: Merge.rc:7F0D4B47 #, c-format @@ -4743,27 +4895,27 @@ msgstr " #: Merge.rc:444C5DDD #, c-format msgid "From file system" -msgstr "ÆÄÀÏ ½Ã½ºÅÛ ÀÌ¿ë" +msgstr "ÆÄÀÏ ½Ã½ºÅÛ¿¡¼" #: Merge.rc:7A4CFAFE #, c-format msgid "From MRU list" -msgstr "ÃÖ±Ù ÆÄÀÏ ¸ñ·Ï(MRU) »ç¿ë" +msgstr "ÃÖ±Ù ¸ñ·Ï¿¡¼" #: Merge.rc:638BD42D #, c-format msgid "No Highlighting" -msgstr "" +msgstr "°Á¶ Ç¥½Ã ¾øÀ½" #: Merge.rc:7460E8C0 #, c-format msgid "Batch" -msgstr "¹èÄ¡" +msgstr "ÀÏ°ý Ã³¸®" #: Merge.rc:55B03C15 #, c-format msgid "Portable Object" -msgstr "ÀÌµ¿Çü °´Ã¼" +msgstr "ÀÌµ¿ °¡´ÉÇÑ °´Ã¼" #: Merge.rc:5F87E5E #, c-format @@ -4778,30 +4930,29 @@ msgstr " #: Merge.rc:8AF7E6B #, c-format msgid "Close &Left Tabs" -msgstr "" +msgstr "¿ÞÂÊ ÅÇ ´Ý±â(&L)" #: Merge.rc:D404EDF #, c-format msgid "Close R&ight Tabs" -msgstr "" +msgstr "¿À¸¥ÂÊ ÅÇ ´Ý±â(&I)" #: Merge.rc:D404EE0 #, c-format msgid "Close &Other Tabs" -msgstr "" +msgstr "´Ù¸¥ ÅÇ ´Ý±â(&O)" #: Merge.rc:3E934E #, c-format msgid "Enable &Auto Max Width" -msgstr "" +msgstr "ÀÚµ¿ ÃÖ´ë ³Êºñ »ç¿ë(&A)" #: Merge.rc:1D2E4A01 #, c-format msgid "&Image" -msgstr "" +msgstr "ÀÌ¹ÌÁö(&I)" #: Merge.rc:4D3A8E6D #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" -msgstr "" - +msgstr "Frhed(http://frhed.sourceforge.net/)°¡ ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"