[Winmerge-svn] SF.net SVN: winmerge:[6134] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
[Winmerge-svn] SF.net SVN: winmerge:[6134] trunk
|
From: <ki...@us...> - 2008-11-28 19:58:33
|
Revision: 6134
http://winmerge.svn.sourceforge.net/winmerge/?rev=6134&view=rev
Author: kimmov
Date: 2008-11-28 19:58:25 +0000 (Fri, 28 Nov 2008)
Log Message:
-----------
PATCH: [ 2327424 ] Patch for Feature Request 2025423
Submitted by Chris Paulse
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/English.pot
trunk/Src/Merge.cpp
trunk/Src/Merge.rc
trunk/Src/OptionsDef.h
trunk/Src/OptionsInit.cpp
trunk/Src/PropGeneral.cpp
trunk/Src/PropGeneral.h
trunk/Src/resource.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-11-27 23:46:10 UTC (rev 6133)
+++ trunk/Docs/Users/ChangeLog.txt 2008-11-28 19:58:25 UTC (rev 6134)
@@ -4,6 +4,7 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.11.1.8
+ Add option to show Open-dialog on WinMerge startup (#2327424)
Add Git to Source Control filter and fix ignore file rules (#2329381)
Bugfix: Move confirmation dialog sometimes had wrong paths (#2327565, #2309190)
Translation updates:
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2008-11-27 23:46:10 UTC (rev 6133)
+++ trunk/Src/Languages/English.pot 2008-11-28 19:58:25 UTC (rev 6134)
@@ -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-11-19 20:55+0000\n"
+"POT-Creation-Date: 2008-11-28 21:56+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -385,7 +385,7 @@
#: Merge.rc:175
#: Merge.rc:296
#: Merge.rc:484
-#: Merge.rc:1923
+#: Merge.rc:1925
#, c-format
msgid "&Help"
msgstr ""
@@ -716,7 +716,7 @@
msgstr ""
#: Merge.rc:370
-#: Merge.rc:2776
+#: Merge.rc:2778
#, c-format
msgid "< Empty >"
msgstr ""
@@ -918,15 +918,15 @@
msgstr ""
#: Merge.rc:523
-#: Merge.rc:1143
-#: Merge.rc:1525
+#: Merge.rc:1145
+#: Merge.rc:1527
#, c-format
msgid "&Left"
msgstr ""
#: Merge.rc:524
-#: Merge.rc:1145
-#: Merge.rc:1528
+#: Merge.rc:1147
+#: Merge.rc:1530
#, c-format
msgid "&Right"
msgstr ""
@@ -1078,17 +1078,17 @@
#: Merge.rc:674
#: Merge.rc:706
-#: Merge.rc:798
-#: Merge.rc:984
-#: Merge.rc:1062
-#: Merge.rc:1091
-#: Merge.rc:1101
-#: Merge.rc:1267
-#: Merge.rc:1331
-#: Merge.rc:1344
-#: Merge.rc:1436
-#: Merge.rc:1451
-#: Merge.rc:1673
+#: Merge.rc:800
+#: Merge.rc:986
+#: Merge.rc:1064
+#: Merge.rc:1093
+#: Merge.rc:1103
+#: Merge.rc:1269
+#: Merge.rc:1333
+#: Merge.rc:1346
+#: Merge.rc:1438
+#: Merge.rc:1453
+#: Merge.rc:1675
#, c-format
msgid "OK"
msgstr ""
@@ -1104,39 +1104,39 @@
msgstr ""
#: Merge.rc:685
-#: Merge.rc:1602
+#: Merge.rc:1604
#, c-format
msgid "&Left:"
msgstr ""
#: Merge.rc:689
#: Merge.rc:750
-#: Merge.rc:1005
-#: Merge.rc:1027
+#: Merge.rc:1007
+#: Merge.rc:1029
#, c-format
msgid "&Browse..."
msgstr ""
#: Merge.rc:690
-#: Merge.rc:1606
+#: Merge.rc:1608
#, c-format
msgid "&Right:"
msgstr ""
#: Merge.rc:694
-#: Merge.rc:1038
+#: Merge.rc:1040
#, c-format
msgid "Bro&wse..."
msgstr ""
#: Merge.rc:695
-#: Merge.rc:1610
+#: Merge.rc:1612
#, c-format
msgid "&Filter:"
msgstr ""
#: Merge.rc:698
-#: Merge.rc:1612
+#: Merge.rc:1614
#, c-format
msgid "Select..."
msgstr ""
@@ -1152,7 +1152,7 @@
msgstr ""
#: Merge.rc:703
-#: Merge.rc:1613
+#: Merge.rc:1615
#, c-format
msgid "&Include Subfolders"
msgstr ""
@@ -1164,25 +1164,25 @@
#: Merge.rc:707
#: Merge.rc:737
-#: Merge.rc:799
-#: Merge.rc:829
-#: Merge.rc:861
-#: Merge.rc:871
-#: Merge.rc:1063
-#: Merge.rc:1092
-#: Merge.rc:1102
-#: Merge.rc:1153
-#: Merge.rc:1268
-#: Merge.rc:1345
-#: Merge.rc:1437
-#: Merge.rc:1452
-#: Merge.rc:1674
+#: Merge.rc:801
+#: Merge.rc:831
+#: Merge.rc:863
+#: Merge.rc:873
+#: Merge.rc:1065
+#: Merge.rc:1094
+#: Merge.rc:1104
+#: Merge.rc:1155
+#: Merge.rc:1270
+#: Merge.rc:1347
+#: Merge.rc:1439
+#: Merge.rc:1454
+#: Merge.rc:1676
#, c-format
msgid "Cancel"
msgstr ""
#: Merge.rc:708
-#: Merge.rc:1346
+#: Merge.rc:1348
#, c-format
msgid "Help"
msgstr ""
@@ -1223,7 +1223,7 @@
msgstr ""
#: Merge.rc:733
-#: Merge.rc:876
+#: Merge.rc:878
#, c-format
msgid "Apply to all items"
msgstr ""
@@ -1234,7 +1234,7 @@
msgstr ""
#: Merge.rc:736
-#: Merge.rc:872
+#: Merge.rc:874
#, c-format
msgid "Save As..."
msgstr ""
@@ -1250,13 +1250,13 @@
msgstr ""
#: Merge.rc:748
-#: Merge.rc:2053
+#: Merge.rc:2055
#, c-format
msgid "&Path to cleartool.exe:"
msgstr ""
#: Merge.rc:755
-#: Merge.rc:1931
+#: Merge.rc:1933
#, c-format
msgid "General"
msgstr ""
@@ -1303,1456 +1303,1459 @@
#: Merge.rc:777
#, c-format
-msgid "O&pen-dialog Auto-Completion:"
+msgid "Show \"Select Files or Folders\" Dialog on Startup"
msgstr ""
-#: Merge.rc:780
+#: Merge.rc:779
#, c-format
-msgid "Enable multiple compare windows for"
+msgid "O&pen-dialog Auto-Completion:"
msgstr ""
#: Merge.rc:782
-#: Merge.rc:1625
#, c-format
-msgid "&Folder compare"
+msgid "Enable multiple compare windows for"
msgstr ""
#: Merge.rc:784
#: Merge.rc:1627
#, c-format
-msgid "Fil&e compare"
+msgid "&Folder compare"
msgstr ""
#: Merge.rc:786
+#: Merge.rc:1629
#, c-format
-msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
+msgid "Fil&e compare"
msgstr ""
#: Merge.rc:788
#, c-format
+msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
+msgstr ""
+
+#: Merge.rc:790
+#, c-format
msgid "Reset"
msgstr ""
-#: Merge.rc:795
+#: Merge.rc:797
#, c-format
msgid "Language"
msgstr ""
-#: Merge.rc:802
+#: Merge.rc:804
#, c-format
msgid "Available languages:"
msgstr ""
-#: Merge.rc:808
+#: Merge.rc:810
#, c-format
msgid "Find"
msgstr ""
-#: Merge.rc:811
-#: Merge.rc:838
+#: Merge.rc:813
+#: Merge.rc:840
#, c-format
msgid "Fi&nd what:"
msgstr ""
-#: Merge.rc:814
-#: Merge.rc:844
+#: Merge.rc:816
+#: Merge.rc:846
#, c-format
msgid "Match &whole word only"
msgstr ""
-#: Merge.rc:816
-#: Merge.rc:846
+#: Merge.rc:818
+#: Merge.rc:848
#, c-format
msgid "Match &case"
msgstr ""
-#: Merge.rc:818
-#: Merge.rc:848
+#: Merge.rc:820
+#: Merge.rc:850
#, c-format
msgid "Regular &expression"
msgstr ""
-#: Merge.rc:820
+#: Merge.rc:822
#, c-format
msgid "D&on't wrap end of file"
msgstr ""
-#: Merge.rc:823
+#: Merge.rc:825
#, c-format
msgid "Direction"
msgstr ""
-#: Merge.rc:824
+#: Merge.rc:826
#, c-format
msgid "&Up"
msgstr ""
-#: Merge.rc:826
+#: Merge.rc:828
#, c-format
msgid "&Down"
msgstr ""
-#: Merge.rc:828
-#: Merge.rc:858
+#: Merge.rc:830
+#: Merge.rc:860
#, c-format
msgid "&Find Next"
msgstr ""
-#: Merge.rc:835
+#: Merge.rc:837
#, c-format
msgid "Replace"
msgstr ""
-#: Merge.rc:841
+#: Merge.rc:843
#, c-format
msgid "Re&place with:"
msgstr ""
-#: Merge.rc:850
+#: Merge.rc:852
#, c-format
msgid "&Don't wrap end of file"
msgstr ""
-#: Merge.rc:853
+#: Merge.rc:855
#, c-format
msgid "Replace in"
msgstr ""
-#: Merge.rc:854
+#: Merge.rc:856
#, c-format
msgid "&Selection"
msgstr ""
-#: Merge.rc:856
+#: Merge.rc:858
#, c-format
msgid "Wh&ole file"
msgstr ""
-#: Merge.rc:859
+#: Merge.rc:861
#, c-format
msgid "&Replace"
msgstr ""
-#: Merge.rc:860
+#: Merge.rc:862
#, c-format
msgid "Replace &All"
msgstr ""
-#: Merge.rc:867
-#: Merge.rc:2174
+#: Merge.rc:869
+#: Merge.rc:2176
#, c-format
msgid "Rational ClearCase"
msgstr ""
-#: Merge.rc:870
+#: Merge.rc:872
#, c-format
msgid "CheckOut"
msgstr ""
-#: Merge.rc:875
-#: Merge.rc:1187
+#: Merge.rc:877
+#: Merge.rc:1189
#, c-format
msgid "Comments"
msgstr ""
-#: Merge.rc:878
+#: Merge.rc:880
#, c-format
msgid "CheckIn after checkout"
msgstr ""
-#: Merge.rc:884
+#: Merge.rc:886
#, c-format
msgid "Linefilters"
msgstr ""
-#: Merge.rc:887
+#: Merge.rc:889
#, c-format
msgid "Enable Line Filters"
msgstr ""
-#: Merge.rc:890
+#: Merge.rc:892
#, c-format
msgid "Regular Expressions (one per line):"
msgstr ""
-#: Merge.rc:897
+#: Merge.rc:899
#, c-format
msgid "Save"
msgstr ""
-#: Merge.rc:898
+#: Merge.rc:900
#, c-format
msgid "New"
msgstr ""
-#: Merge.rc:899
+#: Merge.rc:901
#, c-format
msgid "Edit"
msgstr ""
-#: Merge.rc:900
+#: Merge.rc:902
#, c-format
msgid "Remove"
msgstr ""
-#: Merge.rc:905
-#: Merge.rc:1934
+#: Merge.rc:907
+#: Merge.rc:1936
#, c-format
msgid "Colors"
msgstr ""
-#: Merge.rc:908
+#: Merge.rc:910
#, c-format
msgid "Difference:"
msgstr ""
-#: Merge.rc:912
+#: Merge.rc:914
#, c-format
msgid "Selected Difference:"
msgstr ""
-#: Merge.rc:916
-#: Merge.rc:1577
+#: Merge.rc:918
+#: Merge.rc:1579
#, c-format
msgid "Background"
msgstr ""
-#: Merge.rc:917
+#: Merge.rc:919
#, c-format
msgid "Deleted"
msgstr ""
-#: Merge.rc:930
-#: Merge.rc:1372
-#: Merge.rc:1578
+#: Merge.rc:932
+#: Merge.rc:1374
+#: Merge.rc:1580
#, c-format
msgid "Text"
msgstr ""
-#: Merge.rc:934
+#: Merge.rc:936
#, c-format
msgid "Ignored Difference:"
msgstr ""
-#: Merge.rc:944
+#: Merge.rc:946
#, c-format
msgid "Moved:"
msgstr ""
-#: Merge.rc:954
+#: Merge.rc:956
#, c-format
msgid "Selected Moved:"
msgstr ""
-#: Merge.rc:961
+#: Merge.rc:963
#, c-format
msgid "Word Difference:"
msgstr ""
-#: Merge.rc:968
+#: Merge.rc:970
#, c-format
msgid "Selected Word Diff:"
msgstr ""
-#: Merge.rc:975
-#: Merge.rc:1061
-#: Merge.rc:1090
-#: Merge.rc:1190
-#: Merge.rc:1418
+#: Merge.rc:977
+#: Merge.rc:1063
+#: Merge.rc:1092
+#: Merge.rc:1192
+#: Merge.rc:1420
#, c-format
msgid "Defaults"
msgstr ""
-#: Merge.rc:981
-#: Merge.rc:1360
-#: Merge.rc:1566
+#: Merge.rc:983
+#: Merge.rc:1362
+#: Merge.rc:1568
#, c-format
msgid "Dialog"
msgstr ""
-#: Merge.rc:991
-#: Merge.rc:1937
+#: Merge.rc:993
+#: Merge.rc:1939
#, c-format
msgid "System"
msgstr ""
-#: Merge.rc:994
+#: Merge.rc:996
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr ""
-#: Merge.rc:996
+#: Merge.rc:998
#, c-format
msgid "Integration"
msgstr ""
-#: Merge.rc:997
+#: Merge.rc:999
#, c-format
msgid "&Add to explorer context menu"
msgstr ""
-#: Merge.rc:999
+#: Merge.rc:1001
#, c-format
msgid "E&nable advanced menu"
msgstr ""
-#: Merge.rc:1001
+#: Merge.rc:1003
#, c-format
msgid "In&clude subfolders by default"
msgstr ""
-#: Merge.rc:1003
+#: Merge.rc:1005
#, c-format
msgid "&External editor:"
msgstr ""
-#: Merge.rc:1006
+#: Merge.rc:1008
#, c-format
msgid "&Filter folder:"
msgstr ""
-#: Merge.rc:1008
+#: Merge.rc:1010
#, c-format
msgid "B&rowse..."
msgstr ""
-#: Merge.rc:1009
+#: Merge.rc:1011
#, c-format
msgid "Temporary files folder"
msgstr ""
-#: Merge.rc:1010
+#: Merge.rc:1012
#, c-format
msgid "S&ystem's temp folder"
msgstr ""
-#: Merge.rc:1012
+#: Merge.rc:1014
#, c-format
msgid "C&ustom folder:"
msgstr ""
-#: Merge.rc:1015
-#: Merge.rc:1031
+#: Merge.rc:1017
+#: Merge.rc:1033
#, c-format
msgid "Br&owse..."
msgstr ""
-#: Merge.rc:1021
+#: Merge.rc:1023
#, c-format
msgid "Patch Generator"
msgstr ""
-#: Merge.rc:1024
+#: Merge.rc:1026
#, c-format
msgid "File&1:"
msgstr ""
-#: Merge.rc:1028
+#: Merge.rc:1030
#, c-format
msgid "File&2:"
msgstr ""
-#: Merge.rc:1032
+#: Merge.rc:1034
#, c-format
msgid "&Swap"
msgstr ""
-#: Merge.rc:1033
+#: Merge.rc:1035
#, c-format
msgid "&Append to existing file"
msgstr ""
-#: Merge.rc:1035
+#: Merge.rc:1037
#, c-format
msgid "&Result:"
msgstr ""
-#: Merge.rc:1039
+#: Merge.rc:1041
#, c-format
msgid "&Format"
msgstr ""
-#: Merge.rc:1040
+#: Merge.rc:1042
#, c-format
msgid "St&yle:"
msgstr ""
-#: Merge.rc:1043
+#: Merge.rc:1045
#, c-format
msgid "&Context:"
msgstr ""
-#: Merge.rc:1046
+#: Merge.rc:1048
#, c-format
msgid "W&hitespaces"
msgstr ""
-#: Merge.rc:1047
+#: Merge.rc:1049
#, c-format
msgid "Com&pare"
msgstr ""
-#: Merge.rc:1049
+#: Merge.rc:1051
#, c-format
msgid "I&gnore changes"
msgstr ""
-#: Merge.rc:1051
+#: Merge.rc:1053
#, c-format
msgid "Ig&nore all"
msgstr ""
-#: Merge.rc:1053
+#: Merge.rc:1055
#, c-format
msgid "Ignor&e blank lines"
msgstr ""
-#: Merge.rc:1055
+#: Merge.rc:1057
#, c-format
msgid "Case sensi&tive"
msgstr ""
-#: Merge.rc:1057
+#: Merge.rc:1059
#, c-format
msgid "Inclu&de command line"
msgstr ""
-#: Merge.rc:1059
+#: Merge.rc:1061
#, c-format
msgid "Open to e&xternal editor"
msgstr ""
-#: Merge.rc:1081
+#: Merge.rc:1083
#, c-format
msgid "Display Columns"
msgstr ""
-#: Merge.rc:1087
+#: Merge.rc:1089
#, c-format
msgid "Move &Up"
msgstr ""
-#: Merge.rc:1088
+#: Merge.rc:1090
#, c-format
msgid "Move &Down"
msgstr ""
-#: Merge.rc:1098
+#: Merge.rc:1100
#, c-format
msgid "Select Unpacker"
msgstr ""
-#: Merge.rc:1103
+#: Merge.rc:1105
#, c-format
msgid "File unpacker:"
msgstr ""
-#: Merge.rc:1106
+#: Merge.rc:1108
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr ""
-#: Merge.rc:1109
+#: Merge.rc:1111
#, c-format
msgid "Extensions list:"
msgstr ""
-#: Merge.rc:1110
+#: Merge.rc:1112
#, c-format
msgid "Description:"
msgstr ""
-#: Merge.rc:1121
+#: Merge.rc:1123
#, c-format
msgid " Folder Compare Progress"
msgstr ""
-#: Merge.rc:1124
-#: Merge.rc:1884
+#: Merge.rc:1126
+#: Merge.rc:1886
#, c-format
msgid "Stop"
msgstr ""
-#: Merge.rc:1129
+#: Merge.rc:1131
#, c-format
msgid "Comparing items..."
msgstr ""
-#: Merge.rc:1130
+#: Merge.rc:1132
#, c-format
msgid "Items compared:"
msgstr ""
-#: Merge.rc:1131
+#: Merge.rc:1133
#, c-format
msgid "Items total:"
msgstr ""
-#: Merge.rc:1137
+#: Merge.rc:1139
#, c-format
msgid "Go To"
msgstr ""
-#: Merge.rc:1140
+#: Merge.rc:1142
#, c-format
msgid "G&oto:"
msgstr ""
-#: Merge.rc:1142
+#: Merge.rc:1144
#, c-format
msgid "File"
msgstr ""
-#: Merge.rc:1147
+#: Merge.rc:1149
#, c-format
msgid "Goto what"
msgstr ""
-#: Merge.rc:1148
+#: Merge.rc:1150
#, c-format
msgid "Li&ne"
msgstr ""
-#: Merge.rc:1150
+#: Merge.rc:1152
#, c-format
msgid "&Difference"
msgstr ""
-#: Merge.rc:1152
+#: Merge.rc:1154
#, c-format
msgid "&Go To"
msgstr ""
-#: Merge.rc:1158
-#: Merge.rc:1932
+#: Merge.rc:1160
+#: Merge.rc:1934
#, c-format
msgid "Compare"
msgstr ""
-#: Merge.rc:1161
+#: Merge.rc:1163
#, c-format
msgid "Whitespace"
msgstr ""
-#: Merge.rc:1162
+#: Merge.rc:1164
#, c-format
msgid "&Compare"
msgstr ""
-#: Merge.rc:1164
+#: Merge.rc:1166
#, c-format
msgid "&Ignore change"
msgstr ""
-#: Merge.rc:1166
+#: Merge.rc:1168
#, c-format
msgid "I&gnore all"
msgstr ""
-#: Merge.rc:1168
+#: Merge.rc:1170
#, c-format
msgid "Ignore blan&k lines"
msgstr ""
-#: Merge.rc:1170
+#: Merge.rc:1172
#, c-format
msgid "Ignore &case"
msgstr ""
-#: Merge.rc:1172
+#: Merge.rc:1174
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr ""
-#: Merge.rc:1175
+#: Merge.rc:1177
#, c-format
msgid "E&nable moved block detection"
msgstr ""
-#: Merge.rc:1177
+#: Merge.rc:1179
#, c-format
msgid "&Match similar lines"
msgstr ""
-#: Merge.rc:1179
+#: Merge.rc:1181
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr ""
-#: Merge.rc:1182
+#: Merge.rc:1184
#, c-format
msgid "&File Compare method:"
msgstr ""
-#: Merge.rc:1185
+#: Merge.rc:1187
#, c-format
msgid "S&top after first difference"
msgstr ""
-#: Merge.rc:1188
+#: Merge.rc:1190
#, c-format
msgid "Filter Comments"
msgstr ""
-#: Merge.rc:1195
-#: Merge.rc:1933
+#: Merge.rc:1197
+#: Merge.rc:1935
#, c-format
msgid "Editor"
msgstr ""
-#: Merge.rc:1198
+#: Merge.rc:1200
#, c-format
msgid "&Highlight syntax"
msgstr ""
-#: Merge.rc:1200
+#: Merge.rc:1202
#, c-format
msgid "&Automatic rescan"
msgstr ""
-#: Merge.rc:1202
+#: Merge.rc:1204
#, c-format
msgid "&Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1204
+#: Merge.rc:1206
#, c-format
msgid "Tabs"
msgstr ""
-#: Merge.rc:1205
+#: Merge.rc:1207
#, c-format
msgid "&Tab size:"
msgstr ""
-#: Merge.rc:1208
+#: Merge.rc:1210
#, c-format
msgid "&Insert Tabs"
msgstr ""
-#: Merge.rc:1210
+#: Merge.rc:1212
#, c-format
msgid "Insert &Spaces"
msgstr ""
-#: Merge.rc:1212
+#: Merge.rc:1214
#, c-format
msgid "Line Difference Coloring"
msgstr ""
-#: Merge.rc:1214
+#: Merge.rc:1216
#, c-format
msgid "View line differences"
msgstr ""
-#: Merge.rc:1216
+#: Merge.rc:1218
#, c-format
msgid "&Character level"
msgstr ""
-#: Merge.rc:1218
+#: Merge.rc:1220
#, c-format
msgid "&Word-level:"
msgstr ""
-#: Merge.rc:1233
+#: Merge.rc:1235
#, c-format
msgid "Filefilters"
msgstr ""
-#: Merge.rc:1239
+#: Merge.rc:1241
#, c-format
msgid "Test"
msgstr ""
-#: Merge.rc:1240
+#: Merge.rc:1242
#, c-format
msgid "Install..."
msgstr ""
-#: Merge.rc:1241
+#: Merge.rc:1243
#, c-format
msgid "New..."
msgstr ""
-#: Merge.rc:1242
+#: Merge.rc:1244
#, c-format
msgid "Edit..."
msgstr ""
-#: Merge.rc:1243
+#: Merge.rc:1245
#, c-format
msgid "Delete..."
msgstr ""
-#: Merge.rc:1249
+#: Merge.rc:1251
#, c-format
msgid "Save modified files?"
msgstr ""
-#: Merge.rc:1252
+#: Merge.rc:1254
#, c-format
msgid "Left side file"
msgstr ""
-#: Merge.rc:1255
+#: Merge.rc:1257
#, c-format
msgid "&Save changes"
msgstr ""
-#: Merge.rc:1257
+#: Merge.rc:1259
#, c-format
msgid "&Discard changes"
msgstr ""
-#: Merge.rc:1259
+#: Merge.rc:1261
#, c-format
msgid "Right side file"
msgstr ""
-#: Merge.rc:1262
+#: Merge.rc:1264
#, c-format
msgid "S&ave changes"
msgstr ""
-#: Merge.rc:1264
+#: Merge.rc:1266
#, c-format
msgid "Dis&card changes"
msgstr ""
-#: Merge.rc:1266
+#: Merge.rc:1268
#, c-format
msgid "Discard All"
msgstr ""
-#: Merge.rc:1273
-#: Merge.rc:1521
-#: Merge.rc:1939
+#: Merge.rc:1275
+#: Merge.rc:1523
+#: Merge.rc:1941
#, c-format
msgid "Codepage"
msgstr ""
-#: Merge.rc:1276
+#: Merge.rc:1278
#, c-format
msgid "Default Codepage"
msgstr ""
-#: Merge.rc:1277
+#: Merge.rc:1279
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr ""
-#: Merge.rc:1279
+#: Merge.rc:1281
#, c-format
msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
msgstr ""
-#: Merge.rc:1282
+#: Merge.rc:1284
#, c-format
msgid "System codepage"
msgstr ""
-#: Merge.rc:1284
+#: Merge.rc:1286
#, c-format
msgid "According to WinMerge User Interface"
msgstr ""
-#: Merge.rc:1286
+#: Merge.rc:1288
#, c-format
msgid "Custom codepage:"
msgstr ""
-#: Merge.rc:1294
+#: Merge.rc:1296
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr ""
-#: Merge.rc:1297
+#: Merge.rc:1299
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr ""
-#: Merge.rc:1300
+#: Merge.rc:1302
#, 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:1302
+#: Merge.rc:1304
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr ""
-#: Merge.rc:1304
+#: Merge.rc:1306
#, c-format
msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available."
msgstr ""
-#: Merge.rc:1306
+#: Merge.rc:1308
#, c-format
msgid "Version"
msgstr ""
-#: Merge.rc:1308
+#: Merge.rc:1310
#, c-format
msgid "Plugin required\n(dllbuild %04u)"
msgstr ""
-#: Merge.rc:1310
+#: Merge.rc:1312
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr ""
-#: Merge.rc:1313
-#: Merge.rc:1316
+#: Merge.rc:1315
+#: Merge.rc:1318
#, c-format
msgid "present"
msgstr ""
-#: Merge.rc:1314
+#: Merge.rc:1316
#, c-format
msgid "Merge7z000U.dll"
msgstr ""
-#: Merge.rc:1317
+#: Merge.rc:1319
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr ""
-#: Merge.rc:1319
-#: Merge.rc:1324
+#: Merge.rc:1321
+#: Merge.rc:1326
#, c-format
msgid "none"
msgstr ""
-#: Merge.rc:1321
+#: Merge.rc:1323
#, c-format
msgid "missing"
msgstr ""
-#: Merge.rc:1322
+#: Merge.rc:1324
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr ""
-#: Merge.rc:1326
+#: Merge.rc:1328
#, c-format
msgid "outdated"
msgstr ""
-#: Merge.rc:1327
+#: Merge.rc:1329
#, c-format
msgid "Plugins on path:"
msgstr ""
-#: Merge.rc:1328
+#: Merge.rc:1330
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
msgstr ""
-#: Merge.rc:1332
+#: Merge.rc:1334
#, c-format
msgid "Plugin Download"
msgstr ""
-#: Merge.rc:1341
+#: Merge.rc:1343
#, c-format
msgid "Options"
msgstr ""
-#: Merge.rc:1352
+#: Merge.rc:1354
#, c-format
msgid " Categories"
msgstr ""
-#: Merge.rc:1354
+#: Merge.rc:1356
#, c-format
msgid "Import..."
msgstr ""
-#: Merge.rc:1355
+#: Merge.rc:1357
#, c-format
msgid "Export..."
msgstr ""
-#: Merge.rc:1363
+#: Merge.rc:1365
#, c-format
msgid "Keywords:"
msgstr ""
-#: Merge.rc:1364
+#: Merge.rc:1366
#, c-format
msgid "Function names:"
msgstr ""
-#: Merge.rc:1365
+#: Merge.rc:1367
#, c-format
msgid "Comments:"
msgstr ""
-#: Merge.rc:1366
+#: Merge.rc:1368
#, c-format
msgid "Numbers:"
msgstr ""
-#: Merge.rc:1367
+#: Merge.rc:1369
#, c-format
msgid "Operators:"
msgstr ""
-#: Merge.rc:1368
+#: Merge.rc:1370
#, c-format
msgid "Strings:"
msgstr ""
-#: Merge.rc:1369
+#: Merge.rc:1371
#, c-format
msgid "Preprocessor:"
msgstr ""
-#: Merge.rc:1370
+#: Merge.rc:1372
#, c-format
msgid "User 1:"
msgstr ""
-#: Merge.rc:1371
+#: Merge.rc:1373
#, c-format
msgid "User 2:"
msgstr ""
-#: Merge.rc:1376
-#: Merge.rc:1381
-#: Merge.rc:1386
-#: Merge.rc:1391
-#: Merge.rc:1396
-#: Merge.rc:1401
-#: Merge.rc:1406
-#: Merge.rc:1411
-#: Merge.rc:1416
+#: Merge.rc:1378
+#: Merge.rc:1383
+#: Merge.rc:1388
+#: Merge.rc:1393
+#: Merge.rc:1398
+#: Merge.rc:1403
+#: Merge.rc:1408
+#: Merge.rc:1413
+#: Merge.rc:1418
#, c-format
msgid "Bold"
msgstr ""
-#: Merge.rc:1424
+#: Merge.rc:1426
#, c-format
msgid "Folder Compare Report"
msgstr ""
-#: Merge.rc:1427
+#: Merge.rc:1429
#, c-format
msgid "Report &File:"
msgstr ""
-#: Merge.rc:1430
-#: Merge.rc:1604
-#: Merge.rc:1608
-#: Merge.rc:1635
+#: Merge.rc:1432
+#: Merge.rc:1606
+#: Merge.rc:1610
+#: Merge.rc:1637
#, c-format
msgid "Browse..."
msgstr ""
-#: Merge.rc:1431
+#: Merge.rc:1433
#, c-format
msgid "&Style:"
msgstr ""
-#: Merge.rc:1434
+#: Merge.rc:1436
#, c-format
msgid "&Copy to Clipboard"
msgstr ""
-#: Merge.rc:1442
+#: Merge.rc:1444
#, c-format
msgid "Shared or Private Filter"
msgstr ""
-#: Merge.rc:1445
+#: Merge.rc:1447
#, c-format
msgid "Which type of filter do you want to create?"
msgstr ""
-#: Merge.rc:1447
+#: Merge.rc:1449
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr ""
-#: Merge.rc:1449
+#: Merge.rc:1451
#, c-format
msgid "Private Filter (only for current user)"
msgstr ""
-#: Merge.rc:1457
-#: Merge.rc:1940
+#: Merge.rc:1459
+#: Merge.rc:1942
#, c-format
msgid "Archive Support"
msgstr ""
-#: Merge.rc:1460
+#: Merge.rc:1462
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr ""
-#: Merge.rc:1462
+#: Merge.rc:1464
#, c-format
msgid "Download 7-zip Plugin"
msgstr ""
-#: Merge.rc:1463
+#: Merge.rc:1465
#, c-format
msgid "&Enable archive file support"
msgstr ""
-#: Merge.rc:1465
+#: Merge.rc:1467
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr ""
-#: Merge.rc:1468
+#: Merge.rc:1470
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr ""
-#: Merge.rc:1470
+#: Merge.rc:1472
#, c-format
msgid "&Detect archive type from file signature"
msgstr ""
-#: Merge.rc:1478
+#: Merge.rc:1480
#, c-format
msgid "Compare Statistics"
msgstr ""
-#: Merge.rc:1481
+#: Merge.rc:1483
#, c-format
msgid "Folders:"
msgstr ""
-#: Merge.rc:1482
+#: Merge.rc:1484
#, c-format
msgid "Files:"
msgstr ""
-#: Merge.rc:1483
-#: Merge.rc:2328
+#: Merge.rc:1485
+#: Merge.rc:2330
#, c-format
msgid "Different"
msgstr ""
-#: Merge.rc:1484
+#: Merge.rc:1486
#, c-format
msgid "Text:"
msgstr ""
-#: Merge.rc:1487
-#: Merge.rc:1506
+#: Merge.rc:1489
+#: Merge.rc:1508
#, c-format
msgid "Binary:"
msgstr ""
-#: Merge.rc:1490
+#: Merge.rc:1492
#, c-format
msgid "Unique"
msgstr ""
-#: Merge.rc:1491
+#: Merge.rc:1493
#, c-format
msgid "Left:"
msgstr ""
-#: Merge.rc:1496
+#: Merge.rc:1498
#, c-format
msgid "Right:"
msgstr ""
-#: Merge.rc:1501
-#: Merge.rc:2322
+#: Merge.rc:1503
+#: Merge.rc:2324
#, c-format
msgid "Identical"
msgstr ""
-#: Merge.rc:1510
+#: Merge.rc:1512
#, c-format
msgid "Total:"
msgstr ""
-#: Merge.rc:1515
+#: Merge.rc:1517
#, c-format
msgid "Close"
msgstr ""
-#: Merge.rc:1524
+#: Merge.rc:1526
#, c-format
msgid "Affects"
msgstr ""
-#: Merge.rc:1527
-#: Merge.rc:1530
+#: Merge.rc:1529
+#: Merge.rc:1532
#, c-format
msgid "(Affects)"
msgstr ""
-#: Merge.rc:1531
+#: Merge.rc:1533
#, c-format
msgid "Select Codepage for"
msgstr ""
-#: Merge.rc:1532
+#: Merge.rc:1534
#, c-format
msgid "&File Loading:"
msgstr ""
-#: Merge.rc:1534
-#: Merge.rc:1537
+#: Merge.rc:1536
+#: Merge.rc:1539
#, c-format
msgid "..."
msgstr ""
-#: Merge.rc:1535
+#: Merge.rc:1537
#, c-format
msgid "File &Saving:"
msgstr ""
-#: Merge.rc:1538
+#: Merge.rc:1540
#, c-format
msgid "&Use same codepage for both"
msgstr ""
-#: Merge.rc:1541
+#: Merge.rc:1543
#, c-format
msgid "&Apply"
msgstr ""
-#: Merge.rc:1542
-#: Merge.rc:1906
+#: Merge.rc:1544
+#: Merge.rc:1908
#, c-format
msgid "&Cancel"
msgstr ""
-#: Merge.rc:1547
+#: Merge.rc:1549
#, c-format
msgid "Test Filter"
msgstr ""
-#: Merge.rc:1550
+#: Merge.rc:1552
#, c-format
msgid "Testing filter ..."
msgstr ""
-#: Merge.rc:1552
+#: Merge.rc:1554
#, c-format
msgid "&Enter text to test:"
msgstr ""
-#: Merge.rc:1554
+#: Merge.rc:1556
#, c-format
msgid "&Folder Name"
msgstr ""
-#: Merge.rc:1556
+#: Merge.rc:1558
#, c-format
msgid "Result:"
msgstr ""
-#: Merge.rc:1560
+#: Merge.rc:1562
#, c-format
msgid "&Test"
msgstr ""
-#: Merge.rc:1561
+#: Merge.rc:1563
#, c-format
msgid "&Close"
msgstr ""
-#: Merge.rc:1569
+#: Merge.rc:1571
#, c-format
msgid "&Use customized text colors"
msgstr ""
-#: Merge.rc:1572
+#: Merge.rc:1574
#, c-format
msgid "Custom text colors"
msgstr ""
-#: Merge.rc:1574
+#: Merge.rc:1576
#, c-format
msgid "Whitespace:"
msgstr ""
-#: Merge.rc:1575
+#: Merge.rc:1577
#, c-format
msgid "Regular text:"
msgstr ""
-#: Merge.rc:1576
+#: Merge.rc:1578
#, c-format
msgid "Selection:"
msgstr ""
-#: Merge.rc:1599
+#: Merge.rc:1601
#, c-format
msgid "Paths"
msgstr ""
-#: Merge.rc:1605
+#: Merge.rc:1607
#, c-format
msgid "R&ead-only"
msgstr ""
-#: Merge.rc:1609
+#: Merge.rc:1611
#, c-format
msgid "Re&ad-only"
msgstr ""
-#: Merge.rc:1615
+#: Merge.rc:1617
#, c-format
msgid "Open..."
msgstr ""
-#: Merge.rc:1616
+#: Merge.rc:1618
#, c-format
msgid "Save..."
msgstr ""
-#: Merge.rc:1621
-#: Merge.rc:1941
+#: Merge.rc:1623
+#: Merge.rc:1943
#, c-format
msgid "Backup Files"
msgstr ""
-#: Merge.rc:1624
+#: Merge.rc:1626
#, c-format
msgid "Create backup files in:"
msgstr ""
-#: Merge.rc:1629
+#: Merge.rc:1631
#, c-format
msgid "Create backup files into:"
msgstr ""
-#: Merge.rc:1630
+#: Merge.rc:1632
#, c-format
msgid "&Original file's folder"
msgstr ""
-#: Merge.rc:1632
+#: Merge.rc:1634
#, c-format
msgid "&Global backup folder:"
msgstr ""
-#: Merge.rc:1636
+#: Merge.rc:1638
#, c-format
msgid "Backup filename:"
msgstr ""
-#: Merge.rc:1637
+#: Merge.rc:1639
#, c-format
msgid "&Append .bak -extension"
msgstr ""
-#: Merge.rc:1639
+#: Merge.rc:1641
#, c-format
msgid "A&ppend timestamp"
msgstr ""
-#: Merge.rc:1646
-#: Merge.rc:2230
+#: Merge.rc:1648
+#: Merge.rc:2232
#, c-format
msgid "Confirm Copy"
msgstr ""
-#: Merge.rc:1650
+#: Merge.rc:1652
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr ""
-#: Merge.rc:1652
+#: Merge.rc:1654
#, c-format
msgid "From left"
msgstr ""
-#: Merge.rc:1655
+#: Merge.rc:1657
#, c-format
msgid "To right"
msgstr ""
-#: Merge.rc:1658
+#: Merge.rc:1660
#, c-format
msgid "Yes"
msgstr ""
-#: Merge.rc:1659
+#: Merge.rc:1661
#, c-format
msgid "No"
msgstr ""
-#: Merge.rc:1665
+#: Merge.rc:1667
#, c-format
msgid "Plugins"
msgstr ""
-#: Merge.rc:1668
+#: Merge.rc:1670
#, c-format
msgid "&Enable plugins"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1698
+#: Merge.rc:1700
#, c-format
msgid "040904e4"
msgstr ""
#. VarFileInfo.Translation
-#: Merge.rc:1714
+#: Merge.rc:1716
#, c-format
msgid "0x409, 1252"
msgstr ""
-#: Merge.rc:1729
+#: Merge.rc:1731
#, c-format
msgid "Ready"
msgstr ""
-#: Merge.rc:1735
+#: Merge.rc:1737
#, c-format
msgid "EXT"
msgstr ""
-#: Merge.rc:1736
+#: Merge.rc:1738
#, c-format
msgid "CAP"
msgstr ""
-#: Merge.rc:1737
+#: Merge.rc:1739
#, c-format
msgid "NUM"
msgstr ""
-#: Merge.rc:1738
+#: Merge.rc:1740
#, c-format
msgid "SCRL"
msgstr ""
-#: Merge.rc:1739
+#: Merge.rc:1741
#, c-format
msgid "OVR"
msgstr ""
-#: Merge.rc:1740
+#: Merge.rc:1742
#, c-format
msgid "REC"
msgstr ""
-#: Merge.rc:1746
+#: Merge.rc:1748
#, c-format
msgid "Create empty documents\nNew Documents (Ctrl+N)"
msgstr ""
-#: Merge.rc:1747
+#: Merge.rc:1749
#, c-format
msgid "Open an existing document\nOpen (Ctrl+O)"
msgstr ""
-#: Merge.rc:1748
+#: Merge.rc:1750
#, c-format
msgid "Close the active document\nClose"
msgstr ""
-#: Merge.rc:1749
+#: Merge.rc:1751
#, c-format
msgid "Save the active document\nSave (Ctrl+S)"
msgstr ""
-#: Merge.rc:1750
+#: Merge.rc:1752
#, c-format
msgid "Save the active document with a new name\nSave As"
msgstr ""
-#: Merge.rc:1751
+#: Merge.rc:1753
#, c-format
msgid "Change the printing options\nPage Setup"
msgstr ""
-#: Merge.rc:1752
+#: Merge.rc:1754
#, c-format
msgid "Change the printer and printing options\nPrint Setup"
msgstr ""
-#: Merge.rc:1753
+#: Merge.rc:1755
#, c-format
msgid "Print the active document\nPrint"
msgstr ""
-#: Merge.rc:1754
+#: Merge.rc:1756
#, c-format
msgid "Display full pages\nPrint Preview"
msgstr ""
-#: Merge.rc:1759
+#: Merge.rc:1761
#, c-format
msgid "Make all hidden items visible again"
msgstr ""
-#: Merge.rc:1760
+#: Merge.rc:1762
#, c-format
msgid "Toggle tree mode"
msgstr ""
-#: Merge.rc:1761
+#: Merge.rc:1763
#, c-format
msgid "Expand all subfolders"
msgstr ""
-#: Merge.rc:1762
+#: Merge.rc:1764
#, c-format
msgid "Collapse all subfolders"
msgstr ""
-#: Merge.rc:1768
+#: Merge.rc:1770
#, c-format
msgid "Open project file\nProject file (Ctrl+J)"
msgstr ""
-#: Merge.rc:1769
+#: Merge.rc:1771
#, c-format
msgid "Unknown error attempting to open project file"
msgstr ""
-#: Merge.rc:1770
+#: Merge.rc:1772
#, c-format
msgid "Unknown error attempting to save project file"
msgstr ""
-#: Merge.rc:1771
+#: Merge.rc:1773
#, c-format
msgid "Project File"
msgstr ""
-#: Merge.rc:1772
+#: Merge.rc:1774
#, c-format
msgid "Project file successfully loaded."
msgstr ""
-#: Merge.rc:1773
+#: Merge.rc:1775
#, c-format
msgid "Project file successfully saved."
msgstr ""
-#: Merge.rc:1774
+#: Merge.rc:1776
#, c-format
msgid "Save current paths and options to project file\nSave Project File"
msgstr ""
-#: Merge.rc:1779
+#: Merge.rc:1781
#, c-format
msgid "Display program information, version number and copyright\nAbout"
msgstr ""
-#: Merge.rc:1780
+#: Merge.rc:1782
#, c-format
msgid "Quit the application; prompts to save documents\nExit"
msgstr ""
-#: Merge.rc:1786
-#: Merge.rc:1787
#: Merge.rc:1788
#: Merge.rc:1789
#: Merge.rc:1790
@@ -2767,2849 +2770,2851 @@
#: Merge.rc:1799
#: Merge.rc:1800
#: Merge.rc:1801
+#: Merge.rc:1802
+#: Merge.rc:1803
#, c-format
msgid "Open this document"
msgstr ""
-#: Merge.rc:1806
+#: Merge.rc:1808
#, c-format
msgid "Switch to the next window pane\nNext Pane"
msgstr ""
-#: Merge.rc:1807
+#: Merge.rc:1809
#, c-format
msgid "Switch back to the previous window pane\nPrevious Pane"
msgstr ""
-#: Merge.rc:1813
+#: Merge.rc:1815
#, c-format
msgid "Arrange windows so they overlap\nCascade Windows"
msgstr ""
-#: Merge.rc:1814
+#: Merge.rc:1816
#, c-format
msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally"
msgstr ""
-#: Merge.rc:1815
+#: Merge.rc:1817
#, c-format
msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically"
msgstr ""
-#: Merge.rc:1821
+#: Merge.rc:1823
#, c-format
msgid "Copy the selection and put it on the Clipboard\nCopy"
msgstr ""
-#: Merge.rc:1822
+#: Merge.rc:1824
#, c-format
msgid "Cut the selection and put it on the Clipboard\nCut"
msgstr ""
-#: Merge.rc:1823
+#: Merge.rc:1825
#, c-format
msgid "Find the specified text\nFind"
msgstr ""
-#: Merge.rc:1824
+#: Merge.rc:1826
#, c-format
msgid "Insert Clipboard contents\nPaste"
msgstr ""
-#: Merge.rc:1825
+#: Merge.rc:1827
#, c-format
msgid "Repeat the last action\nRepeat"
msgstr ""
-#: Merge.rc:1826
+#: Merge.rc:1828
#, c-format
msgid "Replace specific text with different text\nReplace"
msgstr ""
-#: Merge.rc:1827
+#: Merge.rc:1829
#, c-format
msgid "Select the entire document\nSelect All"
msgstr ""
-#: Merge.rc:1828
+#: Merge.rc:1830
#, c-format
msgid "Undo the last action\nUndo (Ctrl+Z)"
msgstr ""
-#: Merge.rc:1829
+#: Merge.rc:1831
#, c-format
msgid "Redo the previously undone action\nRedo (Ctrl+Y)"
msgstr ""
-#: Merge.rc:1835
+#: Merge.rc:1837
#, c-format
msgid "Show or hide the toolbar\nToggle ToolBar"
msgstr ""
-#: Merge.rc:1836
+#: Merge.rc:1838
#, c-format
msgid "Show or hide the status bar\nToggle StatusBar"
msgstr ""
-#: Merge.rc:1837
+#: Merge.rc:1839
#, c-format
msgid "Show or hide the tab bar\nToggle TabBar"
msgstr ""
-#: Merge.rc:1838
+#: Merge.rc:1840
#, c-format
msgid "Automatically resize panes\nLock Panes"
msgstr ""
-#: Merge.rc:1844
+#: Merge.rc:1846
#, c-format
msgid "Change the window size"
msgstr ""
-#: Merge.rc:1845
+#: Merge.rc:1847
#, c-format
msgid "Change the window position"
msgstr ""
-#: Merge.rc:1846
+#: Merge.rc:1848
#, c-format
msgid "Reduce the window to an icon"
msgstr ""
-#: Merge.rc:1847
+#: Merge.rc:1849
#, c-format
msgid "Enlarge the window to full size"
msgstr ""
-#: Merge.rc:1848
+#: Merge.rc:1850
#, c-format
msgid "Switch to the next document window"
msgstr ""
-#: Merge.rc:1849
+#: Merge.rc:1851
#, c-format
msgid "Switch to the previous document window"
msgstr ""
-#: Merge.rc:1850
+#: Merge.rc:1852
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr ""
-#: Merge.rc:1855
+#: Merge.rc:1857
#, c-format
msgid "Restore the window to normal size"
msgstr ""
-#: Merge.rc:1856
+#: Merge.rc:1858
#, c-format
msgid "Activate Task List"
msgstr ""
-#: Merge.rc:1857
+#: Merge.rc:1859
#, c-format
msgid "Activate this window"
msgstr ""
-#: Merge.rc:1863
+#: Merge.rc:1865
#, c-format
msgid "Close print preview mode\nCancel Preview"
msgstr ""
-#: Merge.rc:1870
+#: Merge.rc:1872
#, c-format
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
msgstr ""
-#: Merge.rc:1871
+#: Merge.rc:1873
#, c-format
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr ""
-#: Merge.rc:1878
+#: Merge.rc:1880
#, c-format
msgid "Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1885
+#: Merge.rc:1887
#, c-format
msgid "Press any key"
msgstr ""
-#: Merge.rc:1891
-#: Merge.rc:1892
+#: Merge.rc:1893
+#: Merge.rc:1894
#, c-format
msgid "Right click on the path to copy"
msgstr ""
-#: Merge.rc:1898
+#: Merge.rc:1900
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
msgstr ""
-#: Merge.rc:1899
+#: Merge.rc:1901
#, 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:1905
+#: Merge.rc:1907
#, c-format
msgid "&Ok"
msgstr ""
-#: Merge.rc:1907
+#: Merge.rc:1909
#, c-format
msgid "&Abort"
msgstr ""
-#: Merge.rc:1908
+#: Merge.rc:1910
#, c-format
msgid "&Retry"
msgstr ""
-#: Merge.rc:1909
+#: Merge.rc:1911
#, c-format
msgid "&Ignore"
msgstr ""
-#: Merge.rc:1910
+#: Merge.rc:1912
#, c-format
msgid "Ignore &all"
msgstr ""
-#: Merge.rc:1911
+#: Merge.rc:1913
#, c-format
msgid "&Yes"
msgstr ""
-#: Merge.rc:1917
+#: Merge.rc:1919
#, c-format
msgid "Yes to &all"
msgstr ""
-#: Merge.rc:1918
+#: Merge.rc:1920
#, c-format
msgid "&No"
msgstr ""
-#: Merge.rc:1919
+#: Merge.rc:1921
#, c-format
msgid "No to a&ll"
msgstr ""
-#: Merge.rc:1920
+#: Merge.rc:1922
#, c-format
msgid "&Continue"
msgstr ""
-#: Merge.rc:1921
+#: Merge.rc:1923
#, c-format
msgid "&Skip"
msgstr ""
-#: Merge.rc:1922
+#: Merge.rc:1924
#, c-format
msgid "Skip &all"
msgstr ""
-#: Merge.rc:1924
+#: Merge.rc:1926
#, c-format
msgid "Don't display this &message again."
msgstr ""
-#: Merge.rc:1925
+#: Merge.rc:1927
#, c-format
msgid "Don't ask this &question again."
msgstr ""
-#: Merge.rc:1935
+#: Merge.rc:1937
#, c-format
msgid "Syntax colors"
msgstr ""
-#: Merge.rc:1936
+#: Merge.rc:1938
#, c-format
msgid "Text Colors"
msgstr ""
-#: Merge.rc:1938
+#: Merge.rc:1940
#, c-format
msgid "Version Control"
msgstr ""
-#: Merge.rc:1948
+#: Merge.rc:1950
#, c-format
msgid "To:"
msgstr ""
-#: Merge.rc:1949
+#: Merge.rc:1951
#, c-format
msgid "From left:"
msgstr ""
-#: Merge.rc:1950
+#: Merge.rc:1952
#, c-format
msgid "To left:"
msgstr ""
-#: Merge.rc:1951
+#: Merge.rc:1953
#, c-format
msgid "From right:"
msgstr ""
-#: Merge.rc:1952
+#: Merge.rc:1954
#, c-format
msgid "To right:"
msgstr ""
-#: Merge.rc:1958
+#: Merge.rc:1960
#, c-format
msgid "Version %1"
msgstr ""
-#: Merge.rc:1959
+#: Merge.rc:1961
#, c-format
msgid "Unicode"
msgstr ""
-#: Merge.rc:1965
+#: Merge.rc:1967
#, c-format
msgid "Options (%1)"
msgstr ""
-#: Merge.rc:1966
+#: Merge.rc:1968
#, c-format
msgid "All message boxes are now displayed again."
msgstr ""
-#: Merge.rc:1967
+#: Merge.rc:1969
#, 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:1968
+#: Merge.rc:1970
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr ""
-#: Merge.rc:1970
+#: Merge.rc:1972
#, c-format
msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
msgstr ""
-#: Merge.rc:1972
+#: Merge.rc:1974
#, 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:1978
+#: Merge.rc:1980
#, c-format
msgid "Open"
msgstr ""
-#: Merge.rc:1979
+#: Merge.rc:1981
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1980
+#: Merge.rc:1982
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1981
+#: Merge.rc:1983
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr ""
-#: Merge.rc:1983
+#: Merge.rc:1985
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1989
+#: Merge.rc:1991
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1990
+#: Merge.rc:1992
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1991
+#: Merge.rc:1993
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1997
+#: Merge.rc:1999
#, c-format
msgid "UTF-8"
msgstr ""
-#: Merge.rc:1998
+#: Merge.rc:2000
#, c-format
msgid "UTF-8 (B)"
msgstr ""
-#: Merge.rc:1999
+#: Merge.rc:2001
#, c-format
msgid "UCS-2 LE"
msgstr ""
-#: Merge.rc:2000
+#: Merge.rc:2002
#, c-format
msgid "UCS-2 BE"
msgstr ""
-#: Merge.rc:2006
+#: Merge.rc:2008
#, c-format
msgid "Full Contents"
msgstr ""
-#: Merge.rc:2007
+#: Merge.rc:2009
#, c-format
msgid "Quick Contents"
msgstr ""
-#: Merge.rc:2008
+#: Merge.rc:2010
#, c-format
msgid "Modified Date"
msgstr ""
-#: Merge.rc:2009
+#: Merge.rc:2011
#, c-format
msgid "Modified Date and Size"
msgstr ""
-#: Merge.rc:2010
+#: Merge.rc:2012
#, c-format
msgid "Size"
msgstr ""
-#: Merge.rc:2016
-#: Merge.rc:2640
+#: Merge.rc:2018
+#: Merge.rc:2642
#, c-format
msgid "Name"
msgstr ""
-#: Merge.rc:2017
+#: Merge.rc:2019
#, c-format
msgid "Location"
msgstr ""
-#: Merge.rc:2018
+#: Merge.rc:2020
#, c-format
msgid "Filters"
msgstr ""
-#: Merge.rc:2019
+#: Merge.rc:2021
#, c-format
msgid "[F] "
msgstr ""
-#: Merge.rc:2020
-#: Merge.rc:2642
+#: Merge.rc:2022
+#: Merge.rc:2644
#, c-format
msgid "Description"
msgstr ""
-#: Merge.rc:2021
+#: Merge.rc:2023
#, c-format
msgid "Select filename for new filter"
msgstr ""
-#: Merge.rc:2022
+#: Merge.rc:2024
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:2024
+#: Merge.rc:2026
#, c-format
msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
msgstr ""
-#: Merge.rc:2026
+#: Merge.rc:2028
#, 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:2028
+#: Merge.rc:2030
#, c-format
msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System."
msgstr ""
-#: Merge.rc:2030
+#: Merge.rc:2032
#, c-format
msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
msgstr ""
-#: Merge.rc:2031
+#: Merge.rc:2033
#, c-format
msgid "Locate filter file to install"
msgstr ""
-#: Merge.rc:2033
+#: Merge.rc:2035
#, c-format
msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
msgstr ""
-#: Merge.rc:2035
+#: Merge.rc:2037
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr ""
-#: Merge.rc:2041
+#: Merge.rc:2043
#, c-format
msgid "Regular expression"
msgstr ""
-#: Merge.rc:2047
+#: Merge.rc:2049
#, c-format
msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
-#: Merge.rc:2054
+#: Merge.rc:2056
#, c-format
msgid "&Path to SS.EXE:"
msgstr ""
-#: Merge.rc:2060
+#: Merge.rc:2062
#, c-format
msgid "Folder Comparison Results"
msgstr ""
-#: Merge.rc:2061
+#: Merge.rc:2063
#, c-format
msgid "File Comparison"
msgstr ""
-#: Merge.rc:2062
+#: Merge.rc:2064
#, c-format
msgid "Untitled left"
msgstr ""
-#: Merge.rc:2063
+#: Merge.rc:2065
#, c-format
msgid "Untitled right"
msgstr ""
-#: Merge.rc:2064
+#: Merge.rc:2066
#, c-format
msgid "Theirs File"
msgstr ""
-#: Merge.rc:2065
+#: Merge.rc:2067
#, c-format
msgid "Mine File"
msgstr ""
-#: Merge.rc:2071
+#: Merge.rc:2073
#, c-format
msgid "Scanning files..."
msgstr ""
-#: Merge.rc:2072
+#: Merge.rc:2074
#, c-format
msgid "Opening selection"
msgstr ""
-#: Merge.rc:2073
+#: Merge.rc:2075
#, c-format
msgid "Copying Left to Right"
msgstr ""
-#: Merge.rc:2074
+#: Merge.rc:2076
#, c-format
msgid "Copying Right to Left"
msgstr ""
-#: Merge.rc:2075
+#: Merge.rc:2077
#, c-format
msgid "Copying All to Left"
msgstr ""
-#: Merge.rc:2076
+#: Merge.rc:2078
#, c-format
msgid "Copying All to Right"
msgstr ""
-#: Merge.rc:2077
+#: Merge.rc:2079
#, c-format
msgid "Copying files..."
msgstr ""
-#: Merge.rc:2078
+#: Merge.rc:2080
#, c-format
msgid "Deleting files..."
msgstr ""
-#: Merge.rc:2079
+#: Merge.rc:2081
#, c-format
msgid "Moving files..."
msgstr ""
-#: Merge.rc:2080
+#: Merge.rc:2082
#, c-format
msgid "Creating the report..."
msgstr ""
-#: Merge.rc:2081
+#: Merge.rc:2083
#, c-format
msgid "Undoing the last operation..."
msgstr ""
-#: Merge.rc:2082
+#: Merge.rc:2084
#, c-format
msgid "Redoing the previous operation..."
msgstr ""
-#: Merge.rc:2088
+#: Merge.rc:2090
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
-#: Merge.rc:2089
+#: Merge.rc:2091
#, c-format
msgid "Line: %s"
msgstr ""
-#: Merge.rc:2090
+#: Merge.rc:2092
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
-#: Merge.rc:2091
+#: Merge.rc:2093
#, c-format
msgid "Merge"
msgstr ""
-#: Merge.rc:2092
+#: Merge.rc:2094
#, c-format
msgid "Difference %1 of %2"
msgstr ""
-#: Merge.rc:2093
+#: Merge.rc:2095
#, c-format
msgid "%1 Differences Found"
msgstr ""
-#: Merge.rc:2094
+#: Merge.rc:2096
#, c-format
msgid "1 Difference Found"
msgstr ""
#. Abbreviation from "Read Only"
-#: Merge.rc:2095
+#: Merge.rc:2097
#, c-format
msgid "RO"
msgstr ""
-#: Merge.rc:2101
+#: Merge.rc:2103
#, c-format
msgid "Item %1 of %2"
msgstr ""
-#: Merge.rc:2102
+#: Merge.rc:2104
#, c-format
msgid "Items: %1"
msgstr ""
-#: Merge.rc:2108
+#: Merge.rc:2110
#, c-format
msgid "Select two existing folders or files to compare"
msgstr ""
-#: Merge.rc:2109
+#: Merge.rc:2111
#, c-format
msgid "Folder Selection"
msgstr ""
-#: Merge.rc:2110
+#: Merge.rc:2112
#, c-format
msgid "Select two folders or two files to compare."
msgstr ""
-#: Merge.rc:2111
+#: Merge.rc:2113
#, c-format
msgid "Left path is invalid!"
msgstr ""
-#: Merge.rc:2112
+#: Merge.rc:2114
#, c-format
msgid "Right path is invalid!"
msgstr ""
-#: Merge.rc:2113
+#: Merge.rc:2115
#, c-format
msgid "Both paths are invalid!"
msgstr ""
-#: Merge.rc:2114
+#: Merge.rc:2116
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr ""
-#: Merge.rc:2115
+#: Merge.rc:2117
#, c-format
msgid "Cannot compare file and folder!"
msgstr ""
-#: Merge.rc:2121
+#: Merge.rc:2123
#, c-format
msgid "File not found: %1"
msgstr ""
-#: Merge.rc:2122
+#: Merge.rc:2124
#, c-format
msgid "File not unpacked: %1"
msgstr ""
-#: Merge.rc:2123
+#: Merge.rc:2125
#, c-format
msgid "Cannot open file\n%1\n\n%2"
msgstr ""
-#: Merge.rc:2124
+#: Merge.rc:2126
#, c-format
msgid "Failed to parse conflict file."
msgstr ""
-#: Merge.rc:2125
+#: Merge.rc:2127
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
-#: Merge.rc:2131
+#: Merge.rc:2133
#, c-format
msgid "Save As"
msgstr ""
-#: Merge.rc:2132
+#: Merge.rc:2134
#, c-format
msgid "Save changes to %1?"
msgstr ""
-#: Merge.rc:2133
+#: Merge.rc:2135
#, 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:2134
+#: Merge.rc:2136
#, c-format
msgid "Error checking destination writeability"
msgstr ""
-#: Merge.rc:2135
+#: Merge.rc:2137
#, c-format
msgid "Error backing up file"
msgstr ""
-#: Merge.rc:2137
+#: Merge.rc:2139
#, c-format
msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
msgstr ""
-#: Merge.rc:2138
+#: Merge.rc:2140
#, 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:2139
+#: Merge.rc:2141
#, 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:2140
+#: Merge.rc:2142
#, 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:2141
+#: Merge.rc:2143
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
msgstr ""
-#: Merge.rc:2142
+#: Merge.rc:2144
#, c-format
msgid "%1\nis marked read-only. Would you like to override the read-only item?"
msgstr ""
-#: Merge.rc:2143
+#: Merge.rc:2145
#, 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:2144
+#: Merge.rc:2146
#, c-format
msgid "Save Left File As"
msgstr ""
-#: Merge.rc:2145
+#: Merge.rc:2147
#, c-format
msgid "Save Right File As"
msgstr ""
-#: Merge.rc:2151
+#: Merge.rc:2153
#, c-format
msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
msgstr ""
-#: Merge.rc:2157
+#: Merge.rc:2159
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr ""
-#: Merge.rc:2158
+#: Merge.rc:2160
#, c-format
msgid "Checkout files from VSS..."
msgstr ""
-#: Merge.rc:2159
+#: Merge.rc:2161
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr ""
-#: Merge.rc:2160
+#: Merge.rc:2162
#, c-format
msgid "Error executing versioning system command."
msgstr ""
-#: Merge.rc:2161
+#: Merge.rc:2163
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr ""
-#: Merge.rc:2162
+#: Merge.rc:2164
#, c-format
msgid "No VSS database(s) found!"
msgstr ""
-#: Merge.rc:2163
+#: Merge.rc:2165
#, c-format
msgid "Error from VSS:"
msgstr ""
-#: Merge.rc:2164
+#: Merge.rc:2166
#, 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:2165
+#: Merge.rc:2167
#, 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:2171
-#: Merge.rc:2624
+#: Merge.rc:2173
+#: Merge.rc:2626
#, c-format
msgid "None"
msgstr ""
-#: Merge.rc:2172
+#: Merge.rc:2174
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr ""
-#: Merge.rc:2173
+#: Merge.rc:2175
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr ""
-#: Merge.rc:2175
+#: Merge.rc:2177
#, c-format
msgid "Break at whitespace"
msgstr ""
-#: Merge.rc:2176
+#: Merge.rc:2178
#, c-format
msgid "Break at whitespace or punctuation"
msgstr ""
-#: Merge.rc:2182
#: Merge.rc:2184
+#: Merge.rc:2186
#, c-format
msgid "Copy selected item to named directory"
msgstr ""
-#: Merge.rc:2183
#: Merge.rc:2185
+#: Merge.rc:2187
#, c-format
msgid "Copy selected item to custom directory"
msgstr ""
-#: Merge.rc:2186
+#: Merge.rc:2188
#, c-format
msgid "Delete selected item on left"
msgstr ""
-#: Merge.rc:2187
+#: Merge.rc:2189
#, c-format
msgid "Delete selected item on right"
msgstr ""
-#: Merge.rc:2188
+#: Merge.rc:2190
#, c-format
msgid "Delete selected item(s) on both sides"
msgstr ""
-#: Merge.rc:2189
+#: Merge.rc:2191
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
msgstr ""
-#: Merge.rc:2190
+#: Merge.rc:2192
#, c-format
msgid "Rename selected item on both sides"
msgstr ""
-#: Merge.rc:2191
+#: Merge.rc:2193
#, c-format
msgid "Right to Left (%1)"
msgstr ""
-#: Merge.rc:2192
+#: Merge.rc:2194
#, c-format
msgid "Left to Right (%1)"
msgstr ""
-#: Merge.rc:2193
+#: Merge.rc:2195
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2194
+#: Merge.rc:2196
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2195
-#: Merge.rc:2211
+#: Merge.rc:2197
+#: Merge.rc:2213
#, c-format
msgid "Left to... (%1)"
msgstr ""
-#: Merge.rc:2196
-#: Merge.rc:2212
+#: Merge.rc:2198
+#: Merge.rc:2214
#, c-format
msgid "Right to... (%1)"
msgstr ""
-#: Merge.rc:2197
-#: Merge.rc:2213
+#: Merge.rc:2199
+#: Merge.rc:2215
#, c-format
msgid "Left to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2198
-#: Merge.rc:2214
+#: Merge.rc:2200
+#: Merge.rc:2216
#, c-format
msgid "Right to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2204
+#: Merge.rc:2206
#, c-format
msgid "Left (%1)"
msgstr ""
-#: Merge.rc:2205
+#: Merge.rc:2207
#, c-format
msgid "Right (%1)"
msgstr ""
-#: Merge.rc:2206
+#: Merge.rc:2208
#, c-format
msgid "Both (%1)"
msgstr ""
-#: Merge.rc:2207
+#: Merge.rc:2209
#, c-format
msgid "Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2208
+#: Merge.rc:2210
#, c-format
msgid "Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2209
+#: Merge.rc:2211
#, c-format
msgid "Both (%1 of %2)"
msgstr ""
-#: Merge.rc:2210
+#: Merge.rc:2212
#, c-format
msgid "Select destination folder"
msgstr ""
-#: Merge.rc:2215
+#: Merge.rc:2217
#, c-format
msgid "Left side - select destination folder:"
msgstr ""
-#: Merge.rc:2216
+#: Merge.rc:2218
#, c-format
msgid "Right side - select destination folder:"
msgstr ""
-#: Merge.rc:2217
+#: Merge.rc:2219
#, c-format
msgid "(%1 Files Affected)"
msgstr ""
-#: Merge.rc:2218
+#: Merge.rc:2220
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr ""
-#: Merge.rc:2224
+#: Merge.rc:2226
#, c-format
msgid "Are you sure you want to delete\n\n%1 ?"
msgstr ""
-#: Merge.rc:2225
+#: Merge.rc:2227
#, c-format
msgid "Are you sure you want to copy:"
msgstr ""
-#: Merge.rc:2226
+#: Merge.rc:2228
#, c-format
msgid "Are you sure you want to copy %d items:"
msgstr ""
-#: Merge.rc:2227
+#: Merge.rc:2229
#, 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:2228
+#: Merge.rc:2230
#, c-format
msgid "Are you sure you want to move:"
msgstr ""
-#: Merge.rc:2229
+#: Merge.rc:2231
#, c-format
msgid "Are you sure you want to move %d items:"
msgstr ""
-#: Merge.rc:2231
+#: Merge.rc:2233
#, c-format
msgid "Confirm Move"
msgstr ""
-#: Merge.rc:2237
+#: Merge.rc:2239
#, c-format
msgid "Open left file"
msgstr ""
-#: Merge.rc:2238
+#: Merge.rc:2240
#, c-format
msgid "Open the left file to external editor"
msgstr ""
-#: Merge.rc:2239
+#: Merge.rc:2241
#, c-format
msgid "Open left file with ..."
msgstr ""
-#: Merge.rc:2240
+#: Merge.rc:2242
#, c-format
msgid "Open right file"
msgstr ""
-#: Merge.rc:2241
+#: Merge.rc:2243
#, c-format
msgid "Open the right file to external editor"
msgstr ""
-#: Merge.rc:2242
+#: Merge.rc:2244
#, c-format
msgid "Open right file with..."
msgstr ""
-#: Merge.rc:2243
+#: Merge.rc:2245
#, c-format
msgid "Failed to execute external editor: %1"
msgstr ""
-#: Merge.rc:2244
+#: Merge.rc:2246
#, c-format
msgid "Unknown extension on external editor: %1"
msgstr ""
-#: Merge.rc:2245
+#: Merge.rc:2247
#, c-format
msgid "Copy filenames to clipboard"
msgstr ""
-#: Merge.rc:2246
+#: Merge.rc:2248
#, c-format
msgid "Copy left side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2247
+#: Merge.rc:2249
#, c-format
msgid "Copy right side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2248
+#: Merge.rc:2250
#, c-format
msgid "Copy both sides pathnames to clipboard"
msgstr ""
-#: Merge.rc:2254
+#: Merge.rc:2256
#, c-format
msgid "Left Shell menu"
msgstr ""
-#: Merge.rc:2255
+#: Merge.rc:2257
#, c-format
msgid "Right Shell menu"
msgstr ""
-#: Merge.rc:2261
+#: Merge.rc:2263
#, c-format
msgid "Unknown archive format"
msgstr ""
-#: Merge.rc:2262
+#: Merge.rc:2264
#, c-format
msgid "Add items from left side to archive"
msgstr ""
-#: Merge.rc:2263
+#: Merge.rc:2265
#, c-format
msgid "Add items from right side to archive"
msgstr ""
-#: Merge.rc:2264
+#: Merge.rc:2266
#, c-format
msgid "Add items from both sides to archive"
msgstr ""
-#: Merge.rc:2265
+#: Merge.rc:2267
#, c-format
msgid "Add different items to archive (both sides)"
msgstr ""
-#: Merge.rc:2267
+#: Merge.rc:2269
#, c-format
msgid "Move selected file on left to custom directory"
msgstr ""
-#: Merge.rc:2269
+#: Merge.rc:2271
#, c-format
msgid "Move selected file on right to custom directory"
msgstr ""
-#: Merge.rc:2275
+#: Merge.rc:2277
#, c-format
msgid "Filename"
msgstr ""
-#: Merge.rc:2276
+#: Merge.rc:2278
#, c-format
msgid "Folder"
msgstr ""
-#: Merge.rc:2277
+#: Merge.rc:2279
#, c-format
msgid "Comparison result"
msgstr ""
-#: Merge.rc:2278
+#: Merge.rc:2280
#, c-format
msgid "Left Date"
msgstr ""
-#: Merge.rc:2279
+#: Merge.rc:2281
#, c-format
msgid "Right Date"
msgstr ""
-#: Merge.rc:2280
+#: Merge.rc:2282
#, c-format
msgid "Extension"
msgstr ""
-#: Merge.rc:2281
+#: Merge.rc:2283
#, c-format
msgid "Left Size"
msgstr ""
-#: Merge.rc:2282
+#: Merge.rc:2284
#, c-format
msgid "Right Size"
msgstr ""
-#: Merge.rc:2283
+#: Merge.rc:2285
#, c-format
msgid "Right Size (Short)"
msgstr ""
-#: Merge.rc:2284
+#: Merge.rc:2286
#, c-format
msgid "Left Size (Short)"
msgstr ""
-#: Merge.rc:2290
+#: Merge.rc:2292
#, c-format
msgid "Left Creation Time"
msgstr ""
-#: Merge.rc:2291
+#: Merge.rc:2293
#, c-format
msgid "Right Creation Time"
msgstr ""
-#: Merge.rc:2292
+#: Merge.rc:2294
#, c-format
msgid "Newer File"
msgstr ""
-#: Merge.rc:2293
+#: Merge.rc:2295
#, c-format
msgid "Left File Version"
msgstr ""
-#: Merge.rc:2294
+#: Merge.rc:2296
#, c-format
msgid "Right File Version"
msgstr ""
-#: Merge.rc:2295
+#: Merge.rc:2297
#, c-format
msgid "Short Result"
msgstr ""
-#: Merge.rc:2296
+#: Merge.rc:2298
#, c-format
msgid "Left Attributes"
msgstr ""
-#: Merge.rc:2297
+#: Merge.rc:2299
#, c-format
msgid "Right Attributes"
msgstr ""
-#: Merge.rc:2298
+#: Merge.rc:2300
#, c-format
msgid "Left EOL"
msgstr ""
-#: Merge.rc:2299
+#: Merge.rc:2301
#, c-format
msgid "Right EOL"
msgstr ""
-#: Merge.rc:2305
+#: Merge.rc:2307
#, c-format
msgid "Left Encoding"
msgstr ""
-#: Merge.rc:2306
+#: Merge.rc:2308
#, c-format
msgid "Right Encoding"
msgstr ""
-#: Merge.rc:2307
+#: Merge.rc:2309
#, c-format
msgid "Ignored Diff."
msgstr ""
-#: Merge.rc:2308
+#: Merge.rc:2310
#, c-format
msgid "Differences"
msgstr ""
-#: Merge.rc:2309
-#: Merge.rc:2620
+#: Merge.rc:2311
+#: Merge.rc:2622
#, c-format
msgid "Binary"
msgstr ""
-#: Merge.rc:2315
+#: Merge.rc:2317
#, c-format
msgid "Unable to compare files"
msgstr ""
-#: Merge.rc:2316
+#: Merge.rc:2318
#, c-format
msgid "Item aborted"
msgstr ""
-#: Merge.rc:2317
+#: Merge.rc:2319
#, c-format
msgid "File skipped"
msgstr ""
-#: Merge.rc:2318
+#: Merge.rc:2320
#, c-format
msgid "Folder skipped"
msgstr ""
-#: Merge.rc:2319
+#: Merge.rc:2321
#, c-format
msgid "Left only: %1"
msgstr ""
-#: Merge.rc:2320
+#: Merge.rc:2322
#, c-format
msgid "Right only: %1"
msgstr ""
-#: Merge.rc:2321
+#: Merge.rc:2323
#, c-format
msgid "Binary files are identical"
msgstr ""
-#: Merge.rc:2323
+#: Merge.rc:2325
#, c-format
msgid "Binary files are different"
msgstr ""
-#: Merge.rc:2324
+#: Merge.rc:2326
#, c-format
msgid "Files are different"
msgstr ""
-#: Merge.rc:2325
+#: Merge.rc:2327
#, c-format
msgid "Folders are different"
msgstr ""
-#: Merge.rc:2326
+#: Merge.rc:2328
#, c-format
msgid "Left Only"
msgstr ""
-#: Merge.rc:2327
+#: Merge.rc:2329
#, c-format
msgid "Right Only"
msgstr ""
-#: Merge.rc:2329
+#: Merge.rc:2331
#, c-format
msgid "Error"
msgstr ""
-#: Merge.rc:2330
+#: Merge.rc:2332
#, c-format
msgid "Text files are identical"
msgstr ""
-#: Merge.rc:2335
+#: Merge.rc:2337
#, c-format
msgid "Text files are different"
msgstr ""
-#: Merge.rc:2341
+#: Merge.rc:2343
#, c-format
msgid "Elapsed time: %ld ms"
msgstr ""
-#: Merge.rc:2342
+#: Merge.rc:2344
#, c-format
msgid "1 item selected"
msgstr ""
-#: Merge.rc:2343
+#: Merge.rc:2345
#, c-format
msgid "%1 items selected"
msgstr ""
-#: Merge.rc:2349
+#: ...
[truncated message content] |