|
From: <ki...@us...> - 2008-02-14 17:10:02
|
Revision: 5042
http://winmerge.svn.sourceforge.net/winmerge/?rev=5042&view=rev
Author: kimmov
Date: 2008-02-14 09:09:58 -0800 (Thu, 14 Feb 2008)
Log Message:
-----------
PATCH: [ 1893167 ] Allow setting custom temporary folder
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Environment.cpp
trunk/Src/Languages/English.pot
trunk/Src/Merge.rc
trunk/Src/OptionsDef.h
trunk/Src/OptionsInit.cpp
trunk/Src/PropRegistry.cpp
trunk/Src/PropRegistry.h
trunk/Src/resource.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-02-13 22:05:37 UTC (rev 5041)
+++ trunk/Docs/Users/ChangeLog.txt 2008-02-14 17:09:58 UTC (rev 5042)
@@ -6,6 +6,7 @@
Cleaning up Help-menu (#1875111)
Right-align tab size number in editor options (r5037)
Move Time difference ignore -option to compare options (#1892283)
+ Add option to select temporary folder (#1893167)
BugFix: Potential lockup in folder compare (#1865131, #1889907)
BugFix: Line filter didn't filter non-ascii lines correctly (#1880628)
BugFix: GNU General Public License name in menu (#1868989)
Modified: trunk/Src/Environment.cpp
===================================================================
--- trunk/Src/Environment.cpp 2008-02-13 22:05:37 UTC (rev 5041)
+++ trunk/Src/Environment.cpp 2008-02-14 17:09:58 UTC (rev 5042)
@@ -9,6 +9,8 @@
#include "stdafx.h"
#include "paths.h"
#include "Environment.h"
+#include "OptionsDef.h"
+#include "Merge.h"
// Static string used by paths_GetTempPath() for storing temp path.
static String strTempPath;
@@ -25,18 +27,25 @@
{
if (strTempPath.empty())
{
- int cchTempPath = GetTempPath(0, 0);
- strTempPath.resize(cchTempPath - 1);
- if (!GetTempPath(cchTempPath, &*strTempPath.begin()))
+ if (GetOptionsMgr()->GetBool(OPT_USE_SYSTEM_TEMP_PATH))
{
- int err = GetLastError();
- if (pnerr)
- *pnerr = err;
+ int cchTempPath = GetTempPath(0, 0);
+ strTempPath.resize(cchTempPath - 1);
+ if (!GetTempPath(cchTempPath, &*strTempPath.begin()))
+ {
+ int err = GetLastError();
+ if (pnerr)
+ *pnerr = err;
#ifdef _DEBUG
- CString sysErr = GetSysError(err); // for debugging
+ CString sysErr = GetSysError(err); // for debugging
#endif
- return strTempPath.c_str(); // empty
+ return strTempPath.c_str(); // empty
+ }
}
+ else
+ {
+ strTempPath = GetOptionsMgr()->GetString(OPT_CUSTOM_TEMP_PATH);
+ }
strTempPath = paths_GetLongPath(strTempPath.c_str());
}
return strTempPath.c_str();
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2008-02-13 22:05:37 UTC (rev 5041)
+++ trunk/Src/Languages/English.pot 2008-02-14 17:09:58 UTC (rev 5042)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-02-13 23:00+0000\n"
+"POT-Creation-Date: 2008-02-14 19:09+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -376,7 +376,7 @@
#: Merge.rc:173
#: Merge.rc:287
#: Merge.rc:472
-#: Merge.rc:1883
+#: Merge.rc:1890
#, c-format
msgid "&Help"
msgstr ""
@@ -692,7 +692,7 @@
msgstr ""
#: Merge.rc:360
-#: Merge.rc:2686
+#: Merge.rc:2693
#, c-format
msgid "< Empty >"
msgstr ""
@@ -889,15 +889,15 @@
msgstr ""
#: Merge.rc:510
-#: Merge.rc:1120
-#: Merge.rc:1502
+#: Merge.rc:1127
+#: Merge.rc:1509
#, c-format
msgid "&Left"
msgstr ""
#: Merge.rc:511
-#: Merge.rc:1122
-#: Merge.rc:1505
+#: Merge.rc:1129
+#: Merge.rc:1512
#, c-format
msgid "&Right"
msgstr ""
@@ -1051,14 +1051,14 @@
#: Merge.rc:692
#: Merge.rc:782
#: Merge.rc:968
-#: Merge.rc:1039
-#: Merge.rc:1068
-#: Merge.rc:1078
-#: Merge.rc:1244
-#: Merge.rc:1308
-#: Merge.rc:1321
-#: Merge.rc:1413
-#: Merge.rc:1428
+#: Merge.rc:1046
+#: Merge.rc:1075
+#: Merge.rc:1085
+#: Merge.rc:1251
+#: Merge.rc:1315
+#: Merge.rc:1328
+#: Merge.rc:1420
+#: Merge.rc:1435
#, c-format
msgid "OK"
msgstr ""
@@ -1074,7 +1074,7 @@
msgstr ""
#: Merge.rc:671
-#: Merge.rc:1579
+#: Merge.rc:1586
#, c-format
msgid "&Left:"
msgstr ""
@@ -1082,31 +1082,31 @@
#: Merge.rc:675
#: Merge.rc:736
#: Merge.rc:989
-#: Merge.rc:1004
+#: Merge.rc:1011
#, c-format
msgid "&Browse..."
msgstr ""
#: Merge.rc:676
-#: Merge.rc:1583
+#: Merge.rc:1590
#, c-format
msgid "&Right:"
msgstr ""
#: Merge.rc:680
-#: Merge.rc:1015
+#: Merge.rc:1022
#, c-format
msgid "Bro&wse..."
msgstr ""
#: Merge.rc:681
-#: Merge.rc:1587
+#: Merge.rc:1594
#, c-format
msgid "&Filter:"
msgstr ""
#: Merge.rc:684
-#: Merge.rc:1589
+#: Merge.rc:1596
#, c-format
msgid "Select..."
msgstr ""
@@ -1122,7 +1122,7 @@
msgstr ""
#: Merge.rc:689
-#: Merge.rc:1590
+#: Merge.rc:1597
#, c-format
msgid "&Include Subfolders"
msgstr ""
@@ -1138,20 +1138,20 @@
#: Merge.rc:813
#: Merge.rc:845
#: Merge.rc:855
-#: Merge.rc:1040
-#: Merge.rc:1069
-#: Merge.rc:1079
-#: Merge.rc:1130
-#: Merge.rc:1245
-#: Merge.rc:1322
-#: Merge.rc:1414
-#: Merge.rc:1429
+#: Merge.rc:1047
+#: Merge.rc:1076
+#: Merge.rc:1086
+#: Merge.rc:1137
+#: Merge.rc:1252
+#: Merge.rc:1329
+#: Merge.rc:1421
+#: Merge.rc:1436
#, c-format
msgid "Cancel"
msgstr ""
#: Merge.rc:694
-#: Merge.rc:1323
+#: Merge.rc:1330
#, c-format
msgid "Help"
msgstr ""
@@ -1224,7 +1224,7 @@
msgstr ""
#: Merge.rc:741
-#: Merge.rc:1891
+#: Merge.rc:1898
#, c-format
msgid "General"
msgstr ""
@@ -1275,13 +1275,13 @@
msgstr ""
#: Merge.rc:766
-#: Merge.rc:1602
+#: Merge.rc:1609
#, c-format
msgid "&Folder compare"
msgstr ""
#: Merge.rc:768
-#: Merge.rc:1604
+#: Merge.rc:1611
#, c-format
msgid "Fil&e compare"
msgstr ""
@@ -1402,7 +1402,7 @@
msgstr ""
#: Merge.rc:851
-#: Merge.rc:2117
+#: Merge.rc:2124
#, c-format
msgid "Rational ClearCase"
msgstr ""
@@ -1413,7 +1413,7 @@
msgstr ""
#: Merge.rc:859
-#: Merge.rc:1164
+#: Merge.rc:1171
#, c-format
msgid "Comments"
msgstr ""
@@ -1459,7 +1459,7 @@
msgstr ""
#: Merge.rc:889
-#: Merge.rc:1894
+#: Merge.rc:1901
#, c-format
msgid "Colors"
msgstr ""
@@ -1475,7 +1475,7 @@
msgstr ""
#: Merge.rc:900
-#: Merge.rc:1554
+#: Merge.rc:1561
#, c-format
msgid "Background"
msgstr ""
@@ -1486,8 +1486,8 @@
msgstr ""
#: Merge.rc:914
-#: Merge.rc:1349
-#: Merge.rc:1555
+#: Merge.rc:1356
+#: Merge.rc:1562
#, c-format
msgid "Text"
msgstr ""
@@ -1518,23 +1518,23 @@
msgstr ""
#: Merge.rc:959
-#: Merge.rc:1038
-#: Merge.rc:1067
-#: Merge.rc:1167
-#: Merge.rc:1395
+#: Merge.rc:1045
+#: Merge.rc:1074
+#: Merge.rc:1174
+#: Merge.rc:1402
#, c-format
msgid "Defaults"
msgstr ""
#: Merge.rc:965
-#: Merge.rc:1337
-#: Merge.rc:1543
+#: Merge.rc:1344
+#: Merge.rc:1550
#, c-format
msgid "Dialog"
msgstr ""
#: Merge.rc:975
-#: Merge.rc:1897
+#: Merge.rc:1904
#, c-format
msgid "System"
msgstr ""
@@ -1575,1106 +1575,1115 @@
msgstr ""
#: Merge.rc:992
-#: Merge.rc:1407
-#: Merge.rc:1581
-#: Merge.rc:1585
-#: Merge.rc:1612
+#: Merge.rc:999
+#: Merge.rc:1414
+#: Merge.rc:1588
+#: Merge.rc:1592
+#: Merge.rc:1619
#, c-format
msgid "Browse..."
msgstr ""
-#: Merge.rc:998
+#: Merge.rc:993
#, c-format
+msgid "Temporary files folder"
+msgstr ""
+
+#: Merge.rc:994
+#, c-format
+msgid "System's temp folder"
+msgstr ""
+
+#: Merge.rc:996
+#, c-format
+msgid "Custom folder:"
+msgstr ""
+
+#: Merge.rc:1005
+#, c-format
msgid "Patch Generator"
msgstr ""
-#: Merge.rc:1001
+#: Merge.rc:1008
#, c-format
msgid "File&1:"
msgstr ""
-#: Merge.rc:1005
+#: Merge.rc:1012
#, c-format
msgid "File&2:"
msgstr ""
-#: Merge.rc:1008
+#: Merge.rc:1015
#, c-format
msgid "Br&owse..."
msgstr ""
-#: Merge.rc:1009
+#: Merge.rc:1016
#, c-format
msgid "&Swap"
msgstr ""
-#: Merge.rc:1010
+#: Merge.rc:1017
#, c-format
msgid "&Append to existing file"
msgstr ""
-#: Merge.rc:1012
+#: Merge.rc:1019
#, c-format
msgid "&Result:"
msgstr ""
-#: Merge.rc:1016
+#: Merge.rc:1023
#, c-format
msgid "&Format"
msgstr ""
-#: Merge.rc:1017
+#: Merge.rc:1024
#, c-format
msgid "St&yle:"
msgstr ""
-#: Merge.rc:1020
+#: Merge.rc:1027
#, c-format
msgid "&Context:"
msgstr ""
-#: Merge.rc:1023
+#: Merge.rc:1030
#, c-format
msgid "W&hitespaces"
msgstr ""
-#: Merge.rc:1024
+#: Merge.rc:1031
#, c-format
msgid "Com&pare"
msgstr ""
-#: Merge.rc:1026
+#: Merge.rc:1033
#, c-format
msgid "I&gnore changes"
msgstr ""
-#: Merge.rc:1028
+#: Merge.rc:1035
#, c-format
msgid "Ig&nore all"
msgstr ""
-#: Merge.rc:1030
+#: Merge.rc:1037
#, c-format
msgid "Ignor&e blank lines"
msgstr ""
-#: Merge.rc:1032
+#: Merge.rc:1039
#, c-format
msgid "Case sensi&tive"
msgstr ""
-#: Merge.rc:1034
+#: Merge.rc:1041
#, c-format
msgid "Inclu&de command line"
msgstr ""
-#: Merge.rc:1036
+#: Merge.rc:1043
#, c-format
msgid "Open to e&xternal editor"
msgstr ""
-#: Merge.rc:1058
+#: Merge.rc:1065
#, c-format
msgid "Display Columns"
msgstr ""
-#: Merge.rc:1064
+#: Merge.rc:1071
#, c-format
msgid "Move &Up"
msgstr ""
-#: Merge.rc:1065
+#: Merge.rc:1072
#, c-format
msgid "Move &Down"
msgstr ""
-#: Merge.rc:1075
+#: Merge.rc:1082
#, c-format
msgid "Select Unpacker"
msgstr ""
-#: Merge.rc:1080
+#: Merge.rc:1087
#, c-format
msgid "File unpacker:"
msgstr ""
-#: Merge.rc:1083
+#: Merge.rc:1090
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr ""
-#: Merge.rc:1086
+#: Merge.rc:1093
#, c-format
msgid "Extensions list:"
msgstr ""
-#: Merge.rc:1087
+#: Merge.rc:1094
#, c-format
msgid "Description:"
msgstr ""
-#: Merge.rc:1098
+#: Merge.rc:1105
#, c-format
msgid " Folder Compare Progress"
msgstr ""
-#: Merge.rc:1101
-#: Merge.rc:1844
+#: Merge.rc:1108
+#: Merge.rc:1851
#, c-format
msgid "Stop"
msgstr ""
-#: Merge.rc:1106
+#: Merge.rc:1113
#, c-format
msgid "Comparing items..."
msgstr ""
-#: Merge.rc:1107
+#: Merge.rc:1114
#, c-format
msgid "Items compared:"
msgstr ""
-#: Merge.rc:1108
+#: Merge.rc:1115
#, c-format
msgid "Items total:"
msgstr ""
-#: Merge.rc:1114
+#: Merge.rc:1121
#, c-format
msgid "Go To"
msgstr ""
-#: Merge.rc:1117
+#: Merge.rc:1124
#, c-format
msgid "G&oto:"
msgstr ""
-#: Merge.rc:1119
+#: Merge.rc:1126
#, c-format
msgid "File"
msgstr ""
-#: Merge.rc:1124
+#: Merge.rc:1131
#, c-format
msgid "Goto what"
msgstr ""
-#: Merge.rc:1125
+#: Merge.rc:1132
#, c-format
msgid "Li&ne"
msgstr ""
-#: Merge.rc:1127
+#: Merge.rc:1134
#, c-format
msgid "&Difference"
msgstr ""
-#: Merge.rc:1129
+#: Merge.rc:1136
#, c-format
msgid "&Go To"
msgstr ""
-#: Merge.rc:1135
-#: Merge.rc:1892
+#: Merge.rc:1142
+#: Merge.rc:1899
#, c-format
msgid "Compare"
msgstr ""
-#: Merge.rc:1138
+#: Merge.rc:1145
#, c-format
msgid "Whitespace"
msgstr ""
-#: Merge.rc:1139
+#: Merge.rc:1146
#, c-format
msgid "&Compare"
msgstr ""
-#: Merge.rc:1141
+#: Merge.rc:1148
#, c-format
msgid "&Ignore change"
msgstr ""
-#: Merge.rc:1143
+#: Merge.rc:1150
#, c-format
msgid "I&gnore all"
msgstr ""
-#: Merge.rc:1145
+#: Merge.rc:1152
#, c-format
msgid "Ignore blan&k lines"
msgstr ""
-#: Merge.rc:1147
+#: Merge.rc:1154
#, c-format
msgid "Ignore &case"
msgstr ""
-#: Merge.rc:1149
+#: Merge.rc:1156
#, c-format
msgid "Igno&re carriage return differences (DOS/UNIX/MAC)"
msgstr ""
-#: Merge.rc:1152
+#: Merge.rc:1159
#, c-format
msgid "E&nable moved block detection"
msgstr ""
-#: Merge.rc:1154
+#: Merge.rc:1161
#, c-format
msgid "&Match similar lines"
msgstr ""
-#: Merge.rc:1156
+#: Merge.rc:1163
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr ""
-#: Merge.rc:1159
+#: Merge.rc:1166
#, c-format
msgid "&File Compare method:"
msgstr ""
-#: Merge.rc:1162
+#: Merge.rc:1169
#, c-format
msgid "S&top after first difference"
msgstr ""
-#: Merge.rc:1165
+#: Merge.rc:1172
#, c-format
msgid "Filter Comments"
msgstr ""
-#: Merge.rc:1172
-#: Merge.rc:1893
+#: Merge.rc:1179
+#: Merge.rc:1900
#, c-format
msgid "Editor"
msgstr ""
-#: Merge.rc:1175
+#: Merge.rc:1182
#, c-format
msgid "&Highlight syntax"
msgstr ""
-#: Merge.rc:1177
+#: Merge.rc:1184
#, c-format
msgid "&Automatic rescan"
msgstr ""
-#: Merge.rc:1179
+#: Merge.rc:1186
#, c-format
msgid "&Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1181
+#: Merge.rc:1188
#, c-format
msgid "Tabs"
msgstr ""
-#: Merge.rc:1182
+#: Merge.rc:1189
#, c-format
msgid "&Tab size:"
msgstr ""
-#: Merge.rc:1185
+#: Merge.rc:1192
#, c-format
msgid "&Insert Tabs"
msgstr ""
-#: Merge.rc:1187
+#: Merge.rc:1194
#, c-format
msgid "Insert &Spaces"
msgstr ""
-#: Merge.rc:1189
+#: Merge.rc:1196
#, c-format
msgid "Line Difference Coloring"
msgstr ""
-#: Merge.rc:1191
+#: Merge.rc:1198
#, c-format
msgid "View line differences"
msgstr ""
-#: Merge.rc:1193
+#: Merge.rc:1200
#, c-format
msgid "&Character level"
msgstr ""
-#: Merge.rc:1195
+#: Merge.rc:1202
#, c-format
msgid "&Word-level:"
msgstr ""
-#: Merge.rc:1210
+#: Merge.rc:1217
#, c-format
msgid "Filefilters"
msgstr ""
-#: Merge.rc:1216
+#: Merge.rc:1223
#, c-format
msgid "Test"
msgstr ""
-#: Merge.rc:1217
+#: Merge.rc:1224
#, c-format
msgid "Install..."
msgstr ""
-#: Merge.rc:1218
+#: Merge.rc:1225
#, c-format
msgid "New..."
msgstr ""
-#: Merge.rc:1219
+#: Merge.rc:1226
#, c-format
msgid "Edit..."
msgstr ""
-#: Merge.rc:1220
+#: Merge.rc:1227
#, c-format
msgid "Delete..."
msgstr ""
-#: Merge.rc:1226
+#: Merge.rc:1233
#, c-format
msgid "Save modified files?"
msgstr ""
-#: Merge.rc:1229
+#: Merge.rc:1236
#, c-format
msgid "Left side file"
msgstr ""
-#: Merge.rc:1232
+#: Merge.rc:1239
#, c-format
msgid "&Save changes"
msgstr ""
-#: Merge.rc:1234
+#: Merge.rc:1241
#, c-format
msgid "&Discard changes"
msgstr ""
-#: Merge.rc:1236
+#: Merge.rc:1243
#, c-format
msgid "Right side file"
msgstr ""
-#: Merge.rc:1239
+#: Merge.rc:1246
#, c-format
msgid "S&ave changes"
msgstr ""
-#: Merge.rc:1241
+#: Merge.rc:1248
#, c-format
msgid "Dis&card changes"
msgstr ""
-#: Merge.rc:1243
+#: Merge.rc:1250
#, c-format
msgid "Discard All"
msgstr ""
-#: Merge.rc:1250
-#: Merge.rc:1498
-#: Merge.rc:1899
+#: Merge.rc:1257
+#: Merge.rc:1505
+#: Merge.rc:1906
#, c-format
msgid "Codepage"
msgstr ""
-#: Merge.rc:1253
+#: Merge.rc:1260
#, c-format
msgid "Default Codepage"
msgstr ""
-#: Merge.rc:1254
+#: Merge.rc:1261
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr ""
-#: Merge.rc:1256
+#: Merge.rc:1263
#, c-format
msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session"
msgstr ""
-#: Merge.rc:1259
+#: Merge.rc:1266
#, c-format
msgid "System codepage"
msgstr ""
-#: Merge.rc:1261
+#: Merge.rc:1268
#, c-format
msgid "According to WinMerge User Interface"
msgstr ""
-#: Merge.rc:1263
+#: Merge.rc:1270
#, c-format
msgid "Custom codepage :"
msgstr ""
-#: Merge.rc:1271
+#: Merge.rc:1278
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr ""
-#: Merge.rc:1274
+#: Merge.rc:1281
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr ""
-#: Merge.rc:1277
+#: Merge.rc:1284
#, c-format
msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation."
msgstr ""
-#: Merge.rc:1279
+#: Merge.rc:1286
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr ""
-#: Merge.rc:1281
+#: Merge.rc:1288
#, c-format
msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available."
msgstr ""
-#: Merge.rc:1283
+#: Merge.rc:1290
#, c-format
msgid "Version"
msgstr ""
-#: Merge.rc:1285
+#: Merge.rc:1292
#, c-format
msgid "Plugin required\n(dllbuild %04u)"
msgstr ""
-#: Merge.rc:1287
+#: Merge.rc:1294
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr ""
-#: Merge.rc:1290
-#: Merge.rc:1293
+#: Merge.rc:1297
+#: Merge.rc:1300
#, c-format
msgid "present"
msgstr ""
-#: Merge.rc:1291
+#: Merge.rc:1298
#, c-format
msgid "Merge7z000U.dll"
msgstr ""
-#: Merge.rc:1294
+#: Merge.rc:1301
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr ""
-#: Merge.rc:1296
-#: Merge.rc:1301
+#: Merge.rc:1303
+#: Merge.rc:1308
#, c-format
msgid "none"
msgstr ""
-#: Merge.rc:1298
+#: Merge.rc:1305
#, c-format
msgid "missing"
msgstr ""
-#: Merge.rc:1299
+#: Merge.rc:1306
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr ""
-#: Merge.rc:1303
+#: Merge.rc:1310
#, c-format
msgid "outdated"
msgstr ""
-#: Merge.rc:1304
+#: Merge.rc:1311
#, c-format
msgid "Plugins on path:"
msgstr ""
-#: Merge.rc:1305
+#: Merge.rc:1312
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from help menu.)"
msgstr ""
-#: Merge.rc:1309
+#: Merge.rc:1316
#, c-format
msgid "Plugin Download"
msgstr ""
-#: Merge.rc:1318
+#: Merge.rc:1325
#, c-format
msgid "Options"
msgstr ""
-#: Merge.rc:1329
+#: Merge.rc:1336
#, c-format
msgid " Categories"
msgstr ""
-#: Merge.rc:1331
+#: Merge.rc:1338
#, c-format
msgid "Import..."
msgstr ""
-#: Merge.rc:1332
+#: Merge.rc:1339
#, c-format
msgid "Export..."
msgstr ""
-#: Merge.rc:1340
+#: Merge.rc:1347
#, c-format
msgid "Keywords:"
msgstr ""
-#: Merge.rc:1341
+#: Merge.rc:1348
#, c-format
msgid "Function names:"
msgstr ""
-#: Merge.rc:1342
+#: Merge.rc:1349
#, c-format
msgid "Comments:"
msgstr ""
-#: Merge.rc:1343
+#: Merge.rc:1350
#, c-format
msgid "Numbers:"
msgstr ""
-#: Merge.rc:1344
+#: Merge.rc:1351
#, c-format
msgid "Operators:"
msgstr ""
-#: Merge.rc:1345
+#: Merge.rc:1352
#, c-format
msgid "Strings:"
msgstr ""
-#: Merge.rc:1346
+#: Merge.rc:1353
#, c-format
msgid "Preprocessor:"
msgstr ""
-#: Merge.rc:1347
+#: Merge.rc:1354
#, c-format
msgid "User 1:"
msgstr ""
-#: Merge.rc:1348
+#: Merge.rc:1355
#, c-format
msgid "User 2:"
msgstr ""
-#: Merge.rc:1353
-#: Merge.rc:1358
-#: Merge.rc:1363
-#: Merge.rc:1368
-#: Merge.rc:1373
-#: Merge.rc:1378
-#: Merge.rc:1383
-#: Merge.rc:1388
-#: Merge.rc:1393
+#: Merge.rc:1360
+#: Merge.rc:1365
+#: Merge.rc:1370
+#: Merge.rc:1375
+#: Merge.rc:1380
+#: Merge.rc:1385
+#: Merge.rc:1390
+#: Merge.rc:1395
+#: Merge.rc:1400
#, c-format
msgid "Bold"
msgstr ""
-#: Merge.rc:1401
+#: Merge.rc:1408
#, c-format
msgid "Folder Compare Report"
msgstr ""
-#: Merge.rc:1404
+#: Merge.rc:1411
#, c-format
msgid "Report &File:"
msgstr ""
-#: Merge.rc:1408
+#: Merge.rc:1415
#, c-format
msgid "&Style:"
msgstr ""
-#: Merge.rc:1411
+#: Merge.rc:1418
#, c-format
msgid "&Copy to Clipboard"
msgstr ""
-#: Merge.rc:1419
+#: Merge.rc:1426
#, c-format
msgid "Shared or Private Filter"
msgstr ""
-#: Merge.rc:1422
+#: Merge.rc:1429
#, c-format
msgid "Which type of filter do you want to create?"
msgstr ""
-#: Merge.rc:1424
+#: Merge.rc:1431
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr ""
-#: Merge.rc:1426
+#: Merge.rc:1433
#, c-format
msgid "Private Filter (only for current user)"
msgstr ""
-#: Merge.rc:1434
-#: Merge.rc:1900
+#: Merge.rc:1441
+#: Merge.rc:1907
#, c-format
msgid "Archive Support"
msgstr ""
-#: Merge.rc:1437
+#: Merge.rc:1444
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr ""
-#: Merge.rc:1439
+#: Merge.rc:1446
#, c-format
msgid "Download 7-zip Plugin"
msgstr ""
-#: Merge.rc:1440
+#: Merge.rc:1447
#, c-format
msgid "&Enable archive file support"
msgstr ""
-#: Merge.rc:1442
+#: Merge.rc:1449
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr ""
-#: Merge.rc:1445
+#: Merge.rc:1452
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr ""
-#: Merge.rc:1447
+#: Merge.rc:1454
#, c-format
msgid "&Detect archive type from file signature"
msgstr ""
-#: Merge.rc:1455
+#: Merge.rc:1462
#, c-format
msgid "Compare Statistics"
msgstr ""
-#: Merge.rc:1458
+#: Merge.rc:1465
#, c-format
msgid "Folders:"
msgstr ""
-#: Merge.rc:1459
+#: Merge.rc:1466
#, c-format
msgid "Files:"
msgstr ""
-#: Merge.rc:1460
-#: Merge.rc:2259
+#: Merge.rc:1467
+#: Merge.rc:2266
#, c-format
msgid "Different"
msgstr ""
-#: Merge.rc:1461
+#: Merge.rc:1468
#, c-format
msgid "Text:"
msgstr ""
-#: Merge.rc:1464
-#: Merge.rc:1483
+#: Merge.rc:1471
+#: Merge.rc:1490
#, c-format
msgid "Binary:"
msgstr ""
-#: Merge.rc:1467
+#: Merge.rc:1474
#, c-format
msgid "Unique"
msgstr ""
-#: Merge.rc:1468
+#: Merge.rc:1475
#, c-format
msgid "Left:"
msgstr ""
-#: Merge.rc:1473
+#: Merge.rc:1480
#, c-format
msgid "Right:"
msgstr ""
-#: Merge.rc:1478
-#: Merge.rc:2254
+#: Merge.rc:1485
+#: Merge.rc:2261
#, c-format
msgid "Identical"
msgstr ""
-#: Merge.rc:1487
+#: Merge.rc:1494
#, c-format
msgid "Total:"
msgstr ""
-#: Merge.rc:1492
+#: Merge.rc:1499
#, c-format
msgid "Close"
msgstr ""
-#: Merge.rc:1501
+#: Merge.rc:1508
#, c-format
msgid "Affects"
msgstr ""
-#: Merge.rc:1504
-#: Merge.rc:1507
+#: Merge.rc:1511
+#: Merge.rc:1514
#, c-format
msgid "(Affects)"
msgstr ""
-#: Merge.rc:1508
+#: Merge.rc:1515
#, c-format
msgid "Select Codepage for"
msgstr ""
-#: Merge.rc:1509
+#: Merge.rc:1516
#, c-format
msgid "&File Loading:"
msgstr ""
-#: Merge.rc:1511
-#: Merge.rc:1514
+#: Merge.rc:1518
+#: Merge.rc:1521
#, c-format
msgid "..."
msgstr ""
-#: Merge.rc:1512
+#: Merge.rc:1519
#, c-format
msgid "File &Saving:"
msgstr ""
-#: Merge.rc:1515
+#: Merge.rc:1522
#, c-format
msgid "&Use same codepage for both"
msgstr ""
-#: Merge.rc:1518
+#: Merge.rc:1525
#, c-format
msgid "&Apply"
msgstr ""
-#: Merge.rc:1519
-#: Merge.rc:1866
+#: Merge.rc:1526
+#: Merge.rc:1873
#, c-format
msgid "&Cancel"
msgstr ""
-#: Merge.rc:1524
+#: Merge.rc:1531
#, c-format
msgid "Test Filter"
msgstr ""
-#: Merge.rc:1527
+#: Merge.rc:1534
#, c-format
msgid "Testing filter ..."
msgstr ""
-#: Merge.rc:1529
+#: Merge.rc:1536
#, c-format
msgid "&Enter text to test:"
msgstr ""
-#: Merge.rc:1531
+#: Merge.rc:1538
#, c-format
msgid "&Folder Name"
msgstr ""
-#: Merge.rc:1533
+#: Merge.rc:1540
#, c-format
msgid "Result:"
msgstr ""
-#: Merge.rc:1537
+#: Merge.rc:1544
#, c-format
msgid "&Test"
msgstr ""
-#: Merge.rc:1538
+#: Merge.rc:1545
#, c-format
msgid "&Close"
msgstr ""
-#: Merge.rc:1546
+#: Merge.rc:1553
#, c-format
msgid "&Use customized text colors"
msgstr ""
-#: Merge.rc:1549
+#: Merge.rc:1556
#, c-format
msgid "Custom text colors"
msgstr ""
-#: Merge.rc:1551
+#: Merge.rc:1558
#, c-format
msgid "Whitespace:"
msgstr ""
-#: Merge.rc:1552
+#: Merge.rc:1559
#, c-format
msgid "Regular text:"
msgstr ""
-#: Merge.rc:1553
+#: Merge.rc:1560
#, c-format
msgid "Selection:"
msgstr ""
-#: Merge.rc:1576
+#: Merge.rc:1583
#, c-format
msgid "Paths"
msgstr ""
-#: Merge.rc:1582
+#: Merge.rc:1589
#, c-format
msgid "R&ead-only"
msgstr ""
-#: Merge.rc:1586
+#: Merge.rc:1593
#, c-format
msgid "Re&ad-only"
msgstr ""
-#: Merge.rc:1592
+#: Merge.rc:1599
#, c-format
msgid "Open..."
msgstr ""
-#: Merge.rc:1593
+#: Merge.rc:1600
#, c-format
msgid "Save..."
msgstr ""
-#: Merge.rc:1598
-#: Merge.rc:1901
+#: Merge.rc:1605
+#: Merge.rc:1908
#, c-format
msgid "Backup Files"
msgstr ""
-#: Merge.rc:1601
+#: Merge.rc:1608
#, c-format
msgid "Create backup files in:"
msgstr ""
-#: Merge.rc:1606
+#: Merge.rc:1613
#, c-format
msgid "Create backup files into:"
msgstr ""
-#: Merge.rc:1607
+#: Merge.rc:1614
#, c-format
msgid "&Original file's folder"
msgstr ""
-#: Merge.rc:1609
+#: Merge.rc:1616
#, c-format
msgid "&Global backup folder:"
msgstr ""
-#: Merge.rc:1613
+#: Merge.rc:1620
#, c-format
msgid "Backup filename:"
msgstr ""
-#: Merge.rc:1614
+#: Merge.rc:1621
#, c-format
msgid "&Append .bak -extension"
msgstr ""
-#: Merge.rc:1616
+#: Merge.rc:1623
#, c-format
msgid "A&ppend timestamp"
msgstr ""
-#: Merge.rc:1623
+#: Merge.rc:1630
#, c-format
msgid "Confirm Copy"
msgstr ""
-#: Merge.rc:1627
+#: Merge.rc:1634
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr ""
-#: Merge.rc:1629
+#: Merge.rc:1636
#, c-format
msgid "From left"
msgstr ""
-#: Merge.rc:1632
+#: Merge.rc:1639
#, c-format
msgid "To right"
msgstr ""
-#: Merge.rc:1635
+#: Merge.rc:1642
#, c-format
msgid "Yes"
msgstr ""
-#: Merge.rc:1636
+#: Merge.rc:1643
#, c-format
msgid "No"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1661
+#: Merge.rc:1668
#, c-format
msgid "040904e4"
msgstr ""
#. VarFileInfo.Translation
-#: Merge.rc:1677
+#: Merge.rc:1684
#, c-format
msgid "0x409, 1252"
msgstr ""
-#: Merge.rc:1692
+#: Merge.rc:1699
#, c-format
msgid "Ready"
msgstr ""
-#: Merge.rc:1698
+#: Merge.rc:1705
#, c-format
msgid "EXT"
msgstr ""
-#: Merge.rc:1699
+#: Merge.rc:1706
#, c-format
msgid "CAP"
msgstr ""
-#: Merge.rc:1700
+#: Merge.rc:1707
#, c-format
msgid "NUM"
msgstr ""
-#: Merge.rc:1701
+#: Merge.rc:1708
#, c-format
msgid "SCRL"
msgstr ""
-#: Merge.rc:1702
+#: Merge.rc:1709
#, c-format
msgid "OVR"
msgstr ""
-#: Merge.rc:1703
+#: Merge.rc:1710
#, c-format
msgid "REC"
msgstr ""
-#: Merge.rc:1709
+#: Merge.rc:1716
#, c-format
msgid "Create empty documents\nNew Documents (Ctrl+N)"
msgstr ""
-#: Merge.rc:1710
+#: Merge.rc:1717
#, c-format
msgid "Open an existing document\nOpen (Ctrl+O)"
msgstr ""
-#: Merge.rc:1711
+#: Merge.rc:1718
#, c-format
msgid "Close the active document\nClose"
msgstr ""
-#: Merge.rc:1712
+#: Merge.rc:1719
#, c-format
msgid "Save the active document\nSave (Ctrl+S)"
msgstr ""
-#: Merge.rc:1713
+#: Merge.rc:1720
#, c-format
msgid "Save the active document with a new name\nSave As"
msgstr ""
-#: Merge.rc:1714
+#: Merge.rc:1721
#, c-format
msgid "Change the printing options\nPage Setup"
msgstr ""
-#: Merge.rc:1715
+#: Merge.rc:1722
#, c-format
msgid "Change the printer and printing options\nPrint Setup"
msgstr ""
-#: Merge.rc:1716
+#: Merge.rc:1723
#, c-format
msgid "Print the active document\nPrint"
msgstr ""
-#: Merge.rc:1717
+#: Merge.rc:1724
#, c-format
msgid "Display full pages\nPrint Preview"
msgstr ""
-#: Merge.rc:1722
+#: Merge.rc:1729
#, c-format
msgid "Make all hidden items visible again"
msgstr ""
-#: Merge.rc:1728
+#: Merge.rc:1735
#, c-format
msgid "Open project file\nProject file (Ctrl+J)"
msgstr ""
-#: Merge.rc:1729
+#: Merge.rc:1736
#, c-format
msgid "Unknown error attempting to open project file"
msgstr ""
-#: Merge.rc:1730
+#: Merge.rc:1737
#, c-format
msgid "Unknown error attempting to save project file"
msgstr ""
-#: Merge.rc:1731
+#: Merge.rc:1738
#, c-format
msgid "Project File"
msgstr ""
-#: Merge.rc:1732
+#: Merge.rc:1739
#, c-format
msgid "Project file successfully loaded."
msgstr ""
-#: Merge.rc:1733
+#: Merge.rc:1740
#, c-format
msgid "Project file successfully saved."
msgstr ""
-#: Merge.rc:1734
+#: Merge.rc:1741
#, c-format
msgid "Save current paths and options to project file\nSave Project File"
msgstr ""
-#: Merge.rc:1739
+#: Merge.rc:1746
#, c-format
msgid "Display program information, version number and copyright\nAbout"
msgstr ""
-#: Merge.rc:1740
+#: Merge.rc:1747
#, c-format
msgid "Quit the application; prompts to save documents\nExit"
msgstr ""
-#: Merge.rc:1746
-#: Merge.rc:1747
-#: Merge.rc:1748
-#: Merge.rc:1749
-#: Merge.rc:1750
-#: Merge.rc:1751
-#: Merge.rc:1752
#: Merge.rc:1753
#: Merge.rc:1754
#: Merge.rc:1755
@@ -2684,2727 +2693,2734 @@
#: Merge.rc:1759
#: Merge.rc:1760
#: Merge.rc:1761
+#: Merge.rc:1762
+#: Merge.rc:1763
+#: Merge.rc:1764
+#: Merge.rc:1765
+#: Merge.rc:1766
+#: Merge.rc:1767
+#: Merge.rc:1768
#, c-format
msgid "Open this document"
msgstr ""
-#: Merge.rc:1766
+#: Merge.rc:1773
#, c-format
msgid "Switch to the next window pane\nNext Pane"
msgstr ""
-#: Merge.rc:1767
+#: Merge.rc:1774
#, c-format
msgid "Switch back to the previous window pane\nPrevious Pane"
msgstr ""
-#: Merge.rc:1773
+#: Merge.rc:1780
#, c-format
msgid "Arrange windows so they overlap\nCascade Windows"
msgstr ""
-#: Merge.rc:1774
+#: Merge.rc:1781
#, c-format
msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally"
msgstr ""
-#: Merge.rc:1775
+#: Merge.rc:1782
#, c-format
msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically"
msgstr ""
-#: Merge.rc:1781
+#: Merge.rc:1788
#, c-format
msgid "Copy the selection and put it on the Clipboard\nCopy"
msgstr ""
-#: Merge.rc:1782
+#: Merge.rc:1789
#, c-format
msgid "Cut the selection and put it on the Clipboard\nCut"
msgstr ""
-#: Merge.rc:1783
+#: Merge.rc:1790
#, c-format
msgid "Find the specified text\nFind"
msgstr ""
-#: Merge.rc:1784
+#: Merge.rc:1791
#, c-format
msgid "Insert Clipboard contents\nPaste"
msgstr ""
-#: Merge.rc:1785
+#: Merge.rc:1792
#, c-format
msgid "Repeat the last action\nRepeat"
msgstr ""
-#: Merge.rc:1786
+#: Merge.rc:1793
#, c-format
msgid "Replace specific text with different text\nReplace"
msgstr ""
-#: Merge.rc:1787
+#: Merge.rc:1794
#, c-format
msgid "Select the entire document\nSelect All"
msgstr ""
-#: Merge.rc:1788
+#: Merge.rc:1795
#, c-format
msgid "Undo the last action\nUndo (Ctrl+Z)"
msgstr ""
-#: Merge.rc:1789
+#: Merge.rc:1796
#, c-format
msgid "Redo the previously undone action\nRedo (Ctrl+Y)"
msgstr ""
-#: Merge.rc:1795
+#: Merge.rc:1802
#, c-format
msgid "Show or hide the toolbar\nToggle ToolBar"
msgstr ""
-#: Merge.rc:1796
+#: Merge.rc:1803
#, c-format
msgid "Show or hide the status bar\nToggle StatusBar"
msgstr ""
-#: Merge.rc:1797
+#: Merge.rc:1804
#, c-format
msgid "Show or hide the tab bar\nToggle TabBar"
msgstr ""
-#: Merge.rc:1798
+#: Merge.rc:1805
#, c-format
msgid "Automatically resize panes\nLock Panes"
msgstr ""
-#: Merge.rc:1804
+#: Merge.rc:1811
#, c-format
msgid "Change the window size"
msgstr ""
-#: Merge.rc:1805
+#: Merge.rc:1812
#, c-format
msgid "Change the window position"
msgstr ""
-#: Merge.rc:1806
+#: Merge.rc:1813
#, c-format
msgid "Reduce the window to an icon"
msgstr ""
-#: Merge.rc:1807
+#: Merge.rc:1814
#, c-format
msgid "Enlarge the window to full size"
msgstr ""
-#: Merge.rc:1808
+#: Merge.rc:1815
#, c-format
msgid "Switch to the next document window"
msgstr ""
-#: Merge.rc:1809
+#: Merge.rc:1816
#, c-format
msgid "Switch to the previous document window"
msgstr ""
-#: Merge.rc:1810
+#: Merge.rc:1817
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr ""
-#: Merge.rc:1815
+#: Merge.rc:1822
#, c-format
msgid "Restore the window to normal size"
msgstr ""
-#: Merge.rc:1816
+#: Merge.rc:1823
#, c-format
msgid "Activate Task List"
msgstr ""
-#: Merge.rc:1817
+#: Merge.rc:1824
#, c-format
msgid "Activate this window"
msgstr ""
-#: Merge.rc:1823
+#: Merge.rc:1830
#, c-format
msgid "Close print preview mode\nCancel Preview"
msgstr ""
-#: Merge.rc:1830
+#: Merge.rc:1837
#, c-format
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
msgstr ""
-#: Merge.rc:1831
+#: Merge.rc:1838
#, c-format
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr ""
-#: Merge.rc:1838
+#: Merge.rc:1845
#, c-format
msgid "Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1845
+#: Merge.rc:1852
#, c-format
msgid "Press any key"
msgstr ""
-#: Merge.rc:1851
-#: Merge.rc:1852
+#: Merge.rc:1858
+#: Merge.rc:1859
#, c-format
msgid "Right click on the path to copy"
msgstr ""
-#: Merge.rc:1858
+#: Merge.rc:1865
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
msgstr ""
-#: Merge.rc:1859
+#: Merge.rc:1866
#, 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 ""
-#: Merge.rc:1865
+#: Merge.rc:1872
#, c-format
msgid "&Ok"
msgstr ""
-#: Merge.rc:1867
+#: Merge.rc:1874
#, c-format
msgid "&Abort"
msgstr ""
-#: Merge.rc:1868
+#: Merge.rc:1875
#, c-format
msgid "&Retry"
msgstr ""
-#: Merge.rc:1869
+#: Merge.rc:1876
#, c-format
msgid "&Ignore"
msgstr ""
-#: Merge.rc:1870
+#: Merge.rc:1877
#, c-format
msgid "Ignore &all"
msgstr ""
-#: Merge.rc:1871
+#: Merge.rc:1878
#, c-format
msgid "&Yes"
msgstr ""
-#: Merge.rc:1877
+#: Merge.rc:1884
#, c-format
msgid "Yes to &all"
msgstr ""
-#: Merge.rc:1878
+#: Merge.rc:1885
#, c-format
msgid "&No"
msgstr ""
-#: Merge.rc:1879
+#: Merge.rc:1886
#, c-format
msgid "No to a&ll"
msgstr ""
-#: Merge.rc:1880
+#: Merge.rc:1887
#, c-format
msgid "&Continue"
msgstr ""
-#: Merge.rc:1881
+#: Merge.rc:1888
#, c-format
msgid "&Skip"
msgstr ""
-#: Merge.rc:1882
+#: Merge.rc:1889
#, c-format
msgid "Skip &all"
msgstr ""
-#: Merge.rc:1884
+#: Merge.rc:1891
#, c-format
msgid "Don't display this &message again."
msgstr ""
-#: Merge.rc:1885
+#: Merge.rc:1892
#, c-format
msgid "Don't ask this &question again."
msgstr ""
-#: Merge.rc:1895
+#: Merge.rc:1902
#, c-format
msgid "Syntax colors"
msgstr ""
-#: Merge.rc:1896
+#: Merge.rc:1903
#, c-format
msgid "Text Colors"
msgstr ""
-#: Merge.rc:1898
+#: Merge.rc:1905
#, c-format
msgid "Version Control"
msgstr ""
-#: Merge.rc:1908
+#: Merge.rc:1915
#, c-format
msgid "To:"
msgstr ""
-#: Merge.rc:1909
+#: Merge.rc:1916
#, c-format
msgid "From left:"
msgstr ""
-#: Merge.rc:1910
+#: Merge.rc:1917
#, c-format
msgid "To left:"
msgstr ""
-#: Merge.rc:1911
+#: Merge.rc:1918
#, c-format
msgid "From right:"
msgstr ""
-#: Merge.rc:1912
+#: Merge.rc:1919
#, c-format
msgid "To right:"
msgstr ""
-#: Merge.rc:1918
+#: Merge.rc:1925
#, c-format
msgid "Version %1"
msgstr ""
-#: Merge.rc:1919
+#: Merge.rc:1926
#, c-format
msgid "Unicode"
msgstr ""
-#: Merge.rc:1925
+#: Merge.rc:1932
#, c-format
msgid "Options (%1)"
msgstr ""
-#: Merge.rc:1926
+#: Merge.rc:1933
#, c-format
msgid "All message boxes are now displayed again."
msgstr ""
-#: Merge.rc:1927
+#: Merge.rc:1934
#, 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 ""
-#: Merge.rc:1928
+#: Merge.rc:1935
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr ""
-#: Merge.rc:1930
+#: Merge.rc:1937
#, c-format
msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
msgstr ""
-#: Merge.rc:1932
+#: Merge.rc:1939
#, c-format
msgid "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
msgstr ""
-#: Merge.rc:1938
+#: Merge.rc:1945
#, c-format
msgid "Open"
msgstr ""
-#: Merge.rc:1939
+#: Merge.rc:1946
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1940
+#: Merge.rc:1947
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1941
+#: Merge.rc:1948
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr ""
-#: Merge.rc:1943
+#: Merge.rc:1950
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1949
+#: Merge.rc:1956
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1950
+#: Merge.rc:1957
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1951
+#: Merge.rc:1958
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1957
+#: Merge.rc:1964
#, c-format
msgid "Full Contents"
msgstr ""
-#: Merge.rc:1958
+#: Merge.rc:1965
#, c-format
msgid "Quick Contents"
msgstr ""
-#: Merge.rc:1959
+#: Merge.rc:1966
#, c-format
msgid "Modified Date"
msgstr ""
-#: Merge.rc:1960
+#: Merge.rc:1967
#, c-format
msgid "Modified Date and Size"
msgstr ""
-#: Merge.rc:1961
+#: Merge.rc:1968
#, c-format
msgid "Size"
msgstr ""
-#: Merge.rc:1967
+#: Merge.rc:1974
#, c-format
msgid "Name"
msgstr ""
-#: Merge.rc:1968
+#: Merge.rc:1975
#, c-format
msgid "Location"
msgstr ""
-#: Merge.rc:1969
+#: Merge.rc:1976
#, c-format
msgid "Filters"
msgstr ""
-#: Merge.rc:1970
+#: Merge.rc:1977
#, c-format
msgid "[F] "
msgstr ""
-#: Merge.rc:1971
+#: Merge.rc:1978
#, c-format
msgid "Description"
msgstr ""
-#: Merge.rc:1972
+#: Merge.rc:1979
#, c-format
msgid "Select filename for new filter"
msgstr ""
-#: Merge.rc:1973
+#: Merge.rc:1980
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1975
+#: Merge.rc:1982
#, c-format
msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
msgstr ""
-#: Merge.rc:1977
+#: Merge.rc:1984
#, c-format
msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
msgstr ""
-#: Merge.rc:1979
+#: Merge.rc:1986
#, c-format
msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System."
msgstr ""
-#: Merge.rc:1981
+#: Merge.rc:1988
#, c-format
msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
msgstr ""
-#: Merge.rc:1982
+#: Merge.rc:1989
#, c-format
msgid "Locate filter file to install"
msgstr ""
-#: Merge.rc:1984
+#: Merge.rc:1991
#, c-format
msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
msgstr ""
-#: Merge.rc:1986
+#: Merge.rc:1993
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr ""
-#: Merge.rc:1992
+#: Merge.rc:1999
#, c-format
msgid "Regular expression"
msgstr ""
-#: Merge.rc:1998
+#: Merge.rc:2005
#, c-format
msgid "&Path to cleartool.exe :"
msgstr ""
-#: Merge.rc:1999
+#: Merge.rc:2006
#, c-format
msgid "&Path to SS.EXE :"
msgstr ""
-#: Merge.rc:2005
+#: Merge.rc:2012
#, c-format
msgid "Folder Comparison Results"
msgstr ""
-#: Merge.rc:2006
+#: Merge.rc:2013
#, c-format
msgid "File Comparison"
msgstr ""
-#: Merge.rc:2007
+#: Merge.rc:2014
#, c-format
msgid "Untitled left"
msgstr ""
-#: Merge.rc:2008
+#: Merge.rc:2015
#, c-format
msgid "Untitled right"
msgstr ""
-#: Merge.rc:2009
+#: Merge.rc:2016
#, c-format
msgid "Theirs File"
msgstr ""
-#: Merge.rc:2010
+#: Merge.rc:2017
#, c-format
msgid "Mine File"
msgstr ""
-#: Merge.rc:2016
+#: Merge.rc:2023
#, c-format
msgid "Scanning files..."
msgstr ""
-#: Merge.rc:2017
+#: Merge.rc:2024
#, c-format
msgid "Opening selection"
msgstr ""
-#: Merge.rc:2018
+#: Merge.rc:2025
#, c-format
msgid "Copying Left to Right"
msgstr ""
-#: Merge.rc:2019
+#: Merge.rc:2026
#, c-format
msgid "Copying Right to Left"
msgstr ""
-#: Merge.rc:2020
+#: Merge.rc:2027
#, c-format
msgid "Copying All to Left"
msgstr ""
-#: Merge.rc:2021
+#: Merge.rc:2028
#, c-format
msgid "Copying All to Right"
msgstr ""
-#: Merge.rc:2022
+#: Merge.rc:2029
#, c-format
msgid "Copying files..."
msgstr ""
-#: Merge.rc:2023
+#: Merge.rc:2030
#, c-format
msgid "Deleting files..."
msgstr ""
-#: Merge.rc:2024
+#: Merge.rc:2031
#, c-format
msgid "Moving files..."
msgstr ""
-#: Merge.rc:2025
+#: Merge.rc:2032
#, c-format
msgid "Creating the report..."
msgstr ""
-#: Merge.rc:2031
+#: Merge.rc:2038
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
-#: Merge.rc:2032
+#: Merge.rc:2039
#, c-format
msgid "Line: %s"
msgstr ""
-#: Merge.rc:2033
+#: Merge.rc:2040
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
-#: Merge.rc:2034
+#: Merge.rc:2041
#, c-format
msgid "Merge"
msgstr ""
-#: Merge.rc:2035
+#: Merge.rc:2042
#, c-format
msgid "Difference %1 of %2"
msgstr ""
-#: Merge.rc:2036
+#: Merge.rc:2043
#, c-format
msgid "%1 Differences Found"
msgstr ""
-#: Merge.rc:2037
+#: Merge.rc:2044
#, c-format
msgid "1 Difference Found"
msgstr ""
#. Abbreviation from "Read Only"
-#: Merge.rc:2038
+#: Merge.rc:2045
#, c-format
msgid "RO"
msgstr ""
-#: Merge.rc:2044
+#: Merge.rc:2051
#, c-format
msgid "Item %1 of %2"
msgstr ""
-#: Merge.rc:2045
+#: Merge.rc:2052
#, c-format
msgid "Items: %1"
msgstr ""
-#: Merge.rc:2051
+#: Merge.rc:2058
#, c-format
msgid "Select two existing folders or files to compare"
msgstr ""
-#: Merge.rc:2052
+#: Merge.rc:2059
#, c-format
msgid "Folder Selection"
msgstr ""
-#: Merge.rc:2053
+#: Merge.rc:2060
#, c-format
msgid "Select two folders or two files to compare."
msgstr ""
-#: Merge.rc:2054
+#: Merge.rc:2061
#, c-format
msgid "Left path is invalid!"
msgstr ""
-#: Merge.rc:2055
+#: Merge.rc:2062
#, c-format
msgid "Right path is invalid!"
msgstr ""
-#: Merge.rc:2056
+#: Merge.rc:2063
#, c-format
msgid "Both paths are invalid!"
msgstr ""
-#: Merge.rc:2057
+#: Merge.rc:2064
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr ""
-#: Merge.rc:2058
+#: Merge.rc:2065
#, c-format
msgid "Cannot compare file and folder!"
msgstr ""
-#: Merge.rc:2064
+#: Merge.rc:2071
#, c-format
msgid "File not found: %1"
msgstr ""
-#: Merge.rc:2065
+#: Merge.rc:2072
#, c-format
msgid "File not unpacked: %1"
msgstr ""
-#: Merge.rc:2066
+#: Merge.rc:2073
#, c-format
msgid "Cannot open file\n%1\n\n%2"
msgstr ""
-#: Merge.rc:2067
+#: Merge.rc:2074
#, c-format
msgid "Failed to parse conflict file."
msgstr ""
-#: Merge.rc:2068
+#: Merge.rc:2075
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
-#: Merge.rc:2074
+#: Merge.rc:2081
#, c-format
msgid "Save As"
msgstr ""
-#: Merge.rc:2075
+#: Merge.rc:2082
#, c-format
msgid "Save changes to %1?"
msgstr ""
-#: Merge.rc:2076
+#: Merge.rc:2083
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
msgstr ""
-#: Merge.rc:2077
+#: Merge.rc:2084
#, c-format
msgid "Error checking destination writeability"
msgstr ""
-#: Merge.rc:2078
+#: Merge.rc:2085
#, c-format
msgid "Error backing up file"
msgstr ""
-#: Merge.rc:2080
+#: Merge.rc:2087
#, c-format
msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
msgstr ""
-#: Merge.rc:2081
+#: Merge.rc:2088
#, c-format
msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
msgstr ""
-#: Merge.rc:2082
+#: Merge.rc:2089
#, c-format
msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
msgstr ""
-#: Merge.rc:2083
+#: Merge.rc:2090
#, c-format
msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
msgstr ""
-#: Merge.rc:2084
+#: Merge.rc:2091
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
msgstr ""
-#: Merge.rc:2085
+#: Merge.rc:2092
#, c-format
msgid "%1\nis marked read-only. Would you like to override the read-only item?"
msgstr ""
-#: Merge.rc:2086
+#: Merge.rc:2093
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nIf you want to refresh files close current file compare and load files again."
msgstr ""
-#: Merge.rc:2087
+#: Merge.rc:2094
#, c-format
msgid "Save Left File As"
msgstr ""
-#: Merge.rc:2088
+#: Merge.rc:2095
#, c-format
msgid "Save Right File As"
msgstr ""
-#: Merge.rc:2094
+#: Merge.rc:2101
#, c-format
msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
msgstr ""
-#: Merge.rc:2100
+#: Merge.rc:2107
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr ""
-#: Merge.rc:2101
+#: Merge.rc:2108
#, c-format
msgid "Checkout files from VSS..."
msgstr ""
-#: Merge.rc:2102
+#: Merge.rc:2109
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr ""
-#: Merge.rc:2103
+#: Merge.rc:2110
#, c-format
msgid "Error executing versioning system command."
msgstr ""
-#: Merge.rc:2104
+#: Merge.rc:2111
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr ""
-#: Merge.rc:2105
+#: Merge.rc:2112
#, c-format
msgid "No VSS database(s) found!"
msgstr ""
-#: Merge.rc:2106
+#: Merge.rc:2113
#, c-format
msgid "Error from VSS:"
msgstr ""
-#: Merge.rc:2107
+#: Merge.rc:2114
#, c-format
msgid "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?"
msgstr ""
-#: Merge.rc:2108
+#: Merge.rc:2115
#, c-format
msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. "
msgstr ""
-#: Merge.rc:2114
-#: Merge.rc:2722
+#: Merge.rc:2121
+#: Merge.rc:2729
#, c-format
msgid "None"
msgstr ""
-#: Merge.rc:2115
+#: Merge.rc:2122
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr ""
-#: Merge.rc:2116
+#: Merge.rc:2123
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr ""
-#: Merge.rc:2118
+#: Merge.rc:2125
#, c-format
msgid "Break at whitespace"
msgstr ""
-#: Merge.rc:2119
+#: Merge.rc:2126
#, c-format
msgid "Break at whitespace or punctuation"
msgstr ""
-#: Merge.rc:2125
-#: Merge.rc:2127
+#: Merge.rc:2132
+#: Merge.rc:2134
#, c-format
msgid "Copy selected item to named directory"
msgstr ""
-#: Merge.rc:2126
-#: Merge.rc:2128
+#: Merge.rc:2133
+#: Merge.rc:2135
#, c-format
msgid "Copy selected item to custom directory"
msgstr ""
-#: Merge.rc:2129
+#: Merge.rc:2136
#, c-format
msgid "Delete selected item on left"
msgstr ""
-#: Merge.rc:2130
+#: Merge.rc:2137
#, c-format
msgid "Delete selected item on right"
msgstr ""
-#: Merge.rc:2131
+#: Merge.rc:2138
#, c-format
msgid "Delete selected item(s) on both sides"
msgstr ""
-#: Merge.rc:2132
+#: Merge.rc:2139
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
msgstr ""
-#: Merge.rc:2133
+#: Merge.rc:2140
#, c-format
msgid "Rename selected item on both sides"
msgstr ""
-#: Merge.rc:2134
+#: Merge.rc:2141
#, c-format
msgid "Right to Left (%1)"
msgstr ""
-#: Merge.rc:2135
+#: Merge.rc:2142
#, c-format
msgid "Left to Right (%1)"
msgstr ""
-#: Merge.rc:2136
+#: Merge.rc:2143
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2137
+#: Merge.rc:2144
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2138
-#: Merge.rc:2154
+#: Merge.rc:2145
+#: Merge.rc:2161
#, c-format
msgid "Left to... (%1)"
msgstr ""
-#: Merge.rc:2139
-#: Merge.rc:2155
+#: Merge.rc:2146
+#: Merge.rc:2162
#, c-format
msgid "Right to... (%1)"
msgstr ""
-#: Merge.rc:2140
-#: Merge.rc:2156
+#: Merge.rc:2147
+#: Merge.rc:2163
#, c-format
msgid "Left to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2141
-#: Merge.rc:2157
+#: Merge.rc:2148
+#: Merge.rc:2164
#, c-format
msgid "Right to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2147
+#: Merge.rc:2154
#, c-format
msgid "Left (%1)"
msgstr ""
-#: Merge.rc:2148
+#: Merge.rc:2155
#, c-format
msgid "Right (%1)"
msgstr ""
-#: Merge.rc:2149
+#: Merge.rc:2156
#, c-format
msgid "Both (%1)"
msgstr ""
-#: Merge.rc:2150
+#: Merge.rc:2157
#, c-format
msgid "Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2151
+#: Merge.rc:2158
#, c-format
msgid "Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2152
+#: Merge.rc:2159
#, c-format
msgid "Both (%1 of %2)"
msgstr ""
-#: Merge.rc:2153
+#: Merge.rc:2160
#, c-format
msgid "Select destination folder"
msgstr ""
-#: Merge.rc:2158
+#: Merge.rc:2165
#, c-format
msgid "Left side - select destination folder:"
msgstr ""
-#: Merge.rc:2159
+#: Merge.rc:2166
#, c-format
msgid "Right side - select destination folder:"
msgstr ""
-#: Merge.rc:2160
+#: Merge.rc:2167
#, c-format
msgid "(%1 Files Affected)"
msgstr ""
-#: Merge.rc:2161
+#: Merge.rc:2168
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr ""
-#: Merge.rc:2167
+#: Merge.rc:2174
#, c-format
msgid "Are you sure you want to delete\n\n%1 ?"
msgstr ""
-#: Merge.rc:2168
+#: Merge.rc:2175
#, c-format
msgid "Are you sure you want to copy:"
msgstr ""
-#: Merge.rc:2169
+#: Merge.rc:2176
#, c-format
msgid "Are you sure you want to copy %d items:"
msgstr ""
-#: Merge.rc:2170
+#: Merge.rc:2177
#, c-format
msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare."
msgstr ""
-#: Merge.rc:2176
+#: Merge.rc:2183
#, c-format
msgid "Open left file"
msgstr ""
-#: Merge.rc:2177
+#: Merge.rc:2184
#, c-format
msgid "Open the left file to external editor"
msgstr ""
-#: Merge.rc:2178
+#: Merge.rc:2185
#, c-format
msgid "Open left file with ..."
msgstr ""
-#: Merge.rc:2179
+#: Merge.rc:2186
#, c-format
msgid "Open right file"
msgstr ""
-#: Merge.rc:2180
+#: Merge.rc:2187
#, c-format
msgid "Open the right file to external editor"
msgstr ""
-#: Merge.rc:2181
+#: Merge.rc:2188
#, c-format
msgid "Open right file with..."
msgstr ""
-#: Merge.rc:2182
+#: Merge.rc:2189
#, c-format
msgid "Failed to execute external editor: %1"
msgstr ""
-#: Merge.rc:2183
+#: Merge.rc:2190
#, c-format
msgid "Unknown extension on external editor: %1"
msgstr ""
-#: Merge.rc:2184
+#: Merge.rc:2191
#, c-format
msgid "Copy filenames to clipboard"
msgstr ""
-#: Merge.rc:2185
+#: Merge.rc:2192
#, c-format
msgid "Copy left side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2186
+#: Merge.rc:2193
#, c-format
msgid "Copy right side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2187
+#: Merge.rc:2194
#, c-format
msgid "Copy both sides pathnames to clipboard"
msgstr ""
-#: Merge.rc:2193
+#: Merge.rc:2200
#, c-format
msgid "Unknown archive format"
msgstr ""
-#: Merge.rc:2194
+#: Merge.rc:2201
#, c-format
msgid "Add items from left side to archive"
msgstr ""
-#: Merge.rc:2195
+#: Merge.rc:2202
#, c-format
msgid "Add items from right side to archive"
msgstr ""
-#: Merge.rc:2196
+#: Merge.rc:2203
#, c-format
msgid "Add items from both sides to archive"
msgstr ""
-#: Merge.rc:2197
+#: Merge.rc:2204
#, c-format
msgid "Add different items to archive (both sides)"
msgstr ""
-#: Merge.rc:2199
+#: Merge.rc:2206
#, c-format
msgid "Move selected file on left to custom directory"
msgstr ""
-#: Merge.rc:2201
+#: Merge.rc:2208
#, c-format
msgid "Move selected file on right to custom directory"
msgstr ""
-#: Merge.rc:2207
+#: Merge.rc:2214
#, c-format
msgid "Filename"
msgstr ""
-#: Merge.rc:2208
+#: Merge.rc:2215
#, c-format
msgid "Folder"
msgstr ""
-#: Merge.rc:2209
+#: Merge.rc:2216
#, c-format
msgid "Comparison result"
msgstr ""
-#: Merge.rc:2210
+#: Merge.rc:2217
#, c-format
msgid "Left Date"
msgstr ""
-#: Merge.rc:2211
+#: Merge.rc:2218
#, c-format
msgid "Right Date"
msgstr ""
-#: Merge.rc:2212
+#: Merge.rc:2219
#, c-format
msgid "Extension"
msgstr ""
-#: Merge.rc:2213
+#: Merge.rc:2220
#, c-format
msgid "Left Size"
msgstr ""
-#: Merge.rc:2214
+#: Merge.rc:2221
#, c-format
msgid "Right Size"
msgstr ""
-#: Merge.rc:2215
+#: Merge.rc:2222
#, c-format
msgid "Right Size (Short)"
msgstr ""
-#: Merge.rc:2216
+#: Merge.rc:2223
#, c-format
msgid "Left Size (Short)"
msgstr ""
-#: Merge.rc:2222
+#: Merge.rc:2229
#, c-format
msgid "Left Creation Time"
msgstr ""
-#: Merge.rc:2223
+#: Merge.rc:2230
#, c-format
msgid "Right Creation Time"
msgstr ""
-#: Merge.rc:2224
+#: Merge.rc:2231
#, c-format
msgid "Newer File"
msgstr ""
-#: Merge.rc:2225
+#: Merge.rc:2232
#, c-format
msgid "Left File Version"
msgstr ""
-#: Merge.rc:2226
+#: Merge.rc:2233
#, c-format
msgid "Right File Version"
msgstr ""
-#: Merge.rc:2227
+#: Merge.rc:2234
#, c-format
msgid "Short Result"
msgstr ""
-#: Merge.rc:2228
+#: Merge.rc:2235
#, c-format
msgid "Left Attributes"
msgstr ""
-#: Merge.rc:2229
+#: Merge.rc:2236
#, c-format
msgid "Right Attributes"
msgstr ""
-#: Merge.rc:2230
+#: Merge.rc:2237
#, c-format
msgid "Left EOL"
msgstr ""
-#: Merge.rc:2231
+#: Merge.rc:2238
#, c-format
msgid "Right EOL"
msgstr ""
-#: Merge.rc:2237
+#: Merge.rc:2244
#, c-format
msgid "Left Encoding"
msgstr ""
-#: Merge.rc:2238
+#: Merge.rc:2245
#, c-format
msgid "Right Encoding"
msgstr ""
-#: Merge.rc:2239
+#: Merge.rc:2246
#, c-format
msgid "Ignored Diff."
msgstr ""
-#: Merge.rc:2240
+#: Merge.rc:2247
#, c-format
msgid "Differences"
msgstr ""
-#: Merge.rc:2241
-#: Merge.rc:2545
+#: Merge.rc:2248
+#: Merge.rc:2552
#, c-format
msgid "Binary"
msgstr ""
-#: Merge.rc:2247
+#: Merge.rc:2254
#, c-format
msgid "Unable to compare files"
msgstr ""
-#: Merge.rc:2248
+#: Merge.rc:2255
#, c-format
msgid "Item aborted"
msgstr ""
-#: Merge.rc:2249
+#: Merge.rc:2256
#, c-format
msgid "File skipped"
msgstr ""
-#: Merge.rc:2250
+#: Merge.rc:2257
#, c-format
msgid "Folder skipped"
msgstr ""
-#: Merge.rc:2251
+#: Merge.rc:2258
#, c-format
msgid "Left only: %1"
msgstr ""
-#: Merge.rc:2252
+#: Merge.rc:2259
#, c-format
msgid "Right only: %1"
msgstr ""
-#: Merge.rc:2253
+#: Merge.rc:2260
#, c-format
msgid "Binary files are identical"
msgstr ""
-#: Merge.rc:2255
+#: Merge.rc:2262
#, c-format
msgid "Binary files are different"
msgstr ""
-#: Merge.rc:2256
+#: Merge.rc:2263
#, c-format
msgid "Files are different"
msgstr ""
-#: Merge.rc:2257
+#: Merge.rc:2264
#, c-format
msgid "Left Only"
msgstr ""
-#: Merge.rc:2258
+#: Merge.rc:2265
#, c-format
msgid "Right Only"
msgstr ""
-#: Merge.rc:2260
+#: Merge.rc:2267
#, c-format
msgid "Error"
msgstr ""
-#: Merge.rc:2266
+#: Merge.rc:2273
#, c-format
msgid "Elapsed time: %ld ms"
msgstr ""
-#: Merge.rc:2267
+#: Merge.rc:2274
#, c-format
msgid "1 item selected"
msgstr ""
-#: Merge.rc:2268
+#: Merge.rc:2275
#, c-format
msgid "%1 items selected"
msgstr ""
-#: Merge.rc:2274
+#: Merge.rc:2281
#, c-format
msgid "Filename or folder name."
msgstr ""
-#: Merge.rc:2275
+#: Merge.rc:2282
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr ""
-#: Merge.rc:2276
+#: Merge.rc:2283
#, c-format
msgid "Comparison result, long form."
msgstr ""
-#: Merge.rc:2277
+#: Merge.rc:2284
#, c-format
msgid "Left side modification date."
msgstr ""
-#: Merge.rc:2278
+#: Merge.rc:2285
#, c-format
msgid "Right side modification date."
msgstr ""
-#: Merge.rc:2279
+#: Merge.rc:2286
#, c-format
msgid "File's extension."
msgstr ""
-#: Merge.rc:2280
+#: Merge.rc:2287
#, c-format
msgid "Left file size in bytes."
msgstr ""
-#: Merge.rc:2281
+#: Merge.rc:2288
#, c-format
msgid "Right file size in bytes."
msgstr ""
-#: Merge.rc:2282
+#: Merge.rc:2289
#, c-format
msgid "Left file size abbreviated."
msgstr ""
-#: Merge.rc:2283
+#: Merge.rc:2290
#, c-format
msgid "Right file size abbreviated."
msgstr ""
-#: Merge.rc:2289
+#: Merge.rc:2296
#, c-format
msgid "Left side creation time."
msgstr ""
-#: Merge.rc:2290
+#: Merge.rc:2297
#, c-format
msgid "Right side creation time."
msgstr ""
-#: Merge.rc:2291
+#: Merge.rc:2298
#, c-format
msgid "Tells which side has newer modification date."
msgstr ""
-#: Merge.rc:2292
+#: Merge.rc:2299
#, c-format
msgid "Left side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2293
+#: Merge.rc:2300
#, c-format
msgid "Right side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2294
+#: Merge.rc:2301
#, c-format
msgid "Short comparison result."
msgstr ""
-#: Merge.rc:2295
+#: Merge.rc:2302
#, c-format
msgid "Left side attributes."
msgstr ""
-#: Merge.rc:2296
+#: Merge.rc:2303
#, c-format
msgid "Right side attributes."
msgstr ""
-#: Merge.rc:2297
+#: Merge.rc:2304
#, c-format
msgid "Left side file EOL type"
msgstr ""
-#: Merge.rc:2298
+#: Merge.rc:2305
#, c-format
msgid "Right side file EOL type"
msgstr ""
-#: Merge.rc:2304
+#: Merge.rc:2311
#, c-format
msgid "Left side encoding."
msgstr ""
-#: Merge.rc:2305
+#: Merge.rc:2312
#, c-format
msgid "Right side encoding."
msgstr ""
-#: Merge.rc:2306
+#: Merge.rc:2313
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
msgstr ""
-#: Merge.rc:2307
+#: Merge.rc:2314
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
msgstr ""
-#: Merge.rc:2308
+#: Merge.rc:2315
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr ""
-#: Merge.rc:2314
+#: Merge.rc:2321
#, c-format
msgid "Compare %1 with %2"
msgstr ""
-#: Merge.rc:2315
+#: Merge.rc:2322
#, c-format
msgid "Comma-separated list"
msgstr ""
-#: Merge.rc:2316
+#: Merge.rc:2323
#, c-format
msgid "Tab-separated list"
msgstr ""
-#: Merge.rc:2317
+#: Merge.rc:2324
#, c-format
msgid "Simple HTML"
msgstr ""
-#: Merge.rc:2318
+#: Merge.rc:2325
#, c-format
msgid "Simple XML"
msgstr ""
-#: Merge.rc:2320
+#: Merge.rc:2327
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
msgstr ""
-#: Merge.rc:2321
+#: Merge.rc:2328
#, c-format
msgid "Error creating the report:\n%1"
msgstr ""
-#: Merge.rc:2322
+#: Merge.rc:2329
#, c-format
msgid "The report has been created successfully."
msgstr ""
-#: Merge.rc:2328
+#: Merge.rc:2335
#, c-format
msgid "The same file is opened in both panels."
msgstr ""
-#: Merge.rc:2329
+#: Merge.rc:2336
#, c-format
msgid "The selected files are identical."
msgstr ""
-#: Merge.rc:2330
+#: Merge.rc:2337
#, c-format
msgid "An error occurred while comparing the files."
msgstr ""
-#: Merge.rc:2331
+#: Merge.rc:2338
#, c-format
msgid "Temporary files could not be created. Check your temporary path settings."
msgstr ""
-#: Merge.rc:2332
+#: Merge.rc:2339
#, c-format
msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
msgstr ""
-#: Merge.rc:2333
+#: Merge.rc:2340
#, c-format
msgid "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
msgstr ""
-#: Merge.rc:2334
+#: Merge.rc:2341
#, c-format
msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
msgstr ""
-#: Merge.rc:2335
+#: Merge.rc:2342
#, c-format
msgid "The selected folder is invalid."
msgstr ""
-#: Merge.rc:2336
+#: Merge.rc:2343
#, c-format
msgid "Cannot open a binary file to editor."
msgstr ""
-#: Merge.rc:2337
+#: Merge.rc:2344
#, c-format
msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
msgstr ""
-#: Merge.rc:2343
+#: Merge.rc:2350
#, c-format
msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?"
msgstr ""
-#: Mer...
[truncated message content] |
