From 3487eda017109de351fa03f361c861929439f086 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Fri, 19 Feb 2010 19:03:56 +0000 Subject: [PATCH] PATCH: [ 2954833 ] Traditional Chinese Language File updated Submitted by wck3 --- Docs/Users/ChangeLog.txt | 1 + Translations/WinMerge/ChineseTraditional.po | 1895 ++++++++++++--------------- 2 files changed, 821 insertions(+), 1075 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index f84b73212..8206328de 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -5,6 +5,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.13.12 Translation updates: + - Chinese Traditional (#2954833) - Slovenian (#2934354) - Swedish (#2943964) diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index 3ef1cfaa7..66fcdf084 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n" -"POT-Creation-Date: 2009-01-15 20:39+0000\n" -"PO-Revision-Date: 2009-01-27 19:11+0800\n" -"Last-Translator: wck \n" +"POT-Creation-Date: 2009-11-08 13:51+0000\n" +"PO-Revision-Date: 2010-02-19 17:04+0800\n" +"Last-Translator: wck3 \n" "Language-Team: ChineseTraditional \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP950\n" @@ -291,12 +291,12 @@ msgstr " #: Merge.rc:152 #, c-format msgid "Ma&nual Prediffer" -msgstr "" +msgstr "¤â°Ê¥ý¦æ³B²z¾¹(&N)" #: Merge.rc:153 #, c-format msgid "A&utomatic Prediffer" -msgstr "" +msgstr "¦Û°Ê¥ý¦æ³B²z¾¹(&U)" # "¤â°Ê¸ÑÀ£ÁY(&M)" #: Merge.rc:155 @@ -402,7 +402,7 @@ msgstr " #: Merge.rc:178 #: Merge.rc:299 #: Merge.rc:487 -#: Merge.rc:1947 +#: Merge.rc:1948 #, c-format msgid "&Help" msgstr "»¡©ú(&H)" @@ -733,7 +733,7 @@ msgid "&Scripts" msgstr "ÀHĶ§Y¦æ½X(&S)" #: Merge.rc:373 -#: Merge.rc:2803 +#: Merge.rc:2708 #, c-format msgid "< Empty >" msgstr "< µL >" @@ -940,14 +940,14 @@ msgstr " #: Merge.rc:526 #: Merge.rc:1147 -#: Merge.rc:1531 +#: Merge.rc:1514 #, c-format msgid "&Left" msgstr "¥ªÃä(&L)" #: Merge.rc:527 #: Merge.rc:1149 -#: Merge.rc:1534 +#: Merge.rc:1517 #, c-format msgid "&Right" msgstr "¥kÃä(&R)" @@ -1104,12 +1104,12 @@ msgstr " #: Merge.rc:1066 #: Merge.rc:1095 #: Merge.rc:1105 -#: Merge.rc:1273 -#: Merge.rc:1337 -#: Merge.rc:1350 -#: Merge.rc:1442 -#: Merge.rc:1457 -#: Merge.rc:1679 +#: Merge.rc:1256 +#: Merge.rc:1320 +#: Merge.rc:1333 +#: Merge.rc:1425 +#: Merge.rc:1440 +#: Merge.rc:1662 #, c-format msgid "OK" msgstr "½T©w" @@ -1125,7 +1125,7 @@ msgid "Select Files or Folders" msgstr "¿ï¨úÀɮשθê®Æ§¨" #: Merge.rc:690 -#: Merge.rc:1608 +#: Merge.rc:1591 #, c-format msgid "&Left:" msgstr "¥ªÃä(&L)¡G" @@ -1139,7 +1139,7 @@ msgid "&Browse..." msgstr "ÂsÄý(&B)..." #: Merge.rc:695 -#: Merge.rc:1612 +#: Merge.rc:1595 #, c-format msgid "&Right:" msgstr "¥kÃä(&R)¡G" @@ -1151,13 +1151,13 @@ msgid "Bro&wse..." msgstr "ÂsÄý(&W)..." #: Merge.rc:700 -#: Merge.rc:1616 +#: Merge.rc:1599 #, c-format msgid "&Filter:" msgstr "¿z¿ï¾¹(&F)¡G" #: Merge.rc:703 -#: Merge.rc:1618 +#: Merge.rc:1601 #, c-format msgid "Select..." msgstr "¿ï¨ú..." @@ -1173,7 +1173,7 @@ msgid "&Select..." msgstr "¿ï¨ú(&S)..." #: Merge.rc:708 -#: Merge.rc:1619 +#: Merge.rc:1602 #, c-format msgid "&Include Subfolders" msgstr "¥]¬A¤l¸ê®Æ§¨(&I)" @@ -1193,17 +1193,17 @@ msgstr " #: Merge.rc:1096 #: Merge.rc:1106 #: Merge.rc:1157 -#: Merge.rc:1274 -#: Merge.rc:1351 -#: Merge.rc:1443 -#: Merge.rc:1458 -#: Merge.rc:1680 +#: Merge.rc:1257 +#: Merge.rc:1334 +#: Merge.rc:1426 +#: Merge.rc:1441 +#: Merge.rc:1663 #, c-format msgid "Cancel" msgstr "¨ú®ø" #: Merge.rc:713 -#: Merge.rc:1352 +#: Merge.rc:1335 #, c-format msgid "Help" msgstr "»¡©ú" @@ -1271,13 +1271,14 @@ msgid "&Versioning System:" msgstr "ª©¥»ºÞ²z¨t²Î(&V)¡G" #: Merge.rc:753 -#: Merge.rc:2079 +#: Merge.rc:2083 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe ¸ô®|(&P)¡G" #: Merge.rc:760 -#: Merge.rc:1955 +#: Merge.rc:1956 +#: Merge.rc:1969 #, c-format msgid "General" msgstr "¤@¯ë" @@ -1335,13 +1336,13 @@ msgid "Enable multiple compare windows for" msgstr "±Ò¥Î¦h­«¤ñ¸ûµøµ¡" #: Merge.rc:787 -#: Merge.rc:1631 +#: Merge.rc:1614 #, c-format msgid "&Folder compare" msgstr "¤ñ¸û¸ê®Æ§¨®É(&F)" #: Merge.rc:789 -#: Merge.rc:1633 +#: Merge.rc:1616 #, c-format msgid "Fil&e compare" msgstr "¤ñ¸ûÀÉ®×®É(&E)" @@ -1462,7 +1463,7 @@ msgid "Replace &All" msgstr "¥þ³¡¨ú¥N(&A)" #: Merge.rc:872 -#: Merge.rc:2201 +#: Merge.rc:2205 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1473,7 +1474,7 @@ msgid "CheckOut" msgstr "°e¦^§ï¹LÀÉ" #: Merge.rc:880 -#: Merge.rc:1191 +#: Merge.rc:1175 #, c-format msgid "Comments" msgstr "³Æµù" @@ -1519,7 +1520,7 @@ msgid "Remove" msgstr "²¾°£" #: Merge.rc:910 -#: Merge.rc:1958 +#: Merge.rc:1959 #, c-format msgid "Colors" msgstr "¦â±m" @@ -1535,7 +1536,7 @@ msgid "Selected Difference:" msgstr "¤w¿ï¨úªº¬Û²§°Ï¶ô¡G" #: Merge.rc:921 -#: Merge.rc:1583 +#: Merge.rc:1566 #, c-format msgid "Background" msgstr "­I´º" @@ -1546,8 +1547,9 @@ msgid "Deleted" msgstr "¤w§R°£" #: Merge.rc:935 -#: Merge.rc:1378 -#: Merge.rc:1584 +#: Merge.rc:1361 +#: Merge.rc:1567 +#: Merge.rc:1960 #, c-format msgid "Text" msgstr "«e´º¤å" @@ -1575,26 +1577,27 @@ msgstr " #: Merge.rc:976 #, c-format msgid "Selected Word Diff:" -msgstr "¤w¿ï¨úªº¦r¬Û²§¡G" +msgstr "¤w¿ï¨úªº¦rªº¬Û²§¡G" #: Merge.rc:986 #: Merge.rc:1065 #: Merge.rc:1094 -#: Merge.rc:1194 -#: Merge.rc:1424 +#: Merge.rc:1177 +#: Merge.rc:1407 +#: Merge.rc:1699 #, c-format msgid "Defaults" msgstr "¹w³]­È" #: Merge.rc:992 -#: Merge.rc:1366 -#: Merge.rc:1572 +#: Merge.rc:1349 +#: Merge.rc:1555 #, c-format msgid "Dialog" msgstr "¹ï¸Ü" #: Merge.rc:1002 -#: Merge.rc:1961 +#: Merge.rc:1962 #, c-format msgid "System" msgstr "¨t²Î" @@ -1771,7 +1774,7 @@ msgid " Folder Compare Progress" msgstr "¤ñ¸û¸ê®Æ§¨¤¤" #: Merge.rc:1128 -#: Merge.rc:1908 +#: Merge.rc:1909 #, c-format msgid "Stop" msgstr "°±¤î" @@ -1827,7 +1830,7 @@ msgid "&Go To" msgstr "²¾¦Ü(&G)" #: Merge.rc:1162 -#: Merge.rc:1956 +#: Merge.rc:1957 #, c-format msgid "Compare" msgstr "¤ñ¸û" @@ -1842,215 +1845,200 @@ msgstr " msgid "&Compare" msgstr "¤ñ¹ïªÅ¥Õ³B(&W)" -#: Merge.rc:1168 +#: Merge.rc:1167 #, c-format msgid "&Ignore change" msgstr "©¿²¤ªÅ¥Õ¼Æ¶q¤§Åܰʦӳy¦¨ªº®t²§(&H)" -#: Merge.rc:1170 +#: Merge.rc:1168 #, c-format msgid "I&gnore all" msgstr "©¿²¤ªÅ¥Õ³B¤§¥ô¦ó®t²§(&A)" -#: Merge.rc:1172 +#: Merge.rc:1169 #, c-format msgid "Ignore blan&k lines" msgstr "©¿²¤ªÅ¥Õ¦æ(&K)" -#: Merge.rc:1174 +#: Merge.rc:1170 #, c-format msgid "Ignore &case" msgstr "©¿²¤¤j¤p¼g(&C)" -#: Merge.rc:1176 +#: Merge.rc:1171 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "©¿²¤´«¦æ¦r¤¸¤§®t²§(Windows/Unix/Mac)(&R)" -#: Merge.rc:1179 +#: Merge.rc:1173 #, c-format msgid "E&nable moved block detection" msgstr "°»´ú²¾¦ìªº°Ï¶ô(&N)" -#: Merge.rc:1181 +#: Merge.rc:1174 #, c-format msgid "&Match similar lines" msgstr "§ä¥X¬Û¦ü¦æ(&M)" -#: Merge.rc:1183 -#, c-format -msgid "Ign&ore time differences less than 3 seconds" -msgstr "¦p¨âÀɮפ§­×§ï®É¶¡¶¡¹j¤Ö©ó¤T¬í¡A«h©¿²¤¦¹®t²§(&O)" - -#: Merge.rc:1186 -#, c-format -msgid "&File Compare method:" -msgstr "Àɮפñ¸û¤è¦¡(&F)¡G" - -#: Merge.rc:1189 -#, c-format -msgid "S&top after first difference" -msgstr "²Ä¤@­Ó®t²§´N°±(&T)" - -#: Merge.rc:1192 +#: Merge.rc:1176 #, c-format msgid "Filter Comments" msgstr "¿z¿ï¾¹¤§µù" -#: Merge.rc:1199 -#: Merge.rc:1957 +#: Merge.rc:1182 +#: Merge.rc:1958 #, c-format msgid "Editor" msgstr "½s¿è¾¹" -#: Merge.rc:1202 +#: Merge.rc:1185 #, c-format msgid "&Highlight syntax" msgstr "°ª«G«×»yªk(&H)" -#: Merge.rc:1204 +#: Merge.rc:1187 #, c-format msgid "&Automatic rescan" msgstr "¦Û°Ê­«·s±½´y(&A)" -#: Merge.rc:1206 +#: Merge.rc:1189 #, c-format msgid "&Preserve original EOL chars" msgstr "«O¯d­ì©l EOL ¦r¤¸(&P)" -#: Merge.rc:1208 +#: Merge.rc:1191 #, c-format msgid "Tabs" msgstr "¸õ®æ" -#: Merge.rc:1209 +#: Merge.rc:1192 #, c-format msgid "&Tab size:" msgstr "¸õ®æ¤j¤p(&T)¡G" -#: Merge.rc:1212 +#: Merge.rc:1195 #, c-format msgid "&Insert Tabs" msgstr "´¡¤J¸õ®æ¦r¤¸(&I)" -#: Merge.rc:1214 +#: Merge.rc:1197 #, c-format msgid "Insert &Spaces" msgstr "´¡¤JªÅ¥Õ(&S)" -#: Merge.rc:1216 +#: Merge.rc:1199 #, c-format msgid "Line Difference Coloring" msgstr "¦æ¤º®t²§µÛ¦â" -#: Merge.rc:1218 +#: Merge.rc:1201 #, c-format msgid "View line differences" msgstr "À˵ø¦æ¤º®t²§" -#: Merge.rc:1220 +#: Merge.rc:1203 #, c-format msgid "&Character level" msgstr "¦r¤¸¶¥¼h(&C)" -#: Merge.rc:1222 +#: Merge.rc:1205 #, c-format msgid "&Word-level:" msgstr "¦r¶¥¼h(&W)¡G" -#: Merge.rc:1226 +#: Merge.rc:1209 #, c-format msgid "W&ord break characters:" -msgstr "" +msgstr "Â_¥y¦r¤¸(&O)¡G" -#: Merge.rc:1239 +#: Merge.rc:1222 #, c-format msgid "Filefilters" msgstr "Àɮ׿z¿ï¾¹" -#: Merge.rc:1245 +#: Merge.rc:1228 #, c-format msgid "Test" msgstr "´ú¸Õ" -#: Merge.rc:1246 +#: Merge.rc:1229 #, c-format msgid "Install..." msgstr "¦w¸Ë..." -#: Merge.rc:1247 +#: Merge.rc:1230 #, c-format msgid "New..." msgstr "·s¼W..." -#: Merge.rc:1248 +#: Merge.rc:1231 #, c-format msgid "Edit..." msgstr "½s¿è..." -#: Merge.rc:1249 +#: Merge.rc:1232 #, c-format msgid "Delete..." msgstr "§R°£..." -#: Merge.rc:1255 +#: Merge.rc:1238 #, c-format msgid "Save modified files?" msgstr "Àx¦s­×§ïªºÀɮסH" -#: Merge.rc:1258 +#: Merge.rc:1241 #, c-format msgid "Left side file" msgstr "¥ªÃäÀÉ®×" -#: Merge.rc:1261 +#: Merge.rc:1244 #, c-format msgid "&Save changes" msgstr "Àx¦sÅܧó(&S)" -#: Merge.rc:1263 +#: Merge.rc:1246 #, c-format msgid "&Discard changes" msgstr "©ñ±óÅܧó(&D)" -#: Merge.rc:1265 +#: Merge.rc:1248 #, c-format msgid "Right side file" msgstr "¥kÃäÀÉ®×" -#: Merge.rc:1268 +#: Merge.rc:1251 #, c-format msgid "S&ave changes" msgstr "Àx¦sÅܧó(&A)" -#: Merge.rc:1270 +#: Merge.rc:1253 #, c-format msgid "Dis&card changes" msgstr "©ñ±óÅܧó(&C)" -#: Merge.rc:1272 +#: Merge.rc:1255 #, c-format msgid "Disca&rd All" -msgstr "" +msgstr "©ñ±ó¥þ³¡(&R)" -#: Merge.rc:1279 -#: Merge.rc:1527 -#: Merge.rc:1963 +#: Merge.rc:1262 +#: Merge.rc:1510 +#: Merge.rc:1964 #, c-format msgid "Codepage" msgstr "½s½X­¶" -#: Merge.rc:1282 +#: Merge.rc:1265 #, c-format msgid "Default Codepage" msgstr "½s½X­¶" -#: Merge.rc:1283 +#: Merge.rc:1266 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "©ó¸ü¤J non-unicode Àɮ׮ɧïÅܩҥΪº½s½X­¶¦¨" -#: Merge.rc:1285 +#: Merge.rc:1268 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2059,32 +2047,32 @@ msgstr "" "°»´ú«á­±Àɮתº½s½X­¶¸ê°T¡G.html, .rc, .xml \n" "­«±Ò°Ê«á¤~°»´ú" -#: Merge.rc:1288 +#: Merge.rc:1271 #, c-format msgid "System codepage" msgstr "¨t²Î¥Îªº½s½X­¶" -#: Merge.rc:1290 +#: Merge.rc:1273 #, c-format msgid "According to WinMerge User Interface" msgstr "WinMerge ¨Ï¥ÎªÌ¤¶­±¥Îªº½s½X­¶" -#: Merge.rc:1292 +#: Merge.rc:1275 #, c-format msgid "Custom codepage:" msgstr "¦Û­q½s½X­¶¡G" -#: Merge.rc:1300 +#: Merge.rc:1283 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - ¤wÃö³¬À£ÁYÀɤ䴩" -#: Merge.rc:1303 +#: Merge.rc:1286 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "µLªk´úª¾ 7-Zip ª©¥»(¨S¦w¸Ë 7-Zip ¶Ü¡H)" -#: Merge.rc:1306 +#: Merge.rc:1289 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2093,12 +2081,12 @@ msgstr "" "¥²¶·¦w¸Ë 7-Zip 3.11 ©Î§ó±ßªºª©¥»©ó§Aªº¹q¸£¡A\n" "©Î¨ä®Ö¤ß¤¸¥ó¤w³Q½Æ»s¨ìµ{¦¡¥Ø¿ý¡F" -#: Merge.rc:1308 +#: Merge.rc:1291 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "ÁÙ¥²¶·¦b¸ô¸g¤W¦³¾A·í¤¶­±¥~±¾(Merge7z*.dll)¡A¤~¯à¤ä´©À£ÁY¡C" -#: Merge.rc:1310 +#: Merge.rc:1293 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2108,13 +2096,13 @@ msgstr "" "7-Zip ¤¶­±¥~±¾ª©¥»¡C" # I suggest "7-Zip Version" instead. -#: Merge.rc:1312 +#: Merge.rc:1295 #, c-format msgid "Version" msgstr "7-Zip ª©¥»" # I suggest "Required Interface-Plugin" instead. -#: Merge.rc:1314 +#: Merge.rc:1297 #, c-format msgid "" "Plugin required\n" @@ -2123,56 +2111,56 @@ msgstr "" "¸Óª©©Ò­nªº¤¶­±¥~±¾\n" "(dllbuild %04u)" -#: Merge.rc:1316 +#: Merge.rc:1299 #, c-format msgid "Recommended version of 7-Zip:" msgstr "±ÀÂ˪º 7-Zip ª©¥»¡G" -#: Merge.rc:1319 -#: Merge.rc:1322 +#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "present" msgstr "¦s¦b" -#: Merge.rc:1320 +#: Merge.rc:1303 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1323 +#: Merge.rc:1306 #, c-format msgid "7-Zip software installed on your computer:" msgstr "¤w¦w¸Ë©ó§Aªº¹q¸£ªº¿W¥ß 7-Zip ³nÅé¡G" -#: Merge.rc:1325 -#: Merge.rc:1330 +#: Merge.rc:1308 +#: Merge.rc:1313 #, c-format msgid "none" msgstr "µL" -#: Merge.rc:1327 +#: Merge.rc:1310 #, c-format msgid "missing" msgstr "¤£¦s¦b" # I suggest "7-Zip components only for WinMerge:" instead. -#: Merge.rc:1328 +#: Merge.rc:1311 #, c-format msgid "7-Zip components for standalone operation:" msgstr "WinMerge ¤º¥Îªº 7-Zip ®Ö¤ß¤¸¥ó¡G" -#: Merge.rc:1332 +#: Merge.rc:1315 #, c-format msgid "outdated" msgstr "¤wÂÂ" # I suggest "Interface-Plugin on path:" instead. -#: Merge.rc:1333 +#: Merge.rc:1316 #, c-format msgid "Plugins on path:" msgstr "¸ô®|¤Wªº¤¶­±¥~±¾¡G" -#: Merge.rc:1334 +#: Merge.rc:1317 #, c-format msgid "" "Don't display this &message again.\n" @@ -2182,541 +2170,574 @@ msgstr "" "(¤´¥i¥Ñ»¡©ú¿ï³æ¤¤¥s¥X¥¦)" # I suggest Interface-Plugin Download" instead. -#: Merge.rc:1338 +#: Merge.rc:1321 #, c-format msgid "Plugin Download" msgstr "¤¶­±¥~±¾¤U¸ü" -#: Merge.rc:1347 +#: Merge.rc:1330 #, c-format msgid "Options" msgstr "¿ï¶µ" -#: Merge.rc:1358 +#: Merge.rc:1341 #, c-format msgid " Categories" msgstr "ºØÃþ" -#: Merge.rc:1360 +#: Merge.rc:1343 #, c-format msgid "Import..." msgstr "¶×¤J..." -#: Merge.rc:1361 +#: Merge.rc:1344 #, c-format msgid "Export..." msgstr "¶×¥X..." -#: Merge.rc:1369 +#: Merge.rc:1352 #, c-format msgid "Keywords:" msgstr "ÃöÁä¦r¡G" -#: Merge.rc:1370 +#: Merge.rc:1353 #, c-format msgid "Function names:" msgstr "¨ç¼Æ¦W¡G" -#: Merge.rc:1371 +#: Merge.rc:1354 #, c-format msgid "Comments:" msgstr "µù¡G" -#: Merge.rc:1372 +#: Merge.rc:1355 #, c-format msgid "Numbers:" msgstr "¼Æ¡G" -#: Merge.rc:1373 +#: Merge.rc:1356 #, c-format msgid "Operators:" msgstr "¹Bºâ¤l¡G" -#: Merge.rc:1374 +#: Merge.rc:1357 #, c-format msgid "Strings:" msgstr "¦r¦ê¡G" -#: Merge.rc:1375 +# What is preprocessor? Is it prediffer? The term "preprocessor" cannot be found elsewhere. +#: Merge.rc:1358 #, c-format msgid "Preprocessor:" msgstr "«e³B²z¾¹¡G" -#: Merge.rc:1376 +#: Merge.rc:1359 #, c-format msgid "User 1:" msgstr "¨Ï¥ÎªÌ 1¡G" -#: Merge.rc:1377 +#: Merge.rc:1360 #, c-format msgid "User 2:" msgstr "¨Ï¥ÎªÌ 2¡G" -#: Merge.rc:1382 -#: Merge.rc:1387 -#: Merge.rc:1392 -#: Merge.rc:1397 -#: Merge.rc:1402 -#: Merge.rc:1407 -#: Merge.rc:1412 -#: Merge.rc:1417 -#: Merge.rc:1422 +#: Merge.rc:1365 +#: Merge.rc:1370 +#: Merge.rc:1375 +#: Merge.rc:1380 +#: Merge.rc:1385 +#: Merge.rc:1390 +#: Merge.rc:1395 +#: Merge.rc:1400 +#: Merge.rc:1405 #, c-format msgid "Bold" msgstr "²ÊÅé" -#: Merge.rc:1430 +#: Merge.rc:1413 #, c-format msgid "Folder Compare Report" msgstr "¤ñ¸û¥Ø¿ý«áªº³ø§i" -#: Merge.rc:1433 +#: Merge.rc:1416 #, c-format msgid "Report &File:" msgstr "³ø§iÀÉ(&F)¡G" -#: Merge.rc:1436 -#: Merge.rc:1610 -#: Merge.rc:1614 -#: Merge.rc:1641 +#: Merge.rc:1419 +#: Merge.rc:1593 +#: Merge.rc:1597 +#: Merge.rc:1624 #, c-format msgid "Browse..." msgstr "ÂsÄý..." -#: Merge.rc:1437 +#: Merge.rc:1420 #, c-format msgid "&Style:" msgstr "¼Ë¦¡(&S)¡G" -#: Merge.rc:1440 +#: Merge.rc:1423 #, c-format msgid "&Copy to Clipboard" msgstr "½Æ»s¨ì°Å¶Kï(&C)" -#: Merge.rc:1448 +#: Merge.rc:1431 #, c-format msgid "Shared or Private Filter" msgstr "¦@¥Î©Î­Ó¤H¿z¿ï¾¹" -#: Merge.rc:1451 +#: Merge.rc:1434 #, c-format msgid "Which type of filter do you want to create?" msgstr "§A­n«Ø¥ß­þºØ¿z¿ï¾¹¡H" -#: Merge.rc:1453 +#: Merge.rc:1436 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "¦@¥Î¿z¿ï¾¹(¾A¥Î©Ò¦³¨Ï¥ÎªÌ)" -#: Merge.rc:1455 +#: Merge.rc:1438 #, c-format msgid "Private Filter (only for current user)" msgstr "­Ó¤H¿z¿ï¾¹(¶È¾A¥Î²{¦b¨Ï¥ÎªÌ)" -#: Merge.rc:1463 -#: Merge.rc:1964 +#: Merge.rc:1446 +#: Merge.rc:1965 #, c-format msgid "Archive Support" msgstr "¤ä´©À£ÁY" # ¡u¥H shared installation ¦w¸Ë7-Zip ¥~±¾¤~¦³¤ä´©À£ÁY¤§±ø¥ó¡G¡v¡u¥²¶·¥ý¦w¸Ë 7-Zip ¥~±¾¡A¤~¤ä´©À£ÁY¡G¡v # I suggest "The following options shall be invalid without 7-Zip inerface plugin installed first." instead. -#: Merge.rc:1466 +#: Merge.rc:1449 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "¥²¶·¥ý¦w¸Ë 7-Zip ¤¶­±¥~±¾¡A©³¤U¿ï¶µ¤~¥i¦æ¡G" # I suggest "Download 7-Zip Interface-Plugin" instead. -#: Merge.rc:1468 +#: Merge.rc:1451 #, c-format msgid "Download 7-zip Plugin" msgstr "¤U¸ü 7-Zip ¤¶­±¥~±¾" -#: Merge.rc:1469 +#: Merge.rc:1452 #, c-format msgid "&Enable archive file support" msgstr "À£ÁYÀɤ䴩(&E)" # I suggest "Use installed 7-Zip software" instead. -#: Merge.rc:1471 +#: Merge.rc:1454 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "¨Ï¥Î¿W¥ßªº 7-Zip ³nÅé(&U)" # ¨Ï¥Î¥H sp in + st op ¿ï¶µ¦w¸Ëªº¥[±¾ÀÉ(¦w¸Ë7-Zip ¥~±¾®É)(&S) # I suggest "U&se WinMerge-dependent 7-Zip" or "U&se 7-Zip components installed by WinMerge Plugin-installer" instead. -#: Merge.rc:1474 +#: Merge.rc:1457 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "¨Ï¥Î¤£¿W¥ß©ó WinMerge ªº 7-Zip ®Ö¤ß¤¸¥ó(&S)" -#: Merge.rc:1476 +#: Merge.rc:1459 #, c-format msgid "&Detect archive type from file signature" msgstr "°»´úÀÉ­º¸ê°T¥H¨M©wÀ£ÁYÀÉÃþ«¬(&D)" -#: Merge.rc:1484 +#: Merge.rc:1467 #, c-format msgid "Compare Statistics" msgstr "¤ñ¸û«áªº²Î­p" -#: Merge.rc:1487 +#: Merge.rc:1470 #, c-format msgid "Folders:" msgstr "¸ê®Æ§¨¡G" -#: Merge.rc:1488 +#: Merge.rc:1471 #, c-format msgid "Files:" msgstr "ÀɮסG" -#: Merge.rc:1489 -#: Merge.rc:2355 +#: Merge.rc:1472 +#: Merge.rc:2359 #, c-format msgid "Different" msgstr "¤£¦P" -#: Merge.rc:1490 +#: Merge.rc:1473 #, c-format msgid "Text:" msgstr "¤å¦r¡G" -#: Merge.rc:1493 -#: Merge.rc:1512 +#: Merge.rc:1476 +#: Merge.rc:1495 #, c-format msgid "Binary:" msgstr "¤G¶i¨î¡G" -#: Merge.rc:1496 +#: Merge.rc:1479 #, c-format msgid "Unique" msgstr "¿W¦³" -#: Merge.rc:1497 +#: Merge.rc:1480 #, c-format msgid "Left:" msgstr "¥ªÃä¡G" -#: Merge.rc:1502 +#: Merge.rc:1485 #, c-format msgid "Right:" msgstr "¥kÃä¡G" -#: Merge.rc:1507 -#: Merge.rc:2349 +#: Merge.rc:1490 +#: Merge.rc:2353 #, c-format msgid "Identical" msgstr "¥þ¦P" -#: Merge.rc:1516 +#: Merge.rc:1499 #, c-format msgid "Total:" msgstr "Á`­p¡G" -#: Merge.rc:1521 +#: Merge.rc:1504 #, c-format msgid "Close" msgstr "Ãö³¬" -#: Merge.rc:1530 +#: Merge.rc:1513 #, c-format msgid "Affects" msgstr "¼vÅT" -#: Merge.rc:1533 -#: Merge.rc:1536 +#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "(Affects)" msgstr "(¼vÅT)" -#: Merge.rc:1537 +#: Merge.rc:1520 #, c-format msgid "Select Codepage for" msgstr "¿ï©w½s½X­¶µ¹" -#: Merge.rc:1538 +#: Merge.rc:1521 #, c-format msgid "&File Loading:" msgstr "­n¸ü¤JªºÀÉ®×(&F)¡G" -#: Merge.rc:1540 -#: Merge.rc:1543 +#: Merge.rc:1523 +#: Merge.rc:1526 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1541 +#: Merge.rc:1524 #, c-format msgid "File &Saving:" msgstr "­nÀx¦sªºÀÉ®×(&S)¡G" -#: Merge.rc:1544 +#: Merge.rc:1527 #, c-format msgid "&Use same codepage for both" msgstr "¨âÀɳ£¥Î¬Û¦Pªº½s½X­¶(&U)" -#: Merge.rc:1547 +#: Merge.rc:1530 #, c-format msgid "&Apply" msgstr "®M¥Î(&A)" -#: Merge.rc:1548 -#: Merge.rc:1930 +#: Merge.rc:1531 +#: Merge.rc:1931 #, c-format msgid "&Cancel" msgstr "¨ú®ø(&C)" -#: Merge.rc:1553 +#: Merge.rc:1536 #, c-format msgid "Test Filter" msgstr "´ú¸Õ¿z¿ï¾¹" -#: Merge.rc:1556 +#: Merge.rc:1539 #, c-format msgid "Testing filter ..." msgstr "´ú¸Õ¿z¿ï¾¹ ..." -#: Merge.rc:1558 +#: Merge.rc:1541 #, c-format msgid "&Enter text to test:" msgstr "¿é¤J¤å¦r¥H°µ´ú¸Õ(&E)¡G" -#: Merge.rc:1560 +#: Merge.rc:1543 #, c-format msgid "&Folder Name" msgstr "¸ê®Æ§¨¦WºÙ(&F)" -#: Merge.rc:1562 +#: Merge.rc:1545 #, c-format msgid "Result:" msgstr "µ²ªG¡G" -#: Merge.rc:1566 +#: Merge.rc:1549 #, c-format msgid "&Test" msgstr "´ú¸Õ(&T)" -#: Merge.rc:1567 +#: Merge.rc:1550 #, c-format msgid "&Close" msgstr "Ãö³¬(&C)" -#: Merge.rc:1575 +#: Merge.rc:1558 #, c-format msgid "&Use customized text colors" msgstr "¨Ï¥Î¦Û­q¤å¦r¦â±m(&U)" -#: Merge.rc:1578 +#: Merge.rc:1561 #, c-format msgid "Custom text colors" msgstr "¦Û­q¤å¦r¦â±m" -#: Merge.rc:1580 +#: Merge.rc:1563 #, c-format msgid "Whitespace:" msgstr "ªÅ¥Õ¡G" -#: Merge.rc:1581 +#: Merge.rc:1564 #, c-format msgid "Regular text:" msgstr "Ãþ«¬ªí¦¡¤å¡G" -#: Merge.rc:1582 +#: Merge.rc:1565 #, c-format msgid "Selection:" msgstr "¿ï¨ú¡G" -#: Merge.rc:1605 +#: Merge.rc:1588 #, c-format msgid "Paths" msgstr "¸ô®|" -#: Merge.rc:1611 +#: Merge.rc:1594 #, c-format msgid "R&ead-only" msgstr "°ßŪ(&E)" -#: Merge.rc:1615 +#: Merge.rc:1598 #, c-format msgid "Re&ad-only" msgstr "°ßŪ(&A)" -#: Merge.rc:1621 +#: Merge.rc:1604 #, c-format msgid "Open..." msgstr "¶}±Ò..." -#: Merge.rc:1622 +#: Merge.rc:1605 #, c-format msgid "Save..." msgstr "Àx¦s..." -#: Merge.rc:1627 -#: Merge.rc:1965 +#: Merge.rc:1610 +#: Merge.rc:1966 #, c-format msgid "Backup Files" msgstr "³Æ¥÷ÀÉ®×" -#: Merge.rc:1630 +#: Merge.rc:1613 #, c-format msgid "Create backup files in:" msgstr "²£¥Í³Æ¥÷ÀÉ©ó¡G" -#: Merge.rc:1635 +#: Merge.rc:1618 #, c-format msgid "Create backup files into:" msgstr "²£¥Í³Æ¥÷ÀɦܡG" -#: Merge.rc:1636 +#: Merge.rc:1619 #, c-format msgid "&Original file's folder" msgstr "­ì©lÀɪº¸ê®Æ§¨(&O)" -#: Merge.rc:1638 +#: Merge.rc:1621 #, c-format msgid "&Global backup folder:" msgstr "Á`ªº³Æ¥÷¸ê®Æ§¨(&G)¡G" -#: Merge.rc:1642 +#: Merge.rc:1625 #, c-format msgid "Backup filename:" msgstr "³Æ¥÷ÀÉÀɦW¡G" -#: Merge.rc:1643 +#: Merge.rc:1626 #, c-format msgid "&Append .bak -extension" msgstr "ªþ¤W .bak °ÆÀɦW(&A)" -#: Merge.rc:1645 +#: Merge.rc:1628 #, c-format msgid "A&ppend timestamp" msgstr "ªþ¤W®É¶¡ÂW°O(&P)" -#: Merge.rc:1652 -#: Merge.rc:2257 +#: Merge.rc:1635 +#: Merge.rc:2261 #, c-format msgid "Confirm Copy" msgstr "½T»{½Æ»s" -#: Merge.rc:1656 +#: Merge.rc:1639 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "½T©w­n½Æ»s XXX ¶µ¥Ø¡H" -#: Merge.rc:1658 +#: Merge.rc:1641 #, c-format msgid "From left" msgstr "±q¥ªÃä" -#: Merge.rc:1661 +#: Merge.rc:1644 #, c-format msgid "To right" msgstr "¨ì¥kÃä" -#: Merge.rc:1664 +#: Merge.rc:1647 #, c-format msgid "Yes" msgstr "¬O" -#: Merge.rc:1665 +#: Merge.rc:1648 #, c-format msgid "No" msgstr "§_" -#: Merge.rc:1671 +#: Merge.rc:1654 #, c-format msgid "Plugins" msgstr "¥~±¾" -#: Merge.rc:1674 +#: Merge.rc:1657 #, c-format msgid "&Enable plugins" msgstr "±Ò¥Î¥~±¾(&E)" -#: Merge.rc:1685 -#: Merge.rc:1966 +#: Merge.rc:1668 +#: Merge.rc:1967 #, c-format msgid "Shell Integration" msgstr "¨Ö¤JÀÉ®×Á`ºÞ¤¶­±" -#: Merge.rc:1688 +#: Merge.rc:1671 #, c-format msgid "Explorer" msgstr "ÀÉ®×Á`ºÞ" -#: Merge.rc:1689 +#: Merge.rc:1672 #, c-format msgid "E&nable advanced menu" msgstr "±Ò¥Î¶i¶¥¿ï³æ(&N)" -#: Merge.rc:1691 +#: Merge.rc:1674 #, c-format msgid "In&clude subfolders by default" msgstr "¦Û°Ê¥]¬A¤l¥Ø¿ý(&C)" -#: Merge.rc:1693 +#: Merge.rc:1676 #, c-format msgid "&Add to context menu" msgstr "¥[¨ì¥kÁä¿ï³æ(&A)" -#: Merge.rc:1695 +#: Merge.rc:1678 #, c-format msgid "Folder compare" msgstr "¸ê®Æ§¨¤ñ¸û" -#: Merge.rc:1696 +#: Merge.rc:1679 #, c-format msgid "Add &Shell menu to context menu" msgstr "±N WinMerge ¿ï³æ¥[¨ì¥kÁä¿ï³æ(&S)" +#: Merge.rc:1686 +#: Merge.rc:1970 +#: Merge.rc:2307 +#, c-format +msgid "Folder" +msgstr "¸ê®Æ§¨" + +#: Merge.rc:1689 +#, c-format +msgid "&Compare method:" +msgstr "Àɮפñ¸û¤è¦¡(&C)¡G" + +#: Merge.rc:1691 +#, c-format +msgid "S&top after first difference" +msgstr "²Ä¤@­Ó®t²§´N°±(&T)" + +#: Merge.rc:1693 +#, c-format +msgid "Ign&ore time differences less than 3 seconds" +msgstr "¦p¨âÀɮפ§­×§ï®É¶¡¶¡¹j¤Ö©ó¤T¬í¡A«h©¿²¤¦¹®t²§(&O)" + +#: Merge.rc:1695 +#, c-format +msgid "&Include unique subfolders contents" +msgstr "¥]¬A¿W¤@¤l¸ê®Æ§¨(&I)" + +#: Merge.rc:1697 +#, c-format +msgid "&Quick compare limit (MB):" +msgstr "§Ö³t¤ñ¸û¤§Àɮפj¤p¤W­­ (MB)(&Q)¡G" + #. StringFileInfo.Block -#: Merge.rc:1722 +#: Merge.rc:1723 #, c-format msgid "040904e4" msgstr "040403B6" #. VarFileInfo.Translation -#: Merge.rc:1738 +#: Merge.rc:1739 #, c-format msgid "0x409, 1252" msgstr "0x404, 950" -#: Merge.rc:1753 +#: Merge.rc:1754 #, c-format msgid "Ready" msgstr "´Nºü" -#: Merge.rc:1759 +#: Merge.rc:1760 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1761 +#: Merge.rc:1762 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1762 +#: Merge.rc:1763 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1763 +#: Merge.rc:1764 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1764 +#: Merge.rc:1765 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1770 +#: Merge.rc:1771 #, c-format msgid "" "Create empty documents\n" @@ -2725,7 +2746,7 @@ msgstr "" "«Ø¥ßªÅ¥Õ¤å¥ó\n" "·s¤å¥ó (Ctrl+N)" -#: Merge.rc:1771 +#: Merge.rc:1772 #, c-format msgid "" "Open an existing document\n" @@ -2734,7 +2755,7 @@ msgstr "" "¶}±Ò²{¦s¤å¥ó\n" "¶}±Ò (Ctrl+O)" -#: Merge.rc:1772 +#: Merge.rc:1773 #, c-format msgid "" "Close the active document\n" @@ -2743,7 +2764,7 @@ msgstr "" "Ãö³¬¥Ø«e½s¿è¤å¥ó\n" "Ãö³¬" -#: Merge.rc:1773 +#: Merge.rc:1774 #, c-format msgid "" "Save the active document\n" @@ -2752,7 +2773,7 @@ msgstr "" "Àx¦s¥Ø«e½s¿è¤å¥ó\n" "Àx¦s (Ctrl+S)" -#: Merge.rc:1774 +#: Merge.rc:1775 #, c-format msgid "" "Save the active document with a new name\n" @@ -2761,7 +2782,7 @@ msgstr "" "¥H·s¦WºÙÀx¦s¥Ø«e½s¿è¤å¥ó\n" "¥t¦s·sÀÉ" -#: Merge.rc:1775 +#: Merge.rc:1776 #, c-format msgid "" "Change the printing options\n" @@ -2770,7 +2791,7 @@ msgstr "" "Åܧó¦C¦L¿ï¶µ\n" "ª©­±³]©w" -#: Merge.rc:1776 +#: Merge.rc:1777 #, c-format msgid "" "Change the printer and printing options\n" @@ -2779,7 +2800,7 @@ msgstr "" "Åܧó¦Lªí¾÷©M¦C¦L¿ï¶µ\n" "¦C¦L³]©w" -#: Merge.rc:1777 +#: Merge.rc:1778 #, c-format msgid "" "Print the active document\n" @@ -2788,7 +2809,7 @@ msgstr "" "¦C¦L¥Ø«e½s¿è¤å¥ó\n" "¦C¦L" -#: Merge.rc:1778 +#: Merge.rc:1779 #, c-format msgid "" "Display full pages\n" @@ -2797,27 +2818,27 @@ msgstr "" "Åã¥Ü¾ã­¶\n" "¹wÄý¦C¦L" -#: Merge.rc:1783 +#: Merge.rc:1784 #, c-format msgid "Make all hidden items visible again" msgstr "¨Ï©Ò¦³ÁôÂöµ¥Ø¦AÅã¥Ü¥X¨Ó" -#: Merge.rc:1784 +#: Merge.rc:1785 #, c-format msgid "Toggle tree mode" msgstr "¤Á´«¾ðª¬¼Ò¦¡" -#: Merge.rc:1785 +#: Merge.rc:1786 #, c-format msgid "Expand all subfolders" msgstr "®i¶}©Ò¦³¤l¸ê®Æ§¨" -#: Merge.rc:1786 +#: Merge.rc:1787 #, c-format msgid "Collapse all subfolders" msgstr "¦¬¦X©Ò¦³¤l¸ê®Æ§¨" -#: Merge.rc:1792 +#: Merge.rc:1793 #, c-format msgid "" "Open project file\n" @@ -2826,32 +2847,32 @@ msgstr "" "¶}±Ò±M®×ÀÉ\n" "±M®×ÀÉ (Ctrl+J)" -#: Merge.rc:1793 +#: Merge.rc:1794 #, c-format msgid "Unknown error attempting to open project file" msgstr "¶}±Ò±M®×Àɮɵo¥Í¤£©ú¿ù»~" -#: Merge.rc:1794 +#: Merge.rc:1795 #, c-format msgid "Unknown error attempting to save project file" msgstr "Àx¦s±M®×Àɮɵo¥Í¤£©ú¿ù»~" -#: Merge.rc:1795 +#: Merge.rc:1796 #, c-format msgid "Project File" msgstr "±M®×ÀÉ" -#: Merge.rc:1796 +#: Merge.rc:1797 #, c-format msgid "Project file successfully loaded." msgstr "±M®×Àɦ¨¥\¸ü¤J¡C" -#: Merge.rc:1797 +#: Merge.rc:1798 #, c-format msgid "Project file successfully saved." msgstr "±M®×Àɦ¨¥\Àx¦s¡C" -#: Merge.rc:1798 +#: Merge.rc:1799 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2860,7 +2881,7 @@ msgstr "" "Àx¦s¥Ø«e¸ô®|¤Î¿ï¶µ¦Ü±M®×ÀÉ\n" "Àx¦s±M®×ÀÉ" -#: Merge.rc:1803 +#: Merge.rc:1804 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2869,7 +2890,7 @@ msgstr "" "Åã¥Üµ{¦¡¸ê°T¡Aª©¥»¸¹½X©MµÛ§@Åv\n" "Ãö©ó" -#: Merge.rc:1804 +#: Merge.rc:1805 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2878,7 +2899,6 @@ msgstr "" "Â÷¶}À³¥Îµ{¦¡¡F´£¿ôÀx¦s¤å¥ó\n" "µ²§ô" -#: Merge.rc:1810 #: Merge.rc:1811 #: Merge.rc:1812 #: Merge.rc:1813 @@ -2894,11 +2914,12 @@ msgstr "" #: Merge.rc:1823 #: Merge.rc:1824 #: Merge.rc:1825 +#: Merge.rc:1826 #, c-format msgid "Open this document" msgstr "¶}±Ò¦¹¤å¥ó" -#: Merge.rc:1830 +#: Merge.rc:1831 #, c-format msgid "" "Switch to the next window pane\n" @@ -2907,7 +2928,7 @@ msgstr "" "¤Á´«¨ì¤U¤@µøµ¡\n" "¤U¤@µøµ¡" -#: Merge.rc:1831 +#: Merge.rc:1832 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2916,7 +2937,7 @@ msgstr "" "¤Á´«¦^¤W¤@µøµ¡\n" "¤W¤@µøµ¡" -#: Merge.rc:1837 +#: Merge.rc:1838 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2925,7 +2946,7 @@ msgstr "" "Å|¸mµøµ¡\n" "Å|¸mµøµ¡" -#: Merge.rc:1838 +#: Merge.rc:1839 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2934,7 +2955,7 @@ msgstr "" "«DÅ|¸m¤W¤U±Æ¦Cµøµ¡\n" "¤W¤U¨Ã¦Cµøµ¡" -#: Merge.rc:1839 +#: Merge.rc:1840 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2943,7 +2964,7 @@ msgstr "" "«DÅ|¸m¥ª¥k±Æ¦Cµøµ¡\n" "¥ª¥k¨Ã¦Cµøµ¡" -#: Merge.rc:1845 +#: Merge.rc:1846 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2952,7 +2973,7 @@ msgstr "" "½Æ»s©Ò¿ï¨ì°Å¶Kï\n" "½Æ»s" -#: Merge.rc:1846 +#: Merge.rc:1847 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2961,7 +2982,7 @@ msgstr "" "°Å¤U©Ò¿ï¨ì°Å¶Kï\n" "°Å¤U" -#: Merge.rc:1847 +#: Merge.rc:1848 #, c-format msgid "" "Find the specified text\n" @@ -2970,7 +2991,7 @@ msgstr "" "´M§ä«ü©w¤å¦r\n" "´M§ä" -#: Merge.rc:1848 +#: Merge.rc:1849 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2979,7 +3000,7 @@ msgstr "" "´¡¤J°Å¶K鷺®e\n" "¶K¤W" -#: Merge.rc:1849 +#: Merge.rc:1850 #, c-format msgid "" "Repeat the last action\n" @@ -2988,7 +3009,7 @@ msgstr "" "­«½Æ¤W¦¸ªº°Ê§@\n" "­«½Æ" -#: Merge.rc:1850 +#: Merge.rc:1851 #, c-format msgid "" "Replace specific text with different text\n" @@ -2997,7 +3018,7 @@ msgstr "" "¥H¤£¦P¤å¦r¨ú¥N«ü©w¤å¦r\n" "¨ú¥N" -#: Merge.rc:1851 +#: Merge.rc:1852 #, c-format msgid "" "Select the entire document\n" @@ -3006,7 +3027,7 @@ msgstr "" "¿ï¨ú¾ã¥÷¤å¥ó\n" "¥þ¿ï" -#: Merge.rc:1852 +#: Merge.rc:1853 #, c-format msgid "" "Undo the last action\n" @@ -3015,7 +3036,7 @@ msgstr "" "ºM¦^¤W¦¸°Ê§@\n" "´_­ì" -#: Merge.rc:1853 +#: Merge.rc:1854 #, c-format msgid "" "Redo the previously undone action\n" @@ -3024,7 +3045,7 @@ msgstr "" "¦A°µ¤W¦¸ªººM¦^\n" "¦A°µ" -#: Merge.rc:1859 +#: Merge.rc:1860 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3033,7 +3054,7 @@ msgstr "" "Åã¥Ü©ÎÁôÂäu¨ã¦C\n" "±Ò³¬¤u¨ã¦C" -#: Merge.rc:1860 +#: Merge.rc:1861 #, c-format msgid "" "Show or hide the status bar\n" @@ -3042,7 +3063,7 @@ msgstr "" "Åã¥Ü©ÎÁôÂꬺA¦C\n" "±Ò³¬ª¬ºA¦C" -#: Merge.rc:1861 +#: Merge.rc:1862 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3051,7 +3072,7 @@ msgstr "" "Åã¥Ü©ÎÁôÂí¶ÅÒ¦C\n" "±Ò³¬­¶ÅÒ¦C" -#: Merge.rc:1862 +#: Merge.rc:1863 #, c-format msgid "" "Automatically resize panes\n" @@ -3060,57 +3081,57 @@ msgstr "" "¦Û°Ê½Õ¾ãµ¡®æ¤j¤p\n" "Âê¦íµ¡®æ" -#: Merge.rc:1868 +#: Merge.rc:1869 #, c-format msgid "Change the window size" msgstr "§ó§ïµøµ¡¤j¤p" -#: Merge.rc:1869 +#: Merge.rc:1870 #, c-format msgid "Change the window position" msgstr "§ó§ïµøµ¡¦ì¸m" -#: Merge.rc:1870 +#: Merge.rc:1871 #, c-format msgid "Reduce the window to an icon" msgstr "ÁY¤pµøµ¡¦¨¹Ï¥Ü" -#: Merge.rc:1871 +#: Merge.rc:1872 #, c-format msgid "Enlarge the window to full size" msgstr "ÂX¤jµøµ¡¦¨¥þ¿Ã¹õ" -#: Merge.rc:1872 +#: Merge.rc:1873 #, c-format msgid "Switch to the next document window" msgstr "¤Á´«¨ì¤U¤@¤å¥óµøµ¡" -#: Merge.rc:1873 +#: Merge.rc:1874 #, c-format msgid "Switch to the previous document window" msgstr "¤Á´«¨ì¤W¤@¤å¥óµøµ¡" -#: Merge.rc:1874 +#: Merge.rc:1875 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Ãö³¬¥Ø«e½s¿èµøµ¡¨Ã´£¿ôÀx¦s¤å¥ó" -#: Merge.rc:1879 +#: Merge.rc:1880 #, c-format msgid "Restore the window to normal size" msgstr "µøµ¡«ì´_¼Ð·Ç¤j¤p" -#: Merge.rc:1880 +#: Merge.rc:1881 #, c-format msgid "Activate Task List" msgstr "±Ò¥Î¤u§@²M³æ" -#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Activate this window" msgstr "±Ò¥Î³o­Óµøµ¡" -#: Merge.rc:1887 +#: Merge.rc:1888 #, c-format msgid "" "Close print preview mode\n" @@ -3119,7 +3140,7 @@ msgstr "" "Ãö³¬¹wÄý¦C¦L¼Ò¦¡\n" "¨ú®ø¹wÄý" -#: Merge.rc:1894 +#: Merge.rc:1895 #, c-format msgid "" "\n" @@ -3138,7 +3159,7 @@ msgstr "" "WinMerge.Àɮפñ¸û\n" "WinMerge Àɮפñ¸û" -#: Merge.rc:1895 +#: Merge.rc:1896 #, c-format msgid "" "\n" @@ -3157,23 +3178,23 @@ msgstr "" "WinMerge.¸ê®Æ§¨¤ñ¸û\n" "WinMerge ¸ê®Æ§¨¤ñ¸û" -#: Merge.rc:1902 +#: Merge.rc:1903 #, c-format msgid "Preserve original EOL chars" msgstr "«O¯d­ì©l EOL ¦r¤¸" -#: Merge.rc:1909 +#: Merge.rc:1910 #, c-format msgid "Press any key" msgstr "«ö¥ô·NÁä" -#: Merge.rc:1915 #: Merge.rc:1916 +#: Merge.rc:1917 #, c-format msgid "Right click on the path to copy" msgstr "¹«¥kÁäÂIÀ»«Ý½Æ»sªº¸ô®|" -#: Merge.rc:1922 +#: Merge.rc:1923 #, c-format msgid "" "Developers:\n" @@ -3182,157 +3203,158 @@ msgstr "" "¬ãµoªÌ¡G\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1923 +#: Merge.rc:1924 #, 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 "µ´¤£«OÃҦۥѳnÅé WinMerge µL·å²«¡CÅwªï¦b¬Y¨Ç±ø¥ó¤U¦A´²µo¥¦¡F²Ó¸`¨£»¡©ú¿ï³æ¤¤ªº GNU ¤½¦@±ÂÅvÃÒ¡C" -#: Merge.rc:1929 +#: Merge.rc:1930 #, c-format msgid "&Ok" msgstr "½T©w(&O)" -#: Merge.rc:1931 +#: Merge.rc:1932 #, c-format msgid "&Abort" msgstr "©ñ±ó(&A)" -#: Merge.rc:1932 +#: Merge.rc:1933 #, c-format msgid "&Retry" msgstr "­«¸Õ(&R)" -#: Merge.rc:1933 +#: Merge.rc:1934 #, c-format msgid "&Ignore" msgstr "©¿²¤(&I)" -#: Merge.rc:1934 +#: Merge.rc:1935 #, c-format msgid "Ignore &all" msgstr "¥þ³¡©¿²¤(&A)" -#: Merge.rc:1935 +#: Merge.rc:1936 #, c-format msgid "&Yes" msgstr "¬O(&Y)" -#: Merge.rc:1941 +#: Merge.rc:1942 #, c-format msgid "Yes to &all" msgstr "¥þ³¡¬Ò¬O(&A)" -#: Merge.rc:1942 +#: Merge.rc:1943 #, c-format msgid "&No" msgstr "§_(&N)" -#: Merge.rc:1943 +#: Merge.rc:1944 #, c-format msgid "No to a&ll" msgstr "¥þ³¡¬Ò§_(&L)" -#: Merge.rc:1944 +#: Merge.rc:1945 #, c-format msgid "&Continue" msgstr "Ä~Äò(&C)" -#: Merge.rc:1945 +#: Merge.rc:1946 #, c-format msgid "&Skip" msgstr "²¤¹L(&S)" -#: Merge.rc:1946 +#: Merge.rc:1947 #, c-format msgid "Skip &all" msgstr "¥þ³¡²¤¹L(&A)" -#: Merge.rc:1948 +#: Merge.rc:1949 #, c-format msgid "Don't display this &message again." msgstr "¤£­n¦AÅã¥Ü³o­Ó°T®§(&M)" -#: Merge.rc:1949 +#: Merge.rc:1950 #, c-format msgid "Don't ask this &question again." msgstr "¤£­n¦A´£¥Ü³o­Ó°ÝÃD(&Q)" -#: Merge.rc:1959 -#, c-format -msgid "Syntax colors" -msgstr "»yªk¦â±m" - -#: Merge.rc:1960 +#: Merge.rc:1961 #, c-format -msgid "Text Colors" -msgstr "¤å¦r¦â±m" +msgid "Syntax" +msgstr "»yªk" -#: Merge.rc:1962 +#: Merge.rc:1963 #, c-format msgid "Version Control" msgstr "ª©¥»±±¨î" -#: Merge.rc:1973 +#: Merge.rc:1968 +#: Merge.rc:2339 +#, c-format +msgid "Differences" +msgstr "®t²§" + +#: Merge.rc:1977 #, c-format msgid "To:" msgstr "¨ì¡G" -#: Merge.rc:1974 +#: Merge.rc:1978 #, c-format msgid "From left:" msgstr "±q¥ªÃä¡G" -#: Merge.rc:1975 +#: Merge.rc:1979 #, c-format msgid "To left:" msgstr "¨ì¥ªÃä¡G" -#: Merge.rc:1976 +#: Merge.rc:1980 #, c-format msgid "From right:" msgstr "±q¥kÃä¡G" -#: Merge.rc:1977 +#: Merge.rc:1981 #, c-format msgid "To right:" msgstr "¨ì¥kÃä¡G" -#: Merge.rc:1983 +#: Merge.rc:1987 #, c-format msgid "Version %1" msgstr "ª©¥» %1" -#: Merge.rc:1984 +#: Merge.rc:1988 #, c-format msgid "Unicode" msgstr "¸U°ê½X" -#: Merge.rc:1985 +#: Merge.rc:1989 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:1991 +#: Merge.rc:1995 #, c-format msgid "Options (%1)" msgstr "¿ï¶µ (%1)" -#: Merge.rc:1992 +#: Merge.rc:1996 #, c-format msgid "All message boxes are now displayed again." msgstr "©Ò¦³°T®§²°²{¦b·|¦AÅã¥Ü¡C" -#: Merge.rc:1993 +#: Merge.rc:1997 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Àɮפñ¹ïªº³]©w¤w³Q­×§ï¡C­«·s±Ò°Ê¤ñ¹ï¡A¨º¨Ç³]©w¤~·|¥Í®Ä¡C" -#: Merge.rc:1994 +#: Merge.rc:1998 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "©Ò¿ï¦r«¬¤§Åܧ󤣷|®M¥Î¨ì¥ô¦ó¥Ø«eÅã²{®t²§ªºµøµ¡¡C" -#: Merge.rc:1996 +#: Merge.rc:2000 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3343,7 +3365,7 @@ msgstr "" "\n" "½Ð¥Î­È 1 - %1¡C" -#: Merge.rc:1998 +#: Merge.rc:2002 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3354,130 +3376,130 @@ msgstr "" "\n" "­«³]«á½Ð­«·s±Ò°Ê WinMerge¡C" -#: Merge.rc:2004 +#: Merge.rc:2008 #, c-format msgid "Open" msgstr "¶}±Ò" -#: Merge.rc:2005 +#: Merge.rc:2009 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "µ{¦¡|*.exe;*.bat;*.cmd|©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:2006 +#: Merge.rc:2010 #, c-format msgid "All Files (*.*)|*.*||" msgstr "©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:2007 +#: Merge.rc:2011 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ±M®×ÀÉ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2009 +#: Merge.rc:2013 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "¿ï¶µÀÉ (*.ini)|*.ini|©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:2015 +#: Merge.rc:2019 #, 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|All Files (*.*)|*.*||" -#: Merge.rc:2016 +#: Merge.rc:2020 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ÀÉ (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -#: Merge.rc:2017 +#: Merge.rc:2021 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ÀÉ (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:2023 +#: Merge.rc:2027 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:2024 +#: Merge.rc:2028 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:2025 +#: Merge.rc:2029 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:2026 +#: Merge.rc:2030 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:2032 +#: Merge.rc:2036 #, c-format msgid "Full Contents" msgstr "§¹¾ã¤º®e" -#: Merge.rc:2033 +#: Merge.rc:2037 #, c-format msgid "Quick Contents" msgstr "§Ö³t¤º®e" -#: Merge.rc:2034 +#: Merge.rc:2038 #, c-format msgid "Modified Date" msgstr "­×§ï¤é´Á" -#: Merge.rc:2035 +#: Merge.rc:2039 #, c-format msgid "Modified Date and Size" msgstr "­×§ï¤é´Á»P¤j¤p" -#: Merge.rc:2036 +#: Merge.rc:2040 #, c-format msgid "Size" msgstr "¤j¤p" -#: Merge.rc:2042 -#: Merge.rc:2667 +#: Merge.rc:2046 +#: Merge.rc:2572 #, c-format msgid "Name" msgstr "¦WºÙ" -#: Merge.rc:2043 +#: Merge.rc:2047 #, c-format msgid "Location" msgstr "¦ì¸m" -#: Merge.rc:2044 +#: Merge.rc:2048 #, c-format msgid "Filters" msgstr "¿z¿ï¾¹" -#: Merge.rc:2045 +#: Merge.rc:2049 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2046 -#: Merge.rc:2669 +#: Merge.rc:2050 +#: Merge.rc:2574 #, c-format msgid "Description" msgstr "´y­z" # I suggest "Add new filter filename" instead. For it must not select a name, rather give one. -#: Merge.rc:2047 +#: Merge.rc:2051 #, c-format msgid "Select filename for new filter" msgstr "«Ø¥ß·s¿z¿ï¾¹ÀɦW" -#: Merge.rc:2048 +#: Merge.rc:2052 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Àɮ׿z¿ï¾¹ (*.flt)|*.flt|©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:2050 +#: Merge.rc:2054 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3490,7 +3512,7 @@ msgstr "" "½Ð½Æ»sÀÉ®× %1 ¨ì WinMerge/Àɮ׿z¿ï¾¹-¸ê®Æ§¨¡G\n" "%2¡C" -#: Merge.rc:2052 +#: Merge.rc:2056 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3503,7 +3525,7 @@ msgstr "" "\n" "½Ð½T©w¦³¸Ó¸ê®Æ§¨¡A¦Ó¥B¤¹³\¼g¤J¡C" -#: Merge.rc:2054 +#: Merge.rc:2058 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3514,7 +3536,7 @@ msgstr "" "\n" "½Ð©ó¡u¿ï¶µ/¨t²Î¡v¤¤¿ï©wÀɮ׿z¿ï¾¹¸ê®Æ§¨¡C" -#: Merge.rc:2056 +#: Merge.rc:2060 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3527,12 +3549,12 @@ msgstr "" "\n" "¥¦¬O°ßŪÀÉ¡H" -#: Merge.rc:2057 +#: Merge.rc:2061 #, c-format msgid "Locate filter file to install" msgstr "§ä¨ìÀɮ׿z¿ï¾¹ÀÉ¥H¦w¸Ë" -#: Merge.rc:2059 +#: Merge.rc:2063 #, c-format msgid "" "Installing filter file failed.\n" @@ -3543,17 +3565,17 @@ msgstr "" "\n" "¤£¯à½Æ»s·s¿z¿ï¾¹ÀɨìÀɮ׿z¿ï¾¹¸ê®Æ§¨¡C" -#: Merge.rc:2061 +#: Merge.rc:2065 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Àɮ׿z¿ï¾¹Àɤw¦s¦b¡CÂл\¤§¡H" -#: Merge.rc:2067 +#: Merge.rc:2071 #, c-format msgid "Regular expression" msgstr "Ãþ«¬ªí¦¡" -#: Merge.rc:2073 +#: Merge.rc:2077 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3564,203 +3586,203 @@ msgstr "" "\n" "¦p¤£·Q²{¦b­«¾ã¡A¿ï¡u§_¡v¡A¥H«á¦A­«¾ã¡C" -#: Merge.rc:2080 +#: Merge.rc:2084 #, c-format msgid "&Path to SS.EXE:" msgstr "¦Ü SS.EXE ªº¸ô®|(&P)" -#: Merge.rc:2086 +#: Merge.rc:2090 #, c-format msgid "Folder Comparison Results" msgstr "¸ê®Æ§¨¤ñ¹ïµ²ªG" -#: Merge.rc:2087 +#: Merge.rc:2091 #, c-format msgid "File Comparison" msgstr "Àɮפñ¹ï¤¤" -#: Merge.rc:2088 +#: Merge.rc:2092 #, c-format msgid "Untitled left" msgstr "¥¼³]¼ÐÃDªº¥ªÃä" -#: Merge.rc:2089 +#: Merge.rc:2093 #, c-format msgid "Untitled right" msgstr "¥¼³]¼ÐÃDªº¥kÃä" -#: Merge.rc:2090 +#: Merge.rc:2094 #, c-format msgid "Theirs File" msgstr "¥L­Ìªº(ÀÉ®×)" -#: Merge.rc:2091 +#: Merge.rc:2095 #, c-format msgid "Mine File" msgstr "§Úªº(ÀÉ®×)" -#: Merge.rc:2097 +#: Merge.rc:2101 #, c-format msgid "Scanning files..." msgstr "±½´yÀÉ®×..." -#: Merge.rc:2098 +#: Merge.rc:2102 #, c-format msgid "Opening selection" msgstr "¶}±Ò¿ï¨ú" -#: Merge.rc:2099 +#: Merge.rc:2103 #, c-format msgid "Copying Left to Right" msgstr "¥¿½Æ»s¥ªÃä¨ì¥kÃä" -#: Merge.rc:2100 +#: Merge.rc:2104 #, c-format msgid "Copying Right to Left" msgstr "¥¿½Æ»s¥kÃä¨ì¥ªÃä" -#: Merge.rc:2101 +#: Merge.rc:2105 #, c-format msgid "Copying All to Left" msgstr "¥¿½Æ»s¥þ³¡¨ì¥ªÃä" -#: Merge.rc:2102 +#: Merge.rc:2106 #, c-format msgid "Copying All to Right" msgstr "¥¿½Æ»s¥þ³¡¨ì¥kÃä" -#: Merge.rc:2103 +#: Merge.rc:2107 #, c-format msgid "Copying files..." msgstr "¥¿½Æ»sÀÉ®×..." -#: Merge.rc:2104 +#: Merge.rc:2108 #, c-format msgid "Deleting files..." msgstr "¥¿§R°£ÀÉ®×..." -#: Merge.rc:2105 +#: Merge.rc:2109 #, c-format msgid "Moving files..." msgstr "¥¿²¾°ÊÀÉ®×..." -#: Merge.rc:2106 +#: Merge.rc:2110 #, c-format msgid "Creating the report..." msgstr "¥¿²£¥Í³ø§i..." -#: Merge.rc:2107 +#: Merge.rc:2111 #, c-format msgid "Undoing the last operation..." msgstr "ºM¦^¤W¦¸ªº¾Þ§@..." -#: Merge.rc:2108 +#: Merge.rc:2112 #, c-format msgid "Redoing the previous operation..." msgstr "¦A°µ¤W¦¸ªº¾Þ§@..." -#: Merge.rc:2114 +#: Merge.rc:2118 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "¦æ¡G%s Äæ¡G%d/%d ¦r¤¸¡G%d/%d ¦æ¥½¡G%s" -#: Merge.rc:2115 +#: Merge.rc:2119 #, c-format msgid "Line: %s" msgstr "¦æ¡G %s" -#: Merge.rc:2116 +#: Merge.rc:2120 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "¦æ¡G%s Äæ¡G%d/%d ¦r¤¸¡G%d/%d" -#: Merge.rc:2117 +#: Merge.rc:2121 #, c-format msgid "Merge" msgstr "¦X¨Ö" -#: Merge.rc:2118 +#: Merge.rc:2122 #, c-format msgid "Difference %1 of %2" msgstr "%2 ­Ó®t²§¤¤¤§²Ä %1" -#: Merge.rc:2119 +#: Merge.rc:2123 #, c-format msgid "%1 Differences Found" msgstr "§ä¨ì %1 ­Ó®t²§" -#: Merge.rc:2120 +#: Merge.rc:2124 #, c-format msgid "1 Difference Found" msgstr "§ä¨ì 1 ­Ó®t²§" #. Abbreviation from "Read Only" -#: Merge.rc:2121 +#: Merge.rc:2125 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2127 +#: Merge.rc:2131 #, c-format msgid "Item %1 of %2" msgstr "%2 ­Ó¶µ¥Ø¤§²Ä %1" -#: Merge.rc:2128 +#: Merge.rc:2132 #, c-format msgid "Items: %1" msgstr "¶µ¥Ø¡G%1" -#: Merge.rc:2134 +#: Merge.rc:2138 #, c-format msgid "Select two existing folders or files to compare" msgstr "¿ï¨ú¨â­Ó²{¦s¸ê®Æ§¨©ÎÀÉ®×°µ¤ñ¹ï" -#: Merge.rc:2135 +#: Merge.rc:2139 #, c-format msgid "Folder Selection" msgstr "¸ê®Æ§¨¿ï¨ú" -#: Merge.rc:2136 +#: Merge.rc:2140 #, c-format msgid "Select two folders or two files to compare." msgstr "¿ï¨ú¨â­Ó¸ê®Æ§¨©ÎÀÉ®×°µ¤ñ¹ï¡C" -#: Merge.rc:2137 +#: Merge.rc:2141 #, c-format msgid "Left path is invalid!" msgstr "¥ªÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2138 +#: Merge.rc:2142 #, c-format msgid "Right path is invalid!" msgstr "¥kÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2139 +#: Merge.rc:2143 #, c-format msgid "Both paths are invalid!" msgstr "¨âÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2140 +#: Merge.rc:2144 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "¿ï¨âÀÉ¥H±Ò¥Î¸Ñ¥]¾¹¿ï¨ú¡C" -#: Merge.rc:2141 +#: Merge.rc:2145 #, c-format msgid "Cannot compare file and folder!" msgstr "µLªk¤ñ¸ûÀɮשM¸ê®Æ§¨¡I" -#: Merge.rc:2147 +#: Merge.rc:2151 #, c-format msgid "File not found: %1" msgstr "§ä¤£¨ìÀɮסG%1" -#: Merge.rc:2148 +#: Merge.rc:2152 #, c-format msgid "File not unpacked: %1" msgstr "¥¼¸Ñ¥]ªºÀɮסG%1" -#: Merge.rc:2149 +#: Merge.rc:2153 #, c-format msgid "" "Cannot open file\n" @@ -3773,12 +3795,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2150 +#: Merge.rc:2154 #, c-format msgid "Failed to parse conflict file." msgstr "µLªk¸ÑªR½Ä¬ðÀÉ¡C" -#: Merge.rc:2151 +#: Merge.rc:2155 #, c-format msgid "" "The file\n" @@ -3789,32 +3811,32 @@ msgstr "" "%1\n" "¤£¬O½Ä¬ðÀÉ¡C" -#: Merge.rc:2157 +#: Merge.rc:2161 #, c-format msgid "Save As" msgstr "¥t¦s·sÀÉ" -#: Merge.rc:2158 +#: Merge.rc:2162 #, c-format msgid "Save changes to %1?" msgstr "Àx¦s§ó§ï¨ì %1¡H" -#: Merge.rc:2159 +#: Merge.rc:2163 #, 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 ¤w¼Ð°O¦¨°ßŪ¡C§A­nÂмg°ßŪÀɶܡH (§_¡A«h¥H·sÀɦWÀx¦s)" -#: Merge.rc:2160 +#: Merge.rc:2164 #, c-format msgid "Error checking destination writeability" msgstr "Àˬd¥Ø¼Ð¼g¤J©Ê®Éµo¥Í¿ù»~" -#: Merge.rc:2161 +#: Merge.rc:2165 #, c-format msgid "Error backing up file" msgstr "³Æ¥÷Àɮ׮ɵo¥Í¿ù»~" -#: Merge.rc:2163 +#: Merge.rc:2167 #, c-format msgid "" "Unable to backup original file:\n" @@ -3827,7 +3849,7 @@ msgstr "" "\n" "¤´ÂÂÄ~Äò¶Ü¡H" -#: Merge.rc:2164 +#: Merge.rc:2168 #, c-format msgid "" "Saving file failed.\n" @@ -3844,7 +3866,7 @@ msgstr "" "\t-¥H¤£¦P¦WºÙÀx¦sÀÉ®× («ö¡u½T©w¡v)\n" "\t-©ñ±ó¥Ø«e¾Þ§@(«ö¡u¨ú®ø¡v)¡H" -#: Merge.rc:2165 +#: Merge.rc:2169 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3859,7 +3881,7 @@ msgstr "" "\n" "­nÀx¦s¸Ñ¥]ª©¦¨¥t¤@Àɮ׶ܡH" -#: Merge.rc:2166 +#: Merge.rc:2170 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3874,7 +3896,7 @@ msgstr "" "\n" "§A­nÀx¦s¸Ñ«Ê¥]ª©¥»¬°¥t¤@Àɮ׶ܡH" -#: Merge.rc:2167 +#: Merge.rc:2171 #, c-format msgid "" "Another application has updated file\n" @@ -3889,7 +3911,7 @@ msgstr "" "\n" "­nÂмg¨º§ó·s¹LªºÀɮ׶ܡH" -#: Merge.rc:2168 +#: Merge.rc:2172 #, c-format msgid "" "%1\n" @@ -3898,7 +3920,7 @@ msgstr "" "%1\n" "¤w¼Ð°O¦¨°ßŪ¡C¤´­nÂмg¥¦¶Ü¡H" -#: Merge.rc:2169 +#: Merge.rc:2173 #, c-format msgid "" "Another application has updated file\n" @@ -3913,17 +3935,17 @@ msgstr "" "\n" "­n­«·s¸ü¤J¥¦¶Ü¡H" -#: Merge.rc:2170 +#: Merge.rc:2174 #, c-format msgid "Save Left File As" msgstr "Àx¦s¥ªÃäÀɮ׬°" -#: Merge.rc:2171 +#: Merge.rc:2175 #, c-format msgid "Save Right File As" msgstr "Àx¦s¥kÃäÀɮ׬°" -#: Merge.rc:2172 +#: Merge.rc:2176 #, c-format msgid "" "The file\n" @@ -3934,7 +3956,7 @@ msgstr "" "%1\n" "®ø¥¢¡C½ÐÀx¦sÀÉ®×°Æ¥»¦AÄ~Äò¡C" -#: Merge.rc:2178 +#: Merge.rc:2182 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3942,42 +3964,42 @@ msgid "" "Refresh documents before continuing." msgstr "¦p¥¼­«¾ãÀɮסAWinMerge ¤£¯à¨Ö¤J²§°Ê¡C" -#: Merge.rc:2184 +#: Merge.rc:2188 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "¤@©w±o«ü©w¤@­Ó SourceSafe ±M®×¸ô®|¤~¯àÄ~Äò (¨Ò¦p¡G $/MyProject)" -#: Merge.rc:2185 +#: Merge.rc:2189 #, c-format msgid "Checkout files from VSS..." msgstr "¥Ñ VSS ¨ú¥XÀÉ®×..." -#: Merge.rc:2186 +#: Merge.rc:2190 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "°e¦^§ï¹LÀɮɡAª©¥»¨t²Î¦^³ø¤@­Ó¿ù»~¡CµLªkÄ~Äò..." -#: Merge.rc:2187 +#: Merge.rc:2191 #, c-format msgid "Error executing versioning system command." msgstr "°õ¦æª©¥»¨t²Î«ü¥O®Éµo¥Í¿ù»~¡C" -#: Merge.rc:2188 +#: Merge.rc:2192 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS §@·~¸ê®Æ§¨©M¥Ø«eÀɮצì¸m¤£²Å¦X¡C­nÄ~Äò¶Ü¡H" -#: Merge.rc:2189 +#: Merge.rc:2193 #, c-format msgid "No VSS database(s) found!" msgstr "§ä¤£¨ì VSS ¸ê®Æ®w¡I" -#: Merge.rc:2190 +#: Merge.rc:2194 #, c-format msgid "Error from VSS:" msgstr "VSS µo¥Í¿ù»~¡G" -#: Merge.rc:2191 +#: Merge.rc:2195 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3988,7 +4010,7 @@ msgstr "" " ½ÐÀˬdÀ˵ø¹L«áªº²ÕºA¡C\n" " ºM¦^¨ú¥X¡H" -#: Merge.rc:2192 +#: Merge.rc:2196 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3997,169 +4019,169 @@ msgstr "" "ºM¦^¨ú¥XÀɮ׮ɡAª©¥»¨t²Î¦^³ø¤@­Ó¿ù»~¡C\n" " ½ÐÀˬdÀ˵ø¹L«áªº²ÕºA¡C" -#: Merge.rc:2198 -#: Merge.rc:2651 +#: Merge.rc:2202 +#: Merge.rc:2556 #, c-format msgid "None" msgstr "µL" -#: Merge.rc:2199 +#: Merge.rc:2203 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (¦­©ó 5.0 ª©)" -#: Merge.rc:2200 +#: Merge.rc:2204 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ª©©M§ó±ßªºª©¥»)" -#: Merge.rc:2202 +#: Merge.rc:2206 #, c-format msgid "Break at whitespace" msgstr "ªÅ¥Õ³B¤¤Â_" -#: Merge.rc:2203 +#: Merge.rc:2207 #, c-format msgid "Break at whitespace or punctuation" msgstr "ªÅ¥Õ³B©Î¼ÐÂI³B¤¤Â_" -#: Merge.rc:2209 -#: Merge.rc:2211 +#: Merge.rc:2213 +#: Merge.rc:2215 #, c-format msgid "Copy selected item to named directory" msgstr "½Æ»s¿ï¨ú¶µ¨ìnamed ¥Ø¿ý" -#: Merge.rc:2210 -#: Merge.rc:2212 +#: Merge.rc:2214 +#: Merge.rc:2216 #, c-format msgid "Copy selected item to custom directory" msgstr "½Æ»s¿ï¨ú¶µ¨ì¦Û­q¥Ø¿ý" -#: Merge.rc:2213 +#: Merge.rc:2217 #, c-format msgid "Delete selected item on left" msgstr "§R°£¥ªÃ䪺¿ï¨ú¶µ¥Ø" -#: Merge.rc:2214 +#: Merge.rc:2218 #, c-format msgid "Delete selected item on right" msgstr "§R°£¥kÃ䪺¿ï¨ú¶µ¥Ø" -#: Merge.rc:2215 +#: Merge.rc:2219 #, c-format msgid "Delete selected item(s) on both sides" msgstr "§R°£¨âÃ䪺¿ï¨ú¶µ¥Ø" -#: Merge.rc:2216 +#: Merge.rc:2220 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "ÁôÂÿï¨ú¶µ¥Ø (¦Û°Ê¿z¿ï¾¹)" -#: Merge.rc:2217 +#: Merge.rc:2221 #, c-format msgid "Rename selected item on both sides" msgstr "¨âÃä¿ï¨ú¶µ¥Ø³£­«·s©R¦W" -#: Merge.rc:2218 +#: Merge.rc:2222 #, c-format msgid "Right to Left (%1)" msgstr "¥kÃä¨ì¥ªÃä (%1)" -#: Merge.rc:2219 +#: Merge.rc:2223 #, c-format msgid "Left to Right (%1)" msgstr "¥ªÃä¨ì¥kÃä (%1)" -#: Merge.rc:2220 +#: Merge.rc:2224 #, c-format msgid "Right to Left (%1 of %2)" msgstr "¥kÃä¨ì¥ªÃä (%2 ¤§ %1)" -#: Merge.rc:2221 +#: Merge.rc:2225 #, c-format msgid "Left to Right (%1 of %2)" msgstr "¥ªÃä¨ì¥kÃä (%2 ¤§ %1)" -#: Merge.rc:2222 -#: Merge.rc:2238 +#: Merge.rc:2226 +#: Merge.rc:2242 #, c-format msgid "Left to... (%1)" msgstr "¥ªÃä¨ì... (%1)" -#: Merge.rc:2223 -#: Merge.rc:2239 +#: Merge.rc:2227 +#: Merge.rc:2243 #, c-format msgid "Right to... (%1)" msgstr "¥kÃä¨ì... (%1)" -#: Merge.rc:2224 -#: Merge.rc:2240 +#: Merge.rc:2228 +#: Merge.rc:2244 #, c-format msgid "Left to... (%1 of %2)" msgstr "¥ªÃä¨ì... (%2 ¤§ %1)" -#: Merge.rc:2225 -#: Merge.rc:2241 +#: Merge.rc:2229 +#: Merge.rc:2245 #, c-format msgid "Right to... (%1 of %2)" msgstr "¥kÃä¨ì... (%2 ¤§ %1)" -#: Merge.rc:2231 +#: Merge.rc:2235 #, c-format msgid "Left (%1)" msgstr "¥ªÃä (%1)" -#: Merge.rc:2232 +#: Merge.rc:2236 #, c-format msgid "Right (%1)" msgstr "¥kÃä (%1)" -#: Merge.rc:2233 +#: Merge.rc:2237 #, c-format msgid "Both (%1)" msgstr "¨âÃä (%1)" -#: Merge.rc:2234 +#: Merge.rc:2238 #, c-format msgid "Left (%1 of %2)" msgstr "¥ªÃä (%2 ¤§ %1)" -#: Merge.rc:2235 +#: Merge.rc:2239 #, c-format msgid "Right (%1 of %2)" msgstr "¥kÃä (%2 ¤§ %1)" -#: Merge.rc:2236 +#: Merge.rc:2240 #, c-format msgid "Both (%1 of %2)" msgstr "¨âÃä (%2 ¤§ %1)" -#: Merge.rc:2237 +#: Merge.rc:2241 #, c-format msgid "Select destination folder" msgstr "¿ï¨ú¥Ø¼Ð¸ê®Æ§¨" -#: Merge.rc:2242 +#: Merge.rc:2246 #, c-format msgid "Left side - select destination folder:" msgstr "¥ªÃä - ¿ï¨ú¥Ø¼Ð¸ê®Æ§¨¡G" -#: Merge.rc:2243 +#: Merge.rc:2247 #, c-format msgid "Right side - select destination folder:" msgstr "¥kÃä - ¿ï¨ú¥Ø¼Ð¸ê®Æ§¨¡G" -#: Merge.rc:2244 +#: Merge.rc:2248 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ¨ü¼vÅTÀÉ®×)" -#: Merge.rc:2245 +#: Merge.rc:2249 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%2 ¨ü¼vÅTÀɮפ§ %1)" -#: Merge.rc:2251 +#: Merge.rc:2255 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4170,17 +4192,17 @@ msgstr "" "\n" "%1¡H" -#: Merge.rc:2252 +#: Merge.rc:2256 #, c-format msgid "Are you sure you want to copy:" msgstr "½T©w­n½Æ»s¡G" -#: Merge.rc:2253 +#: Merge.rc:2257 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "½T©w­n½Æ»s %d ¶µ¥Ø¡G" -#: Merge.rc:2254 +#: Merge.rc:2258 #, c-format msgid "" "Operation aborted!\n" @@ -4199,498 +4221,488 @@ msgstr "" "\n" "½Ð­«¾ã¤ñ¸û¡C" -#: Merge.rc:2255 +#: Merge.rc:2259 #, c-format msgid "Are you sure you want to move:" msgstr "½T©w­n²¾°£¡G" -#: Merge.rc:2256 +#: Merge.rc:2260 #, c-format msgid "Are you sure you want to move %d items:" msgstr "½T©w­n²¾°£ %d ¶µ¥Ø¡G" -#: Merge.rc:2258 +#: Merge.rc:2262 #, c-format msgid "Confirm Move" msgstr "½T»{²¾°£" -#: Merge.rc:2264 +#: Merge.rc:2268 #, c-format msgid "Open left file" msgstr "¶}±Ò¥ªÃäÀÉ®×" -#: Merge.rc:2265 +#: Merge.rc:2269 #, c-format msgid "Open the left file to external editor" msgstr "¶}±Ò¥ªÃäÀɮרì¥~³¡½s¿è¾¹" -#: Merge.rc:2266 +#: Merge.rc:2270 #, c-format msgid "Open left file with ..." msgstr "¥H...¶}±Ò¥ªÃäÀÉ®×" -#: Merge.rc:2267 +#: Merge.rc:2271 #, c-format msgid "Open right file" msgstr "¶}±Ò¥kÃäÀÉ®×" -#: Merge.rc:2268 +#: Merge.rc:2272 #, c-format msgid "Open the right file to external editor" msgstr "¶}±Ò¥kÃäÀɮרì¥~³¡½s¿è¾¹" -#: Merge.rc:2269 +#: Merge.rc:2273 #, c-format msgid "Open right file with..." msgstr "¥H...¶}±Ò¥kÃäÀÉ®×" -#: Merge.rc:2270 +#: Merge.rc:2274 #, c-format msgid "Failed to execute external editor: %1" msgstr "µLªk°õ¦æ¥~³¡½s¿è¾¹ %1" -#: Merge.rc:2271 +#: Merge.rc:2275 #, c-format msgid "Unknown extension on external editor: %1" msgstr "¥¼ª¾°ÆÀɦW©ó¥~³¡½s¿è¾¹¡G%1" -#: Merge.rc:2272 +#: Merge.rc:2276 #, c-format msgid "Copy filenames to clipboard" msgstr "½Æ»sÀɦW¨ì°Å¶Kï" -#: Merge.rc:2273 +#: Merge.rc:2277 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "½Æ»s¥ªÃä®|¦W¨ì°Å¶Kï" -#: Merge.rc:2274 +#: Merge.rc:2278 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "½Æ»s¥kÃä®|¦W¨ì°Å¶Kï" -#: Merge.rc:2275 +#: Merge.rc:2279 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "½Æ»s¨âÃä®|¦W¨ì°Å¶Kï" -#: Merge.rc:2281 +#: Merge.rc:2285 #, c-format msgid "Left Shell menu" msgstr "¥ªÃ䤶­±¿ï³æ" -#: Merge.rc:2282 +#: Merge.rc:2286 #, c-format msgid "Right Shell menu" msgstr "¥kÃ䤶­±¿ï³æ" -#: Merge.rc:2288 +#: Merge.rc:2292 #, c-format msgid "Unknown archive format" msgstr "¥¼ª¾À£ÁY®æ¦¡" -#: Merge.rc:2289 +#: Merge.rc:2293 #, c-format msgid "Add items from left side to archive" msgstr "¥ªÃ䶵¥Ø¥[¨ìÀ£ÁYÀÉ" -#: Merge.rc:2290 +#: Merge.rc:2294 #, c-format msgid "Add items from right side to archive" msgstr "¥kÃ䶵¥Ø¥[¨ìÀ£ÁYÀÉ" -#: Merge.rc:2291 +#: Merge.rc:2295 #, c-format msgid "Add items from both sides to archive" msgstr "¨âÃ䶵¥Ø¥[¨ìÀ£ÁYÀÉ" -#: Merge.rc:2292 +#: Merge.rc:2296 #, c-format msgid "Add different items to archive (both sides)" msgstr "¨âÃä¬Û²§¶µ¥Ø¥[¤J¨ìÀ£ÁYÀÉ" -#: Merge.rc:2294 +#: Merge.rc:2298 #, c-format msgid "Move selected file on left to custom directory" msgstr "¥ªÃä¿ï¨ú¶µ¥Ø²¾¨ì¦Û­q¸ê®Æ§¨" -#: Merge.rc:2296 +#: Merge.rc:2300 #, c-format msgid "Move selected file on right to custom directory" msgstr "¥kÃä¿ï¨ú¶µ¥Ø²¾¨ì¦Û­q¸ê®Æ§¨" -#: Merge.rc:2302 +#: Merge.rc:2306 #, c-format msgid "Filename" msgstr "ÀɮצWºÙ" -#: Merge.rc:2303 -#, c-format -msgid "Folder" -msgstr "¸ê®Æ§¨" - -#: Merge.rc:2304 +#: Merge.rc:2308 #, c-format msgid "Comparison result" msgstr "¤ñ¹ïµ²ªG" -#: Merge.rc:2305 +#: Merge.rc:2309 #, c-format msgid "Left Date" msgstr "¥ªÃä¤é´Á" -#: Merge.rc:2306 +#: Merge.rc:2310 #, c-format msgid "Right Date" msgstr "¥kÃä¤é´Á" -#: Merge.rc:2307 +#: Merge.rc:2311 #, c-format msgid "Extension" msgstr "°ÆÀɦW" -#: Merge.rc:2308 +#: Merge.rc:2312 #, c-format msgid "Left Size" msgstr "¥ªÃä¤j¤p" -#: Merge.rc:2309 +#: Merge.rc:2313 #, c-format msgid "Right Size" msgstr "¥kÃä¤j¤p" -#: Merge.rc:2310 +#: Merge.rc:2314 #, c-format msgid "Right Size (Short)" msgstr "¥kÃä¤j¤p (²)" -#: Merge.rc:2311 +#: Merge.rc:2315 #, c-format msgid "Left Size (Short)" msgstr "¥ªÃä¤j¤p (²)" -#: Merge.rc:2317 +#: Merge.rc:2321 #, c-format msgid "Left Creation Time" msgstr "¥ªÃä«Ø¥ß®É¶¡" -#: Merge.rc:2318 +#: Merge.rc:2322 #, c-format msgid "Right Creation Time" msgstr "¥kÃä«Ø¥ß®É¶¡" -#: Merge.rc:2319 +#: Merge.rc:2323 #, c-format msgid "Newer File" msgstr "¸û·sÀÉ®×" -#: Merge.rc:2320 +#: Merge.rc:2324 #, c-format msgid "Left File Version" msgstr "¥ªÃäÀɮת©¥»" -#: Merge.rc:2321 +#: Merge.rc:2325 #, c-format msgid "Right File Version" msgstr "¥kÃäÀɮת©¥»" -#: Merge.rc:2322 +#: Merge.rc:2326 #, c-format msgid "Short Result" msgstr "²¦¡µ²ªG" -#: Merge.rc:2323 +#: Merge.rc:2327 #, c-format msgid "Left Attributes" msgstr "¥ªÃäÄÝ©Ê" -#: Merge.rc:2324 +#: Merge.rc:2328 #, c-format msgid "Right Attributes" msgstr "¥kÃäÄÝ©Ê" -#: Merge.rc:2325 +#: Merge.rc:2329 #, c-format msgid "Left EOL" msgstr "¥ªÃä EOL" -#: Merge.rc:2326 +#: Merge.rc:2330 #, c-format msgid "Right EOL" msgstr "¥kÃä EOL" -#: Merge.rc:2332 +#: Merge.rc:2336 #, c-format msgid "Left Encoding" msgstr "¥ªÃä½s½X" -#: Merge.rc:2333 +#: Merge.rc:2337 #, c-format msgid "Right Encoding" msgstr "¥kÃä½s½X" -#: Merge.rc:2334 +#: Merge.rc:2338 #, c-format msgid "Ignored Diff." msgstr "©¿²¤ªº®t²§" -#: Merge.rc:2335 -#, c-format -msgid "Differences" -msgstr "®t²§" - -#: Merge.rc:2336 -#: Merge.rc:2647 +#: Merge.rc:2340 +#: Merge.rc:2552 #, c-format msgid "Binary" msgstr "¤G¶i¨î" -#: Merge.rc:2342 +#: Merge.rc:2346 #, c-format msgid "Unable to compare files" msgstr "µLªk¤ñ¸ûÀÉ®×" -#: Merge.rc:2343 +#: Merge.rc:2347 #, c-format msgid "Item aborted" msgstr "¤¤Â_ªº¶µ¥Ø" -#: Merge.rc:2344 +#: Merge.rc:2348 #, c-format msgid "File skipped" msgstr "²¤¹LªºÀÉ®×" -#: Merge.rc:2345 +#: Merge.rc:2349 #, c-format msgid "Folder skipped" msgstr "²¤¹Lªº¸ê®Æ§¨" -#: Merge.rc:2346 +#: Merge.rc:2350 #, c-format msgid "Left only: %1" msgstr "¶È¥ªÃä¡G%1" -#: Merge.rc:2347 +#: Merge.rc:2351 #, c-format msgid "Right only: %1" msgstr "¶È¥kÃä¡G%1" -#: Merge.rc:2348 +#: Merge.rc:2352 #, c-format msgid "Binary files are identical" msgstr "¤G¶i¨îÀɧ¹¥þ¬Û¦P" -#: Merge.rc:2350 +#: Merge.rc:2354 #, c-format msgid "Binary files are different" msgstr "¤G¶i¨îÀɤ£¦P" -#: Merge.rc:2351 +#: Merge.rc:2355 #, c-format msgid "Files are different" msgstr "Àɮפ£¦P" -#: Merge.rc:2352 +#: Merge.rc:2356 #, c-format msgid "Folders are different" msgstr "¨â¸ê®Æ§¨¤£¦P" -#: Merge.rc:2353 +#: Merge.rc:2357 #, c-format msgid "Left Only" msgstr "¶È¥ªÃä" -#: Merge.rc:2354 +#: Merge.rc:2358 #, c-format msgid "Right Only" msgstr "¶È¥kÃä" -#: Merge.rc:2356 +#: Merge.rc:2360 #, c-format msgid "Error" msgstr "¿ù»~" -#: Merge.rc:2357 +#: Merge.rc:2361 #, c-format msgid "Text files are identical" msgstr "¤å¦rÀɤº®e¬Û¦P" -#: Merge.rc:2362 +#: Merge.rc:2366 #, c-format msgid "Text files are different" msgstr "¤å¦rÀɤº®e¤£¦P" -#: Merge.rc:2368 +#: Merge.rc:2372 #, c-format msgid "Elapsed time: %ld ms" msgstr "¸g¹L®É¶¡¡G %ld ²@¬í" -#: Merge.rc:2369 +#: Merge.rc:2373 #, c-format msgid "1 item selected" msgstr "¤w¿ï¨ú 1 ­Ó¶µ¥Ø" -#: Merge.rc:2370 +#: Merge.rc:2374 #, c-format msgid "%1 items selected" msgstr "¤w¿ï¨ú %1 ­Ó¶µ¥Ø" -#: Merge.rc:2376 +#: Merge.rc:2380 #, c-format msgid "Filename or folder name." msgstr "ÀɮצWºÙ©Î¸ê®Æ§¨¦WºÙ¡C" -#: Merge.rc:2377 +#: Merge.rc:2381 #, c-format msgid "Subfolder name when subfolders are included." msgstr "¥]¬A¤l¸ê®Æ§¨®É¤§¤l¸ê®Æ§¨¦WºÙ¡C" -#: Merge.rc:2378 +#: Merge.rc:2382 #, c-format msgid "Comparison result, long form." msgstr "¤ñ¸ûµ²ªG¡Aªø¦¡ªí³æ¡C" -#: Merge.rc:2379 +#: Merge.rc:2383 #, c-format msgid "Left side modification date." msgstr "¥ªÃä­×§ï¤é´Á¡C" -#: Merge.rc:2380 +#: Merge.rc:2384 #, c-format msgid "Right side modification date." msgstr "¥ªÃä­×§ï¤é´Á¡C" -#: Merge.rc:2381 +#: Merge.rc:2385 #, c-format msgid "File's extension." msgstr "°ÆÀɦW¡C" -#: Merge.rc:2382 +#: Merge.rc:2386 #, c-format msgid "Left file size in bytes." msgstr "¥ªÃäÀɮצ줸²Õ¤j¤p¡C" -#: Merge.rc:2383 +#: Merge.rc:2387 #, c-format msgid "Right file size in bytes." msgstr "¥kÃäÀɮצ줸²Õ¤j¤p¡C" -#: Merge.rc:2384 +#: Merge.rc:2388 #, c-format msgid "Left file size abbreviated." msgstr "¥ªÃäÀɮײ¦¡¤j¤p¡C" -#: Merge.rc:2385 +#: Merge.rc:2389 #, c-format msgid "Right file size abbreviated." msgstr "¥kÃäÀɮײ¦¡¤j¤p¡C" -#: Merge.rc:2391 +#: Merge.rc:2395 #, c-format msgid "Left side creation time." msgstr "¥ªÃä«Ø¥ß®É¶¡¡C" -#: Merge.rc:2392 +#: Merge.rc:2396 #, c-format msgid "Right side creation time." msgstr "¥kÃä«Ø¥ß®É¶¡¡C" -#: Merge.rc:2393 +#: Merge.rc:2397 #, c-format msgid "Tells which side has newer modification date." msgstr "§iª¾¨ºÃ䦳¸û·sªº­×§ï¤é´Á¡C" -#: Merge.rc:2394 +#: Merge.rc:2398 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¥ªÃäÀɮת©¥»¡A¥u¬Y¨ÇÀÉ®×Ãþ«¬¡C" -#: Merge.rc:2395 +#: Merge.rc:2399 #, c-format msgid "Right side file version, only for some filetypes." msgstr "¥kÃäÀɮת©¥»¡A¥u¬Y¨ÇÀÉ®×Ãþ«¬¡C" -#: Merge.rc:2396 +#: Merge.rc:2400 #, c-format msgid "Short comparison result." msgstr "µu¦¡¤ñ¸ûµ²ªG¡C" -#: Merge.rc:2397 +#: Merge.rc:2401 #, c-format msgid "Left side attributes." msgstr "¥ªÃäÄÝ©Ê¡C" -#: Merge.rc:2398 +#: Merge.rc:2402 #, c-format msgid "Right side attributes." msgstr "¥kÃäÄÝ©Ê¡C" -#: Merge.rc:2399 +#: Merge.rc:2403 #, c-format msgid "Left side file EOL type" msgstr "¥ªÃäÀÉ®× EOL Ãþ«¬" -#: Merge.rc:2400 +#: Merge.rc:2404 #, c-format msgid "Right side file EOL type" msgstr "¥kÃäÀÉ®× EOL Ãþ«¬" -#: Merge.rc:2406 +#: Merge.rc:2410 #, c-format msgid "Left side encoding." msgstr "¥ªÃä½s½X¡C" -#: Merge.rc:2407 +#: Merge.rc:2411 #, c-format msgid "Right side encoding." msgstr "¥kÃä½s½X¡C" -#: Merge.rc:2408 +#: Merge.rc:2412 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "³Q©¿²¤ªºÀɮפ¤ªº®t²§­Ó¼Æ¡C¬J³Q©¿²¤¡A´N¤£¯à¦X¨Ö¡C" -#: Merge.rc:2409 +#: Merge.rc:2413 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Àɮפ¤ªº®t²§­Ó¼Æ¡C¦¹¼Æ¤£¥]¬A³Q©¿²¤ªº®t²§¡C" -#: Merge.rc:2410 +#: Merge.rc:2414 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "¬O¤G¶i¨îÀÉ¡A´NÅã¥Ü¬P¸¹ (*)" -#: Merge.rc:2416 +#: Merge.rc:2420 #, c-format msgid "Compare %1 with %2" msgstr "¤ñ¸û %1 ©M %2" -#: Merge.rc:2417 +#: Merge.rc:2421 #, c-format msgid "Comma-separated list" msgstr "³r¸¹¤À¹j¦Cªí" -#: Merge.rc:2418 +#: Merge.rc:2422 #, c-format msgid "Tab-separated list" msgstr "¸õ®æ¸¹¤À¹j¦Cªí" -#: Merge.rc:2419 +#: Merge.rc:2423 #, c-format msgid "Simple HTML" msgstr "³æ¯Â HTML" -#: Merge.rc:2420 +#: Merge.rc:2424 #, c-format msgid "Simple XML" msgstr "³æ¯Â XML" -#: Merge.rc:2422 +#: Merge.rc:2426 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "³ø§iÀɤw¸g¦s¦b¡CÂл\¤§¡H" -#: Merge.rc:2423 +#: Merge.rc:2427 #, c-format msgid "" "Error creating the report:\n" @@ -4699,32 +4711,32 @@ msgstr "" "²£¥Í³ø§i®Éµo¥Í¿ù»~¡G\n" "%1" -#: Merge.rc:2424 +#: Merge.rc:2428 #, c-format msgid "The report has been created successfully." msgstr "¦¨¥\²£¥Í³ø§i¡C" -#: Merge.rc:2430 +#: Merge.rc:2434 #, c-format msgid "The same file is opened in both panels." msgstr "¬Û¦PÀɮ׶}±Ò¨ì¨âÃä¡C" -#: Merge.rc:2431 +#: Merge.rc:2435 #, c-format msgid "The selected files are identical." msgstr "©Ò¿ïÀɮק¹¥þ¬Û¦P¡C" -#: Merge.rc:2432 +#: Merge.rc:2436 #, c-format msgid "An error occurred while comparing the files." msgstr "¤ñ¹ïÀɮ׮ɵo¥Í¿ù»~¡C" -#: Merge.rc:2433 +#: Merge.rc:2437 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "µLªk«Ø¥ß¼È¦sÀɮסC½ÐÀˬd¼È¦s¸ô®|¤§³]©w¡C" -#: Merge.rc:2434 +#: Merge.rc:2438 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4739,7 +4751,7 @@ msgstr "" "\n" "ª`·N¡G¦p­n±N©Ò¦³´«¦æ¦r¤¸µø­Y¬Û¦P¡A±o¦b(½s¿è > ¿ï¶µ) ¿ï¶µ¹ï¸Ü²°¤§¡u¤ñ¸û¡v­¶ÅÒ³]©w¿ï¶µ¦¨¡u©¿²¤´«¦æ¦r¤¸¤§®t²§¡v¡C" -#: Merge.rc:2435 +#: Merge.rc:2439 #, c-format msgid "" "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" @@ -4750,22 +4762,22 @@ msgstr "" "¥H¥Ø«e¿ï¶µ¡A¥¦­Ì·|²Î¤@¨ì¥DÃþ«¬¡C\n" "§A­nÅܧó¿ï¶µ¨Ã«O¯d¤£¦PªºÀÉ®×µ²§ô¦r¤¸¶Ü¡H" -#: Merge.rc:2436 +#: Merge.rc:2440 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "¤@­Ó¿ù»~µo¥Í©ó«e¸m¤£¦PÀÉ®× '%1' ¥H¥~±¾ '%2'¡C «e¸m¤£¦PµLªk¦A®M¥Î¡C" -#: Merge.rc:2437 +#: Merge.rc:2441 #, c-format msgid "The selected folder is invalid." msgstr "©Ò¿ïªº¸ê®Æ§¨µL®Ä¡C" -#: Merge.rc:2438 +#: Merge.rc:2442 #, c-format msgid "Cannot open a binary file to editor." msgstr "½s¿è¾¹¤£¯à¶}±Ò¤G¶i¨îÀÉ¡C" -#: Merge.rc:2439 +#: Merge.rc:2443 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4780,7 +4792,7 @@ msgstr "" "%1\n" "¨ì¥t¤@Ãä¡AµM«á¶}±Ò¨â§¨¶Ü¡H" -#: Merge.rc:2445 +#: Merge.rc:2449 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4791,136 +4803,136 @@ msgstr "" "§Y¨Ïºû«ù¦U§O½X­¶·|¤À§O¬Ý¨ì¤å¦r¡A¦ý¦X¨Ö/½Æ»s·|¦³¦MÀI¡C\n" "­n¨Ï¥Î¬Û¦Pªº¹w³] windows ½s½X­¶¥h¬Ý¨âÃä¶Ü¡H(«Øij)" -#: Merge.rc:2446 +#: Merge.rc:2450 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "ĵ§i¡GÀɮרϥΤ£¦Pªº½s½X¡A¥ªÃä=%s¡A¥kÃä=%s¡A¦X¨Ö¥i¯à¾É­P¸ê°T·l¥¢¡C" -#: Merge.rc:2447 +#: Merge.rc:2451 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "¦]½s½X°ÝÃD¾É­P¤º®eµLªk¥¿±`§e²{¡G¨â­ÓÀɮ׬Ҧp¦¹¡C" -#: Merge.rc:2448 +#: Merge.rc:2452 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "¦]½s½X°ÝÃD¾É­P¸ê°T·l¥¢¡G¥kÃäÀɮצp¦¹¡C" -#: Merge.rc:2449 +#: Merge.rc:2453 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "¦]½s½X°ÝÃD¾É­P¸ê°T·l¥¢¡G¥ªÃäÀɮצp¦¹¡C" -#: Merge.rc:2455 +#: Merge.rc:2459 #, c-format msgid "No difference" msgstr "µL®t²§" -#: Merge.rc:2456 +#: Merge.rc:2460 #, c-format msgid "Line difference" msgstr "¦æ¤º®t²§" -#: Merge.rc:2462 +#: Merge.rc:2466 #, c-format msgid "Replaced %1 string(s)." msgstr "¤w¨ú¥N %1 ­Ó¦r¦ê¡C" -#: Merge.rc:2463 +#: Merge.rc:2467 #, c-format msgid "Cannot find string \"%s\"" msgstr "§ä¤£¨ì \"%s\" ¦r¦ê" -#: Merge.rc:2469 +#: Merge.rc:2473 #, c-format msgid "Copy Full Path" msgstr "½Æ»s§¹¾ã¸ô®|" -#: Merge.rc:2470 +#: Merge.rc:2474 #, c-format msgid "Copy Filename" msgstr "½Æ»sÀɦW" # also refer to line 5584 # ¦ì¸mµ¡®æ -#: Merge.rc:2476 +#: Merge.rc:2480 #, c-format msgid "Location Pane" msgstr "»·±æµ¡®æ" # also refer to line 5578 # ®t²§µ¡®æ -#: Merge.rc:2477 +#: Merge.rc:2481 #, c-format msgid "Diff Pane" msgstr "ªñ¹îµ¡®æ" -#: Merge.rc:2483 +#: Merge.rc:2487 #, c-format msgid "Patch file successfully written." msgstr "¸ÉºóÀɦ¨¥\¼g¤J¡C" -#: Merge.rc:2484 +#: Merge.rc:2488 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ¶µ¥Ø§ä¤£¨ì©Î¥¦¬O¸ê®Æ§¨¡I" -#: Merge.rc:2485 +#: Merge.rc:2489 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ¶µ¥Ø§ä¤£¨ì©Î¥¦¬O¸ê®Æ§¨¡I" -#: Merge.rc:2486 +#: Merge.rc:2490 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "¸ÉºóÀɤw¦s¦b¡C­nÂмg¥¦¶Ü¡H" -#: Merge.rc:2487 +#: Merge.rc:2491 #, c-format msgid "[%1 files selected]" msgstr "[%1 ­ÓÀɮפw¿ï¨ú]" -#: Merge.rc:2488 +#: Merge.rc:2492 #, c-format msgid "Normal" msgstr "¤@¯ë" -#: Merge.rc:2489 +#: Merge.rc:2493 #, c-format msgid "Context" msgstr "¯ßµ¸" -#: Merge.rc:2490 +#: Merge.rc:2494 #, c-format msgid "Unified" msgstr "¦P¤@¤Æ" -#: Merge.rc:2491 +#: Merge.rc:2495 #, c-format msgid "Could not write to file %1." msgstr "µLªk¼g¤J¨ìÀÉ®× %1¡C" -#: Merge.rc:2492 +#: Merge.rc:2496 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "«ü©wªº¿é¥X¸ô®|¤£¬Oµ´¹ï¸ô®|¡G%1" -#: Merge.rc:2493 +#: Merge.rc:2497 #, c-format msgid "Specify an output file" msgstr "«ü©w¤@­Ó¿é¥XÀÉ" -#: Merge.rc:2494 +#: Merge.rc:2498 #, c-format msgid "Cannot create a patch file from binary files." msgstr "µLªk±q¤G¶i¨îÀɫظɺóÀÉ¡C" -#: Merge.rc:2495 +#: Merge.rc:2499 #, c-format msgid "Cannot create a patch file from directories." msgstr "µLªk±q¥Ø¿ý«Ø¸ÉºóÀÉ¡C" -#: Merge.rc:2496 +#: Merge.rc:2500 #, c-format msgid "" "Please save all files first.\n" @@ -4931,17 +4943,17 @@ msgstr "" "\n" "«Ø¸ÉºóÀÉ«e±o¥ýÀx¦sÀɤº©Ò¦³²§°Ê¡C" -#: Merge.rc:2497 +#: Merge.rc:2501 #, c-format msgid "Folder does not exist." msgstr "¸ê®Æ§¨¤£¦s¦b¡C" -#: Merge.rc:2502 +#: Merge.rc:2506 #, c-format msgid "Current directory comparison results will be cleared." msgstr "·|²M°£¥Ø«eªº¸ê®Æ§¨¤ñ¸ûµ²ªG¡C" -#: Merge.rc:2503 +#: Merge.rc:2507 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4952,7 +4964,7 @@ msgstr "" "§ä¤£¨ì¤ä´©À£ÁYªº©Ò¦³¥²­n¤¸¥ó (7-Zip ©M/©Î Merge7z*.dll)¡C\n" "½Ð°Ñ¦Ò¤â¥U¨ú±o§ó¦h¦³ÃöÀ£ÁY¤ä´©©M±Ò¥ÎÀ£ÁYªº¸ê°T¡C" -#: Merge.rc:2504 +#: Merge.rc:2508 #, c-format msgid "" "\n" @@ -4961,7 +4973,7 @@ msgstr "" "\n" "ª`·N¡GWinMerge ³]©w¤¤¤wÃö³¬ 7-Zip ¤§¾ã¦X¡C" -#: Merge.rc:2505 +#: Merge.rc:2509 #, c-format msgid "" "\n" @@ -4970,37 +4982,37 @@ msgstr "" "\n" "ª`·N¡GWinMerge ³]©w¤¤ 7-Zip ¤w³]¦¨¿W¥ß¹B§@¡C" -#: Merge.rc:2506 +#: Merge.rc:2510 #, c-format msgid "Select file for export" msgstr "¿ï¨úÀÉ®×¥H¶×¥X" -#: Merge.rc:2507 +#: Merge.rc:2511 #, c-format msgid "Select file for import" msgstr "¿ï¨úÀÉ®×¥H¶×¤J" -#: Merge.rc:2508 +#: Merge.rc:2512 #, c-format msgid "Options imported from the file." msgstr "±qÀɮ׶פJ¿ï¶µ¡C" -#: Merge.rc:2509 +#: Merge.rc:2513 #, c-format msgid "Options exported to the file." msgstr "¶×¥X¿ï¶µ¨ìÀɮסC" -#: Merge.rc:2510 +#: Merge.rc:2514 #, c-format msgid "Failed to import options from the file." msgstr "µLªk±qÀɮ׶פJ¿ï¶µ¡C" -#: Merge.rc:2511 +#: Merge.rc:2515 #, c-format msgid "Failed to write options to the file." msgstr "µLªk¶×¥X¿ï¶µ¨ìÀɮסC" -#: Merge.rc:2512 +#: Merge.rc:2516 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -5011,495 +5023,228 @@ msgstr "" "\n" "­nÄ~Äò¶Ü¡H" -#: Merge.rc:2518 +#: Merge.rc:2522 #, c-format msgid "Regular expression error" msgstr "Ãþ«¬ªí¦¡¿ù»~" -#: Merge.rc:2519 +#: Merge.rc:2523 #, c-format msgid "No match" msgstr "¨S¦³²Å¦Xªí¦¡ªº" -#: Merge.rc:2520 +#: Merge.rc:2524 #, c-format msgid "Invalid regular expression" msgstr "µL®ÄªºÃþ«¬ªí¦¡" -#: Merge.rc:2521 +#: Merge.rc:2525 #, c-format msgid "Invalid collation character" msgstr "µL®Äªº¤ñ¸û¦r¤¸" -#: Merge.rc:2522 +#: Merge.rc:2526 #, c-format msgid "Invalid character class name" msgstr "µL®Äªº¦r¤¸Ãþ¦WºÙ" -#: Merge.rc:2523 +#: Merge.rc:2527 #, c-format msgid "Trailing backslash" msgstr "©ì¦²¤Ï±×½u" -#: Merge.rc:2524 +#: Merge.rc:2528 #, c-format msgid "Invalid back reference" msgstr "µL®Äªº¦^°Ñ" -#: Merge.rc:2525 +#: Merge.rc:2529 #, c-format msgid "Unmatched [ or [^" msgstr "[ or [^ ¤£§¹¾ã" -#: Merge.rc:2526 +#: Merge.rc:2530 #, c-format msgid "Unmatched ( or \\(" msgstr "( or \\( ¤£§¹¾ã" -#: Merge.rc:2527 +#: Merge.rc:2531 #, c-format msgid "Unmatched \\{" msgstr "\\{ ¤£§¹¾ã" -#: Merge.rc:2528 +#: Merge.rc:2532 #, c-format msgid "Invalid content of \\{\\}" msgstr "\\{\\} ¤¤¬°µL®Ä¤º®e" -#: Merge.rc:2529 +#: Merge.rc:2533 #, c-format msgid "Invalid range end" msgstr "µL®Äªº½d³ò¬É" -#: Merge.rc:2530 +#: Merge.rc:2534 #, c-format msgid "Out of memory" msgstr "°O¾ÐÅ餣¨¬" -#: Merge.rc:2531 +#: Merge.rc:2535 #, c-format msgid "Invalid preceding regular expression" msgstr "µL®Äªº«e¸mÃþ«¬ªí¦¡" -#: Merge.rc:2532 +#: Merge.rc:2536 #, c-format msgid "Premature end of regular expression" msgstr "Ãþ«¬ªí¦¡¥¼§¹" -#: Merge.rc:2533 +#: Merge.rc:2537 #, c-format msgid "Regular expression too big" msgstr "Ãþ«¬ªí¦¡¤Óªø" -#: Merge.rc:2538 +#: Merge.rc:2542 #, c-format msgid "Unmatched ) or \\)" msgstr "¥¼§ä¨ì ) or \\)" -#: Merge.rc:2544 -#, c-format -msgid "Western European" -msgstr "Western European ¦è¼Ú" - -#: Merge.rc:2545 -#, c-format -msgid "Eastern European" -msgstr "Eastern European ªF¼Ú" - -#: Merge.rc:2546 -#, c-format -msgid "East Asian" -msgstr "East Asian ªF¨È" - -#: Merge.rc:2547 -#, c-format -msgid "SE & SW Asian" -msgstr "SE & SW Asian ªF«n©M¦è«n¨È" - #: Merge.rc:2548 #, c-format -msgid "Middle Eastern" -msgstr "Middle Eastern ¤¤¨È" - -#: Merge.rc:2549 -#: Merge.rc:2559 -#, c-format -msgid "Not applicable" -msgstr "Not applicable µL¥i¾A¥Î" - -#: Merge.rc:2555 -#, c-format -msgid "MS-Windows" -msgstr "MS-Windows ·L³nµøµ¡§@·~¨t²Î" - -#: Merge.rc:2556 -#, c-format -msgid "MS-DOS" -msgstr "MS-DOS ·L³n DOS §@·~¨t²Î" - -#: Merge.rc:2557 -#, c-format -msgid "Macintosh" -msgstr "Macintosh ³Áª÷¶ð§@·~¨t²Î" - -# According to the rc file. It has to do with CODEPAGE PLATFORM GROUPS. As I can know, "IBM" is not a name of operating system. So the original string is wrong. And I remain the string untranslated. -#: Merge.rc:2558 -#, c-format -msgid "IBM" -msgstr "IBM" - -#: Merge.rc:2565 -#, c-format -msgid "EBCDIC" -msgstr "EBCDIC" - -#: Merge.rc:2566 -#, c-format -msgid "IBM EBCDIC Cyrillic" -msgstr "IBM EBCDIC Cyrillic ¦è¨½¨½§J»y" - -#: Merge.rc:2572 -#, c-format -msgid "MS-DOS Latin US" -msgstr "MS-DOS Latin US ©Ô¤B¬ü¬w" - -#: Merge.rc:2573 -#, c-format -msgid "MS-DOS Arabic" -msgstr "MS-DOS Arabic ªü©Ô§B»y" - -#: Merge.rc:2574 -#, c-format -msgid "MS-DOS Greek" -msgstr "MS-DOS Greek §Æþ»y" - -#: Merge.rc:2575 -#, c-format -msgid "MS-DOS Baltic Rim" -msgstr "MS-DOS Baltic Rim ªiùªº®ü¨½©i»y" - -#: Merge.rc:2576 -#, c-format -msgid "MS-DOS Latin 1" -msgstr "MS-DOS Latin 1 ©Ô¤B 1" - -#: Merge.rc:2577 -#, c-format -msgid "MS-DOS Greek 1" -msgstr "MS-DOS Greek 1 §Æþ»y 1" - -#: Merge.rc:2578 -#, c-format -msgid "MS-DOS Latin 2" -msgstr "MS-DOS Latin 2 ©Ô¤B 2" - -#: Merge.rc:2579 -#, c-format -msgid "MS-DOS Cyrillic" -msgstr "MS-DOS Cyrillic ¦è¨½¨½§J»y" - -#: Merge.rc:2580 -#, c-format -msgid "MS-DOS Turkish" -msgstr "MS-DOS Turkish ¤g¦Õ¨ä»y" - -#: Merge.rc:2581 -#, c-format -msgid "MS-DOS Portuguese" -msgstr "MS-DOS Portuguese ¸²µå¤ú»y" - -#: Merge.rc:2587 -#, c-format -msgid "MS-DOS Icelandic" -msgstr "MS-DOS Icelandic ¦B®q»y" - -#: Merge.rc:2588 -#, c-format -msgid "MS-DOS Hebrew" -msgstr "MS-DOS Hebrew §Æ§B¨Ó»y" - -#: Merge.rc:2589 -#, c-format -msgid "MS-DOS French Canada" -msgstr "MS-DOS French Canada ªkÄÝ¥[®³¤j" - -#: Merge.rc:2590 -#, c-format -msgid "MS-DOS Nordic" -msgstr "MS-DOS Nordic ¥_·¥" - -#: Merge.rc:2591 -#, c-format -msgid "MS-DOS Cyrillic CIS 1" -msgstr "MS-DOS Cyrillic ¦è¨½¨½§J»y CIS 1" - -#: Merge.rc:2592 -#, c-format -msgid "MS-DOS Greek 2" -msgstr "MS-DOS Greek 2 §Æþ»y 2" - -#: Merge.rc:2598 -#, c-format -msgid "Windows Thai" -msgstr "Windows Thai ®õ»y" - -#: Merge.rc:2599 -#, c-format -msgid "Windows Japanese" -msgstr "Windows Japanese ¤é»y" - -#: Merge.rc:2600 -#, c-format -msgid "Windows Simplified Chinese" -msgstr "Windows Simplified Chinese ²Å餤¤å" - -#: Merge.rc:2601 -#, c-format -msgid "Windows Korean" -msgstr "Windows Korean Áú»y" - -#: Merge.rc:2602 -#, c-format -msgid "Windows Traditional Chinese" -msgstr "Windows Traditional Chinese ¥¿Å餤¤å" - -#: Merge.rc:2603 -#, c-format -msgid "Windows Latin 2" -msgstr "Windows Latin 2 ©Ô¤B 2" - -#: Merge.rc:2604 -#, c-format -msgid "Windows Cyrillic (Slavic)" -msgstr "Windows Cyrillic (Slavic) ¦è¨½¨½§J»y (´µ©Ô¤Ò)" - -#: Merge.rc:2605 -#, c-format -msgid "Windows Latin 1" -msgstr "Windows Latin 1 ©Ô¤B 1" - -#: Merge.rc:2606 -#, c-format -msgid "Windows Greek" -msgstr "Windows Greek §Æþ»y" - -#: Merge.rc:2607 -#, c-format -msgid "Windows Latin 5 (Turkish)" -msgstr "Windows Latin 5 (Turkish) ©Ô¤B 5 (¤g¦Õ¨ä)" - -#: Merge.rc:2608 -#, c-format -msgid "Windows Hebrew" -msgstr "Windows Hebrew §Æ§B¨Ó»y" - -#: Merge.rc:2609 -#, c-format -msgid "Windows Arabic" -msgstr "Windows Arabic ªü©Ô§B»y" - -#: Merge.rc:2610 -#, c-format -msgid "Windows Baltic Rim" -msgstr "Windows Baltic Rim ªiùªº®ü¨½©i»y" - -#: Merge.rc:2611 -#, c-format -msgid "Windows Vietnamese" -msgstr "Windows Vietnamese ¶V«n»y" - -#: Merge.rc:2617 -#, c-format -msgid "Macintosh Roman" -msgstr "Macintosh Roman ù°¨»y" - -#: Merge.rc:2618 -#, c-format -msgid "Macintosh Greek" -msgstr "Macintosh Greek §Æþ»y" - -#: Merge.rc:2619 -#, c-format -msgid "Macintosh Cyrillic" -msgstr "Macintosh Cyrillic ¦è¨½¨½§J»y" - -#: Merge.rc:2620 -#, c-format -msgid "Macintosh " -msgstr "Macintosh" - -#: Merge.rc:2621 -#, c-format -msgid "Macintosh Central Europe" -msgstr "Macintosh Central Europe ¤¤¼Ú" - -#: Merge.rc:2622 -#, c-format -msgid "Macintosh Turkish" -msgstr "Macintosh Turkish ¤g¦Õ¨ä»y" - -#: Merge.rc:2631 -#, c-format -msgid "Approximates ISO-8859-2" -msgstr "±µªñ ISO-8859-2" - -#: Merge.rc:2634 -#, c-format -msgid "Approximates ISO-8859-1" -msgstr "±µªñ ISO-8859-1" - -#: Merge.rc:2635 -#, c-format -msgid "Approximates ISO-8859-7" -msgstr "±µªñ ISO-8859-7" - -#: Merge.rc:2636 -#, c-format -msgid "Approximates ISO-8859-9" -msgstr "±µªñ ISO-8859-9" - -#: Merge.rc:2637 -#, c-format -msgid "Approximates ISO-8859-8" -msgstr "±µªñ ISO-8859-8" - -#: Merge.rc:2643 -#, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2644 +#: Merge.rc:2549 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2645 +#: Merge.rc:2550 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2646 +#: Merge.rc:2551 #, c-format msgid "Mixed" msgstr "²V¦X" -#: Merge.rc:2648 +#: Merge.rc:2553 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2649 +#: Merge.rc:2554 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2650 +#: Merge.rc:2555 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2657 +#: Merge.rc:2562 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2658 +#: Merge.rc:2563 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2659 +#: Merge.rc:2564 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2660 +#: Merge.rc:2565 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2661 +#: Merge.rc:2566 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2662 +#: Merge.rc:2567 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2668 +#: Merge.rc:2573 #, c-format msgid "Type" msgstr "Ãþ«¬" -#: Merge.rc:2670 +#: Merge.rc:2575 #, c-format msgid "Unpacker" msgstr "¸Ñ¥]¾¹" -#: Merge.rc:2671 +#: Merge.rc:2576 #, c-format msgid "Prediffer" msgstr "¥ý¦æ³B²z¾¹" # What does "Editor script" mean? Perhaps "editing scripts" or "scripts to edit"? -#: Merge.rc:2672 +#: Merge.rc:2577 #, c-format msgid "Editor script" msgstr "½s¿è¾¹ÀHĶ§Y¦æ½X" -#: Merge.rc:2679 +#: Merge.rc:2584 #, c-format msgid "Save the left file" msgstr "Àx¦s¥ªÃäÀÉ®×" -#: Merge.rc:2680 +#: Merge.rc:2585 #, c-format msgid "Save the right file" msgstr "Àx¦s¥kÃäÀÉ®×" -#: Merge.rc:2681 +#: Merge.rc:2586 #, c-format msgid "Save the left file with name..." msgstr "Àx¦s¥ªÃäÀÉ®×¥H¦WºÙ..." -#: Merge.rc:2682 +#: Merge.rc:2587 #, c-format msgid "Save the right file with name..." msgstr "Àx¦s¥kÃäÀÉ®×¥H¦WºÙ..." -#: Merge.rc:2683 +#: Merge.rc:2588 #, c-format msgid "Change left side file/folder read-only status" msgstr "Åܧó¥ªÃäÀÉ®×/¸ê®Æ§¨°ßŪª¬ºA" -#: Merge.rc:2684 +#: Merge.rc:2589 #, c-format msgid "Change right side file/folder read-only status" msgstr "Åܧó¥kÃäÀÉ®×/¸ê®Æ§¨°ßŪª¬ºA" -#: Merge.rc:2685 +#: Merge.rc:2590 #, c-format msgid "Convert EOL to Windows mode" msgstr "Âà´«¦æ§À¦r¤¸¬° Windows ¦¡" -#: Merge.rc:2686 +#: Merge.rc:2591 #, c-format msgid "Convert EOL to Unix mode" msgstr "Âà´«¦æ§À¦r¤¸¬° Unix ¦¡" -#: Merge.rc:2687 +#: Merge.rc:2592 #, c-format msgid "Convert EOL to Mac mode" msgstr "Âà´«¦æ§À¦r¤¸¬° Mac ¦¡" -#: Merge.rc:2688 +#: Merge.rc:2593 #, c-format msgid "Switch between editing and merging modes" msgstr "½s¿è©M¦X¨Ö¼Ò¦¡¤Á´«" -#: Merge.rc:2689 +#: Merge.rc:2594 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5508,12 +5253,12 @@ msgstr "" "À˵ø»P½Õ¾ãÀÉ®×½s½X\n" "ÀÉ®×½s½X" -#: Merge.rc:2690 +#: Merge.rc:2595 #, c-format msgid "Open and resolve conflict file" msgstr "¶}±Ò¨Ã¸Ñ¨M½Ä¬ðÀÉ" -#: Merge.rc:2696 +#: Merge.rc:2601 #, c-format msgid "" "Select difference area in the current line\n" @@ -5522,7 +5267,7 @@ msgstr "" "¿ï¨ú¥Ø«e¦æ¤§®t²§³¡¥÷\n" "¥Ø«e¦æ¤§®t²§" -#: Merge.rc:2697 +#: Merge.rc:2602 #, c-format msgid "" "Go to line or difference\n" @@ -5531,7 +5276,7 @@ msgstr "" "²¾¦Ü¬Y¦æ©Î¬Y¬Û²§°Ï¶ô\n" "²¾¦Ü (Ctrl+G)" -#: Merge.rc:2698 +#: Merge.rc:2603 #, c-format msgid "" "Set program options\n" @@ -5540,7 +5285,7 @@ msgstr "" "³]©wµ{¦¡¿ï¶µ\n" "¿ï¶µ" -#: Merge.rc:2699 +#: Merge.rc:2604 #, c-format msgid "" "Refresh display\n" @@ -5549,37 +5294,37 @@ msgstr "" "­«¾ã«áÅã¥Ü\n" "­«¾ã (F5)" -#: Merge.rc:2700 +#: Merge.rc:2605 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "½Æ»s¿ï¨ú¦æ¨ì°Å¶Kï(ªþ¥[¦æ¸¹©ó¦æ­º)" -#: Merge.rc:2701 +#: Merge.rc:2606 #, c-format msgid "Refresh selected items" msgstr "­«¾ã¿ï¨ú¶µ" -#: Merge.rc:2702 +#: Merge.rc:2607 #, c-format msgid "Toggle bookmark" msgstr "¶}Ãö®ÑÅÒ" -#: Merge.rc:2703 +#: Merge.rc:2608 #, c-format msgid "Go to next bookmark" msgstr "¦Ü¤U¤@®ÑÅÒ" -#: Merge.rc:2704 +#: Merge.rc:2609 #, c-format msgid "Go to previous bookmark" msgstr "¦Ü¤W¤@®ÑÅÒ" -#: Merge.rc:2705 +#: Merge.rc:2610 #, c-format msgid "Clear all bookmarks" msgstr "²M°£©Ò¦³®ÑÅÒ" -#: Merge.rc:2711 +#: Merge.rc:2616 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5588,7 +5333,7 @@ msgstr "" "Åã¥Ü§¹¥þ¬Û¦Pªº¶µ¥Ø\n" "Åã¥Ü¬Û¦P¶µ¥Ø" -#: Merge.rc:2712 +#: Merge.rc:2617 #, c-format msgid "" "Displays items that have differences\n" @@ -5597,7 +5342,7 @@ msgstr "" "Åã¥Ü¬Û²§ªº¶µ¥Ø\n" "Åã¥Ü¬Û²§¶µ¥Ø" -#: Merge.rc:2713 +#: Merge.rc:2618 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5606,7 +5351,7 @@ msgstr "" "Åã¥Ü¥u¦b¥ªÃ䦳ªº¶µ¥Ø\n" "Åã¥Ü¥ªÃä¿W¦³¶µ¥Ø" -#: Merge.rc:2714 +#: Merge.rc:2619 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5615,7 +5360,7 @@ msgstr "" "Åã¥Ü¥u¦b¥kÃ䦳ªº¶µ¥Ø\n" "Åã¥Ü¥kÃä¿W¦³¶µ¥Ø" -#: Merge.rc:2715 +#: Merge.rc:2620 #, c-format msgid "" "Displays binary files\n" @@ -5624,7 +5369,7 @@ msgstr "" "Åã¥Ü¤G¶i¨îÀÉ®×\n" "Åã¥Ü¤G¶i¨îÀÉ®×" -#: Merge.rc:2716 +#: Merge.rc:2621 #, c-format msgid "" "Displays skipped items\n" @@ -5633,7 +5378,7 @@ msgstr "" "Åã¥Ü²¤¹Lªº¶µ¥Ø\n" "Åã¥Ü²¤¹Lªº¶µ¥Ø" -#: Merge.rc:2722 +#: Merge.rc:2627 #, c-format msgid "" "Select the font for the view\n" @@ -5642,7 +5387,7 @@ msgstr "" "¿ï¨úÀ˵ø¥Î¦r«¬\n" "¿ï¨úÀ˵ø¦r«¬" -#: Merge.rc:2723 +#: Merge.rc:2628 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5651,30 +5396,30 @@ msgstr "" "«ì´_¨Ï¥Î¹w³]ªº¨t²Î¦r«¬©óÀ˵ø\n" "¹w³]ªº¦r«¬" -#: Merge.rc:2724 +#: Merge.rc:2629 #, c-format msgid "Shows whitespace characters" msgstr "Åã¥ÜªÅ¥Õ©M¸õ®æ¦r¤¸" # I would suggest "Toggle Microview Pane" instead. # "¶}Ãö®t²§µ¡®æ" -#: Merge.rc:2725 +#: Merge.rc:2630 #, c-format msgid "Toggle Diff Pane" msgstr "¶}Ãöªñ¹îµ¡®æ" # ¦ì¸mµ¡®æÅã¥ÜÀÉ®×¥þ¹³ -#: Merge.rc:2726 +#: Merge.rc:2631 #, c-format msgid "Location pane shows overall picture from files" msgstr "»·±æµ¡®æÅã¥ÜÀÉ®×¥þ¹³" -#: Merge.rc:2727 +#: Merge.rc:2632 #, c-format msgid "Show folder compare statistics dialog" msgstr "Åã¥Ü¸ê®Æ§¨¤ñ¸û¤§²Î­p¹ï¸Ü²°" -#: Merge.rc:2728 +#: Merge.rc:2633 #, c-format msgid "" "Select the current user interface language\n" @@ -5683,7 +5428,7 @@ msgstr "" "¿ï¨ú¥Ø«e¨Ï¥ÎªÌ¤¶­±»y¨¥\n" "»y¨¥" -#: Merge.rc:2729 +#: Merge.rc:2634 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5692,12 +5437,12 @@ msgstr "" "¥H¤£¦P¦â±mÅã¥Ü¦æ¤º®t²§\n" "Åã¥Ü¦æ¤º®t²§" -#: Merge.rc:2730 +#: Merge.rc:2635 #, c-format msgid "Swap the positions of the two panes" msgstr "¹ï½Õ¨âµ¡®æ¦ì¸m" -#: Merge.rc:2731 +#: Merge.rc:2636 #, c-format msgid "" "Shows line numbers\n" @@ -5706,7 +5451,7 @@ msgstr "" "Åã¥Ü¦æ¸¹\n" "Åã¥Ü¦æ¸¹" -#: Merge.rc:2732 +#: Merge.rc:2637 #, c-format msgid "" "Enable word wrap\n" @@ -5715,7 +5460,7 @@ msgstr "" "±Ò¥Î¦Û°Ê§é¦æ\n" "¦Û°Ê§é¦æ" -#: Merge.rc:2733 +#: Merge.rc:2638 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5724,22 +5469,22 @@ msgstr "" "Åã¥Ü¨âµ¡¤§Ãä°Ï\n" "Åã¥Ü¨âµ¡Ãä°Ï" -#: Merge.rc:2734 +#: Merge.rc:2639 #, c-format msgid "Increase text size" msgstr "¥[¤j¤å¦r" -#: Merge.rc:2735 +#: Merge.rc:2640 #, c-format msgid "Decrease text size" msgstr "ÁY¤p¤å¦r" -#: Merge.rc:2736 +#: Merge.rc:2641 #, c-format msgid "Reset text zoom to default size" msgstr "«ì´_¤å¦r­ì©l¤j¤p" -#: Merge.rc:2742 +#: Merge.rc:2647 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5748,7 +5493,7 @@ msgstr "" "±²¨ì¤W¤@®t²§\n" "¤W¤@®t²§ (Alt + Up)" -#: Merge.rc:2743 +#: Merge.rc:2648 #, c-format msgid "" "Scroll to the next difference\n" @@ -5757,7 +5502,7 @@ msgstr "" "±²¨ì¤U¤@®t²§\n" "¤U¤@®t²§ (Alt + Down)" -#: Merge.rc:2744 +#: Merge.rc:2649 #, c-format msgid "" "Scroll to the first difference\n" @@ -5766,7 +5511,7 @@ msgstr "" "±²¨ì³Ìªì®t²§\n" "³Ìªì®t²§ (Alt+Home)" -#: Merge.rc:2745 +#: Merge.rc:2650 #, c-format msgid "" "Scroll to the current difference\n" @@ -5775,7 +5520,7 @@ msgstr "" "±²¨ì¥Ø«e®t²§\n" "¥Ø«e®t²§ (Alt+Enter)" -#: Merge.rc:2746 +#: Merge.rc:2651 #, c-format msgid "" "Scroll to the last difference\n" @@ -5784,7 +5529,7 @@ msgstr "" "±²¨ì³Ì¥½®t²§\n" "³Ì¥½®t²§ (Alt+End)" -#: Merge.rc:2747 +#: Merge.rc:2652 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5793,7 +5538,7 @@ msgstr "" "½Æ»s®t²§°Ï¶ô¨ì¥kÃäÀÉ®×\n" "½Æ»s¨ì¥kÃä (Alt + Right)" -#: Merge.rc:2748 +#: Merge.rc:2653 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5802,7 +5547,7 @@ msgstr "" "½Æ»s®t²§°Ï¶ô¨ì¥ªÃäÀÉ®×\n" "½Æ»s¨ì¥ªÃä (Alt + Left)" -#: Merge.rc:2749 +#: Merge.rc:2654 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5811,7 +5556,7 @@ msgstr "" "½Æ»s®t²§¨ì¥kÃä¨Ã¨ì¤U¤@®t²§\n" "½Æ»s¨ì¥kÃä¨Ã«e¶i (Ctrl+Alt+Right)" -#: Merge.rc:2750 +#: Merge.rc:2655 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5820,7 +5565,7 @@ msgstr "" "½Æ»s®t²§¨ì¥ªÃä¨Ã¨ì¤U¤@®t²§\n" "½Æ»s¨ì¥ªÃä¨Ã«e¶i (Ctrl+Alt+Left)" -#: Merge.rc:2751 +#: Merge.rc:2656 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5829,7 +5574,7 @@ msgstr "" "½Æ»s©Ò¦³®t²§¨ì¥kÃäÀÉ®×\n" "©Ò¦³¨ì¥kÃä" -#: Merge.rc:2752 +#: Merge.rc:2657 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5838,81 +5583,81 @@ msgstr "" "½Æ»s©Ò¦³®t²§¨ì¥ªÃäÀÉ®×\n" "©Ò¦³¨ì¥ªÃä" -#: Merge.rc:2753 +#: Merge.rc:2658 #, c-format msgid "Delete selected items from both directories" msgstr "±q¨âÃä¥Ø¿ý°»´ú©Ò¦³¶µ¥Ø" -#: Merge.rc:2754 +#: Merge.rc:2659 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "¤ñ¸û¿ï¨ú¶µ¥Ø(­Y¬°¦h­«¿ï¨ú¶µ¥Ø¡A¤ñ¸û¨ä²Ä¤@­Ó¶µ¥Ø)" -#: Merge.rc:2760 +#: Merge.rc:2665 #, c-format msgid "Select and reorder directory compare columns" msgstr "¿ï¨ú¨Ã¬ö¿ý¸ê®Æ§¨¤ñ¸ûÄæ¦ì" -#: Merge.rc:2761 +#: Merge.rc:2666 #, c-format msgid "Generate a patch-file" msgstr "²£¥Í¸ÉºóÀÉ" -#: Merge.rc:2762 +#: Merge.rc:2667 #, c-format msgid "Select and modify filters" msgstr "¿ï¨ú¨Ã­×§ï¿z¿ï¾¹" -#: Merge.rc:2763 +#: Merge.rc:2668 #, c-format msgid "Generates a report from compare results" msgstr "±q¤ñ¸ûµ²ªG²£¥Í³ø§i" -#: Merge.rc:2769 +#: Merge.rc:2674 #, c-format msgid "Shows a list of available plugins" msgstr "¦C¥X¥i¥Îªº¥~±¾" # "¨Ï¥ÎªÌ¿ï¨ú¸ÑÀ£¾¹(¤ñ¸û¸ê®Æ§¨®É¤£¸ÑÀ£) # " I would suggest "The user selects the unpacker (no automatic unpacking non-text files when comparing dir)" instead. -#: Merge.rc:2770 +#: Merge.rc:2675 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "¨Ï¥ÎªÌ¿ï¨ú¸Ñ¥]¾¹(¤ñ¸û¸ê®Æ§¨®É¤£¦Û°Ê¸Ñ¶}«D¯Â¤å¦rÀÉ®×)" # Instead of "one file only needs the extension" I would suggest "at least one file should have a needed extension". -#: Merge.rc:2771 +#: Merge.rc:2676 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "¥H¿ï¥Îªº¸Ñ¥]¾¹¥Î¨ì¨â­ÓÀÉ (¦Ü¤Ö¤@­ÓÀɮ׻ݰÆÀɦW)" -#: Merge.rc:2772 +#: Merge.rc:2677 #, c-format msgid "Select an unpacker to edit this file" msgstr "¿ï¤@­Ó¸Ñ¥]¾¹¥H½s¿è³o­ÓÀÉ®×" -#: Merge.rc:2773 +#: Merge.rc:2678 #, c-format msgid "No prediffer (normal)" msgstr "¤£­n¥ý¦æ³B²z¾¹ (±`ºA)" -#: Merge.rc:2774 +#: Merge.rc:2679 #, c-format msgid "Suggested plugins" msgstr "«Øijªº¥~±¾" -#: Merge.rc:2775 +#: Merge.rc:2680 #, c-format msgid "Other plugins" msgstr "¨ä¥L¥~±¾" -#: Merge.rc:2776 +#: Merge.rc:2681 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "¨ø¸ü©Ò¦³¥~±¾¦A­«·s¸ü¤J (¾A¥Îµo®iªÌ)" # The original text is strange because the next file seems to be always visible. The correct one is "Activate next file" or "Change the focus to next file", etc. -#: Merge.rc:2782 +#: Merge.rc:2687 #, c-format msgid "" "Activates next visible file\n" @@ -5921,12 +5666,12 @@ msgstr "" "¤Á´«µJÂI¦Ü¥t¤@ÀÉ\n" "¤Á´«¦Ü¥t¤@ÀÉ" -#: Merge.rc:2783 +#: Merge.rc:2688 #, c-format msgid "Closes all open windows" msgstr "Ãö³¬©Ò¦³¶}±Òµøµ¡" -#: Merge.rc:2789 +#: Merge.rc:2694 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -5935,22 +5680,22 @@ msgstr "" "¶}±Ò WinMerge »¡©úÀÉ\n" "WinMerge »¡©ú" -#: Merge.rc:2790 +#: Merge.rc:2695 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "¿é¥X¥Ø«e WinMerge ª©¥»¸ê°T¤Î¨ä²ÕºA¨ì¤å¦rÀÉ®×" -#: Merge.rc:2791 +#: Merge.rc:2696 #, c-format msgid "Display the GNU General Public License" msgstr "Åã¥Ü GNU ¤@¯ë¤½¦@±ÂÅvÃÒ" -#: Merge.rc:2792 +#: Merge.rc:2697 #, c-format msgid "Private Build: %1" msgstr "¨p¤H½sĶ¡G%1" -#: Merge.rc:2793 +#: Merge.rc:2698 #, c-format msgid "" "Opens the release notes document\n" @@ -5959,7 +5704,7 @@ msgstr "" "¶}±Òµo¦æ»¡©ú\n" "µo¦æ»¡©ú" -#: Merge.rc:2794 +#: Merge.rc:2699 #, c-format msgid "" "Opens the translations website\n" @@ -5968,272 +5713,272 @@ msgstr "" "¶}±Ò½Ķ¤åºô¯¸\n" "½Ķ" -#: Merge.rc:2800 +#: Merge.rc:2705 #, c-format msgid "Plugin Settings" msgstr "¥~±¾³]©w" -#: Merge.rc:2801 +#: Merge.rc:2706 #, c-format msgid "No prediffer" msgstr "¤£­n¥Î¥ý¦æ³B²z¾¹" -#: Merge.rc:2802 +#: Merge.rc:2707 #, c-format msgid "Prediff if possible" msgstr "¦p¥i¯à´N¥Î¥ý¦æ³B²z¾¹" -#: Merge.rc:2804 +#: Merge.rc:2709 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "§ä¤£¨ì WSH - °±¥Î .sct «ü¥O½X" -#: Merge.rc:2805 +#: Merge.rc:2710 #, c-format msgid "" msgstr "<µL>" -#: Merge.rc:2806 +#: Merge.rc:2711 #, c-format msgid "" msgstr "<¦Û°Ê>" -#: Merge.rc:2812 +#: Merge.rc:2717 #, c-format msgid "Open the file with registered application" msgstr "¥Hµn¿ýªºÀ³¥Îµ{¦¡¶}±ÒÀÉ®×" -#: Merge.rc:2813 +#: Merge.rc:2718 #, c-format msgid "Open the file with external editor" msgstr "¥H¥~¦b½s¿è¾¹¶}±ÒÀÉ®×" -#: Merge.rc:2814 +#: Merge.rc:2719 #, c-format msgid "Open the file with a particular program" msgstr "¥H¯S©wÀ³¥Îµ{¦¡¶}±ÒÀÉ®×" -#: Merge.rc:2820 +#: Merge.rc:2725 #, c-format msgid "Do not display moved blocks" msgstr "¤£Åã¥Ü²¾¦ìªº°Ï¶ô" -#: Merge.rc:2821 +#: Merge.rc:2726 #, c-format msgid "Display all moved blocks" msgstr "Åã¥Ü©Ò¦³²¾¦ìªº°Ï¶ô" -#: Merge.rc:2822 +#: Merge.rc:2727 #, c-format msgid "Display moved blocks only from current diff" msgstr "¶È´N¥Ø«e¬Û²§³BÅã¥Ü¨ä²¾¦ìªº°Ï¶ô" -#: Merge.rc:2823 +#: Merge.rc:2728 #, c-format msgid "Go to diff under cursor" msgstr "¸õ¨ì²{¦b¹«¼Ð¤U©Ò¥Ü¦æ" -#: Merge.rc:2824 +#: Merge.rc:2729 #, c-format msgid "G&oto Diff %1 of %2" msgstr "¦Ü %2 ¤§²Ä %1 ¬Û²§³B(&O)" -#: Merge.rc:2825 +#: Merge.rc:2730 #, c-format msgid "G&oto Line %1" msgstr "¦Ü²Ä %1 ¦æ(&O)" -#: Merge.rc:2831 +#: Merge.rc:2736 #, c-format msgid "Disabled" msgstr "Ãö³¬" -#: Merge.rc:2832 +#: Merge.rc:2737 #, c-format msgid "From file system" msgstr "±qÀɮרt²Î" -#: Merge.rc:2833 +#: Merge.rc:2738 #, c-format msgid "From MRU list" msgstr "±q MRU ªí" -#: Merge.rc:2839 +#: Merge.rc:2744 #, c-format msgid "No Highlighting" msgstr "µL°ª«G«×Åã¥Ü" -#: Merge.rc:2840 +#: Merge.rc:2745 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2841 +#: Merge.rc:2746 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2842 +#: Merge.rc:2747 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2843 +#: Merge.rc:2748 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2844 +#: Merge.rc:2749 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2845 +#: Merge.rc:2750 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2846 +#: Merge.rc:2751 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2847 +#: Merge.rc:2752 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2848 +#: Merge.rc:2753 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2849 +#: Merge.rc:2754 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2850 +#: Merge.rc:2755 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2851 +#: Merge.rc:2756 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2852 +#: Merge.rc:2757 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2853 +#: Merge.rc:2758 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2854 +#: Merge.rc:2759 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2855 +#: Merge.rc:2760 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2856 +#: Merge.rc:2761 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2857 +#: Merge.rc:2762 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2858 +#: Merge.rc:2763 #, c-format msgid "Portable Object" msgstr "¥iÄ⦡ª«¥ó" -#: Merge.rc:2859 +#: Merge.rc:2764 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2860 +#: Merge.rc:2765 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2861 +#: Merge.rc:2766 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2862 +#: Merge.rc:2767 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2863 +#: Merge.rc:2768 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2864 +#: Merge.rc:2769 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2865 +#: Merge.rc:2770 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2866 +#: Merge.rc:2771 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2867 +#: Merge.rc:2772 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2868 +#: Merge.rc:2773 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2869 +#: Merge.rc:2774 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2870 +#: Merge.rc:2775 #, c-format msgid "Verilog" msgstr "Verilog" -#: Merge.rc:2871 +#: Merge.rc:2776 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2876 +#: Merge.rc:2781 #, c-format msgid "Hide the toolbar" msgstr "ÁôÂäu¨ã¦C" -#: Merge.rc:2877 +#: Merge.rc:2782 #, c-format msgid "Show small toolbar" msgstr "Åã¥Ü¤p¤u¨ã¦C" -#: Merge.rc:2878 +#: Merge.rc:2783 #, c-format msgid "Show big toolbar" msgstr "Åã¥Ü¤j¤u¨ã¦C" -- 2.11.0