You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ge...@us...> - 2009-08-02 17:02:38
|
Revision: 6942
http://winmerge.svn.sourceforge.net/winmerge/?rev=6942&view=rev
Author: gerundt
Date: 2009-08-02 17:02:17 +0000 (Sun, 02 Aug 2009)
Log Message:
-----------
Various Updates in German Translation
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/German.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-08-01 18:24:35 UTC (rev 6941)
+++ trunk/Docs/Users/ChangeLog.txt 2009-08-02 17:02:17 UTC (rev 6942)
@@ -20,6 +20,7 @@
Bugfix: In-line difference highlight fixes (#2824173)
Translation updates:
- Dutch (#2801690, #2804979, #2828310)
+ - German (r6942)
- Swedish (#2805726)
- Turkish (#2825130, #2825132, #2827820)
- Ukrainian (#2817835)
Modified: trunk/Translations/WinMerge/German.po
===================================================================
--- trunk/Translations/WinMerge/German.po 2009-08-01 18:24:35 UTC (rev 6941)
+++ trunk/Translations/WinMerge/German.po 2009-08-02 17:02:17 UTC (rev 6942)
@@ -16,7 +16,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-02-10 21:49+0100\n"
+"PO-Revision-Date: 2009-08-02 18:57+0100\n"
"Last-Translator: Tim Gerundt <tim at gerundt.de>\n"
"Language-Team: German <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -294,12 +294,12 @@
#: Merge.rc:152
#, c-format
msgid "Ma&nual Prediffer"
-msgstr ""
+msgstr "Man&ueller Prediffer"
#: Merge.rc:153
#, c-format
msgid "A&utomatic Prediffer"
-msgstr ""
+msgstr "Au&tomatischer Prediffer"
#: Merge.rc:155
#: Merge.rc:276
@@ -402,7 +402,7 @@
#: Merge.rc:178
#: Merge.rc:299
#: Merge.rc:487
-#: Merge.rc:1947
+#: Merge.rc:1948
#, c-format
msgid "&Help"
msgstr "&Hilfe"
@@ -733,7 +733,7 @@
msgstr "Skri&pte"
#: Merge.rc:373
-#: Merge.rc:2803
+#: Merge.rc:2807
#, c-format
msgid "< Empty >"
msgstr "< Leer >"
@@ -936,14 +936,14 @@
#: Merge.rc:526
#: Merge.rc:1147
-#: Merge.rc:1531
+#: Merge.rc:1514
#, c-format
msgid "&Left"
msgstr "&Links"
#: Merge.rc:527
#: Merge.rc:1149
-#: Merge.rc:1534
+#: Merge.rc:1517
#, c-format
msgid "&Right"
msgstr "&Rechts"
@@ -1100,12 +1100,12 @@
#: Merge.rc:1066
#: Merge.rc:1095
#: Merge.rc:1105
-#: Merge.rc:1273
-#: Merge.rc:1337
-#: Merge.rc:1350
-#: Merge.rc:1442
-#: Merge.rc:1457
-#: Merge.rc:1679
+#: Merge.rc:1256
+#: Merge.rc:1320
+#: Merge.rc:1333
+#: Merge.rc:1425
+#: Merge.rc:1440
+#: Merge.rc:1662
#, c-format
msgid "OK"
msgstr "OK"
@@ -1121,7 +1121,7 @@
msgstr "Dateien oder Ordner ausw\xE4hlen..."
#: Merge.rc:690
-#: Merge.rc:1608
+#: Merge.rc:1591
#, c-format
msgid "&Left:"
msgstr "&Links:"
@@ -1135,7 +1135,7 @@
msgstr "&Suchen..."
#: Merge.rc:695
-#: Merge.rc:1612
+#: Merge.rc:1595
#, c-format
msgid "&Right:"
msgstr "&Rechts:"
@@ -1147,13 +1147,13 @@
msgstr "S&uchen..."
#: Merge.rc:700
-#: Merge.rc:1616
+#: Merge.rc:1599
#, c-format
msgid "&Filter:"
msgstr "&Filter:"
#: Merge.rc:703
-#: Merge.rc:1618
+#: Merge.rc:1601
#, c-format
msgid "Select..."
msgstr "Ausw\xE4hlen..."
@@ -1169,7 +1169,7 @@
msgstr "Ausw\xE4hlen..."
#: Merge.rc:708
-#: Merge.rc:1619
+#: Merge.rc:1602
#, c-format
msgid "&Include Subfolders"
msgstr "Unter&ordner einbeziehen"
@@ -1189,17 +1189,17 @@
#: Merge.rc:1096
#: Merge.rc:1106
#: Merge.rc:1157
-#: Merge.rc:1274
-#: Merge.rc:1351
-#: Merge.rc:1443
-#: Merge.rc:1458
-#: Merge.rc:1680
+#: Merge.rc:1257
+#: Merge.rc:1334
+#: Merge.rc:1426
+#: Merge.rc:1441
+#: Merge.rc:1663
#, c-format
msgid "Cancel"
msgstr "Abbrechen"
#: Merge.rc:713
-#: Merge.rc:1352
+#: Merge.rc:1335
#, c-format
msgid "Help"
msgstr "Hilfe"
@@ -1267,13 +1267,14 @@
msgstr "&Versionskontrollsystem"
#: Merge.rc:753
-#: Merge.rc:2079
+#: Merge.rc:2083
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&Pfad zu cleartool.exe:"
#: Merge.rc:760
-#: Merge.rc:1955
+#: Merge.rc:1956
+#: Merge.rc:1969
#, c-format
msgid "General"
msgstr "Allgemein"
@@ -1329,13 +1330,13 @@
msgstr "Aktivieren mehrfacher Vergleichsfenster f\xFCr"
#: Merge.rc:787
-#: Merge.rc:1631
+#: Merge.rc:1614
#, c-format
msgid "&Folder compare"
msgstr "&Ordnervergleich"
#: Merge.rc:789
-#: Merge.rc:1633
+#: Merge.rc:1616
#, c-format
msgid "Fil&e compare"
msgstr "D&ateivergleich"
@@ -1458,7 +1459,7 @@
msgstr "A&lle ersetzen"
#: Merge.rc:872
-#: Merge.rc:2201
+#: Merge.rc:2205
#, c-format
msgid "Rational ClearCase"
msgstr "Rational ClearCase"
@@ -1469,7 +1470,7 @@
msgstr "Auschecken"
#: Merge.rc:880
-#: Merge.rc:1191
+#: Merge.rc:1175
#, c-format
msgid "Comments"
msgstr "Kommentare"
@@ -1515,7 +1516,7 @@
msgstr "Entfernen"
#: Merge.rc:910
-#: Merge.rc:1958
+#: Merge.rc:1959
#, c-format
msgid "Colors"
msgstr "Farben"
@@ -1531,7 +1532,7 @@
msgstr "Selektierter Unterschied:"
#: Merge.rc:921
-#: Merge.rc:1583
+#: Merge.rc:1566
#, c-format
msgid "Background"
msgstr "Hintergrund"
@@ -1542,8 +1543,9 @@
msgstr "Gel\xF6scht"
#: Merge.rc:935
-#: Merge.rc:1378
-#: Merge.rc:1584
+#: Merge.rc:1361
+#: Merge.rc:1567
+#: Merge.rc:1960
#, c-format
msgid "Text"
msgstr "Text"
@@ -1576,21 +1578,22 @@
#: Merge.rc:986
#: Merge.rc:1065
#: Merge.rc:1094
-#: Merge.rc:1194
-#: Merge.rc:1424
+#: Merge.rc:1177
+#: Merge.rc:1407
+#: Merge.rc:1699
#, c-format
msgid "Defaults"
msgstr "Vorgaben"
#: Merge.rc:992
-#: Merge.rc:1366
-#: Merge.rc:1572
+#: Merge.rc:1349
+#: Merge.rc:1555
#, c-format
msgid "Dialog"
msgstr "Dialog"
#: Merge.rc:1002
-#: Merge.rc:1961
+#: Merge.rc:1962
#, c-format
msgid "System"
msgstr "System"
@@ -1767,7 +1770,7 @@
msgstr " Ordnervergleichsfortschritt"
#: Merge.rc:1128
-#: Merge.rc:1908
+#: Merge.rc:1909
#, c-format
msgid "Stop"
msgstr "Stop"
@@ -1823,7 +1826,7 @@
msgstr "&Gehe"
#: Merge.rc:1162
-#: Merge.rc:1956
+#: Merge.rc:1957
#, c-format
msgid "Compare"
msgstr "Vergleichen"
@@ -1838,215 +1841,200 @@
msgid "&Compare"
msgstr "&Vergleichen"
-#: Merge.rc:1168
+#: Merge.rc:1167
#, c-format
msgid "&Ignore change"
msgstr "\xC4nderung &ignorieren"
-#: Merge.rc:1170
+#: Merge.rc:1168
#, c-format
msgid "I&gnore all"
msgstr "&Alle ignorieren"
-#: Merge.rc:1172
+#: Merge.rc:1169
#, c-format
msgid "Ignore blan&k lines"
msgstr "&Leerzeilen ignorieren"
-#: Merge.rc:1174
+#: Merge.rc:1170
#, c-format
msgid "Ignore &case"
msgstr "&Gro\xDF-/Kleinschreibung ignorieren"
-#: Merge.rc:1176
+#: Merge.rc:1171
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "Zeilen&umbruchunterschiede (Windows/Unix/Mac) ignorieren"
-#: Merge.rc:1179
+#: Merge.rc:1173
#, c-format
msgid "E&nable moved block detection"
msgstr "Verschobene &Bl\xF6cke erkennen"
-#: Merge.rc:1181
+#: Merge.rc:1174
#, c-format
msgid "&Match similar lines"
msgstr "\xC4&hnliche Zeilen angleichen"
-#: Merge.rc:1183
+#: Merge.rc:1176
#, c-format
-msgid "Ign&ore time differences less than 3 seconds"
-msgstr "Ignoriere &Zeitunterschiede kleiner als 3 Sekunden"
-
-#: Merge.rc:1186
-#, c-format
-msgid "&File Compare method:"
-msgstr "Vergleichs&methode:"
-
-#: Merge.rc:1189
-#, c-format
-msgid "S&top after first difference"
-msgstr "Nach dem ersten Unterschied &stoppen"
-
-#: Merge.rc:1192
-#, c-format
msgid "Filter Comments"
msgstr "Kommentare filtern"
-#: Merge.rc:1199
-#: Merge.rc:1957
+#: Merge.rc:1182
+#: Merge.rc:1958
#, c-format
msgid "Editor"
msgstr "Editor"
-#: Merge.rc:1202
+#: Merge.rc:1185
#, c-format
msgid "&Highlight syntax"
msgstr "&Syntax hervorheben"
-#: Merge.rc:1204
+#: Merge.rc:1187
#, c-format
msgid "&Automatic rescan"
msgstr "&Automatisch aktualisieren"
-#: Merge.rc:1206
+#: Merge.rc:1189
#, c-format
msgid "&Preserve original EOL chars"
msgstr "&Mischen der Zeilenumbruch-Formate erlauben"
-#: Merge.rc:1208
+#: Merge.rc:1191
#, c-format
msgid "Tabs"
msgstr "Tabulatoren"
-#: Merge.rc:1209
+#: Merge.rc:1192
#, c-format
msgid "&Tab size:"
msgstr "&Tabulator-Gr\xF6\xDFe:"
-#: Merge.rc:1212
+#: Merge.rc:1195
#, c-format
msgid "&Insert Tabs"
msgstr "Tabulatoren &einf\xFCgen"
-#: Merge.rc:1214
+#: Merge.rc:1197
#, c-format
msgid "Insert &Spaces"
msgstr "&Leerzeichen einf\xFCgen"
-#: Merge.rc:1216
+#: Merge.rc:1199
#, c-format
msgid "Line Difference Coloring"
msgstr "Zeilenunterschied-F\xE4rbung"
-#: Merge.rc:1218
+#: Merge.rc:1201
#, c-format
msgid "View line differences"
msgstr "Zeilenunterschied anzeigen"
-#: Merge.rc:1220
+#: Merge.rc:1203
#, c-format
msgid "&Character level"
msgstr "&Zeichen-Ebene"
-#: Merge.rc:1222
+#: Merge.rc:1205
#, c-format
msgid "&Word-level:"
msgstr "&Wort-Ebene:"
-#: Merge.rc:1226
+#: Merge.rc:1209
#, c-format
msgid "W&ord break characters:"
-msgstr ""
+msgstr "W&ort-Abbruchzeichen:"
-#: Merge.rc:1239
+#: Merge.rc:1222
#, c-format
msgid "Filefilters"
msgstr "Dateifilter"
-#: Merge.rc:1245
+#: Merge.rc:1228
#, c-format
msgid "Test"
msgstr "Testen"
-#: Merge.rc:1246
+#: Merge.rc:1229
#, c-format
msgid "Install..."
msgstr "Installieren..."
-#: Merge.rc:1247
+#: Merge.rc:1230
#, c-format
msgid "New..."
msgstr "Neu..."
-#: Merge.rc:1248
+#: Merge.rc:1231
#, c-format
msgid "Edit..."
msgstr "Bearbeiten..."
-#: Merge.rc:1249
+#: Merge.rc:1232
#, c-format
msgid "Delete..."
msgstr "L\xF6schen..."
-#: Merge.rc:1255
+#: Merge.rc:1238
#, c-format
msgid "Save modified files?"
msgstr "Ge\xE4nderte Dateien speichern?"
-#: Merge.rc:1258
+#: Merge.rc:1241
#, c-format
msgid "Left side file"
msgstr "Linke Datei"
-#: Merge.rc:1261
+#: Merge.rc:1244
#, c-format
msgid "&Save changes"
msgstr "\xC4nderungen &speichern"
-#: Merge.rc:1263
+#: Merge.rc:1246
#, c-format
msgid "&Discard changes"
msgstr "\xC4nderungen &verwerfen"
-#: Merge.rc:1265
+#: Merge.rc:1248
#, c-format
msgid "Right side file"
msgstr "Rechte Datei"
-#: Merge.rc:1268
+#: Merge.rc:1251
#, c-format
msgid "S&ave changes"
msgstr "\xC4nderungen s&peichern"
-#: Merge.rc:1270
+#: Merge.rc:1253
#, c-format
msgid "Dis&card changes"
msgstr "\xC4nderungen ver&werfen"
-#: Merge.rc:1272
+#: Merge.rc:1255
#, c-format
msgid "Disca&rd All"
-msgstr ""
+msgstr "&Alle verwerfen"
-#: Merge.rc:1279
-#: Merge.rc:1527
-#: Merge.rc:1963
+#: Merge.rc:1262
+#: Merge.rc:1510
+#: Merge.rc:1964
#, c-format
msgid "Codepage"
msgstr "Zeichensatz"
-#: Merge.rc:1282
+#: Merge.rc:1265
#, c-format
msgid "Default Codepage"
msgstr "Standard-Zeichensatz"
-#: Merge.rc:1283
+#: Merge.rc:1266
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "W\xE4hlen Sie den Standard-Zeichensatz, der angenommen wird, wenn man Nicht-Unicode Dateien l\xE4dt:"
-#: Merge.rc:1285
+#: Merge.rc:1268
#, c-format
msgid ""
"Detect codepage info for these files: .html, .rc, .xml \n"
@@ -2055,33 +2043,33 @@
"Ermitteln des Zeichensatzes f\xFCr folgende Dateien: .html, .rc, .xml \n"
"Ben\xF6tigt einen Neustart des Programmes."
-#: Merge.rc:1288
+#: Merge.rc:1271
#, c-format
msgid "System codepage"
msgstr "System-Zeichensatz"
-#: Merge.rc:1290
+#: Merge.rc:1273
#, c-format
msgid "According to WinMerge User Interface"
msgstr "Entsprechend der WinMerge Benutzeroberfl\xE4che"
-#: Merge.rc:1292
+#: Merge.rc:1275
#, c-format
msgid "Custom codepage:"
msgstr "Benutzerdefinierter Zeichensatz:"
-#: Merge.rc:1300
+#: Merge.rc:1283
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr "WinMerge - Archiv-Unterst\xFCtzung deaktiviert"
-#: Merge.rc:1303
+#: Merge.rc:1286
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "Die 7-Zip Version konnte nicht ermittelt werden. (Nicht installiert?)"
# Removed \n because of lack of space!
-#: Merge.rc:1306
+#: Merge.rc:1289
#, c-format
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
@@ -2089,12 +2077,12 @@
msgstr ""
"Archiv-Unterst\xFCtzung ben\xF6tigt eine Installation von 7-Zip 3.11 (oder neuer) auf Ihrem Computer, oder die notwendigen Komponenten m\xFCssen f\xFCr den Einzelbetrieb ins Programm-Verzeichnis kopiert werden."
-#: Merge.rc:1308
+#: Merge.rc:1291
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "Es muss sich auch ein geeignetes Schnittstellen-Plugin (Merge7z*.dll) im Pfad befinden."
-#: Merge.rc:1310
+#: Merge.rc:1293
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
@@ -2103,12 +2091,12 @@
"Bitte verwenden Sie die unten empfohlene 7-Zip Version, bis Schnittstellen-Plugins\n"
"f\xFCr neuere Versionen verf\xFCgbar sind."
-#: Merge.rc:1312
+#: Merge.rc:1295
#, c-format
msgid "Version"
msgstr "Version"
-#: Merge.rc:1314
+#: Merge.rc:1297
#, c-format
msgid ""
"Plugin required\n"
@@ -2117,54 +2105,54 @@
"Plugin ben\xF6tigt\n"
"(dllbuild %04u)"
-#: Merge.rc:1316
+#: Merge.rc:1299
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "Empfohlene Version von 7-Zip:"
-#: Merge.rc:1319
-#: Merge.rc:1322
+#: Merge.rc:1302
+#: Merge.rc:1305
#, c-format
msgid "present"
msgstr "Vorhanden"
-#: Merge.rc:1320
+#: Merge.rc:1303
#, c-format
msgid "Merge7z000U.dll"
msgstr "Merge7z000U.dll"
-#: Merge.rc:1323
+#: Merge.rc:1306
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr "7-Zip Installation auf Ihrem Computer:"
-#: Merge.rc:1325
-#: Merge.rc:1330
+#: Merge.rc:1308
+#: Merge.rc:1313
#, c-format
msgid "none"
msgstr "Keine"
-#: Merge.rc:1327
+#: Merge.rc:1310
#, c-format
msgid "missing"
msgstr "Fehlend"
-#: Merge.rc:1328
+#: Merge.rc:1311
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "7-Zip Einzelbetrieb-Komponenten:"
-#: Merge.rc:1332
+#: Merge.rc:1315
#, c-format
msgid "outdated"
msgstr "Veraltet"
-#: Merge.rc:1333
+#: Merge.rc:1316
#, c-format
msgid "Plugins on path:"
msgstr "Plugins im Pfad:"
-#: Merge.rc:1334
+#: Merge.rc:1317
#, c-format
msgid ""
"Don't display this &message again.\n"
@@ -2173,535 +2161,567 @@
"Diese &Meldung nicht erneut anzeigen.\n"
"(Sie k\xF6nnen diese Meldung jederzeit vom Hilfe-Men\xFC aus aufrufen.)"
-#: Merge.rc:1338
+#: Merge.rc:1321
#, c-format
msgid "Plugin Download"
msgstr "Plugin Download"
-#: Merge.rc:1347
+#: Merge.rc:1330
#, c-format
msgid "Options"
msgstr "Einstellungen"
-#: Merge.rc:1358
+#: Merge.rc:1341
#, c-format
msgid " Categories"
msgstr " Kategorien"
-#: Merge.rc:1360
+#: Merge.rc:1343
#, c-format
msgid "Import..."
msgstr "Importieren..."
-#: Merge.rc:1361
+#: Merge.rc:1344
#, c-format
msgid "Export..."
msgstr "Exportieren..."
-#: Merge.rc:1369
+#: Merge.rc:1352
#, c-format
msgid "Keywords:"
msgstr "Schl\xFCsselw\xF6rter:"
-#: Merge.rc:1370
+#: Merge.rc:1353
#, c-format
msgid "Function names:"
msgstr "Funktionsnamen:"
-#: Merge.rc:1371
+#: Merge.rc:1354
#, c-format
msgid "Comments:"
msgstr "Kommentare:"
-#: Merge.rc:1372
+#: Merge.rc:1355
#, c-format
msgid "Numbers:"
msgstr "Nummern:"
-#: Merge.rc:1373
+#: Merge.rc:1356
#, c-format
msgid "Operators:"
msgstr "Operatoren:"
-#: Merge.rc:1374
+#: Merge.rc:1357
#, c-format
msgid "Strings:"
msgstr "Zeichenketten:"
-#: Merge.rc:1375
+#: Merge.rc:1358
#, c-format
msgid "Preprocessor:"
msgstr "Preprozessor:"
-#: Merge.rc:1376
+#: Merge.rc:1359
#, c-format
msgid "User 1:"
msgstr "Benutzer 1:"
-#: Merge.rc:1377
+#: Merge.rc:1360
#, c-format
msgid "User 2:"
msgstr "Benutzer 2:"
-#: Merge.rc:1382
-#: Merge.rc:1387
-#: Merge.rc:1392
-#: Merge.rc:1397
-#: Merge.rc:1402
-#: Merge.rc:1407
-#: Merge.rc:1412
-#: Merge.rc:1417
-#: Merge.rc:1422
+#: Merge.rc:1365
+#: Merge.rc:1370
+#: Merge.rc:1375
+#: Merge.rc:1380
+#: Merge.rc:1385
+#: Merge.rc:1390
+#: Merge.rc:1395
+#: Merge.rc:1400
+#: Merge.rc:1405
#, c-format
msgid "Bold"
msgstr "Fett"
-#: Merge.rc:1430
+#: Merge.rc:1413
#, c-format
msgid "Folder Compare Report"
msgstr "Ordnervergleichs-Bericht"
-#: Merge.rc:1433
+#: Merge.rc:1416
#, c-format
msgid "Report &File:"
msgstr "&Berichtsdatei:"
-#: Merge.rc:1436
-#: Merge.rc:1610
-#: Merge.rc:1614
-#: Merge.rc:1641
+#: Merge.rc:1419
+#: Merge.rc:1593
+#: Merge.rc:1597
+#: Merge.rc:1624
#, c-format
msgid "Browse..."
msgstr "Suchen..."
-#: Merge.rc:1437
+#: Merge.rc:1420
#, c-format
msgid "&Style:"
msgstr "&Stil:"
-#: Merge.rc:1440
+#: Merge.rc:1423
#, c-format
msgid "&Copy to Clipboard"
msgstr "In die &Zwischenablage kopieren"
-#: Merge.rc:1448
+#: Merge.rc:1431
#, c-format
msgid "Shared or Private Filter"
msgstr "Gemeinsamer oder privater Filter"
-#: Merge.rc:1451
+#: Merge.rc:1434
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "Welche Art von Filter m\xF6chten Sie erzeugen?"
-#: Merge.rc:1453
+#: Merge.rc:1436
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "Gemeinsamer Filter (f\xFCr alle Benutzer auf diesem Computer)"
-#: Merge.rc:1455
+#: Merge.rc:1438
#, c-format
msgid "Private Filter (only for current user)"
msgstr "Privater Filter (nur f\xFCr den aktuellen Benutzer)"
-#: Merge.rc:1463
-#: Merge.rc:1964
+#: Merge.rc:1446
+#: Merge.rc:1965
#, c-format
msgid "Archive Support"
msgstr "Archiv-Unterst\xFCtzung"
-#: Merge.rc:1466
+#: Merge.rc:1449
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr "Die Archiv-Unterst\xFCtzung erfordert das installierte 7-Zip Plugin:"
-#: Merge.rc:1468
+#: Merge.rc:1451
#, c-format
msgid "Download 7-zip Plugin"
msgstr "7-Zip Plugin herunterladen"
-#: Merge.rc:1469
+#: Merge.rc:1452
#, c-format
msgid "&Enable archive file support"
msgstr "&Archiv-Unterst\xFCtzung aktivieren"
-#: Merge.rc:1471
+#: Merge.rc:1454
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "&Eigenst\xE4ndiges 7-Zip verwenden, wenn vorhanden"
-#: Merge.rc:1474
+#: Merge.rc:1457
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "&Lokales 7-Zip vom WinMerge-Ordner verwenden"
-#: Merge.rc:1476
+#: Merge.rc:1459
#, c-format
msgid "&Detect archive type from file signature"
msgstr "&Archivtyp aus der Dateisignatur ermitteln"
-#: Merge.rc:1484
+#: Merge.rc:1467
#, c-format
msgid "Compare Statistics"
msgstr "Vergleichsstatistik"
-#: Merge.rc:1487
+#: Merge.rc:1470
#, c-format
msgid "Folders:"
msgstr "Ordner:"
-#: Merge.rc:1488
+#: Merge.rc:1471
#, c-format
msgid "Files:"
msgstr "Dateien:"
-#: Merge.rc:1489
-#: Merge.rc:2355
+#: Merge.rc:1472
+#: Merge.rc:2359
#, c-format
msgid "Different"
msgstr "Unterschiedlich"
-#: Merge.rc:1490
+#: Merge.rc:1473
#, c-format
msgid "Text:"
msgstr "Text:"
-#: Merge.rc:1493
-#: Merge.rc:1512
+#: Merge.rc:1476
+#: Merge.rc:1495
#, c-format
msgid "Binary:"
msgstr "Bin\xE4r:"
-#: Merge.rc:1496
+#: Merge.rc:1479
#, c-format
msgid "Unique"
msgstr "Eindeutig"
-#: Merge.rc:1497
+#: Merge.rc:1480
#, c-format
msgid "Left:"
msgstr "Links:"
-#: Merge.rc:1502
+#: Merge.rc:1485
#, c-format
msgid "Right:"
msgstr "Rechts:"
-#: Merge.rc:1507
-#: Merge.rc:2349
+#: Merge.rc:1490
+#: Merge.rc:2353
#, c-format
msgid "Identical"
msgstr "Identisch"
-#: Merge.rc:1516
+#: Merge.rc:1499
#, c-format
msgid "Total:"
msgstr "Gesamt:"
-#: Merge.rc:1521
+#: Merge.rc:1504
#, c-format
msgid "Close"
msgstr "Schlie\xDFen"
-#: Merge.rc:1530
+#: Merge.rc:1513
#, c-format
msgid "Affects"
msgstr "Betrifft"
-#: Merge.rc:1533
-#: Merge.rc:1536
+#: Merge.rc:1516
+#: Merge.rc:1519
#, c-format
msgid "(Affects)"
msgstr "(Betrifft)"
-#: Merge.rc:1537
+#: Merge.rc:1520
#, c-format
msgid "Select Codepage for"
msgstr "Zeichensatz ausw\xE4hlen f\xFCr"
-#: Merge.rc:1538
+#: Merge.rc:1521
#, c-format
msgid "&File Loading:"
msgstr "&Datei laden:"
-#: Merge.rc:1540
-#: Merge.rc:1543
+#: Merge.rc:1523
+#: Merge.rc:1526
#, c-format
msgid "..."
msgstr "..."
-#: Merge.rc:1541
+#: Merge.rc:1524
#, c-format
msgid "File &Saving:"
msgstr "Datei &speichern:"
-#: Merge.rc:1544
+#: Merge.rc:1527
#, c-format
msgid "&Use same codepage for both"
msgstr "&Gleichen Zeichensatz f\xFCr Beide verwenden"
-#: Merge.rc:1547
+#: Merge.rc:1530
#, c-format
msgid "&Apply"
msgstr "An&wenden"
-#: Merge.rc:1548
-#: Merge.rc:1930
+#: Merge.rc:1531
+#: Merge.rc:1931
#, c-format
msgid "&Cancel"
msgstr "&Abbrechen"
-#: Merge.rc:1553
+#: Merge.rc:1536
#, c-format
msgid "Test Filter"
msgstr "Filter testen"
-#: Merge.rc:1556
+#: Merge.rc:1539
#, c-format
msgid "Testing filter ..."
msgstr "Teste Filter ..."
-#: Merge.rc:1558
+#: Merge.rc:1541
#, c-format
msgid "&Enter text to test:"
msgstr "&Text zum Testen:"
-#: Merge.rc:1560
+#: Merge.rc:1543
#, c-format
msgid "&Folder Name"
msgstr "&Ordnername"
-#: Merge.rc:1562
+#: Merge.rc:1545
#, c-format
msgid "Result:"
msgstr "Ergebnis:"
-#: Merge.rc:1566
+#: Merge.rc:1549
#, c-format
msgid "&Test"
msgstr "&Testen"
-#: Merge.rc:1567
+#: Merge.rc:1550
#, c-format
msgid "&Close"
msgstr "&Schlie\xDFen"
-#: Merge.rc:1575
+#: Merge.rc:1558
#, c-format
msgid "&Use customized text colors"
msgstr "&Benutzerdefinierte Textfarben verwenden"
-#: Merge.rc:1578
+#: Merge.rc:1561
#, c-format
msgid "Custom text colors"
msgstr "Benutzerdefinierte Textfarben"
-#: Merge.rc:1580
+#: Merge.rc:1563
#, c-format
msgid "Whitespace:"
msgstr "Leerzeichen:"
-#: Merge.rc:1581
+#: Merge.rc:1564
#, c-format
msgid "Regular text:"
msgstr "Normaler Text:"
-#: Merge.rc:1582
+#: Merge.rc:1565
#, c-format
msgid "Selection:"
msgstr "Auswahl:"
-#: Merge.rc:1605
+#: Merge.rc:1588
#, c-format
msgid "Paths"
msgstr "Pfade"
-#: Merge.rc:1611
+#: Merge.rc:1594
#, c-format
msgid "R&ead-only"
msgstr "Schreib&gesch\xFCtzt"
-#: Merge.rc:1615
+#: Merge.rc:1598
#, c-format
msgid "Re&ad-only"
msgstr "Schreibg&esch\xFCtzt"
-#: Merge.rc:1621
+#: Merge.rc:1604
#, c-format
msgid "Open..."
msgstr "\xD6ffnen..."
-#: Merge.rc:1622
+#: Merge.rc:1605
#, c-format
msgid "Save..."
msgstr "Speichern..."
-#: Merge.rc:1627
-#: Merge.rc:1965
+#: Merge.rc:1610
+#: Merge.rc:1966
#, c-format
msgid "Backup Files"
msgstr "Sicherungsdateien"
-#: Merge.rc:1630
+#: Merge.rc:1613
#, c-format
msgid "Create backup files in:"
msgstr "Sicherungsdateien erzeugen beim:"
-#: Merge.rc:1635
+#: Merge.rc:1618
#, c-format
msgid "Create backup files into:"
msgstr "Sicherungsdateien erzeugen im:"
-#: Merge.rc:1636
+#: Merge.rc:1619
#, c-format
msgid "&Original file's folder"
msgstr "Ordner der &urspr\xFCnglichen Datei"
-#: Merge.rc:1638
+#: Merge.rc:1621
#, c-format
msgid "&Global backup folder:"
msgstr "&Globalen Sicherungsordner:"
-#: Merge.rc:1642
+#: Merge.rc:1625
#, c-format
msgid "Backup filename:"
msgstr "Sicherungsdateiname:"
-#: Merge.rc:1643
+#: Merge.rc:1626
#, c-format
msgid "&Append .bak -extension"
msgstr ".bak-&Erweiterung anh\xE4ngen"
-#: Merge.rc:1645
+#: Merge.rc:1628
#, c-format
msgid "A&ppend timestamp"
msgstr "&Zeitstempel anh\xE4ngen"
-#: Merge.rc:1652
-#: Merge.rc:2257
+#: Merge.rc:1635
+#: Merge.rc:2261
#, c-format
msgid "Confirm Copy"
msgstr "Kopieren best\xE4tigen"
-#: Merge.rc:1656
+#: Merge.rc:1639
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Wollen Sie wirklich XXX Objekte kopieren?"
-#: Merge.rc:1658
+#: Merge.rc:1641
#, c-format
msgid "From left"
msgstr "Von links"
-#: Merge.rc:1661
+#: Merge.rc:1644
#, c-format
msgid "To right"
msgstr "Nach rechts"
-#: Merge.rc:1664
+#: Merge.rc:1647
#, c-format
msgid "Yes"
msgstr "Ja"
-#: Merge.rc:1665
+#: Merge.rc:1648
#, c-format
msgid "No"
msgstr "Nein"
-#: Merge.rc:1671
+#: Merge.rc:1654
#, c-format
msgid "Plugins"
msgstr "Plugins"
-#: Merge.rc:1674
+#: Merge.rc:1657
#, c-format
msgid "&Enable plugins"
msgstr "&Plugins aktivieren"
-#: Merge.rc:1685
-#: Merge.rc:1966
+#: Merge.rc:1668
+#: Merge.rc:1967
#, c-format
msgid "Shell Integration"
msgstr "Shell-Integration"
-#: Merge.rc:1688
+#: Merge.rc:1671
#, c-format
msgid "Explorer"
msgstr "Explorer"
-#: Merge.rc:1689
+#: Merge.rc:1672
#, c-format
msgid "E&nable advanced menu"
msgstr "Er&weitertes Men\xFC verwenden"
-#: Merge.rc:1691
+#: Merge.rc:1674
#, c-format
msgid "In&clude subfolders by default"
msgstr "Standardm\xE4\xDFig &Unterordner einbeziehen"
-#: Merge.rc:1693
+#: Merge.rc:1676
#, c-format
msgid "&Add to context menu"
msgstr "Zum Kontextmen\xFC &hinzuf\xFCgen"
-#: Merge.rc:1695
+#: Merge.rc:1678
#, c-format
msgid "Folder compare"
msgstr "Ordnervergleich"
-#: Merge.rc:1696
+#: Merge.rc:1679
#, c-format
msgid "Add &Shell menu to context menu"
msgstr "&Shell-Men\xFC zum Kontextmen\xFC hinzuf\xFCgen"
+#: Merge.rc:1686
+#: Merge.rc:1970
+#: Merge.rc:2307
+#, c-format
+msgid "Folder"
+msgstr "Ordner"
+
+#: Merge.rc:1689
+#, c-format
+msgid "&Compare method:"
+msgstr "Vergleichs&methode:"
+
+#: Merge.rc:1691
+#, c-format
+msgid "S&top after first difference"
+msgstr "Nach dem ersten Unterschied &stoppen"
+
+#: Merge.rc:1693
+#, c-format
+msgid "Ign&ore time differences less than 3 seconds"
+msgstr "Ignoriere &Zeitunterschiede kleiner als 3 Sekunden"
+
+#: Merge.rc:1695
+#, c-format
+msgid "&Include unique subfolders contents"
+msgstr "&Eindeutige Unterordner-Inhalte einbeziehen"
+
+#: Merge.rc:1697
+#, c-format
+msgid "&Quick compare limit (MB):"
+msgstr "&Limit f\xFCr Schneller Inhalt (MB):"
+
#. StringFileInfo.Block
-#: Merge.rc:1722
+#: Merge.rc:1723
#, c-format
msgid "040904e4"
msgstr "040704e4"
#. VarFileInfo.Translation
-#: Merge.rc:1738
+#: Merge.rc:1739
#, c-format
msgid "0x409, 1252"
msgstr "0x407, 1252"
-#: Merge.rc:1753
+#: Merge.rc:1754
#, c-format
msgid "Ready"
msgstr "Bereit"
-#: Merge.rc:1759
+#: Merge.rc:1760
#, c-format
msgid "EXT"
msgstr "ER"
-#: Merge.rc:1760
+#: Merge.rc:1761
#, c-format
msgid "CAP"
msgstr "FEST"
-#: Merge.rc:1761
+#: Merge.rc:1762
#, c-format
msgid "NUM"
msgstr "NUM"
-#: Merge.rc:1762
+#: Merge.rc:1763
#, c-format
msgid "SCRL"
msgstr "RF"
-#: Merge.rc:1763
+#: Merge.rc:1764
#, c-format
msgid "OVR"
msgstr "\xDCB"
-#: Merge.rc:1764
+#: Merge.rc:1765
#, c-format
msgid "REC"
msgstr "MA"
-#: Merge.rc:1770
+#: Merge.rc:1771
#, c-format
msgid ""
"Create empty documents\n"
@@ -2710,7 +2730,7 @@
"Erzeugt leere Dokumente.\n"
"Neue Dokumente (Strg+N)"
-#: Merge.rc:1771
+#: Merge.rc:1772
#, c-format
msgid ""
"Open an existing document\n"
@@ -2719,7 +2739,7 @@
"\xD6ffnet ein bestehendes Dokument.\n"
"\xD6ffnen (Strg+O)"
-#: Merge.rc:1772
+#: Merge.rc:1773
#, c-format
msgid ""
"Close the active document\n"
@@ -2728,7 +2748,7 @@
"Schlie\xDFt das aktive Dokument.\n"
"Schlie\xDFen"
-#: Merge.rc:1773
+#: Merge.rc:1774
#, c-format
msgid ""
"Save the active document\n"
@@ -2737,7 +2757,7 @@
"Speichert das aktive Dokument.\n"
"Speichern (Strg+S)"
-#: Merge.rc:1774
+#: Merge.rc:1775
#, c-format
msgid ""
"Save the active document with a new name\n"
@@ -2746,7 +2766,7 @@
"Speichert das aktive Dokument unter neuem Namen.\n"
"Speichern unter"
-#: Merge.rc:1775
+#: Merge.rc:1776
#, c-format
msgid ""
"Change the printing options\n"
@@ -2755,7 +2775,7 @@
"\xC4ndert die Seiteneinstellungen.\n"
"Seite einrichten"
-#: Merge.rc:1776
+#: Merge.rc:1777
#, c-format
msgid ""
"Change the printer and printing options\n"
@@ -2764,7 +2784,7 @@
"\xC4ndert die Druckerkonfiguration.\n"
"Drucker einrichten"
-#: Merge.rc:1777
+#: Merge.rc:1778
#, c-format
msgid ""
"Print the active document\n"
@@ -2773,7 +2793,7 @@
"Druckt das aktive Dokument.\n"
"Drucken"
-#: Merge.rc:1778
+#: Merge.rc:1779
#, c-format
msgid ""
"Display full pages\n"
@@ -2782,27 +2802,27 @@
"Zeigt die Druckvorschau an.\n"
"Druckvorschau"
-#: Merge.rc:1783
+#: Merge.rc:1784
#, c-format
msgid "Make all hidden items visible again"
msgstr "Zeigt alle versteckten Objekte wieder an."
-#: Merge.rc:1784
+#: Merge.rc:1785
#, c-format
msgid "Toggle tree mode"
msgstr "Schaltet den Baummodus ein oder aus."
-#: Merge.rc:1785
+#: Merge.rc:1786
#, c-format
msgid "Expand all subfolders"
msgstr "Alle Unterordner erweitern."
-#: Merge.rc:1786
+#: Merge.rc:1787
#, c-format
msgid "Collapse all subfolders"
msgstr "Alle Unterordner reduzieren."
-#: Merge.rc:1792
+#: Merge.rc:1793
#, c-format
msgid ""
"Open project file\n"
@@ -2811,32 +2831,32 @@
"\xD6ffnet eine Projektdatei.\n"
"Projektdatei (Strg+J)"
-#: Merge.rc:1793
+#: Merge.rc:1794
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "Unbekannter Fehler beim Versuch die Projektdatei zu \xF6ffnen."
-#: Merge.rc:1794
+#: Merge.rc:1795
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "Unbekannter Fehler beim Versuch die Projektdatei zu speichern."
-#: Merge.rc:1795
+#: Merge.rc:1796
#, c-format
msgid "Project File"
msgstr "Projektdatei"
-#: Merge.rc:1796
+#: Merge.rc:1797
#, c-format
msgid "Project file successfully loaded."
msgstr "Projektdatei erfolgreich geladen."
-#: Merge.rc:1797
+#: Merge.rc:1798
#, c-format
msgid "Project file successfully saved."
msgstr "Projektdatei erfolgreich gespeichert."
-#: Merge.rc:1798
+#: Merge.rc:1799
#, c-format
msgid ""
"Save current paths and options to project file\n"
@@ -2845,7 +2865,7 @@
"Speichert die aktuellen Pfade und Einstellungen in eine Projektdatei.\n"
"Projektdatei speichern"
-#: Merge.rc:1803
+#: Merge.rc:1804
#, c-format
msgid ""
"Display program information, version number and copyright\n"
@@ -2854,7 +2874,7 @@
"Zeigt Programm-Informationen, Versionsnummer und Copyright an.\n"
"Info"
-#: Merge.rc:1804
+#: Merge.rc:1805
#, c-format
msgid ""
"Quit the application; prompts to save documents\n"
@@ -2863,7 +2883,6 @@
"Verl\xE4\xDFt die Anwendung; fragt, ob Dokumente gespeichert werden sollen.\n"
"Beenden"
-#: Merge.rc:1810
#: Merge.rc:1811
#: Merge.rc:1812
#: Merge.rc:1813
@@ -2879,11 +2898,12 @@
#: Merge.rc:1823
#: Merge.rc:1824
#: Merge.rc:1825
+#: Merge.rc:1826
#, c-format
msgid "Open this document"
msgstr "\xD6ffnet dieses Dokument."
-#: Merge.rc:1830
+#: Merge.rc:1831
#, c-format
msgid ""
"Switch to the next window pane\n"
@@ -2892,7 +2912,7 @@
"Wechselt zum n\xE4chsten Fensterausschnitt.\n"
"N\xE4chster Ausschnitt"
-#: Merge.rc:1831
+#: Merge.rc:1832
#, c-format
msgid ""
"Switch back to the previous window pane\n"
@@ -2901,7 +2921,7 @@
"Springt zum vorherigen Fensterausschnitt zur\xFCck.\n"
"Vorheriger Ausschnitt"
-#: Merge.rc:1837
+#: Merge.rc:1838
#, c-format
msgid ""
"Arrange windows so they overlap\n"
@@ -2910,7 +2930,7 @@
"Ordnet die Fenster \xFCberlappend an.\n"
"\xDCberlappende Fenster"
-#: Merge.rc:1838
+#: Merge.rc:1839
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
@@ -2919,7 +2939,7 @@
"Ordnet die Fenster untereinander an.\n"
"Fenster untereinander"
-#: Merge.rc:1839
+#: Merge.rc:1840
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
@@ -2928,7 +2948,7 @@
"Ordnet die Fenster nebeneinander an.\n"
"Fenster nebeneinander"
-#: Merge.rc:1845
+#: Merge.rc:1846
#, c-format
msgid ""
"Copy the selection and put it on the Clipboard\n"
@@ -2937,7 +2957,7 @@
"Kopiert die Markierung und \xFCbertr\xE4gt sie in die Zwischenablage.\n"
"Kopieren"
-#: Merge.rc:1846
+#: Merge.rc:1847
#, c-format
msgid ""
"Cut the selection and put it on the Clipboard\n"
@@ -2946,7 +2966,7 @@
"Entfernt die Markierung und \xFCbertr\xE4gt sie in die Zwischenablage.\n"
"Ausschneiden"
-#: Merge.rc:1847
+#: Merge.rc:1848
#, c-format
msgid ""
"Find the specified text\n"
@@ -2955,7 +2975,7 @@
"Sucht den angegebenen Text.\n"
"Suchen"
-#: Merge.rc:1848
+#: Merge.rc:1849
#, c-format
msgid ""
"Insert Clipboard contents\n"
@@ -2964,7 +2984,7 @@
"F\xFCgt den Inhalt der Zwischenablage ein.\n"
"Einf\xFCgen"
-#: Merge.rc:1849
+#: Merge.rc:1850
#, c-format
msgid ""
"Repeat the last action\n"
@@ -2973,7 +2993,7 @@
"Wiederholt die letzte Aktion.\n"
"Wiederholen"
-#: Merge.rc:1850
+#: Merge.rc:1851
#, c-format
msgid ""
"Replace specific text with different text\n"
@@ -2982,7 +3002,7 @@
"Ersetzt einen bestimmten Text durch einen anderen.\n"
"Ersetzen"
-#: Merge.rc:1851
+#: Merge.rc:1852
#, c-format
msgid ""
"Select the entire document\n"
@@ -2991,7 +3011,7 @@
"Markiert das gesamte Dokument.\n"
"Alles markieren"
-#: Merge.rc:1852
+#: Merge.rc:1853
#, c-format
msgid ""
"Undo the last action\n"
@@ -3000,7 +3020,7 @@
"Macht die letzte Aktion r\xFCckg\xE4ngig.\n"
"R\xFCckg\xE4ngig (Strg+Z)"
-#: Merge.rc:1853
+#: Merge.rc:1854
#, c-format
msgid ""
"Redo the previously undone action\n"
@@ -3009,7 +3029,7 @@
"Wiederholt die vorher r\xFCckg\xE4ngig gemachte Aktion.\n"
"Wiederherstellen (Strg+Y)"
-#: Merge.rc:1859
+#: Merge.rc:1860
#, c-format
msgid ""
"Show or hide the toolbar\n"
@@ -3018,7 +3038,7 @@
"Blendet die Symbolleiste ein oder aus.\n"
"Symbolleiste ein-/ausschalten"
-#: Merge.rc:1860
+#: Merge.rc:1861
#, c-format
msgid ""
"Show or hide the status bar\n"
@@ -3027,7 +3047,7 @@
"Blendet die Statusleiste ein oder aus.\n"
"Statusleiste ein-/ausschalten"
-#: Merge.rc:1861
+#: Merge.rc:1862
#, c-format
msgid ""
"Show or hide the tab bar\n"
@@ -3036,62 +3056,62 @@
"Blendet die Tab-Leiste ein oder aus.\n"
"Tab-Leiste ein-/ausschalten"
-#: Merge.rc:1862
+#: Merge.rc:1863
#, c-format
msgid "Automatically resize panes\nLock Panes"
msgstr "Ausschnitte automatisch in der Gr\xF6\xDFe anpassen.\nAusschnitte fixieren"
-#: Merge.rc:1868
+#: Merge.rc:1869
#, c-format
msgid "Change the window size"
msgstr "\xC4ndert die Fenstergr\xF6\xDFe."
-#: Merge.rc:1869
+#: Merge.rc:1870
#, c-format
msgid "Change the window position"
msgstr "\xC4ndert die Position des Fensters."
-#: Merge.rc:1870
+#: Merge.rc:1871
#, c-format
msgid "Reduce the window to an icon"
msgstr "Verkleinert das Fenster zu einem Symbol."
-#: Merge.rc:1871
+#: Merge.rc:1872
#, c-format
msgid "Enlarge the window to full size"
msgstr "Vergr\xF6\xDFert das Fenster zu voller Gr\xF6\xDFe."
-#: Merge.rc:1872
+#: Merge.rc:1873
#, c-format
msgid "Switch to the next document window"
msgstr "Wechselt zum n\xE4chsten Dokumentfenster."
-#: Merge.rc:1873
+#: Merge.rc:1874
#, c-format
msgid "Switch to the previous document window"
msgstr "Wechselt zum vorherigen Dokumentfenster."
-#: Merge.rc:1874
+#: Merge.rc:1875
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr "Schlie\xDFt das aktive Fenster und fordert zur Dokumentspeicherung auf."
-#: Merge.rc:1879
+#: Merge.rc:1880
#, c-format
msgid "Restore the window to normal size"
msgstr "Stellt das Fenster in seiner normalen Gr\xF6\xDFe wieder her."
-#: Merge.rc:1880
+#: Merge.rc:1881
#, c-format
msgid "Activate Task List"
msgstr "Aktiviert die Task-Liste."
-#: Merge.rc:1881
+#: Merge.rc:1882
#, c-format
msgid "Activate this window"
msgstr "Aktiviert dieses Fenster."
-#: Merge.rc:1887
+#: Merge.rc:1888
#, c-format
msgid ""
"Close print preview mode\n"
@@ -3100,33 +3120,33 @@
"Beendet die Seitenansicht.\n"
"Seitenansicht beenden"
-#: Merge.rc:1894
+#: Merge.rc:1895
#, c-format
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
msgstr "\nDateivergleich\n\n\n\nWinMerge.Dateivergleich\nWinMerge Dateivergleich"
-#: Merge.rc:1895
+#: Merge.rc:1896
#, c-format
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr "\nOrdnervergleich\n\n\n\nWinMerge.Ordnervergleich\nWinMerge Ordnervergleich"
-#: Merge.rc:1902
+#: Merge.rc:1903
#, c-format
msgid "Preserve original EOL chars"
msgstr "Mischen der Zeilenumbruch-Formate erlauben"
-#: Merge.rc:1909
+#: Merge.rc:1910
#, c-format
msgid "Press any key"
msgstr "Beliebige Taste"
-#: Merge.rc:1915
#: Merge.rc:1916
+#: Merge.rc:1917
#, c-format
msgid "Right click on the path to copy"
msgstr "Rechtsklick auf den Pfad zum Kopieren."
-#: Merge.rc:1922
+#: Merge.rc:1923
#, c-format
msgid ""
"Developers:\n"
@@ -3135,157 +3155,158 @@
"Entwickler:\n"
"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-#: Merge.rc:1923
+#: Merge.rc:1924
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr "WinMerge kommt mit ABSOLUT KEINER GARANTIE. Es ist freie Software und Sie k\xF6nnen sie unter bestimmten Bedingungen weiter vertreiben; f\xFCr Details sehen Sie sich die GNU General Public License unter dem Hilfe-Men\xFC an."
-#: Merge.rc:1929
+#: Merge.rc:1930
#, c-format
msgid "&Ok"
msgstr "&OK"
-#: Merge.rc:1931
+#: Merge.rc:1932
#, c-format
msgid "&Abort"
msgstr "&Abbruch"
-#: Merge.rc:1932
+#: Merge.rc:1933
#, c-format
msgid "&Retry"
msgstr "&Wiederholen"
-#: Merge.rc:1933
+#: Merge.rc:1934
#, c-format
msgid "&Ignore"
msgstr "&Ignorieren"
-#: Merge.rc:1934
+#: Merge.rc:1935
#, c-format
msgid "Ignore &all"
msgstr "&Alle ignorieren"
-#: Merge.rc:1935
+#: Merge.rc:1936
#, c-format
msgid "&Yes"
msgstr "&Ja"
-#: Merge.rc:1941
+#: Merge.rc:1942
#, c-format
msgid "Yes to &all"
msgstr "Ja zu &allen"
-#: Merge.rc:1942
+#: Merge.rc:1943
#, c-format
msgid "&No"
msgstr "&Nein"
-#: Merge.rc:1943
+#: Merge.rc:1944
#, c-format
msgid "No to a&ll"
msgstr "Nein zu a&llen"
-#: Merge.rc:1944
+#: Merge.rc:1945
#, c-format
msgid "&Continue"
msgstr "&Fortsetzen"
-#: Merge.rc:1945
+#: Merge.rc:1946
#, c-format
msgid "&Skip"
msgstr "\xDCber&springen"
-#: Merge.rc:1946
+#: Merge.rc:1947
#, c-format
msgid "Skip &all"
msgstr "&Alle \xFCberspringen"
-#: Merge.rc:1948
+#: Merge.rc:1949
#, c-format
msgid "Don't display this &message again."
msgstr "Diese &Meldung nicht erneut anzeigen."
-#: Merge.rc:1949
+#: Merge.rc:1950
#, c-format
msgid "Don't ask this &question again."
msgstr "Diese &Frage nicht erneut stellen."
-#: Merge.rc:1959
+#: Merge.rc:1961
#, c-format
-msgid "Syntax colors"
-msgstr "Syntaxfarben"
+msgid "Syntax"
+msgstr "Syntax"
-#: Merge.rc:1960
+#: Merge.rc:1963
#, c-format
-msgid "Text Colors"
-msgstr "Textfarben"
-
-#: Merge.rc:1962
-#, c-format
msgid "Version Control"
msgstr "Versionskontrolle"
-#: Merge.rc:1973
+#: Merge.rc:1968
+#: Merge.rc:2339
#, c-format
+msgid "Differences"
+msgstr "Unterschiede"
+
+#: Merge.rc:1977
+#, c-format
msgid "To:"
msgstr "Nach:"
-#: Merge.rc:1974
+#: Merge.rc:1978
#, c-format
msgid "From left:"
msgstr "Von links:"
-#: Merge.rc:1975
+#: Merge.rc:1979
#, c-format
msgid "To left:"
msgstr "Nach links:"
-#: Merge.rc:1976
+#: Merge.rc:1980
#, c-format
msgid "From right:"
msgstr "Von rechts:"
-#: Merge.rc:1977
+#: Merge.rc:1981
#, c-format
msgid "To right:"
msgstr "Nach rechts:"
-#: Merge.rc:1983
+#: Merge.rc:1987
#, c-format
msgid "Version %1"
msgstr "Version %1 - Deutsch"
-#: Merge.rc:1984
+#: Merge.rc:1988
#, c-format
msgid "Unicode"
msgstr "Unicode"
-#: Merge.rc:1985
+#: Merge.rc:1989
#, c-format
msgid "X64"
msgstr "X64"
-#: Merge.rc:1991
+#: Merge.rc:1995
#, c-format
msgid "Options (%1)"
msgstr "Eigenschaften (%1)"
-#: Merge.rc:1992
+#: Merge.rc:1996
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Alle Meldungen werden wieder angezeigt."
-#: Merge.rc:1993
+#: Merge.rc:1997
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
msgstr "Datei(en) dieses Vergleichs wurden ge\xE4ndert. Einige Einstellungen werden erste wirksam, wenn der aktuelle Dateivergleich neu gestartet wurde."
-#: Merge.rc:1994
+#: Merge.rc:1998
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr "Die \xC4nderung der Schriftart wird auf keines der offenen Diff-Fenster angewendet werden."
-#: Merge.rc:1996
+#: Merge.rc:2000
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
@@ -3296,7 +3317,7 @@
"\n"
"Bitte benutzen Sie Werte von 1 - %1."
-#: Merge.rc:1998
+#: Merge.rc:2002
#, c-format
msgid ""
"Are you sure you want to reset all WinMerge options to default values?\n"
@@ -3307,129 +3328,129 @@
"\n"
"Bitte starten Sie WinMerge nach dem Zur\xFCcksetzen neu."
-#: Merge.rc:2004
+#: Merge.rc:2008
#, c-format
msgid "Open"
msgstr "\xD6ffnen"
-#: Merge.rc:2005
+#: Merge.rc:2009
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programme|*.exe;*.bat;*.cmd|Alle Dateien (*.*)|*.*||"
-#: Merge.rc:2006
+#: Merge.rc:2010
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Alle Dateien (*.*)|*.*||"
-#: Merge.rc:2007
+#: Merge.rc:2011
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge Projektdatei (*.WinMerge)|*.WinMerge||"
-#: Merge.rc:2009
+#: Merge.rc:2013
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Einstellungsdateien (*.ini)|*.ini|Alle Dateien (*.*)|*.*||"
-#: Merge.rc:2015
+#: Merge.rc:2019
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Textdateien (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle Dateien (*.*)|*.*||"
-#: Merge.rc:2016
+#: Merge.rc:2020
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML-Dateien (*.htm,*.html)|*.htm;*.html|Alle Dateien (*.*)|*.*||"
-#: Merge.rc:2017
+#: Merge.rc:2021
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML-Dateien (*.xml)|*.xml|Alle Dateien (*.*)|*.*||"
-#: Merge.rc:2023
+#: Merge.rc:2027
#, c-format
msgid "UTF-8"
msgstr "UTF-8"
-#: Merge.rc:2024
+#: Merge.rc:2028
#, c-format
msgid "UTF-8 (B)"
msgstr "UTF-8 (B)"
-#: Merge.rc:2025
+#: Merge.rc:2029
#, c-format
msgid "UCS-2 LE"
msgstr "UCS-2 LE"
-#: Merge.rc:2026
+#: Merge.rc:2030
#, c-format
msgid "UCS-2 BE"
msgstr "UCS-2 BE"
-#: Merge.rc:2032
+#: Merge.rc:2036
#, c-format
msgid "Full Contents"
msgstr "Voller Inhalt"
-#: Merge.rc:2033
+#: Merge.rc:2037
#, c-format
msgid "Quick Contents"
msgstr "Schneller Inhalt"
-#: Merge.rc:2034
+#: Merge.rc:2038
#, c-format
msgid "Modified Date"
msgstr "\xC4nderungsdatum"
-#: Merge.rc:2035
+#: Merge.rc:2039
#, c-format
msgid "Modified Date and Size"
msgstr "\xC4nderungsdatum und Gr\xF6\xDFe"
-#: Merge.rc:2036
+#: Merge.rc:2040
#, c-format
msgid "Size"
msgstr "Gr\xF6\xDFe"
-#: Merge.rc:2042
-#: Merge.rc:2667
+#: Merge.rc:2046
+#: Merge.rc:2671
#, c-format
msgid "Name"
msgstr "Name"
-#: Merge.rc:2043
+#: Merge.rc:2047
#, c-format
msgid "Location"
msgstr "Pfad"
-#: Merge.rc:2044
+#: Merge.rc:2048
#, c-format
msgid "Filters"
msgstr "Filter"
-#: Merge.rc:2045
+#: Merge.rc:2049
#, c-format
msgid "[F] "
msgstr "[F] "
-#: Merge.rc:2046
-#: Merge.rc:2669
+#: Merge.rc:2050
+#: Merge.rc:2673
#, c-format
msgid "Description"
msgstr "Beschreibung"
-#: Merge.rc:2047
+#: Merge.rc:2051
#, c-format
msgid "Select filename for new filter"
msgstr "Dateinamen f\xFCr neuen Filter ausw\xE4hlen"
-#: Merge.rc:2048
+#: Merge.rc:2052
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Dateifilter (*.flt)|*.flt|Alle Dateien (*.*)|*.*||"
-#: Merge.rc:2050
+#: Merge.rc:2054
#, c-format
msgid ""
"Cannot find file filter template file!\n"
@@ -3442,7 +3463,7 @@
"Bitte kopieren Sie die Datei %1 in den Filterordner:\n"
"%2."
-#: Merge.rc:2052
+#: Merge.rc:2056
#, c-format
msgid ""
"Cannot copy filter template file to filter folder:\n"
@@ -3455,7 +3476,7 @@
"\n"
"Bitte stellen Sie sicher, dass der Ordner existiert und beschreibbar ist."
-#: Merge.rc:2054
+#: Merge.rc:2058
#, c-format
msgid ""
"User's filter file folder is not defined!\n"
@@ -3466,7 +3487,7 @@
"\n"
"Bitte w\xE4hlen Sie den Filterordner unter Einstellungen/System aus."
-#: Merge.rc:2056
+#: Merge.rc:2060
#, c-format
msgid ""
"Failed to delete the filter file:\n"
@@ -3479,12 +3500,12 @@
"\n"
"Ist die Datei m\xF6glicherweise schreibgesch\xFCtzt?"
-#: Merge.rc:2057
+#: Merge.rc:2061
#, c-format
msgid "Locate filter file to install"
msgstr "Zu installierenden Filter ausw\xE4hlen"
-#: Merge.rc:2059
+#: Merge.rc:2063
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -3495,17 +3516,17 @@
"\n"
"Die Filterdatei konnte nicht in den Filterordner kopiert werden."
-#: Merge.rc:2061
+#: Merge.rc:2065
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr "Filterdatei existiert bereits. Existierenden Filter \xFCberschreiben?"
-#: Merge.rc:2067
+#: Merge.rc:2071
#, c-format
msgid "Regular expression"
msgstr "Regul\xE4rer Ausdruck"
-#: Merge.rc:2073
+#: Merge.rc:2077
#, c-format
msgid ""
"Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3516,205 +3537,205 @@
"\n"
"Wenn Sie nicht jetzt alle Vergleiche aktualisieren m\xF6chten, k\xF6nnen Sie Nein w\xE4hlen und die Vergleiche sp\xE4ter aktualisieren."
-#: Merge.rc:2080
+#: Merge.rc:2084
#, c-format
msgid "&Path to SS.EXE:"
msgstr "&Pfad zu SS.EXE:"
-#: Merge.rc:2086
+#: Merge.rc:2090
#, c-format
msgid "Folder Comparison Results"
msgstr "Ordnervergleichs-Ergebnisse"
-#: Merge.rc:2087
+#: Merge.rc:2091
#, c-format
msgid "File Comparison"
msgstr "Dateivergleich"
-#: Merge.rc:2088
+#: Merge.rc:2092
#, c-format
msgid "Untitled left"
msgstr "Unbenannt links"
-#: Merge.rc:2089
+#: Merge.rc:2093
#, c-format
msgid "Untitled right"
msgstr "Unbenannt rechts"
-#: Merge.rc:2090
+#: Merge.rc:2094
#, c-format
msgid "Theirs File"
msgstr "Deren Datei"
-#: Merge.rc:2091
+#: Merge.rc:2095
#, c-format
msgid "Mine File"
msgstr "Meine Datei"
-#: Merge.rc:2097
+#: Merge.rc:2101
#, c-format
msgid "Scanning files..."
msgstr "\xDCberpr\xFCfe Dateien..."
-#: Merge.rc:2098
+#: Merge.rc:2102
#, c-format
msgid "Opening selection"
msgstr "\xD6ffne Auswahl"
-#: Merge.rc:2099
+#: Merge.rc:2103
#, c-format
msgid "Copying Left to Right"
msgstr "Kopiere links nach rechts"
-#: Merge.rc:2100
+#: Merge.rc:2104
#, c-format
msgid "Copying Right to Left"
msgstr "Kopiere rechts nach links"
-#: Merge.rc:2101
+#: Merge.rc:2105
#, c-format
msgid "Copying All to Left"
msgstr "Kopiere alles nach links"
-#: Merge.rc:2102
+#: Merge.rc:2106
#, c-format
msgid "Copying All to Right"
msgstr "Kopiere alles nach rechts"
-#: Merge.rc:2103
+#: Merge.rc:2107
#, c-format
msgid "Copying files..."
msgstr "Kopiere Dateien..."
-#: Merge.rc:2104
+#: Merge.rc:2108
#, c-format
msgid "Deleting files..."
msgstr "L\xF6sche Dateien..."
-#: Merge.rc:2105
+#: Merge.rc:2109
#, c-format
msgid "Moving files..."
msgstr "Verschiebe Dateien..."
-#: Merge.rc:2106
+#: Merge.rc:2110
#, c-format
msgid "Creating the report..."
msgstr "Erzeugt den Bericht..."
# Use action instead operation, like the rest of the undo/redo system.
-#: Merge.rc:2107
+#: Merge.rc:2111
#, c-format
msgid "Undoing the last operation..."
msgstr "R\xFCckg\xE4ngigmachen der letzten Aktion..."
# Use action instead operation, like the rest of the undo/redo system.
-#: Merge.rc:2108
+#: Merge.rc:2112
#, c-format
msgid "Redoing the previous operation..."
msgstr "Wiederholen der vorherigen Aktion..."
-#: Merge.rc:2114
+#: Merge.rc:2118
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Ze: %s Sp: %d/%d Zchn: %d/%d Format: %s"
-#: Merge.rc:2115
+#: Merge.rc:2119
#, c-format
msgid "Line: %s"
msgstr "Zeile: %s"
-#: Merge.rc:2116
+#: Merge.rc:2120
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Ze: %s Sp: %d/%d Zchn: %d/%d"
-#: Merge.rc:2117
+#: Merge.rc:2121
#, c-format
msgid "Merge"
msgstr "Merge"
-#: Merge.rc:2118
+#: Merge.rc:2122
#, c-format
msgid "Difference %1 of %2"
msgstr "Unterschied %1 von %2"
-#: Merge.rc:2119
+#: Merge.rc:2123
#, c-format
msgid "%1 Differences Found"
msgstr "%1 Unterschiede gefunden"
-#: Merge.rc:2120
+#: Merge.rc:2124
#, c-format
msgid "1 Difference Found"
msgstr "1 Unterschied gefunden"
#. Abbreviation from "Read Only"
-#: Merge.rc:2121
+#: Merge.rc:2125
#, c-format
msgid "RO"
msgstr "RO"
-#: Merge.rc:2127
+#: Merge.rc:2131
#, c-format
msgid "Item %1 of %2"
msgstr "Objekt %1 von %2"
-#: Merge.rc:2128
+#: Merge.rc:2132
#, c-format
msgid "Items: %1"
msgstr "Objekte: %1"
-#: Merge.rc:2134
+#: Merge.rc:2138
#, c-format
msgid "Select two existing folders or files to compare"
msgstr "W\xE4hlen Sie zwei Dateien oder Ordner zum Vergleichen aus"
-#: Merge.rc:2135
+#: Merge.rc:2139
#, c-format
msgid "Folder Selection"
msgstr "Ordnerauswahl"
-#: Merge.rc:2136
+#: Merge.rc:2140
#, c-format
msgid "Select two folders or two files to compare."
msgstr "Zwei Ordner oder zwei Dateien zum Vergleichen ausw\xE4hlen."
-#: Merge.rc:2137
+#: Merge.rc:2141
#, c-format
msgid "Left path is invalid!"
msgstr "Der linke Pfad ist ung\xFCltig!"
-#: Merge.rc:2138
+#: Merge.rc:2142
#, c-format
msgid "Right path is invalid!"
msgstr "Der rechte Pfad ist ung\xFCltig!"
-#: Merge.rc:2139
+#: Merge.rc:2143
#, c-format
msgid "Both paths are invalid!"
msgstr "Beide Pfade sind ung\xFCltig!"
-#: Merge.rc:2140
+#: Merge.rc:2144
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr "Zwei Dateien zum Aktivieren der Entpacker-Auswahl ausw\xE4hlen."
-#: Merge.rc:2141
+#: Merge.rc:2145
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Datei und Ordner k\xF6nnen nicht verglichen werden!"
-#: Merge.rc:2147
+#: Merge.rc:2151
#, c-format
msgid "File not found: %1"
msgstr "Datei nicht gefunden: %1"
-#: Merge.rc:2148
+#: Merge.rc:2152
#, c-format
msgid "File not unpacked: %1"
msgstr "Datei nicht entpackt: %1"
-#: Merge.rc:2149
+#: Merge.rc:2153
#, c-format
msgid ""
"Cannot open file\n"
@@ -3727,12 +3748,12 @@
"\n"
"%2"
-#: Merge.rc:2150
+#: Merge.rc:2154
#, c-format
msgid "Failed to parse conflict file."
msgstr "Fehler beim Analysieren der Konflikt-Datei."
-#: Merge.rc:2151
+#: Merge.rc:2155
#, c-format
msgid ""
"The file\n"
@@ -3743,32 +3764,32 @@
"%1\n"
"ist keine Konflikt-Datei."
-#: Merge.rc:2157
+#: Merge.rc:2161
#, c-format
msgid "Save As"
msgstr "Speichern unter"
-#: Merge.rc:2158
+#: Merge.rc:2162
#, c-format
msgid "Save changes to %1?"
msgstr "\xC4nderungen in %1 speichern?"
-#: Merge.rc:2159
+#: Merge.rc:2163
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
msgstr "%1 ist als Schreibgesch\xFCtzt markiert. M\xF6chten Sie die schreibgesch\xFCtzte Datei \xFCberschreiben? (Nicht unter neuem Dateinamen speichern.)"
-#: Merge.rc:2160
+#: Merge.rc:2164
#, c-format
msgid "Error checking destination writeability"
msgstr "Fehler beim Pr\xFCfen des Zielverzeichnisses auf Schreibschutz"
-#: Merge.rc:2161
+#: Merge.rc:2165
#, c-format
msgid "Error backing up file"
msgstr "Fehler beim Erstellen einer Sicherheitskopie"
-#: Merge.rc:2163
+#: Merge.rc:2167
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -3781,7 +3802,7 @@
"\n"
"Trotzdem fortfahren?"
-#: Merge.rc:2164
+#: Merge.rc:2168
#, c-format
msgid ""
"Saving file failed.\n"
@@ -3798,7 +3819,7 @@
"\t-einen anderen Dateinamen verwenden? (Ok dr\xFCcken)\n"
"\t-die aktuelle Operation abbrechen? (Abbruch dr\xFCcken)"
-#: Merge.rc:2165
+#: Merge.rc:2169
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -3813,7 +3834,7 @@
"\n"
"M\xF6chten Sie die ungepackte Version in einer anderen Datei speichern?"
-#: Merge.rc:2166
+#: Merge.rc:2170
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -3828,7 +3849,7 @@
"\n"
"M\xF6chten Sie die ungepackte Version in einer anderen Datei speichern?"
-#: Merge.rc:2167
+#: Merge.rc:2171
#, c-format
msgid ""
"Another application has updated file\n"
@@ -3843,7 +3864,7 @@
"\n"
"Ge\xE4nderte Datei \xFCberschreiben?"
-#: Merge.rc:2168
+#: Merge.rc:2172
#, c-format
msgid ""
"%1\n"
@@ -3852,27 +3873,27 @@
"%1\n"
"ist als schreibgesch\xFCtzt markiert. M\xF6chten Sie das schreibgesch\xFCtzte Objekt \xFCberschreiben?"
-#: Merge.rc:2169
+#: Merge.rc:2173
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
msgstr "Eine andere Anwendung hat die Datei\n%1\naktualisiert, seit WinMerge sie das letzte Mal gepr\xFCft hat.\n\nM\xF6chten Sie die Datei neu laden?"
-#: Merge.rc:2170
+#: Merge.rc:2174
#, c-format
msgid "Save Left File As"
msgstr "Speichere linke Datei unter"
-#: Merge.rc:2171
+#: Merge.rc:2175
#, c-format
msgid "Save Right File As"
msgstr "Speichere rechte Datei unter"
-#: Merge.rc:2172
+#: Merge.rc:2176
#, c-format
msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
msgstr "Die Datei\n%1\nist verlorengegangen. Bitte speichern Sie eine Kopie der Datei, um fortzufahren."
-#: Merge.rc:2178
+#: Merge.rc:2182
#, c-format
msgid ""
"Cannot merge differences when documents are not in synch.\n"
@@ -3883,42 +3904,42 @@
"\n"
"Aktualisieren Sie die Dokumente, bevor Sie fortfahren."
-#: Merge.rc:2184
+#: Merge.rc:2188
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr "Sie m\xFCssen einen SourceSafe-Projektpfad angeben um fortzufahren (z.B.: $/MeinProjekt)"
-#: Merge.rc:2185
+#: Merge.rc:2189
#, c-format
msgid "Checkout files from VSS..."
msgstr "Dateien auschecken vom VSS..."
-#: Merge.rc:2186
+#: Merge.rc:2190
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr "Das Versionierungssystem meldete einen Fehler beim Versuch die Datei auszuchecken. Der Vorgang kann nicht fortgesetzt werden..."
-#: Merge.rc:2187
+#: Merge.rc:2191
#, c-format
msgid "Error executing versioning system command."
msgstr "Fehler beim Ausf\xFChren eines Befehles des Versionierungssystems."
-#: Merge.rc:2188
+#: Merge.rc:2192
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr "Der VSS-Arbeitsordner und die Position der aktuellen Datei stimmen nicht \xFCberein. Fortsetzen?"
-#: Merge.rc:2189
+#: Merge.rc:2193
#, c-format
msgid "No VSS database(s) found!"
msgstr "Keine VSS Datenbank(en) gefunden!"
-#: Merge.rc:2190
+#: Merge.rc:2194
#, c-format
msgid "Error from VSS:"
msgstr "Fehler vom VSS:"
-#: Merge.rc:2191
+#: Merge.rc:2195
#, c-format
msgid ""
"Versioning System returned an error while attempting to check in the file.\n"
@@ -3929,7 +3950,7 @@
" Bitte \xFCberpr\xFCfen Sie die Konfiguration der verwendeten Ansicht.\n"
" Auschecken r\xFCckg\xE4ngig machen?"
-#: Merge.rc:2192
+#: Merge.rc:2196
#, c-format
msgid ""
"Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -3938,169 +3959,169 @@
"Das Versionierungssystem meldete einen Fehler beim Versuch das Auschecken der Datei r\xFCckg\xE4ngig zu machen.\n"
" Bitte \xFCberpr\xFCfen Sie die Konfiguration der verwendeten Ansicht."
-#: Merge.rc:2198
-#: Merge.rc:2651
+#: Merge.rc:2202
+#: Merge.rc:2655
#, c-format
msgid "None"
msgstr "Keines"
-#: Merge.rc:2199
+#: Merge.rc:2203
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr "Visual SourceSafe (kleiner als 5.0)"
-#: Merge.rc:2200
+#: Merge.rc:2204
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr "Visual SourceSafe (5.0 und h\xF6her)"
-#: Merge.rc:2202
+#: Merge.rc:2206
#, c-format
msgid "Break at whitespace"
msgstr "An Leerzeichen abbrechen"
-#: Merge.rc:2203
+#: Merge.rc:2207
#, c-format
msgid "Break at whitespace or punctuation"
msgstr "An Leerzeichen oder Interpunktion abbrechen"
-#: Merge.rc:2209
-#: Merge.rc:2211
+#: Merge.rc:2213
+#: Merge.rc:2215
#, c-format
msgid "Copy selected item to named directory"
msgstr "Kopiert ausgew\xE4hltes Objekt ins angegebene Verzeichnis."
-#: Merge.rc:2210
-#: Merge.rc:2212
+#: Merge.rc:2214
+#: Merge.rc:2216
#, c-format
msgid "Copy selected item to custom directory"
msgstr "Kopiert ausgew\xE4hltes Objekt in ein beliebiges Verzeichnis."
-#: Merge.rc:2213
+#: Merge.rc:2217
#, c-format
msgid "Delete selected item on left"
msgstr "L\xF6scht ausgew\xE4hltes Objekt auf der linken Seite."
-#: Merge.rc:2214
+#: Merge.rc:2218
#, c-format
msgid "Delete selected item on right"
msgstr "L\xF6scht ausgew\xE4hltes Objekt auf der rechten Seite."
-#: Merge.rc:2215
+#: Merge.rc:2219
#, c-format
msgid "Delete selected item(s) on both sides"
msgstr "L\xF6scht ausgew\xE4hlte Objekte auf beiden Seiten."
-#: Merge.rc:2216
+#: Merge.rc:2220
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
msgstr "Versteckt ausgew\xE4hlte Objekte (dynamischer Filter)"
-#: Merge.rc:2217
+#: Merge.rc:2221
#, c-format
msgid "Rename selected item on both sides"
msgstr "Nennt ausgew\xE4hltes Objekt auf beiden Seiten um."
-#: Merge.rc:2218
+#: Merge.rc:2222
#, c-format
msgid "Right to Left (%1)"
msgstr "Rechts nach Links (%1)"
-#: Merge.rc:2219
+#: Merge.rc:2223
#, c-format
msgid "Left to Right (%1)"
msgstr "Links nach Rechts (%1)"
-#: Merge.rc:2220
+#: Merge.rc:2224
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Rechts nach Links (%1 von %2)"
-#: Merge.rc:2221
+#: Merge.rc:2225
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Links nach Rechts (%1 von %2)"
-#: Merge.rc:2222
-#: Merge.rc:2238
+#: Merge.rc:2226
+#: Merge.rc:2242
#, c-format
msgid "Left to... (%1)"
msgstr "Links nach... (%1)"
-#: Merge.rc:2223
-#: Merge.rc:2239
+#: Merge.rc:2227
+#: Merge.rc:2243
#, c-format
msgid "Right to... (%1)"
msgstr "Rechts nach... (%1)"
-#: Merge.rc:2224
-#: Merge.rc:2240
+#: Merge.rc:2228
+#: Merge.rc:2244
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Links nach... (%1 von %2)"
-#: Merge.rc:2225
-#: Merge.rc:2241
+#: Merge.rc:2229
+#: Merge.rc:2245
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Rechts nach... (%1 von %2)"
-#: Merge.rc:2231
+#: Merge.rc:2235
#, c-format
msgid "Left (%1)"
msgstr "Links (%1)"
-#: Merge.rc:2232
+#: Merge.rc:2236
#, c-format
msgid "Right (%1)"
msgstr "Rechts (%1)"
-#: Merge.rc:2233
+#: Merge.rc:2237
#, c-format
msgid "Both (%1)"
msgstr "Beide (%1)"
-#: Merge.rc:2234
+#: Merge.rc:2238
#, c-format
msgid "Left (%1 of %2)"
msgstr "Links (%1 von %2)"
-#: Merge.rc:2235
+#: Merge.rc:2239
#, c-format
msgid "Right (%1 of %2)"
msgstr "Rechts (%1 von %2)"
-#: Merge.rc:2236
+#: Merge.rc:2240
#, c-format
msgid "Both (%1 of %2)"
msgstr "Beide (%1 von %2)"
-#: Merge.rc:2237
+#: Merge.rc:2241
#, c-format
msgid "Select destination folder"
msgstr "Zielordner ausw\xE4hlen."
-#: Merge.rc:2242
+#: Merge.rc:2246
#, c-format
msgid "Left side - select destination folder:"
msgstr "Linke Seite - Zielordner ausw\xE4hlen:"
-#: Merge.rc:2243
+#: Merge.rc:2247
#, c-format
msgid "Right side - select destination folder:"
msgstr "Rechte Seite - Zielordner ausw\xE4hlen:"
-#: Merge.rc:2244
+#: Merge.rc:2248
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 Dateien betroffen)"
-#: Merge.rc:2245
+#: Merge.rc:2249
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 von %2 Dateien betroffen)"
-#: Merge.rc:2251
+#: Merge.rc:2255
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -4112,17 +4133,17 @@
"%1\n"
"l\xF6schen?"
-#: Merge.rc:2252
+#: Merge.rc:2256
#, c-format
msgid "Are you sure you want to copy:"
msgstr "Wollen Sie wirklich kopieren:"
-#: Merge.rc:2253
+#: Merge.rc:2257
#, c-format
msgid "Are you sure you want to copy %d items:"
msgstr "Wollen Sie wirklich %d Objekte kopieren:"
-#: Merge.rc:2254
+#: Merge.rc:2258
#, c-format
msgid ""
"Operation aborted!\n"
@@ -4141,498 +4162,488 @@
"\n"
"Bitte aktualisieren Sie den Vergleich."
-#: Merge.rc:2255
+#: Merge.rc:2259
#, c-format
msgid "Are you sure you want to move:"
msgstr "Wollen Sie wirklich verschieben:"
-#: Merge.rc:2256
+#: Merge.rc:2260
#, c-format
msgid "Are you sure you want to move %d items:"
msgstr "Wollen Sie wirklich %d Objek...
[truncated message content] |
|
From: <ki...@us...> - 2009-08-01 18:24:41
|
Revision: 6941
http://winmerge.svn.sourceforge.net/winmerge/?rev=6941&view=rev
Author: kimmov
Date: 2009-08-01 18:24:35 +0000 (Sat, 01 Aug 2009)
Log Message:
-----------
Manual: Add /xq command line option (which was added in RFE #2827836 Auto Close if Compare is the Same
Modified Paths:
--------------
trunk/Docs/Users/Manual/Command_line.xml
Modified: trunk/Docs/Users/Manual/Command_line.xml
===================================================================
--- trunk/Docs/Users/Manual/Command_line.xml 2009-08-01 17:29:01 UTC (rev 6940)
+++ trunk/Docs/Users/Manual/Command_line.xml 2009-08-01 18:24:35 UTC (rev 6941)
@@ -33,6 +33,8 @@
<arg><option>/x</option></arg>
+ <arg><option>/xq</option></arg>
+
<arg><option>/s</option></arg>
<arg choice="opt" rep="norepeat"><option>/ul</option></arg>
@@ -158,6 +160,11 @@
</listitem>
<listitem>
+ <para><option>/xq</option> is similar to <option>/x</option> but does not
+ show the message about identical files. </para>
+ </listitem>
+
+ <listitem>
<indexterm>
<primary>WinMerge window</primary>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-08-01 17:29:12
|
Revision: 6940
http://winmerge.svn.sourceforge.net/winmerge/?rev=6940&view=rev
Author: kimmov
Date: 2009-08-01 17:29:01 +0000 (Sat, 01 Aug 2009)
Log Message:
-----------
RFE [ 2827836 ] Auto Close if Compare is the Same
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
trunk/Src/MergeCmdLineInfo.cpp
trunk/Src/MergeCmdLineInfo.h
trunk/Src/MergeDoc.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-07-28 14:30:44 UTC (rev 6939)
+++ trunk/Docs/Users/ChangeLog.txt 2009-08-01 17:29:01 UTC (rev 6940)
@@ -11,6 +11,8 @@
Allow disabling reading of unique folder contents (#2820067)
Add options GUI for quick compare limit (#2825628)
Add accelerator keys for Shell context menu (#2823536)
+ Add /xq command line switch for closing WinMerge after identical files
+ and not showing message (#2827836)
Bugfix: Did not export changed options values (#2799149)
Bugfix: Don't highlight identical words if whitespaces are ignored (#2798360)
Bugfix: Did not reset folder compare method back to original (#2803152)
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2009-07-28 14:30:44 UTC (rev 6939)
+++ trunk/Src/MainFrm.cpp 2009-08-01 17:29:01 UTC (rev 6940)
@@ -75,6 +75,7 @@
#include "PropBackups.h"
#include "PluginsListDlg.h"
#include "stringdiffs.h"
+#include "MergeCmdLineInfo.h"
using std::vector;
@@ -277,7 +278,7 @@
, m_bFirstTime(TRUE)
, m_bEscShutdown(FALSE)
, m_bClearCaseTool(FALSE)
-, m_bExitIfNoDiff(FALSE)
+, m_bExitIfNoDiff(MergeCmdLineInfo::Disabled)
, m_bShowErrors(TRUE)
, m_CheckOutMulti(FALSE)
, m_bVCProjSync(FALSE)
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2009-07-28 14:30:44 UTC (rev 6939)
+++ trunk/Src/MainFrm.h 2009-08-01 17:29:01 UTC (rev 6940)
@@ -34,7 +34,7 @@
#include "MDITabBar.h"
#include "OptionsMgr.h"
#include "VSSHelper.h"
-struct FileLocation;
+#include "MergeCmdLineInfo.h"
/**
* @brief Supported versioncontrol systems.
@@ -70,8 +70,8 @@
class SyntaxColors;
class LineFiltersList;
class TempFile;
+struct FileLocation;
-
// typed lists (homogenous pointer lists)
typedef CTypedPtrList<CPtrList, CMergeDoc *> MergeDocList;
typedef CTypedPtrList<CPtrList, CDirDoc *> DirDocList;
@@ -164,7 +164,7 @@
SyntaxColors * GetMainSyntaxColors() { return m_pSyntaxColors; }
BOOL m_bClearCaseTool; /**< WinMerge is executed as an external Rational ClearCase compare/merge tool. */
BOOL m_bFlashing; /**< Window is flashing. */
- BOOL m_bExitIfNoDiff; /**< If command line switch -x given close application if files are identical. */
+ MergeCmdLineInfo::ExitNoDiff m_bExitIfNoDiff; /**< Exit if files are identical? */
LineFiltersList *m_pLineFilters; /**< List of linefilters */
/**
Modified: trunk/Src/MergeCmdLineInfo.cpp
===================================================================
--- trunk/Src/MergeCmdLineInfo.cpp 2009-07-28 14:30:44 UTC (rev 6939)
+++ trunk/Src/MergeCmdLineInfo.cpp 2009-08-01 17:29:01 UTC (rev 6940)
@@ -116,7 +116,7 @@
m_nCmdShow(SW_SHOWNORMAL),
m_bClearCaseTool(false),
m_bEscShutdown(false),
- m_bExitIfNoDiff(false),
+ m_bExitIfNoDiff(Disabled),
m_bRecurse(false),
m_bNonInteractive(false),
m_bSingleInstance(false),
@@ -347,8 +347,14 @@
else if (param == _T("x"))
{
// -x to close application if files are identical.
- m_bExitIfNoDiff = true;
+ m_bExitIfNoDiff = Exit;
}
+ else if (param == _T("xq"))
+ {
+ // -xn to close application if files are identical without showing
+ // any messages
+ m_bExitIfNoDiff = ExitQuiet;
+ }
else if (param == _T("cp"))
{
String codepage;
Modified: trunk/Src/MergeCmdLineInfo.h
===================================================================
--- trunk/Src/MergeCmdLineInfo.h 2009-07-28 14:30:44 UTC (rev 6939)
+++ trunk/Src/MergeCmdLineInfo.h 2009-08-01 17:29:01 UTC (rev 6940)
@@ -45,11 +45,18 @@
public:
+ enum ExitNoDiff
+ {
+ Disabled, /**< Don't exit. */
+ Exit, /**< Exit and show message. */
+ ExitQuiet, /**< Exit and don't show message. */
+ };
+
int m_nCmdShow; /**< Initial state of the application's window. */
bool m_bClearCaseTool; /**< Running as Rational ClearCase external tool. */
bool m_bEscShutdown; /**< Pressing ESC will close the application */
- bool m_bExitIfNoDiff; /**< Exit after telling the user that files are identical. */
+ ExitNoDiff m_bExitIfNoDiff; /**< Exit if files are identical. */
bool m_bRecurse; /**< Include sub folder in directories compare. */
bool m_bNonInteractive; /**< Suppress user's notifications. */
bool m_bSingleInstance; /**< Allow only one instance of WinMerge executable. */
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2009-07-28 14:30:44 UTC (rev 6939)
+++ trunk/Src/MergeDoc.cpp 2009-08-01 17:29:01 UTC (rev 6940)
@@ -63,6 +63,7 @@
#include "FileOrFolderSelect.h"
#include "LineFiltersList.h"
#include "TempFile.h"
+#include "MergeCmdLineInfo.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -680,18 +681,20 @@
{
UINT nFlags = MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN;
- // Show the "files are identical" error message even if the user
- // requested not to show it again. It is better than to close
- // the application without a warning.
- if (GetMainFrame()->m_bExitIfNoDiff)
+ if (GetMainFrame()->m_bExitIfNoDiff == MergeCmdLineInfo::Exit)
{
+ // Show the "files are identical" for basic "exit no diff" flag
+ // If user don't want to see the message one uses the quiet version
+ // of the "exit no diff".
nFlags &= ~MB_DONT_DISPLAY_AGAIN;
}
- LangMessageBox(IDS_FILESSAME, nFlags);
+ if (GetMainFrame()->m_bExitIfNoDiff != MergeCmdLineInfo::ExitQuiet)
+ LangMessageBox(IDS_FILESSAME, nFlags);
// Exit application if files are identical.
- if (GetMainFrame()->m_bExitIfNoDiff)
+ if (GetMainFrame()->m_bExitIfNoDiff == MergeCmdLineInfo::Exit ||
+ GetMainFrame()->m_bExitIfNoDiff == MergeCmdLineInfo::ExitQuiet)
{
GetMainFrame()->PostMessage(WM_COMMAND, ID_APP_EXIT);
}
@@ -2374,7 +2377,7 @@
// Exit if files are identical should only work for the first
// comparison and must be disabled afterward.
- GetMainFrame()->m_bExitIfNoDiff = FALSE;
+ GetMainFrame()->m_bExitIfNoDiff = MergeCmdLineInfo::Disabled;
}
else
{
@@ -2589,7 +2592,7 @@
// Exit if files are identical should only work for the first
// comparison and must be disabled afterward.
- GetMainFrame()->m_bExitIfNoDiff = FALSE;
+ GetMainFrame()->m_bExitIfNoDiff = MergeCmdLineInfo::Disabled;
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-07-28 14:31:00
|
Revision: 6939
http://winmerge.svn.sourceforge.net/winmerge/?rev=6939&view=rev
Author: gerundt
Date: 2009-07-28 14:30:44 +0000 (Tue, 28 Jul 2009)
Log Message:
-----------
PATCH: [ 2828310 ] Updated Dutch translation (unstable trunk)
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/Dutch.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-07-28 07:11:29 UTC (rev 6938)
+++ trunk/Docs/Users/ChangeLog.txt 2009-07-28 14:30:44 UTC (rev 6939)
@@ -17,7 +17,7 @@
Bugfix: Added EOL chars between copied file/path names (#2817546)
Bugfix: In-line difference highlight fixes (#2824173)
Translation updates:
- - Dutch (#2801690, #2804979)
+ - Dutch (#2801690, #2804979, #2828310)
- Swedish (#2805726)
- Turkish (#2825130, #2825132, #2827820)
- Ukrainian (#2817835)
Modified: trunk/Translations/WinMerge/Dutch.po
===================================================================
--- trunk/Translations/WinMerge/Dutch.po 2009-07-28 07:11:29 UTC (rev 6938)
+++ trunk/Translations/WinMerge/Dutch.po 2009-07-28 14:30:44 UTC (rev 6939)
@@ -13,8 +13,8 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2009-05-16 18:44+0000\n"
-"PO-Revision-Date: 2009-06-11 17:37+0000\n"
+"POT-Creation-Date: 2009-07-23 18:36+0000\n"
+"PO-Revision-Date: 2009-07-28 10:20+0000\n"
"Last-Translator: Thomas De Rocker <tho...@ya...>\n"
"Language-Team: Dutch <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -400,7 +400,7 @@
#: Merge.rc:178
#: Merge.rc:299
#: Merge.rc:487
-#: Merge.rc:1947
+#: Merge.rc:1948
#, c-format
msgid "&Help"
msgstr "&Help"
@@ -731,7 +731,7 @@
msgstr "&Scripts"
#: Merge.rc:373
-#: Merge.rc:2803
+#: Merge.rc:2807
#, c-format
msgid "< Empty >"
msgstr "< Leeg >"
@@ -934,14 +934,14 @@
#: Merge.rc:526
#: Merge.rc:1147
-#: Merge.rc:1531
+#: Merge.rc:1514
#, c-format
msgid "&Left"
msgstr "&Links"
#: Merge.rc:527
#: Merge.rc:1149
-#: Merge.rc:1534
+#: Merge.rc:1517
#, c-format
msgid "&Right"
msgstr "&Rechts"
@@ -1098,12 +1098,12 @@
#: Merge.rc:1066
#: Merge.rc:1095
#: Merge.rc:1105
-#: Merge.rc:1273
-#: Merge.rc:1337
-#: Merge.rc:1350
-#: Merge.rc:1442
-#: Merge.rc:1457
-#: Merge.rc:1679
+#: Merge.rc:1256
+#: Merge.rc:1320
+#: Merge.rc:1333
+#: Merge.rc:1425
+#: Merge.rc:1440
+#: Merge.rc:1662
#, c-format
msgid "OK"
msgstr "OK"
@@ -1119,7 +1119,7 @@
msgstr "Bestanden of mappen selecteren"
#: Merge.rc:690
-#: Merge.rc:1608
+#: Merge.rc:1591
#, c-format
msgid "&Left:"
msgstr "&Links:"
@@ -1133,7 +1133,7 @@
msgstr "&Zoeken"
#: Merge.rc:695
-#: Merge.rc:1612
+#: Merge.rc:1595
#, c-format
msgid "&Right:"
msgstr "&Rechts:"
@@ -1145,13 +1145,13 @@
msgstr "Zoe&ken"
#: Merge.rc:700
-#: Merge.rc:1616
+#: Merge.rc:1599
#, c-format
msgid "&Filter:"
msgstr "&Filter:"
#: Merge.rc:703
-#: Merge.rc:1618
+#: Merge.rc:1601
#, c-format
msgid "Select..."
msgstr "Selecteren..."
@@ -1167,7 +1167,7 @@
msgstr "&Selecteren..."
#: Merge.rc:708
-#: Merge.rc:1619
+#: Merge.rc:1602
#, c-format
msgid "&Include Subfolders"
msgstr "Ook &in submappen"
@@ -1187,17 +1187,17 @@
#: Merge.rc:1096
#: Merge.rc:1106
#: Merge.rc:1157
-#: Merge.rc:1274
-#: Merge.rc:1351
-#: Merge.rc:1443
-#: Merge.rc:1458
-#: Merge.rc:1680
+#: Merge.rc:1257
+#: Merge.rc:1334
+#: Merge.rc:1426
+#: Merge.rc:1441
+#: Merge.rc:1663
#, c-format
msgid "Cancel"
msgstr "Annuleren"
#: Merge.rc:713
-#: Merge.rc:1352
+#: Merge.rc:1335
#, c-format
msgid "Help"
msgstr "Help"
@@ -1265,13 +1265,14 @@
msgstr "&Versiebeheersysteem:"
#: Merge.rc:753
-#: Merge.rc:2079
+#: Merge.rc:2083
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&Pad naar cleartool.exe:"
#: Merge.rc:760
-#: Merge.rc:1955
+#: Merge.rc:1956
+#: Merge.rc:1969
#, c-format
msgid "General"
msgstr "Algemeen"
@@ -1327,13 +1328,13 @@
msgstr "Activeer meerdere vergelijkingsvensters voor"
#: Merge.rc:787
-#: Merge.rc:1631
+#: Merge.rc:1614
#, c-format
msgid "&Folder compare"
msgstr "Mappen vergelijken"
#: Merge.rc:789
-#: Merge.rc:1633
+#: Merge.rc:1616
#, c-format
msgid "Fil&e compare"
msgstr "B&estanden vergelijken"
@@ -1454,7 +1455,7 @@
msgstr "&Alles vervangen"
#: Merge.rc:872
-#: Merge.rc:2201
+#: Merge.rc:2205
#, c-format
msgid "Rational ClearCase"
msgstr "Rational ClearCase"
@@ -1465,7 +1466,7 @@
msgstr "Check-out"
#: Merge.rc:880
-#: Merge.rc:1191
+#: Merge.rc:1175
#, c-format
msgid "Comments"
msgstr "Opmerkingen"
@@ -1511,7 +1512,7 @@
msgstr "Verwijderen"
#: Merge.rc:910
-#: Merge.rc:1958
+#: Merge.rc:1959
#, c-format
msgid "Colors"
msgstr "Kleuren"
@@ -1527,7 +1528,7 @@
msgstr "Geselecteerd verschil:"
#: Merge.rc:921
-#: Merge.rc:1583
+#: Merge.rc:1566
#, c-format
msgid "Background"
msgstr "Achtergrond"
@@ -1538,8 +1539,9 @@
msgstr "Verwijderd"
#: Merge.rc:935
-#: Merge.rc:1378
-#: Merge.rc:1584
+#: Merge.rc:1361
+#: Merge.rc:1567
+#: Merge.rc:1960
#, c-format
msgid "Text"
msgstr "Tekst"
@@ -1572,21 +1574,22 @@
#: Merge.rc:986
#: Merge.rc:1065
#: Merge.rc:1094
-#: Merge.rc:1194
-#: Merge.rc:1424
+#: Merge.rc:1177
+#: Merge.rc:1407
+#: Merge.rc:1699
#, c-format
msgid "Defaults"
msgstr "Standaard"
#: Merge.rc:992
-#: Merge.rc:1366
-#: Merge.rc:1572
+#: Merge.rc:1349
+#: Merge.rc:1555
#, c-format
msgid "Dialog"
msgstr "Dialoog"
#: Merge.rc:1002
-#: Merge.rc:1961
+#: Merge.rc:1962
#, c-format
msgid "System"
msgstr "Systeem"
@@ -1763,7 +1766,7 @@
msgstr "Voortgang mapvergelijking"
#: Merge.rc:1128
-#: Merge.rc:1908
+#: Merge.rc:1909
#, c-format
msgid "Stop"
msgstr "Stoppen"
@@ -1819,7 +1822,7 @@
msgstr "&Ga naar"
#: Merge.rc:1162
-#: Merge.rc:1956
+#: Merge.rc:1957
#, c-format
msgid "Compare"
msgstr "Vergelijken"
@@ -1834,215 +1837,200 @@
msgid "&Compare"
msgstr "&Vergelijken"
-#: Merge.rc:1168
+#: Merge.rc:1167
#, c-format
msgid "&Ignore change"
msgstr "&Wijzigingen negeren"
-#: Merge.rc:1170
+#: Merge.rc:1168
#, c-format
msgid "I&gnore all"
msgstr "Alles ne&geren"
-#: Merge.rc:1172
+#: Merge.rc:1169
#, c-format
msgid "Ignore blan&k lines"
msgstr "Lege regels negeren"
-#: Merge.rc:1174
+#: Merge.rc:1170
#, c-format
msgid "Ignore &case"
msgstr "N&iet hoofdlettergevoelig"
-#: Merge.rc:1176
+#: Merge.rc:1171
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "Negee&r regeleindeteken-verschillen (Windows/Unix/Mac)"
-#: Merge.rc:1179
+#: Merge.rc:1173
#, c-format
msgid "E&nable moved block detection"
msgstr "Detectie verplaatste blokken i&nschakelen"
-#: Merge.rc:1181
+#: Merge.rc:1174
#, c-format
msgid "&Match similar lines"
msgstr "Laat gelijke lijnen overeenko&men"
-#: Merge.rc:1183
+#: Merge.rc:1176
#, c-format
-msgid "Ign&ore time differences less than 3 seconds"
-msgstr "Negeer tijdsverschillen kleiner dan 3 sec&onden"
-
-#: Merge.rc:1186
-#, c-format
-msgid "&File Compare method:"
-msgstr "Met&hode bestandsvergelijking:"
-
-#: Merge.rc:1189
-#, c-format
-msgid "S&top after first difference"
-msgstr "S&top na eerste verschil"
-
-#: Merge.rc:1192
-#, c-format
msgid "Filter Comments"
msgstr "Filter-commentaar"
-#: Merge.rc:1199
-#: Merge.rc:1957
+#: Merge.rc:1182
+#: Merge.rc:1958
#, c-format
msgid "Editor"
msgstr "Editor"
-#: Merge.rc:1202
+#: Merge.rc:1185
#, c-format
msgid "&Highlight syntax"
msgstr "&Accentueer syntax"
-#: Merge.rc:1204
+#: Merge.rc:1187
#, c-format
msgid "&Automatic rescan"
msgstr "&Automatisch opnieuw scannen"
-#: Merge.rc:1206
+#: Merge.rc:1189
#, c-format
msgid "&Preserve original EOL chars"
msgstr "Be&waar originele regeleindes"
-#: Merge.rc:1208
+#: Merge.rc:1191
#, c-format
msgid "Tabs"
msgstr "Tabinstellingen"
-#: Merge.rc:1209
+#: Merge.rc:1192
#, c-format
msgid "&Tab size:"
msgstr "&Tabgrootte:"
-#: Merge.rc:1212
+#: Merge.rc:1195
#, c-format
msgid "&Insert Tabs"
msgstr "Tabs &invoegen"
-#: Merge.rc:1214
+#: Merge.rc:1197
#, c-format
msgid "Insert &Spaces"
msgstr "&Spaties invoegen"
-#: Merge.rc:1216
+#: Merge.rc:1199
#, c-format
msgid "Line Difference Coloring"
msgstr "Kleur van regelverschillen"
-#: Merge.rc:1218
+#: Merge.rc:1201
#, c-format
msgid "View line differences"
msgstr "Bekijk regelverschillen"
-#: Merge.rc:1220
+#: Merge.rc:1203
#, c-format
msgid "&Character level"
msgstr "Tekenniveau"
-#: Merge.rc:1222
+#: Merge.rc:1205
#, c-format
msgid "&Word-level:"
msgstr "&Woordniveau:"
-#: Merge.rc:1226
+#: Merge.rc:1209
#, c-format
msgid "W&ord break characters:"
msgstr "W&oordafbrekingstekens:"
-#: Merge.rc:1239
+#: Merge.rc:1222
#, c-format
msgid "Filefilters"
msgstr "Bestandsfilters"
-#: Merge.rc:1245
+#: Merge.rc:1228
#, c-format
msgid "Test"
msgstr "Test"
-#: Merge.rc:1246
+#: Merge.rc:1229
#, c-format
msgid "Install..."
msgstr "Installeren..."
-#: Merge.rc:1247
+#: Merge.rc:1230
#, c-format
msgid "New..."
msgstr "Nieuw..."
-#: Merge.rc:1248
+#: Merge.rc:1231
#, c-format
msgid "Edit..."
msgstr "Bewerken..."
-#: Merge.rc:1249
+#: Merge.rc:1232
#, c-format
msgid "Delete..."
msgstr "Wissen"
-#: Merge.rc:1255
+#: Merge.rc:1238
#, c-format
msgid "Save modified files?"
msgstr "Gewijzigde bestanden opslaan?"
-#: Merge.rc:1258
+#: Merge.rc:1241
#, c-format
msgid "Left side file"
msgstr "Linker bestand"
-#: Merge.rc:1261
+#: Merge.rc:1244
#, c-format
msgid "&Save changes"
msgstr "Wijzigingen op&slaan"
-#: Merge.rc:1263
+#: Merge.rc:1246
#, c-format
msgid "&Discard changes"
msgstr "Wijzigingen ne&geren"
-#: Merge.rc:1265
+#: Merge.rc:1248
#, c-format
msgid "Right side file"
msgstr "Rechter bestand"
-#: Merge.rc:1268
+#: Merge.rc:1251
#, c-format
msgid "S&ave changes"
msgstr "Wijzigingen opsl&aan"
-#: Merge.rc:1270
+#: Merge.rc:1253
#, c-format
msgid "Dis&card changes"
msgstr "Wijzigingen nege&ren"
-#: Merge.rc:1272
+#: Merge.rc:1255
#, c-format
msgid "Disca&rd All"
msgstr "Alles nege&ren"
-#: Merge.rc:1279
-#: Merge.rc:1527
-#: Merge.rc:1963
+#: Merge.rc:1262
+#: Merge.rc:1510
+#: Merge.rc:1964
#, c-format
msgid "Codepage"
msgstr "Tekenset"
-#: Merge.rc:1282
+#: Merge.rc:1265
#, c-format
msgid "Default Codepage"
msgstr "Standaard codetabel"
-#: Merge.rc:1283
+#: Merge.rc:1266
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "Selecteer de standaard veronderstelde codetabel bij laden van niet-Unicodebestanden:"
-#: Merge.rc:1285
+#: Merge.rc:1268
#, c-format
msgid ""
"Detect codepage info for these files: .html, .rc, .xml \n"
@@ -2051,32 +2039,32 @@
"Tekenset detecteren voor deze bestanden: .html, .rc, .xml \n"
"Herstarten sessie noodzakelijk"
-#: Merge.rc:1288
+#: Merge.rc:1271
#, c-format
msgid "System codepage"
msgstr "Tekenset van systeem"
-#: Merge.rc:1290
+#: Merge.rc:1273
#, c-format
msgid "According to WinMerge User Interface"
msgstr "Volgens WinMerge-gebruikersinterface"
-#: Merge.rc:1292
+#: Merge.rc:1275
#, c-format
msgid "Custom codepage:"
msgstr "Aangepaste tekenset:"
-#: Merge.rc:1300
+#: Merge.rc:1283
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr "WinMerge - Archiefondersteuning uitgeschakeld"
-#: Merge.rc:1303
+#: Merge.rc:1286
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "Kon geen 7-zipversie detecteren (niet ge\xEFnstalleerd?)"
-#: Merge.rc:1306
+#: Merge.rc:1289
#, c-format
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
@@ -2085,12 +2073,12 @@
"Archiefondersteuning vereist dat 7-zip 3.11 of later ge\xEFnstalleerd is op uw pc, of dat de\n"
"essenti\xEBle onderdelen gekopieerd worden naar de programmamap voor standalone-werking."
-#: Merge.rc:1308
+#: Merge.rc:1291
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "Er moet ook een overeenkomstige interface-plugin (Merge7z*.dll) aanwezig zijn op het pad."
-#: Merge.rc:1310
+#: Merge.rc:1293
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
@@ -2099,12 +2087,12 @@
"Gelieve de hieronder aangeraden versie van 7-zip te gebruiken totdat interface-plugins voor\n"
"latere versies beschikbaar worden."
-#: Merge.rc:1312
+#: Merge.rc:1295
#, c-format
msgid "Version"
msgstr "Versie"
-#: Merge.rc:1314
+#: Merge.rc:1297
#, c-format
msgid ""
"Plugin required\n"
@@ -2113,54 +2101,54 @@
"Plugin nodig\n"
"(dllbuild %04u)"
-#: Merge.rc:1316
+#: Merge.rc:1299
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "Aangeraden versie van 7-Zip:"
-#: Merge.rc:1319
-#: Merge.rc:1322
+#: Merge.rc:1302
+#: Merge.rc:1305
#, c-format
msgid "present"
msgstr "aanwezig"
-#: Merge.rc:1320
+#: Merge.rc:1303
#, c-format
msgid "Merge7z000U.dll"
msgstr "Merge7z000U.dll"
-#: Merge.rc:1323
+#: Merge.rc:1306
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr "7-Zip software ge\xEFnstalleerd op deze pc:"
-#: Merge.rc:1325
-#: Merge.rc:1330
+#: Merge.rc:1308
+#: Merge.rc:1313
#, c-format
msgid "none"
msgstr "geen"
-#: Merge.rc:1327
+#: Merge.rc:1310
#, c-format
msgid "missing"
msgstr "ontbreekt"
-#: Merge.rc:1328
+#: Merge.rc:1311
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "7-Zip-onderdelen voor standalone-werking:"
-#: Merge.rc:1332
+#: Merge.rc:1315
#, c-format
msgid "outdated"
msgstr "verouderd"
-#: Merge.rc:1333
+#: Merge.rc:1316
#, c-format
msgid "Plugins on path:"
msgstr "Plugins op pad:"
-#: Merge.rc:1334
+#: Merge.rc:1317
#, c-format
msgid ""
"Don't display this &message again.\n"
@@ -2169,535 +2157,567 @@
"Toon dit bericht niet meer.\n"
"(U kan dit bericht altijd terugroepen van het Help-menu.)"
-#: Merge.rc:1338
+#: Merge.rc:1321
#, c-format
msgid "Plugin Download"
msgstr "Plugin-download"
-#: Merge.rc:1347
+#: Merge.rc:1330
#, c-format
msgid "Options"
msgstr "Opties"
-#: Merge.rc:1358
+#: Merge.rc:1341
#, c-format
msgid " Categories"
msgstr " Categorie\xEBn"
-#: Merge.rc:1360
+#: Merge.rc:1343
#, c-format
msgid "Import..."
msgstr "Importeren..."
-#: Merge.rc:1361
+#: Merge.rc:1344
#, c-format
msgid "Export..."
msgstr "Exporteren..."
-#: Merge.rc:1369
+#: Merge.rc:1352
#, c-format
msgid "Keywords:"
msgstr "Sleutelwoorden:"
-#: Merge.rc:1370
+#: Merge.rc:1353
#, c-format
msgid "Function names:"
msgstr "Functienamen"
-#: Merge.rc:1371
+#: Merge.rc:1354
#, c-format
msgid "Comments:"
msgstr "Opmerkingen:"
-#: Merge.rc:1372
+#: Merge.rc:1355
#, c-format
msgid "Numbers:"
msgstr "Nummers:"
-#: Merge.rc:1373
+#: Merge.rc:1356
#, c-format
msgid "Operators:"
msgstr "Operators:"
-#: Merge.rc:1374
+#: Merge.rc:1357
#, c-format
msgid "Strings:"
msgstr "Strings:"
-#: Merge.rc:1375
+#: Merge.rc:1358
#, c-format
msgid "Preprocessor:"
msgstr "Preprocessor:"
-#: Merge.rc:1376
+#: Merge.rc:1359
#, c-format
msgid "User 1:"
msgstr "Gebruiker 1:"
-#: Merge.rc:1377
+#: Merge.rc:1360
#, c-format
msgid "User 2:"
msgstr "Gebruiker 2:"
-#: Merge.rc:1382
-#: Merge.rc:1387
-#: Merge.rc:1392
-#: Merge.rc:1397
-#: Merge.rc:1402
-#: Merge.rc:1407
-#: Merge.rc:1412
-#: Merge.rc:1417
-#: Merge.rc:1422
+#: Merge.rc:1365
+#: Merge.rc:1370
+#: Merge.rc:1375
+#: Merge.rc:1380
+#: Merge.rc:1385
+#: Merge.rc:1390
+#: Merge.rc:1395
+#: Merge.rc:1400
+#: Merge.rc:1405
#, c-format
msgid "Bold"
msgstr "Vet"
-#: Merge.rc:1430
+#: Merge.rc:1413
#, c-format
msgid "Folder Compare Report"
msgstr "Mapvergelijkingsrapport"
-#: Merge.rc:1433
+#: Merge.rc:1416
#, c-format
msgid "Report &File:"
msgstr "Rapporteer &bestand"
-#: Merge.rc:1436
-#: Merge.rc:1610
-#: Merge.rc:1614
-#: Merge.rc:1641
+#: Merge.rc:1419
+#: Merge.rc:1593
+#: Merge.rc:1597
+#: Merge.rc:1624
#, c-format
msgid "Browse..."
msgstr "Bladeren..."
-#: Merge.rc:1437
+#: Merge.rc:1420
#, c-format
msgid "&Style:"
msgstr "&Stijl:"
-#: Merge.rc:1440
+#: Merge.rc:1423
#, c-format
msgid "&Copy to Clipboard"
msgstr "Naar klembord kopi\xEBren"
-#: Merge.rc:1448
+#: Merge.rc:1431
#, c-format
msgid "Shared or Private Filter"
msgstr "Gedeelde of persoonlijke filter"
-#: Merge.rc:1451
+#: Merge.rc:1434
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "Welk type filter wilt u maken?"
-#: Merge.rc:1453
+#: Merge.rc:1436
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "Gedeelde filter (voor alle gebruikers op deze pc)"
-#: Merge.rc:1455
+#: Merge.rc:1438
#, c-format
msgid "Private Filter (only for current user)"
msgstr "Private filter (alleen voor huidige gebruiker)"
-#: Merge.rc:1463
-#: Merge.rc:1964
+#: Merge.rc:1446
+#: Merge.rc:1965
#, c-format
msgid "Archive Support"
msgstr "Archiefondersteuning"
-#: Merge.rc:1466
+#: Merge.rc:1449
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr "Archiefondersteuning vereist dat de 7-Zip-plugin ge\xEFnstalleerd is:"
-#: Merge.rc:1468
+#: Merge.rc:1451
#, c-format
msgid "Download 7-zip Plugin"
msgstr "Download de 7-Zip-plugin"
-#: Merge.rc:1469
+#: Merge.rc:1452
#, c-format
msgid "&Enable archive file support"
msgstr "Activeer archiefbestand-ondersteuning"
-#: Merge.rc:1471
+#: Merge.rc:1454
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "Gebr&uik stand-alone 7-Zip indien beschikbaar"
-#: Merge.rc:1474
+#: Merge.rc:1457
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "Gebruik lokale 7-Zip van WinMerge-map"
-#: Merge.rc:1476
+#: Merge.rc:1459
#, c-format
msgid "&Detect archive type from file signature"
msgstr "&Detecteer archieftype via bestandssignatuur"
-#: Merge.rc:1484
+#: Merge.rc:1467
#, c-format
msgid "Compare Statistics"
msgstr "Vergelijkingsstatistieken"
-#: Merge.rc:1487
+#: Merge.rc:1470
#, c-format
msgid "Folders:"
msgstr "Mappen:"
-#: Merge.rc:1488
+#: Merge.rc:1471
#, c-format
msgid "Files:"
msgstr "Bestanden:"
-#: Merge.rc:1489
-#: Merge.rc:2355
+#: Merge.rc:1472
+#: Merge.rc:2359
#, c-format
msgid "Different"
msgstr "Verschillend"
-#: Merge.rc:1490
+#: Merge.rc:1473
#, c-format
msgid "Text:"
msgstr "Tekst:"
-#: Merge.rc:1493
-#: Merge.rc:1512
+#: Merge.rc:1476
+#: Merge.rc:1495
#, c-format
msgid "Binary:"
msgstr "Binary:"
-#: Merge.rc:1496
+#: Merge.rc:1479
#, c-format
msgid "Unique"
msgstr "Uniek"
-#: Merge.rc:1497
+#: Merge.rc:1480
#, c-format
msgid "Left:"
msgstr "Links:"
-#: Merge.rc:1502
+#: Merge.rc:1485
#, c-format
msgid "Right:"
msgstr "Rechts:"
-#: Merge.rc:1507
-#: Merge.rc:2349
+#: Merge.rc:1490
+#: Merge.rc:2353
#, c-format
msgid "Identical"
msgstr "Identiek"
-#: Merge.rc:1516
+#: Merge.rc:1499
#, c-format
msgid "Total:"
msgstr "Totaal:"
-#: Merge.rc:1521
+#: Merge.rc:1504
#, c-format
msgid "Close"
msgstr "Sluiten"
-#: Merge.rc:1530
+#: Merge.rc:1513
#, c-format
msgid "Affects"
msgstr "Aanpassingen"
-#: Merge.rc:1533
-#: Merge.rc:1536
+#: Merge.rc:1516
+#: Merge.rc:1519
#, c-format
msgid "(Affects)"
msgstr "(Aanpassingen)"
-#: Merge.rc:1537
+#: Merge.rc:1520
#, c-format
msgid "Select Codepage for"
msgstr "Selecteer codetabel voor"
-#: Merge.rc:1538
+#: Merge.rc:1521
#, c-format
msgid "&File Loading:"
msgstr "Bestanden laden:"
-#: Merge.rc:1540
-#: Merge.rc:1543
+#: Merge.rc:1523
+#: Merge.rc:1526
#, c-format
msgid "..."
msgstr "..."
-#: Merge.rc:1541
+#: Merge.rc:1524
#, c-format
msgid "File &Saving:"
msgstr "Bestanden op&slaan:"
-#: Merge.rc:1544
+#: Merge.rc:1527
#, c-format
msgid "&Use same codepage for both"
msgstr "Gebr&uik dezelfde codetabel voor beide"
-#: Merge.rc:1547
+#: Merge.rc:1530
#, c-format
msgid "&Apply"
msgstr "Toepassen"
-#: Merge.rc:1548
-#: Merge.rc:1930
+#: Merge.rc:1531
+#: Merge.rc:1931
#, c-format
msgid "&Cancel"
msgstr "Annuleren"
-#: Merge.rc:1553
+#: Merge.rc:1536
#, c-format
msgid "Test Filter"
msgstr "Test filter"
-#: Merge.rc:1556
+#: Merge.rc:1539
#, c-format
msgid "Testing filter ..."
msgstr "Filter testen..."
-#: Merge.rc:1558
+#: Merge.rc:1541
#, c-format
msgid "&Enter text to test:"
msgstr "G&eef tekst op om te testen:"
-#: Merge.rc:1560
+#: Merge.rc:1543
#, c-format
msgid "&Folder Name"
msgstr "Mapnaam"
-#: Merge.rc:1562
+#: Merge.rc:1545
#, c-format
msgid "Result:"
msgstr "Resultaat:"
-#: Merge.rc:1566
+#: Merge.rc:1549
#, c-format
msgid "&Test"
msgstr "&Test"
-#: Merge.rc:1567
+#: Merge.rc:1550
#, c-format
msgid "&Close"
msgstr "Sluiten"
-#: Merge.rc:1575
+#: Merge.rc:1558
#, c-format
msgid "&Use customized text colors"
msgstr "Gebr&uik aangepaste tekstkleuren"
-#: Merge.rc:1578
+#: Merge.rc:1561
#, c-format
msgid "Custom text colors"
msgstr "Aangepaste tekstkleuren"
-#: Merge.rc:1580
+#: Merge.rc:1563
#, c-format
msgid "Whitespace:"
msgstr "Witruimte:"
-#: Merge.rc:1581
+#: Merge.rc:1564
#, c-format
msgid "Regular text:"
msgstr "Gewone tekst:"
-#: Merge.rc:1582
+#: Merge.rc:1565
#, c-format
msgid "Selection:"
msgstr "Selectie:"
-#: Merge.rc:1605
+#: Merge.rc:1588
#, c-format
msgid "Paths"
msgstr "Paden"
-#: Merge.rc:1611
+#: Merge.rc:1594
#, c-format
msgid "R&ead-only"
msgstr "All&een-lezen"
-#: Merge.rc:1615
+#: Merge.rc:1598
#, c-format
msgid "Re&ad-only"
msgstr "&Alleen-lezen"
-#: Merge.rc:1621
+#: Merge.rc:1604
#, c-format
msgid "Open..."
msgstr "Openen..."
-#: Merge.rc:1622
+#: Merge.rc:1605
#, c-format
msgid "Save..."
msgstr "Opslaan..."
-#: Merge.rc:1627
-#: Merge.rc:1965
+#: Merge.rc:1610
+#: Merge.rc:1966
#, c-format
msgid "Backup Files"
msgstr "Backupbestanden"
-#: Merge.rc:1630
+#: Merge.rc:1613
#, c-format
msgid "Create backup files in:"
msgstr "Maak backupbestanden in:"
-#: Merge.rc:1635
+#: Merge.rc:1618
#, c-format
msgid "Create backup files into:"
msgstr "Maak backupbestanden binnen:"
-#: Merge.rc:1636
+#: Merge.rc:1619
#, c-format
msgid "&Original file's folder"
msgstr "Map van &origineel bestand"
-#: Merge.rc:1638
+#: Merge.rc:1621
#, c-format
msgid "&Global backup folder:"
msgstr "&Globale backupmap:"
-#: Merge.rc:1642
+#: Merge.rc:1625
#, c-format
msgid "Backup filename:"
msgstr "Bestandsnaam backup:"
-#: Merge.rc:1643
+#: Merge.rc:1626
#, c-format
msgid "&Append .bak -extension"
msgstr "Voeg .b&ak-extensie toe"
-#: Merge.rc:1645
+#: Merge.rc:1628
#, c-format
msgid "A&ppend timestamp"
msgstr "Voeg tijdstem&pel toe"
-#: Merge.rc:1652
-#: Merge.rc:2257
+#: Merge.rc:1635
+#: Merge.rc:2261
#, c-format
msgid "Confirm Copy"
msgstr "Bevestig kopi\xEBren"
-#: Merge.rc:1656
+#: Merge.rc:1639
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Bent u zeker dat u XXX items wilt kopi\xEBren?"
-#: Merge.rc:1658
+#: Merge.rc:1641
#, c-format
msgid "From left"
msgstr "Van links"
-#: Merge.rc:1661
+#: Merge.rc:1644
#, c-format
msgid "To right"
msgstr "Naar rechts"
-#: Merge.rc:1664
+#: Merge.rc:1647
#, c-format
msgid "Yes"
msgstr "Ja"
-#: Merge.rc:1665
+#: Merge.rc:1648
#, c-format
msgid "No"
msgstr "Nee"
-#: Merge.rc:1671
+#: Merge.rc:1654
#, c-format
msgid "Plugins"
msgstr "Plugins"
-#: Merge.rc:1674
+#: Merge.rc:1657
#, c-format
msgid "&Enable plugins"
msgstr "Plugins activeren"
-#: Merge.rc:1685
-#: Merge.rc:1966
+#: Merge.rc:1668
+#: Merge.rc:1967
#, c-format
msgid "Shell Integration"
msgstr "Shell-integratie"
-#: Merge.rc:1688
+#: Merge.rc:1671
#, c-format
msgid "Explorer"
msgstr "Verkenner"
-#: Merge.rc:1689
+#: Merge.rc:1672
#, c-format
msgid "E&nable advanced menu"
msgstr "Geavanceerd me&nu inschakelen"
-#: Merge.rc:1691
+#: Merge.rc:1674
#, c-format
msgid "In&clude subfolders by default"
msgstr "Submappen standaard bijvoegen"
-#: Merge.rc:1693
+#: Merge.rc:1676
#, c-format
msgid "&Add to context menu"
msgstr "Toevoegen &aan contextmenu van verkenner"
-#: Merge.rc:1695
+#: Merge.rc:1678
#, c-format
msgid "Folder compare"
msgstr "Mappen vergelijken"
-#: Merge.rc:1696
+#: Merge.rc:1679
#, c-format
msgid "Add &Shell menu to context menu"
msgstr "Toevoegen &aan contextmenu van verkenner"
+#: Merge.rc:1686
+#: Merge.rc:1970
+#: Merge.rc:2307
+#, c-format
+msgid "Folder"
+msgstr "Map"
+
+#: Merge.rc:1689
+#, c-format
+msgid "&Compare method:"
+msgstr "Vergelijkingsmethode:"
+
+#: Merge.rc:1691
+#, c-format
+msgid "S&top after first difference"
+msgstr "S&top na eerste verschil"
+
+#: Merge.rc:1693
+#, c-format
+msgid "Ign&ore time differences less than 3 seconds"
+msgstr "Negeer tijdsverschillen kleiner dan 3 sec&onden"
+
+#: Merge.rc:1695
+#, c-format
+msgid "&Include unique subfolders contents"
+msgstr "Inclusief inhoud van unieke submappen"
+
+#: Merge.rc:1697
+#, c-format
+msgid "&Quick compare limit (MB):"
+msgstr "Limiet voor snel vergelijken (MB):"
+
#. StringFileInfo.Block
-#: Merge.rc:1722
+#: Merge.rc:1723
#, c-format
msgid "040904e4"
msgstr "041304e4"
#. VarFileInfo.Translation
-#: Merge.rc:1738
+#: Merge.rc:1739
#, c-format
msgid "0x409, 1252"
msgstr "0x413, 1252"
-#: Merge.rc:1753
+#: Merge.rc:1754
#, c-format
msgid "Ready"
msgstr "Gereed"
-#: Merge.rc:1759
+#: Merge.rc:1760
#, c-format
msgid "EXT"
msgstr "UIT"
-#: Merge.rc:1760
+#: Merge.rc:1761
#, c-format
msgid "CAP"
msgstr "CAP"
-#: Merge.rc:1761
+#: Merge.rc:1762
#, c-format
msgid "NUM"
msgstr "NUM"
-#: Merge.rc:1762
+#: Merge.rc:1763
#, c-format
msgid "SCRL"
msgstr "SCRL"
-#: Merge.rc:1763
+#: Merge.rc:1764
#, c-format
msgid "OVR"
msgstr "OVR"
-#: Merge.rc:1764
+#: Merge.rc:1765
#, c-format
msgid "REC"
msgstr "OPN"
-#: Merge.rc:1770
+#: Merge.rc:1771
#, c-format
msgid ""
"Create empty documents\n"
@@ -2706,7 +2726,7 @@
"Lege documenten aanmaken\n"
"Nieuwe documenten (Ctrl+N)"
-#: Merge.rc:1771
+#: Merge.rc:1772
#, c-format
msgid ""
"Open an existing document\n"
@@ -2715,7 +2735,7 @@
"Een bestaand document openen.\n"
"Openen (Ctrl+O)"
-#: Merge.rc:1772
+#: Merge.rc:1773
#, c-format
msgid ""
"Close the active document\n"
@@ -2724,7 +2744,7 @@
"Het actieve document sluiten.\n"
"Sluiten"
-#: Merge.rc:1773
+#: Merge.rc:1774
#, c-format
msgid ""
"Save the active document\n"
@@ -2733,7 +2753,7 @@
"Actief document opslaan.\n"
"Opslaan"
-#: Merge.rc:1774
+#: Merge.rc:1775
#, c-format
msgid ""
"Save the active document with a new name\n"
@@ -2742,7 +2762,7 @@
"Actief document opslaan met een andere naam.\n"
"Opslaan als"
-#: Merge.rc:1775
+#: Merge.rc:1776
#, c-format
msgid ""
"Change the printing options\n"
@@ -2751,7 +2771,7 @@
"De pagina-instellingen wijzigen.\n"
"Pagina-instellingen"
-#: Merge.rc:1776
+#: Merge.rc:1777
#, c-format
msgid ""
"Change the printer and printing options\n"
@@ -2760,7 +2780,7 @@
"De printerinstellingen wijzigen.\n"
"Printerinstellingen"
-#: Merge.rc:1777
+#: Merge.rc:1778
#, c-format
msgid ""
"Print the active document\n"
@@ -2769,7 +2789,7 @@
"Actief document afdrukken.\n"
"Afdrukken"
-#: Merge.rc:1778
+#: Merge.rc:1779
#, c-format
msgid ""
"Display full pages\n"
@@ -2778,27 +2798,27 @@
"Toon volledige pagina's\n"
"Afdrukvoorbeeld"
-#: Merge.rc:1783
+#: Merge.rc:1784
#, c-format
msgid "Make all hidden items visible again"
msgstr "Maak alle verborgen items terug zichtbaar"
-#: Merge.rc:1784
+#: Merge.rc:1785
#, c-format
msgid "Toggle tree mode"
msgstr "Tree-modus aan/uit"
-#: Merge.rc:1785
+#: Merge.rc:1786
#, c-format
msgid "Expand all subfolders"
msgstr "Alle submappen uitklappen"
-#: Merge.rc:1786
+#: Merge.rc:1787
#, c-format
msgid "Collapse all subfolders"
msgstr "Alle submappen inklappen"
-#: Merge.rc:1792
+#: Merge.rc:1793
#, c-format
msgid ""
"Open project file\n"
@@ -2807,32 +2827,32 @@
"Open projectbestand\n"
"Projectbestand (Ctrl+J)"
-#: Merge.rc:1793
+#: Merge.rc:1794
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "Onbekende fout bij poging tot openen van projectbestand"
-#: Merge.rc:1794
+#: Merge.rc:1795
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "Onbekende fout bij poging tot opslaan van projectbestand"
-#: Merge.rc:1795
+#: Merge.rc:1796
#, c-format
msgid "Project File"
msgstr "Projectbestand"
-#: Merge.rc:1796
+#: Merge.rc:1797
#, c-format
msgid "Project file successfully loaded."
msgstr "Projectbestand met succes geladen."
-#: Merge.rc:1797
+#: Merge.rc:1798
#, c-format
msgid "Project file successfully saved."
msgstr "Projectbestand met succes opgeslagen."
-#: Merge.rc:1798
+#: Merge.rc:1799
#, c-format
msgid ""
"Save current paths and options to project file\n"
@@ -2841,7 +2861,7 @@
"Huidige paden en opties opslaan naar projectbestand\n"
"Projectbestand opslaan"
-#: Merge.rc:1803
+#: Merge.rc:1804
#, c-format
msgid ""
"Display program information, version number and copyright\n"
@@ -2850,7 +2870,7 @@
"Programma-informatie, versienummer en auteursrechten tonen.\n"
"Info"
-#: Merge.rc:1804
+#: Merge.rc:1805
#, c-format
msgid ""
"Quit the application; prompts to save documents\n"
@@ -2859,7 +2879,6 @@
"Applicatie afsluiten, vraagt naar opslaan documenten\n"
"Afsluiten"
-#: Merge.rc:1810
#: Merge.rc:1811
#: Merge.rc:1812
#: Merge.rc:1813
@@ -2875,11 +2894,12 @@
#: Merge.rc:1823
#: Merge.rc:1824
#: Merge.rc:1825
+#: Merge.rc:1826
#, c-format
msgid "Open this document"
msgstr "Dit document openen"
-#: Merge.rc:1830
+#: Merge.rc:1831
#, c-format
msgid ""
"Switch to the next window pane\n"
@@ -2888,7 +2908,7 @@
"Ga naar het volgende vensterdeel.\n"
"Volgende venster"
-#: Merge.rc:1831
+#: Merge.rc:1832
#, c-format
msgid ""
"Switch back to the previous window pane\n"
@@ -2897,7 +2917,7 @@
"Ga naar het vorige vensterdeel.\n"
"Vorige venster"
-#: Merge.rc:1837
+#: Merge.rc:1838
#, c-format
msgid ""
"Arrange windows so they overlap\n"
@@ -2906,7 +2926,7 @@
"Alle vensters trapsgewijs rangschikken.\n"
"Trapsgewijs"
-#: Merge.rc:1838
+#: Merge.rc:1839
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
@@ -2915,7 +2935,7 @@
"Alle vensters horizontaal rangschikken.\n"
"Horizontaal rangschikken"
-#: Merge.rc:1839
+#: Merge.rc:1840
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
@@ -2924,7 +2944,7 @@
"Alle vensters verticaal rangschikken.\n"
"Verticaal rangschikken"
-#: Merge.rc:1845
+#: Merge.rc:1846
#, c-format
msgid ""
"Copy the selection and put it on the Clipboard\n"
@@ -2933,7 +2953,7 @@
"De selectie naar het klembord kopi\xEBren\n"
"Kopi\xEBren"
-#: Merge.rc:1846
+#: Merge.rc:1847
#, c-format
msgid ""
"Cut the selection and put it on the Clipboard\n"
@@ -2942,7 +2962,7 @@
"De slecetie naar het klembord verplaatsen.\n"
"Knippen"
-#: Merge.rc:1847
+#: Merge.rc:1848
#, c-format
msgid ""
"Find the specified text\n"
@@ -2951,7 +2971,7 @@
"De aangegeven tekst vinden.\n"
"Vinden"
-#: Merge.rc:1848
+#: Merge.rc:1849
#, c-format
msgid ""
"Insert Clipboard contents\n"
@@ -2960,7 +2980,7 @@
"Inhoud klembord invoegen\n"
"Plakken"
-#: Merge.rc:1849
+#: Merge.rc:1850
#, c-format
msgid ""
"Repeat the last action\n"
@@ -2969,7 +2989,7 @@
"Laatste actie herhalen.\n"
"Herhalen"
-#: Merge.rc:1850
+#: Merge.rc:1851
#, c-format
msgid ""
"Replace specific text with different text\n"
@@ -2978,7 +2998,7 @@
"Gespecificeerde tekst door een andere vervangen.\n"
"Vervangen"
-#: Merge.rc:1851
+#: Merge.rc:1852
#, c-format
msgid ""
"Select the entire document\n"
@@ -2987,7 +3007,7 @@
"Het hele document selecteren.\n"
"Alles selecteren"
-#: Merge.rc:1852
+#: Merge.rc:1853
#, c-format
msgid ""
"Undo the last action\n"
@@ -2996,7 +3016,7 @@
"Laatste actie ongedaan maken.\n"
"Ongedaan maken"
-#: Merge.rc:1853
+#: Merge.rc:1854
#, c-format
msgid ""
"Redo the previously undone action\n"
@@ -3005,7 +3025,7 @@
"Ongedaangemaakte actie opnieuw uitvoeren.\n"
"Opnieuw"
-#: Merge.rc:1859
+#: Merge.rc:1860
#, c-format
msgid ""
"Show or hide the toolbar\n"
@@ -3014,7 +3034,7 @@
"De werkbalk tonen of verbergen\n"
"Werkbalk"
-#: Merge.rc:1860
+#: Merge.rc:1861
#, c-format
msgid ""
"Show or hide the status bar\n"
@@ -3023,7 +3043,7 @@
"De statusbalk tonen of verbergen\n"
"Statusbalk"
-#: Merge.rc:1861
+#: Merge.rc:1862
#, c-format
msgid ""
"Show or hide the tab bar\n"
@@ -3032,7 +3052,7 @@
"Toon of verberg de tab-balk\n"
"Tab-balk aan/uit"
-#: Merge.rc:1862
+#: Merge.rc:1863
#, c-format
msgid ""
"Automatically resize panes\n"
@@ -3041,57 +3061,57 @@
"Stel venstergrootte automatisch in\n"
"Vensters vastzetten"
-#: Merge.rc:1868
+#: Merge.rc:1869
#, c-format
msgid "Change the window size"
msgstr "De grootte van het venster wijzigen"
-#: Merge.rc:1869
+#: Merge.rc:1870
#, c-format
msgid "Change the window position"
msgstr "Het venster verplaatsen"
-#: Merge.rc:1870
+#: Merge.rc:1871
#, c-format
msgid "Reduce the window to an icon"
msgstr "Venster minimaliseren"
-#: Merge.rc:1871
+#: Merge.rc:1872
#, c-format
msgid "Enlarge the window to full size"
msgstr "Venster maximaliseren"
-#: Merge.rc:1872
+#: Merge.rc:1873
#, c-format
msgid "Switch to the next document window"
msgstr "Naar volgend documentvenster"
-#: Merge.rc:1873
+#: Merge.rc:1874
#, c-format
msgid "Switch to the previous document window"
msgstr "Naar vorig documentvenster"
-#: Merge.rc:1874
+#: Merge.rc:1875
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr "Het actieve venster sluiten, vraag naar opslaan van documenten."
-#: Merge.rc:1879
+#: Merge.rc:1880
#, c-format
msgid "Restore the window to normal size"
msgstr "Venster terug naar vorige formaat"
-#: Merge.rc:1880
+#: Merge.rc:1881
#, c-format
msgid "Activate Task List"
msgstr "Lijst actieve taken"
-#: Merge.rc:1881
+#: Merge.rc:1882
#, c-format
msgid "Activate this window"
msgstr "Dit venster activeren"
-#: Merge.rc:1887
+#: Merge.rc:1888
#, c-format
msgid ""
"Close print preview mode\n"
@@ -3100,7 +3120,7 @@
"Afdrukvoorbeeld sluiten\n"
"Afsluiten voorbeeld"
-#: Merge.rc:1894
+#: Merge.rc:1895
#, c-format
msgid ""
"\n"
@@ -3119,7 +3139,7 @@
"WinMerge.BestandsVergelijking\n"
"WinMerge BestandsVergelijking"
-#: Merge.rc:1895
+#: Merge.rc:1896
#, c-format
msgid ""
"\n"
@@ -3138,23 +3158,23 @@
"WinMerge.MapVergelijking\n"
"WinMerge MapVergelijking"
-#: Merge.rc:1902
+#: Merge.rc:1903
#, c-format
msgid "Preserve original EOL chars"
msgstr "Originele regeleindes behouden"
-#: Merge.rc:1909
+#: Merge.rc:1910
#, c-format
msgid "Press any key"
msgstr "Druk op een willekeurige toets"
-#: Merge.rc:1915
#: Merge.rc:1916
+#: Merge.rc:1917
#, c-format
msgid "Right click on the path to copy"
msgstr "Klik rechts op het pad om het te kopi\xEBren"
-#: Merge.rc:1922
+#: Merge.rc:1923
#, c-format
msgid ""
"Developers:\n"
@@ -3163,157 +3183,158 @@
"Ontwikkelaars:\n"
"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-#: Merge.rc:1923
+#: Merge.rc:1924
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr "WinMerge komt ABSOLUUT ZONDER GARANTIE. Dit is vrije software, en u mag het herverdelen onder bepaalde omstandigheden; zie de GNU General Public License in het Help-menu voor details."
-#: Merge.rc:1929
+#: Merge.rc:1930
#, c-format
msgid "&Ok"
msgstr "&Ok"
-#: Merge.rc:1931
+#: Merge.rc:1932
#, c-format
msgid "&Abort"
msgstr "&Afbreken"
-#: Merge.rc:1932
+#: Merge.rc:1933
#, c-format
msgid "&Retry"
msgstr "&Herhalen"
-#: Merge.rc:1933
+#: Merge.rc:1934
#, c-format
msgid "&Ignore"
msgstr "&Negeren"
-#: Merge.rc:1934
+#: Merge.rc:1935
#, c-format
msgid "Ignore &all"
msgstr "&Alles negeren"
-#: Merge.rc:1935
+#: Merge.rc:1936
#, c-format
msgid "&Yes"
msgstr "&Ja"
-#: Merge.rc:1941
+#: Merge.rc:1942
#, c-format
msgid "Yes to &all"
msgstr "Ja op &alles"
-#: Merge.rc:1942
+#: Merge.rc:1943
#, c-format
msgid "&No"
msgstr "&Nee"
-#: Merge.rc:1943
+#: Merge.rc:1944
#, c-format
msgid "No to a&ll"
msgstr "Nee op a&lles"
-#: Merge.rc:1944
+#: Merge.rc:1945
#, c-format
msgid "&Continue"
msgstr "&Doorgaan"
-#: Merge.rc:1945
+#: Merge.rc:1946
#, c-format
msgid "&Skip"
msgstr "&Overslaan"
-#: Merge.rc:1946
+#: Merge.rc:1947
#, c-format
msgid "Skip &all"
msgstr "&Alles overslaan"
-#: Merge.rc:1948
+#: Merge.rc:1949
#, c-format
msgid "Don't display this &message again."
msgstr "Dit bericht niet &meer tonen."
-#: Merge.rc:1949
+#: Merge.rc:1950
#, c-format
msgid "Don't ask this &question again."
msgstr "Deze &vraag niet meer stellen."
-#: Merge.rc:1959
+#: Merge.rc:1961
#, c-format
-msgid "Syntax colors"
-msgstr "Syntaxkleuren"
+msgid "Syntax"
+msgstr "Syntax"
-#: Merge.rc:1960
+#: Merge.rc:1963
#, c-format
-msgid "Text Colors"
-msgstr "Tekstkleuren"
-
-#: Merge.rc:1962
-#, c-format
msgid "Version Control"
msgstr "Versiebeheer"
-#: Merge.rc:1973
+#: Merge.rc:1968
+#: Merge.rc:2339
#, c-format
+msgid "Differences"
+msgstr "Verschillen"
+
+#: Merge.rc:1977
+#, c-format
msgid "To:"
msgstr "Naar:"
-#: Merge.rc:1974
+#: Merge.rc:1978
#, c-format
msgid "From left:"
msgstr "Van links:"
-#: Merge.rc:1975
+#: Merge.rc:1979
#, c-format
msgid "To left:"
msgstr "Naar links:"
-#: Merge.rc:1976
+#: Merge.rc:1980
#, c-format
msgid "From right:"
msgstr "Van rechts:"
-#: Merge.rc:1977
+#: Merge.rc:1981
#, c-format
msgid "To right:"
msgstr "Naar rechts:"
-#: Merge.rc:1983
+#: Merge.rc:1987
#, c-format
msgid "Version %1"
msgstr "Versie %1 - Nederlands"
-#: Merge.rc:1984
+#: Merge.rc:1988
#, c-format
msgid "Unicode"
msgstr "Unicode"
-#: Merge.rc:1985
+#: Merge.rc:1989
#, c-format
msgid "X64"
msgstr "X64"
-#: Merge.rc:1991
+#: Merge.rc:1995
#, c-format
msgid "Options (%1)"
msgstr "Opties (%1)"
-#: Merge.rc:1992
+#: Merge.rc:1996
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Alle berichtvensters worden weer weergegeven."
-#: Merge.rc:1993
+#: Merge.rc:1997
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
msgstr "De huidige bestandsvergelijkingssessie is gewijzigd. Sommige instellingen werken pas als de huidige bestandsvergelijking opnieuw wordt gestart."
-#: Merge.rc:1994
+#: Merge.rc:1998
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr "De geselecteerde wijziging van het lettertype wordt niet toegepast in de openstaande vensters."
-#: Merge.rc:1996
+#: Merge.rc:2000
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
@@ -3324,7 +3345,7 @@
"\n"
"Gebruik waarden 1 - %1."
-#: Merge.rc:1998
+#: Merge.rc:2002
#, c-format
msgid ""
"Are you sure you want to reset all WinMerge options to default values?\n"
@@ -3335,129 +3356,129 @@
"\n"
"Herstart WinMerge na herstellen."
-#: Merge.rc:2004
+#: Merge.rc:2008
#, c-format
msgid "Open"
msgstr "Openen"
-#: Merge.rc:2005
+#: Merge.rc:2009
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Uitvoerbare bestanden|*.exe;*.bat;*.cmd|Alle bestanden (*.*)|*.*||"
-#: Merge.rc:2006
+#: Merge.rc:2010
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Alle bestanden (*.*)|*.*||"
-#: Merge.rc:2007
+#: Merge.rc:2011
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge Projectbestanden (*.WinMerge)|*.WinMerge||"
-#: Merge.rc:2009
+#: Merge.rc:2013
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Optie-bestanden (*.ini)|*.ini|Alle Bestanden (*.*)|*.*||"
-#: Merge.rc:2015
+#: Merge.rc:2019
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Tekstbestanden (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle Bestanden (*.*)|*.*||"
-#: Merge.rc:2016
+#: Merge.rc:2020
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML-bestanden (*.htm,*.html)|*.htm;*.html|Alle Bestanden (*.*)|*.*||"
-#: Merge.rc:2017
+#: Merge.rc:2021
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML-bestanden (*.xml)|*.xml|Alle Bestanden (*.*)|*.*||"
-#: Merge.rc:2023
+#: Merge.rc:2027
#, c-format
msgid "UTF-8"
msgstr "UTF-8"
-#: Merge.rc:2024
+#: Merge.rc:2028
#, c-format
msgid "UTF-8 (B)"
msgstr "UTF-8 (B)"
-#: Merge.rc:2025
+#: Merge.rc:2029
#, c-format
msgid "UCS-2 LE"
msgstr "UCS-2 LE"
-#: Merge.rc:2026
+#: Merge.rc:2030
#, c-format
msgid "UCS-2 BE"
msgstr "UCS-2 BE"
-#: Merge.rc:2032
+#: Merge.rc:2036
#, c-format
msgid "Full Contents"
msgstr "Volledige inhoud"
-#: Merge.rc:2033
+#: Merge.rc:2037
#, c-format
msgid "Quick Contents"
msgstr "Snelle inhoud"
-#: Merge.rc:2034
+#: Merge.rc:2038
#, c-format
msgid "Modified Date"
msgstr "Datum laatste wijziging"
-#: Merge.rc:2035
+#: Merge.rc:2039
#, c-format
msgid "Modified Date and Size"
msgstr "Aangepaste datum en grootte"
-#: Merge.rc:2036
+#: Merge.rc:2040
#, c-format
msgid "Size"
msgstr "Grootte"
-#: Merge.rc:2042
-#: Merge.rc:2667
+#: Merge.rc:2046
+#: Merge.rc:2671
#, c-format
msgid "Name"
msgstr "Naam"
-#: Merge.rc:2043
+#: Merge.rc:2047
#, c-format
msgid "Location"
msgstr "Locatie"
-#: Merge.rc:2044
+#: Merge.rc:2048
#, c-format
msgid "Filters"
msgstr "Filters"
-#: Merge.rc:2045
+#: Merge.rc:2049
#, c-format
msgid "[F] "
msgstr "[F] "
-#: Merge.rc:2046
-#: Merge.rc:2669
+#: Merge.rc:2050
+#: Merge.rc:2673
#, c-format
msgid "Description"
msgstr "Beschrijving"
-#: Merge.rc:2047
+#: Merge.rc:2051
#, c-format
msgid "Select filename for new filter"
msgstr "Selecteer bestandsnaam voor nieuwe filter"
-#: Merge.rc:2048
+#: Merge.rc:2052
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Bestandsfilters (*.flt)|*.flt|Alle Bestanden (*.*)|*.*||"
-#: Merge.rc:2050
+#: Merge.rc:2054
#, c-format
msgid ""
"Cannot find file filter template file!\n"
@@ -3470,7 +3491,7 @@
"Kopieer bestand %1 naar map WinMerge/Filters:\n"
"%2."
-#: Merge.rc:2052
+#: Merge.rc:2056
#, c-format
msgid ""
"Cannot copy filter template file to filter folder:\n"
@@ -3483,7 +3504,7 @@
"\n"
"Ga na of de map bestaat en schrijfbaar is."
-#: Merge.rc:2054
+#: Merge.rc:2058
#, c-format
msgid ""
"User's filter file folder is not defined!\n"
@@ -3494,7 +3515,7 @@
"\n"
"Selecteer filtermap in Opties/Systeem."
-#: Merge.rc:2056
+#: Merge.rc:2060
#, c-format
msgid ""
"Failed to delete the filter file:\n"
@@ -3507,12 +3528,12 @@
"\n"
"Misschien is het bestand alleen-lezen?"
-#: Merge.rc:2057
+#: Merge.rc:2061
#, c-format
msgid "Locate filter file to install"
msgstr "Localiseer te installeren filterbestand"
-#: Merge.rc:2059
+#: Merge.rc:2063
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -3523,17 +3544,17 @@
"\n"
"Kon nieuwe filter niet kopi\xEBren naar filtermap."
-#: Merge.rc:2061
+#: Merge.rc:2065
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr "Filterbestand bestaat reeds. Bestaande filter overschrijven?"
-#: Merge.rc:2067
+#: Merge.rc:2071
#, c-format
msgid "Regular expression"
msgstr "Reguliere expressie"
-#: Merge.rc:2073
+#: Merge.rc:2077
#, c-format
msgid ""
"Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3544,203 +3565,203 @@
"\n"
"Indien u dit nu niet wilt doen, kan u Nee selecteren en de vergelijkingen later vernieuwen."
-#: Merge.rc:2080
+#: Merge.rc:2084
#, c-format
msgid "&Path to SS.EXE:"
msgstr "&Pad naar SS.EXE:"
-#: Merge.rc:2086
+#: Merge.rc:2090
#, c-format
msgid "Folder Comparison Results"
msgstr "Resultaten mapvergelijking"
-#: Merge.rc:2087
+#: Merge.rc:2091
#, c-format
msgid "File Comparison"
msgstr "Restultaten bestandsvergelijking"
-#: Merge.rc:2088
+#: Merge.rc:2092
#, c-format
msgid "Untitled left"
msgstr "Geen titel links"
-#: Merge.rc:2089
+#: Merge.rc:2093
#, c-format
msgid "Untitled right"
msgstr "Geen titel rechts"
-#: Merge.rc:2090
+#: Merge.rc:2094
#, c-format
msgid "Theirs File"
msgstr "Hun bestand"
-#: Merge.rc:2091
+#: Merge.rc:2095
#, c-format
msgid "Mine File"
msgstr "Mijn bestand"
-#: Merge.rc:2097
+#: Merge.rc:2101
#, c-format
msgid "Scanning files..."
msgstr "Bestanden aan het scannen..."
-#: Merge.rc:2098
+#: Merge.rc:2102
#, c-format
msgid "Opening selection"
msgstr "Bezig met openen van selectie"
-#: Merge.rc:2099
+#: Merge.rc:2103
#, c-format
msgid "Copying Left to Right"
msgstr "Aan het kopi\xEBren van links naar rechts"
-#: Merge.rc:2100
+#: Merge.rc:2104
#, c-format
msgid "Copying Right to Left"
msgstr "Aan het kopi\xEBren van rechts naar links"
-#: Merge.rc:2101
+#: Merge.rc:2105
#, c-format
msgid "Copying All to Left"
msgstr "Alles naar links aan het kopi\xEBren"
-#: Merge.rc:2102
+#: Merge.rc:2106
#, c-format
msgid "Copying All to Right"
msgstr "Alles naar rechts aan het kopi\xEBren"
-#: Merge.rc:2103
+#: Merge.rc:2107
#, c-format
msgid "Copying files..."
msgstr "Bezig met kopi\xEBren van bestanden..."
-#: Merge.rc:2104
+#: Merge.rc:2108
#, c-format
msgid "Deleting files..."
msgstr "Bezig met verwijderen van bestanden..."
-#: Merge.rc:2105
+#: Merge.rc:2109
#, c-format
msgid "Moving files..."
msgstr "Bezig met verplaatsen van bestanden..."
-#: Merge.rc:2106
+#: Merge.rc:2110
#, c-format
msgid "Creating the report..."
msgstr "Rapport genereren..."
-#: Merge.rc:2107
+#: Merge.rc:2111
#, c-format
msgid "Undoing the last operation..."
msgstr "Laatste operatie ongedaan maken..."
-#: Merge.rc:2108
+#: Merge.rc:2112
#, c-format
msgid "Redoing the previous operation..."
msgstr "Vorige operatie opnieuw doen..."
-#: Merge.rc:2114
+#: Merge.rc:2118
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Rg: %s Kol: %d/%d Tk: %d/%d EVR: %s"
-#: Merge.rc:2115
+#: Merge.rc:2119
#, c-format
msgid "Line: %s"
msgstr "Regel: %s"
-#: Merge.rc:2116
+#: Merge.rc:2120
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Rg: %s Kol: %d/%d Tk: %d/%d"
-#: Merge.rc:2117
+#: Merge.rc:2121
#, c-format
msgid "Merge"
msgstr "Samenvoegen"
-#: Merge.rc:2118
+#: Merge.rc:2122
#, c-format
msgid "Difference %1 of %2"
msgstr "Verschil %1 van %2"
-#: Merge.rc:2119
+#: Merge.rc:2123
#, c-format
msgid "%1 Differences Found"
msgstr "%1 verschillen gevonden"
-#: Merge.rc:2120
+#: Merge.rc:2124
#, c-format
msgid "1 Difference Found"
msgstr "E\xE9n verschil gevonden"
#. Abbreviation from "Read Only"
-#: Merge.rc:2121
+#: Merge.rc:2125
#, c-format
msgid "RO"
msgstr "AL"
-#: Merge.rc:2127
+#: Merge.rc:2131
#, c-format
msgid "Item %1 of %2"
msgstr "Item %1 van %2"
-#: Merge.rc:2128
+#: Merge.rc:2132
#, c-format
msgid "Items: %1"
msgstr "Items: %1"
-#: Merge.rc:2134
+#: Merge.rc:2138
#, c-format
msgid "Select two existing folders or files to compare"
msgstr "Selecteer twee bestaande mappen of bestanden om te vergelijken"
-#: Merge.rc:2135
+#: Merge.rc:2139
#, c-format
msgid "Folder Selection"
msgstr "Selectie van mappen"
-#: Merge.rc:2136
+#: Merge.rc:2140
#, c-format
msgid "Select two folders or two files to compare."
msgstr "Selecteer twee mappen of bestanden om te vergelijken."
-#: Merge.rc:2137
+#: Merge.rc:2141
#, c-format
msgid "Left path is invalid!"
msgstr "Linker pad is ongeldig!"
-#: Merge.rc:2138
+#: Merge.rc:2142
#, c-format
msgid "Right path is invalid!"
msgstr "Rechter pad is ongeldig!"
-#: Merge.rc:2139
+#: Merge.rc:2143
#, c-format
msgid "Both paths are invalid!"
msgstr "Beide paden zijn ongeldig!"
-#: Merge.rc:2140
+#: Merge.rc:2144
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr "Kies twee bestanden om de uitpakker selectie in te schakelen."
-#: Merge.rc:2141
+#: Merge.rc:2145
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Kan geen bestand met een map vergelijken!"
-#: Merge.rc:2147
+#: Merge.rc:2151
#, c-format
msgid "File not found: %1"
msgstr "Bestand niet gevonden: %1"
-#: Merge.rc:2148
+#: Merge.rc:2152
#, c-format
msgid "File not unpacked: %1"
msgstr "Bestand niet uitgepakt: %1"
-#: Merge.rc:2149
+#: Merge.rc:2153
#, c-format
msgid ""
"Cannot open file\n"
@@ -3753,12 +3774,12 @@
"\n"
"%2"
-#: Merge.rc:2150
+#: Merge.rc:2154
#, c-format
msgid "Failed to parse conflict file."
msgstr "Analyseren van conflictbestand mislukt."
-#: Merge.rc:2151
+#: Merge.rc:2155
#, c-format
msgid ""
"The file\n"
@@ -3769,32 +3790,32 @@
"%1\n"
"is geen conflictbestand."
-#: Merge.rc:2157
+#: Merge.rc:2161
#, c-format
msgid "Save As"
msgstr "Opslaan als"
-#: Merge.rc:2158
+#: Merge.rc:2162
#, c-format
msgid "Save changes to %1?"
msgstr "Wijzigingen opslaan in %1?"
-#: Merge.rc:2159
+#: Merge.rc:2163
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
msgstr "%1 is gemarkeerd als alleen lezen. Wilt u dit alleen-lezen bestand overschrijven? (Niet opslaan onder nieuwe naam.)"
-#: Merge.rc:2160
+#: Merge.rc:2164
#, c-format
msgid "Error checking destination writeability"
msgstr "Fout bij het controleren van de schrijfrechten van het doelbestand"
-#: Merge.rc:2161
+#: Merge.rc:2165
#, c-format
msgid "Error backing up file"
msgstr "Fout bij het maken van een veiligheidskopie"
-#: Merge.rc:2163
+#: Merge.rc:2167
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -3807,7 +3828,7 @@
"\n"
"Toch doorgaan?"
-#: Merge.rc:2164
+#: Merge.rc:2168
#, c-format
msgid ""
"Saving file failed.\n"
@@ -3822,7 +3843,7 @@
"%2\n"
"Wilt u het bestand onder een andere naam opslaan?"
-#: Merge.rc:2165
+#: Merge.rc:2169
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -3837,7 +3858,7 @@
"\n"
"Wilt u de uitgepakte versie in een ander bestand opslaan?"
-#: Merge.rc:2166
+#: Merge.rc:2170
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -3852,7 +3873,7 @@
"\n"
"Wilt u de uitgepakte versie in een ander bestand opslaan?"
-#: Merge.rc:2167
+#: Merge.rc:2171
#, c-format
msgid ""
"Another application has updated file\n"
@@ -3867,7 +3888,7 @@
"\n"
"Het gewijzigde bestand overschrijven?"
-#: Merge.rc:2168
+#: Merge.rc:2172
#, c-format
msgid ""
"%1\n"
@@ -3876,7 +3897,7 @@
"%1\n"
"is gemarkeerd als alleen-lezen. Wilt u het alleen-lezen item overschrijven?"
-#: Merge.rc:2169
+#: Merge.rc:2173
#, c-format
msgid ""
"Another application has updated file\n"
@@ -3891,17 +3912,17 @@
"\n"
"Wilt u het bestand opnieuw laden?"
-#: Merge.rc:2170
+#: Merge.rc:2174
#, c-format
msgid "Save Left File As"
msgstr "Linker bestand opslaan als"
-#: Merge.rc:2171
+#: Merge.rc:2175
#, c-format
msgid "Save Right File As"
msgstr "Rechter bestand opslaan als"
-#: Merge.rc:2172
+#: Merge.rc:2176
#, c-format
msgid ""
"The file\n"
@@ -3912,7 +3933,7 @@
"%1\n"
"is verdwenen. Sla een kopie op van het bestand om door te gaan."
-#: Merge.rc:2178
+#: Merge.rc:2182
#, c-format
msgid ""
"Cannot merge differences when documents are not in synch.\n"
@@ -3923,42 +3944,42 @@
"\n"
"Vernieuw documenten voordat u doorgaat."
-#: Merge.rc:2184
+#: Merge.rc:2188
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr "U moet een SourceSafe-project pad specificeren voordat u verder kunt (bv: $/MyProject)"
-#: Merge.rc:2185
+#: Merge.rc:2189
#, c-format
msgid "Checkout files from VSS..."
msgstr "Bestanden vanuit VSS uitchecken..."
-#: Merge.rc:2186
+#: Merge.rc:2190
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr "SourceSafe gaf een foutmelding bij de checkout van het bestand. Kan niet verder gaan..."
-#: Merge.rc:2187
+#: Merge.rc:2191
#, c-format
msgid "Error executing versioning system command."
msgstr "Fout bij het uitvoeren van een versiebeheer systeemopdracht."
-#: Merge.rc:2188
+#: Merge.rc:2192
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
-msgstr "De VSS werkmap en de locatie van het huidige bestand komen niet overeen. Doorgaan?"
+msgstr "De VSS-werkmap en de locatie van het huidige bestand komen niet overeen. Doorgaan?"
-#: Merge.rc:2189
+#: Merge.rc:2193
#, c-format
msgid "No VSS database(s) found!"
-msgstr "Geen VSS database(s) gevonden!"
+msgstr "Geen VSS-database(s) gevonden!"
-#: Merge.rc:2190
+#: Merge.rc:2194
#, c-format
msgid "Error from VSS:"
msgstr "Fout uit VSS:"
-#: Merge.rc:2191
+#: Merge.rc:2195
#, c-format
msgid ""
"Versioning System returned an error while attempting to check in the file.\n"
@@ -3969,7 +3990,7 @@
" Controleer configuratie-specificaties van de gebruikte weergave.\n"
" Checkout ongedaan maken?"
-#: Merge.rc:2192
+#: Merge.rc:2196
#, c-format
msgid ""
"Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -3978,169 +3999,169 @@
"Versie-systeem gaf een fout bij een poging tot het ongedaan maken van een bestands-checkout.\n"
" Controleer configuratie-specificaties van de gebruikte weergave."
-#: Merge.rc:2198
-#: Merge.rc:2651
+#: Merge.rc:2202
+#: Merge.rc:2655
#, c-format
msgid "None"
msgstr "Geen"
-#: Merge.rc:2199
+#: Merge.rc:2203
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr "Visual SourceSafe (5.0 of lager)"
-#: Merge.rc:2200
+#: Merge.rc:2204
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr "Visual SourceSafe (5.0 en hoger)"
-#: Merge.rc:2202
+#: Merge.rc:2206
#, c-format
msgid "Break at whitespace"
msgstr "Afbreken bij witruimte"
-#: Merge.rc:2203
+#: Merge.rc:2207
#, c-format
msgid "Break at whitespace or punctuation"
msgstr "Afbreken bij witruimte of interpunctie"
-#: Merge.rc:2209
-#: Merge.rc:2211
+#: Merge.rc:2213
+#: Merge.rc:2215
#, c-format
msgid "Copy selected item to named directory"
msgstr "Kopieer geselecteerd item naar genoemde map"
-#: Merge.rc:2210
-#: Merge.rc:2212
+#: Merge.rc:2214
+#: Merge.rc:2216
#, c-format
msgid "Copy selected item to custom directory"
msgstr "Kopieer geselecteerd item naar aangepaste map"
-#: Merge.rc:2213
+#: Merge.rc:2217
#, c-format
msgid "Delete selected item on left"
-msgstr "Geselecteerde item aan de linkerkant verwijderen"
+msgstr "Geselecteerd item aan de linkerkant verwijderen"
-#: Merge.rc:2214
+#: Merge.rc:2218
#, c-format
msgid "Delete selected item on right"
-msgstr "Geselecteerde item aan de rechterkant verwijderen"
+msgstr "Geselecteerd item aan de rechterkant verwijderen"
-#: Merge.rc:2215
+#: Merge.rc:2219
#, c-format
msgid "Delete selected item(s) on both sides"
-msgstr "Geselecteerde item(s) aan beide kanten verwijderen"
+msgstr "Geselecteerd(e) item(s) aan beide kanten verwijderen"
-#: Merge.rc:2216
+#: Merge.rc:2220
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
msgstr "Verberg geselecteerd(e) item(s) (on-the-fly-filter)"
-#: Merge.rc:2217
+#: Merge.rc:2221
#, c-format
msgid "Rename selected item on both sides"
msgstr "Herbenoem geselecteerd item aan beide kanten"
-#: Merge.rc:2218
+#: Merge.rc:2222
#, c-format
msgid "Right to Left (%1)"
msgstr "Van rechts naar links (%1)"
-#: Merge.rc:2219
+#: Merge.rc:2223
#, c-format
msgid "Left to Right (%1)"
msgstr "Van links naar rechts (%1)"
-#: Merge.rc:2220
+#: Merge.rc:2224
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Van rechts naar links (%1 van %2)"
-#: Merge.rc:2221
+#: Merge.rc:2225
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Van links naar rechts (%1 van %2)"
-#: Merge.rc:2222
-#: Merge.rc:2238
+#: Merge.rc:2226
+#: Merge.rc:2242
#, c-format
msgid "Left to... (%1)"
msgstr "Van links naar... (%1)"
-#: Merge.rc:2223
-#: Merge.rc:2239
+#: Merge.rc:2227
+#: Merge.rc:2243
#, c-format
msgid "Right to... (%1)"
msgstr "Van rechts naar... (%1)"
-#: Merge.rc:2224
-#: Merge.rc:2240
+#: Merge.rc:2228
+#: Merge.rc:2244
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Van links naar... (%1 van %2)"
-#: Merge.rc:2225
-#: Merge.rc:2241
+#: Merge.rc:2229
+#: Merge.rc:2245
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Van rechts naar... (%1 van %2)"
-#: Merge.rc:2231
+#: Merge.rc:2235
#, c-format
msgid "Left (%1)"
msgstr "Links (%1)"
-#: Merge.rc:2232
+#: Merge.rc:2236
#, c-format
msgid "Right (%1)"
msgstr "Rechts (%1)"
-#: Merge.rc:2233
+#: Merge.rc:2237
#, c-format
msgid "Both (%1)"
msgstr "Beide (%1)"
-#: Merge.rc:2234
+#: Merge.rc:2238
#, c-format
msgid "Left (%1 of %2)"
msgstr "Links (%1 of %2)"
-#: Merge.rc:2235
+#: Merge.rc:2239
#, c-format
msgid "Right (%1 of %2)"
msgstr "Rechts (%1 of %2)"
-#: Merge.rc:2236
+#: Merge.rc:2240
#, c-format
msgid "Both (%1 of %2)"
msgstr "Beide (%1 of %2)"
-#: Merge.rc:2237
+#: Merge.rc:2241
#, c-format
msgid "Select destination folder"
msgstr "Selecteer doelmap"
-#: Merge.rc:2242
+#: Merge.rc:2246
#, c-format
msgid "Left side - select destination folder:"
msgstr "Linkerkant - selecteer doelmap:"
-#: Merge.rc:2243
+#: Merge.rc:2247
#, c-format
msgid "Right side - select destination folder:"
msgstr "Rechterkant - selecteer doelmap:"
-#: Merge.rc:2244
+#: Merge.rc:2248
#, c-format
msgid "(%1 Files Affected)"
-msgstr "(%1 Bestanden Aangepast)"
+msgstr "(%1 bestanden aangepast)"
-#: Merge.rc:2245
+#: Merge.rc:2249
#, c-format
msgid "(%1 of %2 Files Affected)"
-msgstr "(%1 van %2 Bestanden Aangepast)"
+msgstr "(%1 van %2 bestanden aangepast)"
-#: Merge.rc:2251
+#: Merge.rc:2255
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -4152,17 +4173,17 @@
"%1\n"
"wilt verwijderen?"
-#: Merge.rc:2252
+#: Merge.rc:2256
#, c-format
msgid "Are you sure you want to copy:"
msgstr "Bent u zeker dat u het volgende wilt kopi\xEBren:"
-#: Merge.rc:2253
+#: Merge.rc:2257
#, c-format
msgid "Are you sure you want to copy %d items:"
msgstr "Bent u zeker dat u %d items wilt kopi\xEBren:"
-#: Merge.rc:2254
+#: Merge.rc:2258
#, c-format
msgid ""
"Operation aborted!\n"
@@ -4181,498 +4202,488 @@
"\n"
"Vernieuw a.u.b. de vergelijking."
-#: Merge.rc:2255
+#: Merge.rc:2259
#, c-format
msgid "Are you sure you want to move:"
msgstr "Bent u zeker dat u wilt verplaatsen:"
-#: Merge.rc:2256
+#: Merge.rc:2260
#, c-format
msgid "Are you sure you want to move %d items:"
msgstr "Bent u zeker dat u %d items wilt verplaatsen:"
-#: Merge.rc:2258
+#: Merge.rc:2262
#, c-format
msgid "Confirm Move"
msgstr "Bevestig verplaatsen"
-#: Merge.rc:2264
+#: Merge.rc:2268
#, c-format
msgid "Open left file"
msgstr "Linker bestand openen"
-#: Merge.rc:2265
+#: Merge.rc:2269
#, c-format
msgid "Open the left file to external editor"
msgstr "Het linker bestand met de externe editor openen"
-#: Merge.rc:2266
+#: Merge.rc:2270
#, c-format
msgid "Open left file with ..."
msgstr "Linker bestand openen met..."
-#: Merge.rc:2267
+#: Merge.rc:2271
#, c-format
msgid "Open right file"
msgstr "Rechter bestand openen"
-#: Merge.rc:2268
+#: Merge.rc:2272
#, c-format
msgid "Open the right file to external editor"
msgstr "Het rechter bestand met de externe editor openen"
-#: Merge.rc:2269
+#: Merge.rc:2273
#, c-format
msgid "Open right file with..."
msgstr "Rechter bestand openen met..."
-#: Merge.rc:2270
+#: Merge.rc:2274
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Uitvoeren externe editor mislukt: %1"
-#: Merge.rc:2271
+#: Merge.rc:2275
#, c-format
msgid "Unknown extension on external editor: %1"
msgstr "Onbekende extensie bij externe editor: %1"
-#: Merge.rc:2272
+#: Merge.rc:2276
#, c-format
msgid "Copy filenames to clipboard"
msgstr "Bestandsnamen naar het klembord kopi\xEBren"
-#: Merge.rc:2273
+#: Merge.rc:2277
#, c-format
msgid "Copy left side pathnames to clipboard"
msgstr "Padnamen van de linker kant naar het klembord kopi\xEBren"
-#: Merge.rc:2274
+#: Merge.rc:2278
#, c-format
msgid "Copy right side pathnames to cl...
[truncated message content] |
|
From: <ge...@us...> - 2009-07-28 07:11:37
|
Revision: 6938
http://winmerge.svn.sourceforge.net/winmerge/?rev=6938&view=rev
Author: gerundt
Date: 2009-07-28 07:11:29 +0000 (Tue, 28 Jul 2009)
Log Message:
-----------
PATCH: [ 2827817 ] Turkish Translation - NEW- (Stable Branch)
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/Turkish.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-07-28 06:55:10 UTC (rev 6937)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-07-28 07:11:29 UTC (rev 6938)
@@ -6,7 +6,7 @@
WinMerge 2.12.6
Translation updates:
- Dutch (#2804979)
- - Turkish (#2825132)
+ - Turkish (#2825132, #2827817)
- Ukrainian (#2817835)
WinMerge 2.12.4 - 2009-06-09 (r6833)
Modified: branches/R2_12/Src/Languages/Turkish.po
===================================================================
--- branches/R2_12/Src/Languages/Turkish.po 2009-07-28 06:55:10 UTC (rev 6937)
+++ branches/R2_12/Src/Languages/Turkish.po 2009-07-28 07:11:29 UTC (rev 6938)
@@ -2,6 +2,7 @@
# Released under the "GNU General Public License"
#
# Translators:
+# * Afyonlu <af...@us...>
# * Ozkan UNVER <turquaz37915 at users.sourceforge.net>
#
# ID line follows -- this is updated by SVN
@@ -12,8 +13,8 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2009-07-27 16:00+0200\n"
+"Last-Translator: Afyonlu <af...@us...>\n"
"Language-Team: Turkish <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1254\n"
@@ -40,196 +41,196 @@
#: Merge.rc:99
#, c-format
msgid "C&opy to Right"
-msgstr ""
+msgstr "Sa\xF0a Kopyala"
#: Merge.rc:73
#: Merge.rc:100
#, c-format
msgid "Cop&y to Left"
-msgstr ""
+msgstr "Sola Kopyala"
#: Merge.rc:75
#, c-format
msgid "&Select Line Difference"
-msgstr ""
+msgstr "Farkl\xFD Olan Sat\xFDrlar\xFD Se\xE7"
#: Merge.rc:77
#, c-format
msgid "&Undo"
-msgstr ""
+msgstr "Geri Al"
#: Merge.rc:78
#, c-format
msgid "&Redo"
-msgstr ""
+msgstr "Yinele"
#: Merge.rc:80
#: Merge.rc:102
#, c-format
msgid "Cu&t"
-msgstr ""
+msgstr "Kes"
#: Merge.rc:81
#: Merge.rc:103
#: Merge.rc:508
#, c-format
msgid "&Copy"
-msgstr ""
+msgstr "Kopyala"
#: Merge.rc:82
#: Merge.rc:104
#, c-format
msgid "&Paste"
-msgstr ""
+msgstr "Yap\xFD\xFEt\xFDr"
#: Merge.rc:84
#: Merge.rc:589
#, c-format
msgid "&Goto..."
-msgstr ""
+msgstr "Git..."
#: Merge.rc:86
#, c-format
msgid "Op&en"
-msgstr ""
+msgstr "A\xE7"
#: Merge.rc:88
#: Merge.rc:531
#: Merge.rc:537
#, c-format
msgid "with &Registered Application"
-msgstr ""
+msgstr "Kay\xFDtl\xFD Uygulama \xDDle"
#: Merge.rc:89
#: Merge.rc:532
#: Merge.rc:538
#, c-format
msgid "with &External Editor"
-msgstr ""
+msgstr "Harici D\xFCzenleyici \xDDle"
#: Merge.rc:90
#: Merge.rc:533
#: Merge.rc:539
#, c-format
msgid "&with..."
-msgstr ""
+msgstr "Birlikte A\xE7..."
#: Merge.rc:110
#: Merge.rc:191
#: Merge.rc:312
#, c-format
msgid "&File"
-msgstr "&Dosya"
+msgstr "Dosya"
#: Merge.rc:112
#: Merge.rc:193
#: Merge.rc:314
#, c-format
msgid "&New\tCtrl+N"
-msgstr "&Yeni\tCtrl+N"
+msgstr "Yeni\tCtrl+N"
#: Merge.rc:113
#: Merge.rc:194
#: Merge.rc:315
#, c-format
msgid "&Open...\tCtrl+O"
-msgstr "&A\xE7...\tCtrl+O"
+msgstr "A\xE7...\tCtrl+O"
#: Merge.rc:114
#: Merge.rc:195
#: Merge.rc:316
#, c-format
msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "Fark Dosyas\xFD A\xE7..."
#: Merge.rc:116
#: Merge.rc:197
#: Merge.rc:318
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
-msgstr ""
+msgstr "Proje A\xE7...\tCtrl+J"
#: Merge.rc:117
#: Merge.rc:198
#: Merge.rc:319
#, c-format
msgid "Sa&ve Project..."
-msgstr ""
+msgstr "Projeyi Kaydet..."
#: Merge.rc:119
#, c-format
msgid "Recent Projects"
-msgstr ""
+msgstr "Son Kullan\xFDlan Projeler"
#: Merge.rc:121
#: Merge.rc:205
#: Merge.rc:351
#, c-format
msgid "E&xit"
-msgstr "\xC7\xFDk\xFD&\xFE"
+msgstr "\xC7\xFDk\xFD\xFE"
#: Merge.rc:123
#: Merge.rc:207
#: Merge.rc:353
#, c-format
msgid "&Edit"
-msgstr "&D\xFCzen"
+msgstr "D\xFCzen"
#: Merge.rc:125
#: Merge.rc:211
#: Merge.rc:387
#, c-format
msgid "&Options..."
-msgstr "&Se\xE7enekler..."
+msgstr "Ayarlar..."
#: Merge.rc:127
#: Merge.rc:213
#: Merge.rc:389
#, c-format
msgid "&View"
-msgstr "&G\xF6r\xFCn\xFCm"
+msgstr "G\xF6r\xFCn\xFCm"
#: Merge.rc:129
#: Merge.rc:228
#: Merge.rc:391
#, c-format
msgid "Select &Font..."
-msgstr "Fo&nt Se\xE7"
+msgstr "Yaz\xFD Tipi Se\xE7..."
#: Merge.rc:130
#: Merge.rc:229
#: Merge.rc:392
#, c-format
msgid "Use Default F&ont"
-msgstr "&Varsay\xFDlan Fontu Kullan"
+msgstr "Varsay\xFDlan Yaz\xFD Tipini Kullan"
#: Merge.rc:132
#: Merge.rc:231
#: Merge.rc:413
#, c-format
msgid "&Toolbar"
-msgstr ""
+msgstr "Ara\xE7 \xC7ubu\xF0u"
#: Merge.rc:134
#: Merge.rc:233
#: Merge.rc:415
#, c-format
msgid "&None"
-msgstr ""
+msgstr "Yok"
#: Merge.rc:135
#: Merge.rc:234
#: Merge.rc:416
#, c-format
msgid "&Small"
-msgstr ""
+msgstr "K\xFC\xE7\xFCk"
#: Merge.rc:136
#: Merge.rc:235
#: Merge.rc:417
#, c-format
msgid "&Big"
-msgstr ""
+msgstr "B\xFCy\xFCk"
#: Merge.rc:138
#: Merge.rc:237
@@ -243,98 +244,98 @@
#: Merge.rc:420
#, c-format
msgid "Ta&b Bar"
-msgstr ""
+msgstr "Sekme \xC7ubu\xF0u"
#: Merge.rc:141
#: Merge.rc:241
#: Merge.rc:424
#, c-format
msgid "&Language..."
-msgstr "&Dil"
+msgstr "Dil..."
#: Merge.rc:143
#: Merge.rc:262
#: Merge.rc:446
#, c-format
msgid "&Tools"
-msgstr "&Ara\xE7lar"
+msgstr "Ara\xE7lar"
#: Merge.rc:145
#: Merge.rc:265
#: Merge.rc:448
#, c-format
msgid "&Filters..."
-msgstr "&Filtreler"
+msgstr "Filtreler..."
#: Merge.rc:146
#: Merge.rc:266
#: Merge.rc:449
#, c-format
msgid "&Generate Patch..."
-msgstr "&Yama \xDCret..."
+msgstr "Yama Olu\xFEtur..."
#: Merge.rc:148
#: Merge.rc:269
#: Merge.rc:452
#, c-format
msgid "&Plugins"
-msgstr "&Eklentiler"
+msgstr "Eklentiler"
#: Merge.rc:150
#: Merge.rc:271
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "Listele..."
#: Merge.rc:152
#: Merge.rc:273
#: Merge.rc:456
-#, c-format
+#, fuzzy, c-format
msgid "&Manual Unpacking"
-msgstr "&Manuel A\xE7mak"
+msgstr "\xC7\xFDkart (Elle)"
#: Merge.rc:153
#: Merge.rc:274
#: Merge.rc:457
#, c-format
msgid "&Automatic Unpacking"
-msgstr "&Otomatik A\xE7mak"
+msgstr "\xC7\xFDkart (Otomatik)"
#: Merge.rc:155
#: Merge.rc:276
#: Merge.rc:459
#, c-format
msgid "&Edit with Unpacker"
-msgstr "&A\xE7\xFDc\xFDyla D\xFCzenler"
+msgstr "\xC7\xFDkartma Program\xFD \xDDle D\xFCzenle"
#: Merge.rc:157
#: Merge.rc:278
#: Merge.rc:466
#, c-format
msgid "&Reload plugins"
-msgstr "Eklentileri &Tekrar Y\xFCkle"
+msgstr "Eklentileri Tekrar Y\xFCkle"
#: Merge.rc:159
#: Merge.rc:280
#: Merge.rc:468
#, c-format
msgid "&Debug"
-msgstr ""
+msgstr "Hata Onar\xFDm\xFD"
#: Merge.rc:161
#: Merge.rc:282
#: Merge.rc:470
#, c-format
msgid "&Load Config..."
-msgstr ""
+msgstr "Ayarlar\xFD Y\xFCkle..."
#: Merge.rc:162
#: Merge.rc:283
#: Merge.rc:471
#, c-format
msgid "&Reset Options"
-msgstr ""
+msgstr "S\xFDf\xFDrlama Se\xE7enekleri"
#: Merge.rc:164
#: Merge.rc:285
@@ -348,42 +349,42 @@
#: Merge.rc:475
#, c-format
msgid "Cl&ose"
-msgstr "&Kapat"
+msgstr "Kapat"
#: Merge.rc:167
#: Merge.rc:288
#: Merge.rc:476
#, c-format
msgid "Clo&se All"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC Kapat"
#: Merge.rc:169
#: Merge.rc:290
#: Merge.rc:478
#, c-format
msgid "Change &Pane\tF6"
-msgstr "&Pencere De\xF0itir\tF6"
+msgstr "Di\xF0er Paneli Aktifle\xFEtir\tF6"
#: Merge.rc:171
#: Merge.rc:292
#: Merge.rc:480
#, c-format
msgid "Tile &Horizontally"
-msgstr "&Yatay D\xF6\xFEe"
+msgstr "Yatay D\xF6\xFEe"
#: Merge.rc:172
#: Merge.rc:293
#: Merge.rc:481
#, c-format
msgid "Tile &Vertically"
-msgstr "&Dikey D\xF6\xFEe"
+msgstr "Dikey D\xF6\xFEe"
#: Merge.rc:173
#: Merge.rc:294
#: Merge.rc:482
#, c-format
msgid "&Cascade"
-msgstr "&S\xFDrala"
+msgstr "Basamakla"
#: Merge.rc:175
#: Merge.rc:296
@@ -391,332 +392,332 @@
#: Merge.rc:1933
#, c-format
msgid "&Help"
-msgstr "&Yard\xFDm"
+msgstr "Yard\xFDm"
#: Merge.rc:177
#: Merge.rc:298
#: Merge.rc:486
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr ""
+msgstr "WinMerge Yard\xFDm\xFD\tF1"
#: Merge.rc:179
#: Merge.rc:300
#: Merge.rc:488
#, c-format
msgid "R&elease Notes"
-msgstr ""
+msgstr "S\xFCr\xFCm Notlar\xFD"
#: Merge.rc:180
#: Merge.rc:301
#: Merge.rc:489
#, c-format
msgid "&Translations"
-msgstr ""
+msgstr "\xC7eviriler"
#: Merge.rc:181
#: Merge.rc:302
#: Merge.rc:490
#, c-format
msgid "C&onfiguration"
-msgstr ""
+msgstr "Yap\xFDland\xFDrma Kayd\xFD"
#: Merge.rc:182
#: Merge.rc:303
#: Merge.rc:491
#, c-format
msgid "A&rchive Support disabled..."
-msgstr "&Yedekleme Deste\xF0i Kapal\xFD"
+msgstr "S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i Kapal\xFD"
#: Merge.rc:184
#: Merge.rc:305
#: Merge.rc:493
#, c-format
msgid "&GNU General Public License"
-msgstr ""
+msgstr "GNU General Public Lisans\xFD"
#: Merge.rc:185
#: Merge.rc:306
#: Merge.rc:494
#, c-format
msgid "&About WinMerge..."
-msgstr "&WinMerge Hakk\xFDnda..."
+msgstr "WinMerge Hakk\xFDnda..."
#: Merge.rc:200
#: Merge.rc:337
#, c-format
msgid "L&eft Read-only"
-msgstr "Salt Okunur S&ol"
+msgstr "Sol Taraf\xFD Salt Okunur Yap"
#: Merge.rc:201
#: Merge.rc:338
#, c-format
msgid "Ri&ght Read-only"
-msgstr "Salt Okunu&r Sa\xF0"
+msgstr "Sa\xF0 Taraf\xFD Salt Okunur Yap"
#: Merge.rc:203
#, c-format
msgid "File En&coding"
-msgstr ""
+msgstr "Dosya Kodlamas\xFD"
#: Merge.rc:209
#: Merge.rc:363
#, c-format
msgid "Select &All\tCtrl+A"
-msgstr "&T\xFCm\xFCn\xFC Se\xE7\tCtrl+A"
+msgstr "T\xFCm\xFCn\xFC Se\xE7\tCtrl+A"
#: Merge.rc:215
#, c-format
msgid "Show &Identical Items"
-msgstr ""
+msgstr "Ayn\xFD \xD6geleri G\xF6ster"
#: Merge.rc:216
#, c-format
msgid "Show &Different Items"
-msgstr ""
+msgstr "Farkl\xFD \xD6geleri G\xF6ster"
#: Merge.rc:217
#, c-format
msgid "Show L&eft Unique Items"
-msgstr ""
+msgstr "Soldaki Benzersiz \xD6geleri G\xF6ster"
#: Merge.rc:218
#, c-format
msgid "Show Ri&ght Unique Items"
-msgstr ""
+msgstr "Sa\xF0daki Benzersiz \xD6geleri G\xF6ster"
#: Merge.rc:219
#, c-format
msgid "Show S&kipped Items"
-msgstr ""
+msgstr "Atlanan \xD6geleri G\xF6ster"
#: Merge.rc:220
#, c-format
msgid "S&how Binary Files"
-msgstr ""
+msgstr "Binary Dosyalar\xFDn\xFD G\xF6ster"
#: Merge.rc:222
#, c-format
msgid "Show Hidd&en Items"
-msgstr ""
+msgstr "Gizli \xD6geleri G\xF6ster"
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "A\xF0a\xE7 G\xF6r\xFCn\xFCm\xFC"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "T\xFCm Alt Klas\xF6rleri Geni\xFElet"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "T\xFCm Alt Klas\xF6rleri Daralt"
#: Merge.rc:239
#, c-format
msgid "Compa&re Statistics"
-msgstr ""
+msgstr "Say\xFDsal Verileri Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:243
#: Merge.rc:426
#, c-format
msgid "Refre&sh\tF5"
-msgstr "Ta&zele\tF5"
+msgstr "Tazele\tF5"
#: Merge.rc:244
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
-msgstr ""
+msgstr "Se\xE7ili Olan\xFD Tazele\tCtrl+F5"
#: Merge.rc:246
#: Merge.rc:428
#, c-format
msgid "&Merge"
-msgstr "&Birle\xFEtirme"
+msgstr "Birle\xFEtir"
#: Merge.rc:248
#, c-format
msgid "Co&mpare\tEnter"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr\tEnter"
#: Merge.rc:250
#: Merge.rc:430
#, c-format
msgid "&Next Difference\tAlt+Down"
-msgstr "&Sonraki Fark\tAlt+Down"
+msgstr "Sonraki Fark\tAlt+Down"
#: Merge.rc:251
#: Merge.rc:431
#, c-format
msgid "&Previous Difference\tAlt+Up"
-msgstr "&\xD6nceki Fark\tAlt+Up"
+msgstr "\xD6nceki Fark\tAlt+Up"
#: Merge.rc:253
#: Merge.rc:433
#, c-format
msgid "&First Difference\tAlt+Home"
-msgstr "&\xDDlk Fark\tAlt+Home"
+msgstr "\xDDlk Fark\tAlt+Home"
#: Merge.rc:254
#: Merge.rc:434
#, c-format
msgid "&Current Difference\tAlt+Enter"
-msgstr "&\xDEu Anki Fark\tAlt+Enter"
+msgstr "\xDEimdiki Fark\tAlt+Enter"
#: Merge.rc:255
#: Merge.rc:435
#, c-format
msgid "&Last Difference\tAlt+End"
-msgstr "S&on Fark\tAlt+End"
+msgstr "Son Fark\tAlt+End"
#: Merge.rc:257
#: Merge.rc:437
#, c-format
msgid "Copy to &Right\tAlt+Right"
-msgstr "S&a\xF0a Kopyala\tAlt+Right"
+msgstr "Sa\xF0a Kopyala\tAlt+Right"
#: Merge.rc:258
#: Merge.rc:438
#, c-format
msgid "Copy to L&eft\tAlt+Left"
-msgstr "So&la Kopyala\tAlt+Left"
+msgstr "Sola Kopyala\tAlt+Left"
#: Merge.rc:260
#, c-format
msgid "&Delete\tDel"
-msgstr ""
+msgstr "Sil"
#: Merge.rc:264
#: Merge.rc:562
#, c-format
msgid "&Customize Columns..."
-msgstr "Kolonlar\xFD &\xD6zelle\xFEtir"
+msgstr "S\xFCtunlar\xFD \xD6zelle\xFEtir..."
#: Merge.rc:267
#: Merge.rc:450
#, c-format
msgid "Generate &Report..."
-msgstr ""
+msgstr "Rapor Haz\xFDrla..."
#: Merge.rc:321
#, c-format
msgid "&Save\tCtrl+S"
-msgstr "&Kaydet\tCtrl+S"
+msgstr "Kaydet\tCtrl+S"
#: Merge.rc:322
#, c-format
msgid "Save &Left"
-msgstr "S&olu Kaydet "
+msgstr "Solu Kaydet "
#: Merge.rc:324
#: Merge.rc:329
#, c-format
msgid "&Save"
-msgstr "&Kaydet"
+msgstr "Kaydet"
#: Merge.rc:325
#: Merge.rc:330
#, c-format
msgid "Save &As..."
-msgstr "&Farkl\xFD Kaydet"
+msgstr "Farkl\xFD Kaydet..."
#: Merge.rc:327
#, c-format
msgid "Save &Right"
-msgstr "&Sa\xF0\xFD Kaydet"
+msgstr "Sa\xF0\xFD Kaydet"
#: Merge.rc:333
#, c-format
msgid "&Print..."
-msgstr ""
+msgstr "Yazd\xFDr..."
#: Merge.rc:334
#, c-format
msgid "Page Se&tup"
-msgstr ""
+msgstr "Sayfa Yap\xFDs\xFD"
#: Merge.rc:335
#, c-format
msgid "Print Previe&w"
-msgstr ""
+msgstr "Bask\xFD \xD6nizleme"
#: Merge.rc:340
#, c-format
msgid "&Convert Line Endings to"
-msgstr ""
+msgstr "Sat\xFDr Sonlar\xFDn\xFD D\xF6n\xFC\xFEt\xFCr"
#: Merge.rc:342
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:343
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:344
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:347
#, c-format
msgid "&Merge Mode\tF9"
-msgstr "Birle\xFEtirme &Durumu\tF9"
+msgstr "Birle\xFEtirme Durumu\tF9"
#: Merge.rc:349
#, c-format
msgid "&File Encoding..."
-msgstr ""
+msgstr "Dosya Kodlamas\xFD..."
#: Merge.rc:355
#, c-format
msgid "&Undo\tCtrl+Z"
-msgstr "&Geri Al\tCtrl+Z"
+msgstr "Geri Al\tCtrl+Z"
#: Merge.rc:356
#, c-format
msgid "&Redo\tCtrl+Y"
-msgstr "&Geri Al\xFD Geri Al\tCtrl+Y"
+msgstr "\xDDleri Al\tCtrl+Y"
#: Merge.rc:358
#, c-format
msgid "Cu&t\tCtrl+X"
-msgstr "&Kes\tCtrl+X"
+msgstr "Kes\tCtrl+X"
#: Merge.rc:359
#, c-format
msgid "&Copy\tCtrl+C"
-msgstr "Ko&pyala\tCtrl+C"
+msgstr "Kopyala\tCtrl+C"
#: Merge.rc:360
#, c-format
msgid "&Paste\tCtrl+V"
-msgstr "&Yap\xFD\xFEt\xFDr\tCtrl+V"
+msgstr "Yap\xFD\xFEt\xFDr\tCtrl+V"
#: Merge.rc:362
#, c-format
msgid "Select Line &Difference\tF4"
-msgstr ""
+msgstr "Farkl\xFD Olan Sat\xFDrlar\xFD Se\xE7\tF4"
#: Merge.rc:365
#, c-format
msgid "F&ind...\tCtrl+F"
-msgstr "&Bul...\tCtrl+F"
+msgstr "Bul...\tCtrl+F"
#: Merge.rc:366
#, c-format
msgid "Repla&ce...\tCtrl+H"
-msgstr "&De\xF0i\xFEtir...\tCtrl+H"
+msgstr "De\xF0i\xFEtir...\tCtrl+H"
#: Merge.rc:368
#, c-format
msgid "&Scripts"
-msgstr "&Senaryolar(Scripts)"
+msgstr "Yaz\xFD D\xFCzeni"
#: Merge.rc:370
#: Merge.rc:2789
@@ -727,103 +728,103 @@
#: Merge.rc:373
#, c-format
msgid "Advanced"
-msgstr ""
+msgstr "Geli\xFEmi\xFE"
#: Merge.rc:375
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
-msgstr ""
+msgstr "Sat\xFDr Numaralar\xFD \xDDle Kopyala\tCtrl+Shift+C"
#: Merge.rc:378
#, c-format
msgid "&Bookmarks"
-msgstr ""
+msgstr "S\xFDk Kullan\xFDlanlar"
#: Merge.rc:380
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
-msgstr ""
+msgstr "S\xFDk Kullan\xFDlanlar\xFD A\xE7-Kapat\tCtrl+F2"
#: Merge.rc:381
#, c-format
msgid "&Next Bookmark\tF2"
-msgstr ""
+msgstr "Sonraki S\xFDk Kullan\xFDlan\tF2"
#: Merge.rc:382
#, c-format
msgid "&Previous bookmark\tShift+F2"
-msgstr ""
+msgstr "\xD6nceki S\xFDk Kullan\xFDlan\tShift+F2"
#: Merge.rc:383
#, c-format
msgid "&Clear All Bookmarks"
-msgstr ""
+msgstr "S\xFDk Kullan\xFDlanlar\xFD Temizle"
#: Merge.rc:385
#, c-format
msgid "&Go To...\tCtrl+G"
-msgstr "&Git...\tCtrl+G"
+msgstr "Git...\tCtrl+G"
#: Merge.rc:393
#, c-format
msgid "&Zoom"
-msgstr ""
+msgstr "Yak\xFDnla\xFEt\xFDr"
#: Merge.rc:395
#, c-format
msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "Yak\xFDnla\xFEt\xFDr\tCtrl++"
#: Merge.rc:396
#, c-format
msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "Uzakla\xFEt\xFDr\tCtrl+-"
#. Zoom to normal
#: Merge.rc:397
#, c-format
msgid "&Normal\tCtrl+*"
-msgstr ""
+msgstr "&Normal\tCtrl+*"
#: Merge.rc:399
#, c-format
msgid "Syntax Highlight"
-msgstr ""
+msgstr "S\xF6zdizimi Vurgusu"
#: Merge.rc:404
#, c-format
msgid "&Lock Panes"
-msgstr ""
+msgstr "Panelleri Kilitle"
#: Merge.rc:405
#, c-format
msgid "&View Whitespace"
-msgstr "&Bo\xFEluklar\xFD G\xF6ster"
+msgstr "Bo\xFEluklar\xFD G\xF6ster"
#: Merge.rc:406
#, c-format
msgid "Vie&w Line Differences"
-msgstr ""
+msgstr "Sat\xFDr Farkl\xFDl\xFDklar\xFDn\xFD G\xF6ster"
#: Merge.rc:407
#, c-format
msgid "View Line &Numbers"
-msgstr ""
+msgstr "Sat\xFDr Numaralar\xFDn\xFD G\xF6ster"
#: Merge.rc:408
#, c-format
msgid "View &Margins"
-msgstr ""
+msgstr "S\xFDn\xFDrlar\xFD G\xF6ster"
#: Merge.rc:409
#, c-format
msgid "W&rap Lines"
-msgstr ""
+msgstr "Sat\xFDrlar\xFD Kayd\xFDr"
#: Merge.rc:411
#, c-format
msgid "Sw&ap Panes"
-msgstr ""
+msgstr "Panelleri Yer De\xF0i\xFEtir"
#: Merge.rc:421
#, c-format
@@ -833,246 +834,246 @@
#: Merge.rc:422
#, c-format
msgid "Lo&cation Pane"
-msgstr "Pozisyon Penceresi"
+msgstr "Durum Penceresi"
#: Merge.rc:440
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "&Geli\xFEmi\xFE Sa\xF0a Kopyala\tAlt+Ctrl+Right"
+msgstr "Sa\xF0a Kopyala ve \xDDlerle\tAlt+Ctrl+Right"
#: Merge.rc:441
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "G&eli\xFEmi\xFE Sola Kopyala\tAlt+Ctrl+Left"
+msgstr "Sola Kopyala ve \xDDlerle\tAlt+Ctrl+Left"
#: Merge.rc:443
#, c-format
msgid "Copy &All to Right"
-msgstr "&T\xFCm\xFCn\xFC Sa\xF0a Kopyala"
+msgstr "T\xFCm\xFCn\xFC Sa\xF0a Kopyala"
#: Merge.rc:444
#, c-format
msgid "Cop&y All to Left"
-msgstr "T&\xFCm\xFCn\xFC Sola Kopyala"
+msgstr "T\xFCm\xFCn\xFC Sola Kopyala"
#: Merge.rc:461
-#, c-format
+#, fuzzy, c-format
msgid "&Prediffer"
-msgstr "&\xD6ncelikli Fark"
+msgstr "\xD6ncelikli Fark"
#: Merge.rc:502
#, c-format
msgid "Comp&are"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:503
#, c-format
msgid "Co&mpare Special"
-msgstr ""
+msgstr "\xD6zel Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:505
#, c-format
msgid "&XML"
-msgstr ""
+msgstr "&XML"
#: Merge.rc:510
#, c-format
msgid "&Left to Right"
-msgstr ""
+msgstr "Solu Sa\xF0a"
#: Merge.rc:511
#, c-format
msgid "L&eft to..."
-msgstr ""
+msgstr "Solu \xDEuraya..."
#: Merge.rc:512
#, c-format
msgid "&Right to Left"
-msgstr ""
+msgstr "Sa\xF0\xFD Sola"
#: Merge.rc:513
#, c-format
msgid "R&ight to..."
-msgstr ""
+msgstr "Sa\xF0\xFD \xDEuraya..."
#: Merge.rc:515
#, c-format
msgid "&Move"
-msgstr ""
+msgstr "Ta\xFE\xFD"
#: Merge.rc:517
#, c-format
msgid "&Left to..."
-msgstr ""
+msgstr "Solu \xDEuraya..."
#: Merge.rc:518
#, c-format
msgid "&Right to..."
-msgstr ""
+msgstr "Sa\xF0\xFD \xDEuraya..."
#: Merge.rc:520
#, c-format
msgid "&Delete"
-msgstr ""
+msgstr "Sil"
#: Merge.rc:522
#: Merge.rc:1135
#: Merge.rc:1517
#, c-format
msgid "&Left"
-msgstr ""
+msgstr "Sol"
#: Merge.rc:523
#: Merge.rc:1137
#: Merge.rc:1520
#, c-format
msgid "&Right"
-msgstr ""
+msgstr "Sa\xF0"
#: Merge.rc:524
#, c-format
msgid "&Both"
-msgstr ""
+msgstr "Her \xDDkisi"
#: Merge.rc:526
#, c-format
msgid "Re&name"
-msgstr ""
+msgstr "Yeniden Adland\xFDr"
#: Merge.rc:527
#, c-format
msgid "&Hide Items"
-msgstr ""
+msgstr "\xD6geleri Gizle"
#: Merge.rc:529
#, c-format
msgid "&Open Left"
-msgstr ""
+msgstr "Sola A\xE7"
#: Merge.rc:535
#, c-format
msgid "O&pen Right"
-msgstr ""
+msgstr "Sa\xF0a A\xE7"
#: Merge.rc:542
#, c-format
msgid "Cop&y Pathnames"
-msgstr ""
+msgstr "Yol Adlar\xFDn\xFD Kopyala"
#: Merge.rc:544
#, c-format
msgid "&Left (%1 of %2)"
-msgstr ""
+msgstr "Soldaki (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:545
#, c-format
msgid "&Right (%1 of %2)"
-msgstr ""
+msgstr "Sa\xF0daki (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:546
#, c-format
msgid "&Both (%1 of %2)"
-msgstr ""
+msgstr "Her \xDDki Taraftaki (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:548
#, c-format
msgid "Copy &Filenames"
-msgstr ""
+msgstr "Dosya Adlar\xFDn\xFD Kopyala"
#: Merge.rc:550
#, c-format
msgid "&Zip"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDr (&Zip'le)"
#: Merge.rc:552
#, c-format
msgid "&Left... (%1 of %2)"
-msgstr ""
+msgstr "Soldakini... (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:553
#, c-format
msgid "&Right... (%1 of %2)"
-msgstr ""
+msgstr "Sa\xF0dakini... (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:554
#, c-format
msgid "&Both... (%1 of %2)"
-msgstr ""
+msgstr "Her \xDDki Taraftakini... (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:555
#, c-format
msgid "&Differences... (%1 of %2)"
-msgstr ""
+msgstr "Farkl\xFD Olanlar\xFD... (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:558
#, c-format
msgid "&Refresh"
-msgstr ""
+msgstr "Tazele"
#: Merge.rc:570
#, c-format
msgid "&Copy Full Path"
-msgstr ""
+msgstr "Tam Yolu Kopyala"
#: Merge.rc:571
#, c-format
msgid "Copy &Filename"
-msgstr ""
+msgstr "Dosya Ad\xFDn\xFD Kopyala"
#: Merge.rc:577
-#, c-format
+#, fuzzy, c-format
msgid "Prediffer Settings"
-msgstr ""
+msgstr "\xD6ncelikli Fark Ayarlar\xFD"
#: Merge.rc:579
-#, c-format
+#, fuzzy, c-format
msgid "&No prediffer"
-msgstr ""
+msgstr "\xD6ncelikli Fark Yok"
#: Merge.rc:580
-#, c-format
+#, fuzzy, c-format
msgid "Auto prediffer"
-msgstr ""
+msgstr "Otomatik \xD6ncelikli Fark"
#: Merge.rc:588
#, c-format
msgid "G&oto Diff"
-msgstr ""
+msgstr "Farka Git"
#: Merge.rc:591
#, c-format
msgid "&No Moved Blocks"
-msgstr ""
+msgstr "Ta\xFE\xFDnan Blok Yok"
#: Merge.rc:592
#, c-format
msgid "&All Moved Blocks"
-msgstr ""
+msgstr "Ta\xFE\xFDnan Bloklar\xFDn Hepsi"
#: Merge.rc:593
#, c-format
msgid "Moved Block for &Current Diff"
-msgstr ""
+msgstr "Ge\xE7erli Fark\xFDn Yerine Ta\xFE\xFDnan Blok"
#: Merge.rc:662
#, c-format
msgid "About WinMerge"
-msgstr ""
+msgstr "WinMerge Hakk\xFDnda"
#: Merge.rc:668
#, c-format
msgid "(Private Build)"
-msgstr ""
+msgstr "(\xD6zel Yap\xFDm)"
#: Merge.rc:669
#, c-format
msgid "All rights reserved."
-msgstr ""
+msgstr "T\xFCm Haklar\xFD Sakl\xFDd\xFDr."
#: Merge.rc:670
#, c-format
msgid "Visit the WinMerge HomePage!"
-msgstr ""
+msgstr "WinMerge Sitesini Ziyaret Ediniz."
#: Merge.rc:673
#: Merge.rc:705
@@ -1089,23 +1090,23 @@
#: Merge.rc:1665
#, c-format
msgid "OK"
-msgstr ""
+msgstr "TAMAM"
#: Merge.rc:674
#, c-format
msgid "Contributors"
-msgstr ""
+msgstr "Destekleyenler"
#: Merge.rc:681
#, c-format
msgid "Select Files or Folders"
-msgstr ""
+msgstr "Dosyalar\xFD veya Klas\xF6rleri Se\xE7"
#: Merge.rc:684
#: Merge.rc:1594
#, c-format
msgid "&Left:"
-msgstr ""
+msgstr "Sol:"
#: Merge.rc:688
#: Merge.rc:749
@@ -1113,52 +1114,52 @@
#: Merge.rc:1019
#, c-format
msgid "&Browse..."
-msgstr ""
+msgstr "G\xF6zat..."
#: Merge.rc:689
#: Merge.rc:1598
#, c-format
msgid "&Right:"
-msgstr ""
+msgstr "Sa\xF0:"
#: Merge.rc:693
#: Merge.rc:1030
#, c-format
msgid "Bro&wse..."
-msgstr ""
+msgstr "G\xF6zat..."
#: Merge.rc:694
#: Merge.rc:1602
#, c-format
msgid "&Filter:"
-msgstr ""
+msgstr "Filtre:"
#: Merge.rc:697
#: Merge.rc:1604
#, c-format
msgid "Select..."
-msgstr ""
+msgstr "Se\xE7..."
#: Merge.rc:698
#, c-format
msgid "&Unpacker:"
-msgstr ""
+msgstr "\xC7\xFDkart\xFDc\xFD:"
#: Merge.rc:701
#, c-format
msgid "&Select..."
-msgstr ""
+msgstr "Se\xE7..."
#: Merge.rc:702
#: Merge.rc:1605
#, c-format
msgid "&Include Subfolders"
-msgstr ""
+msgstr "Alt Klas\xF6rler Dahil"
#: Merge.rc:704
#, c-format
msgid "Status:"
-msgstr ""
+msgstr "Durum:"
#: Merge.rc:706
#: Merge.rc:736
@@ -1177,380 +1178,383 @@
#: Merge.rc:1666
#, c-format
msgid "Cancel"
-msgstr ""
+msgstr "\xDDptal"
#: Merge.rc:707
#: Merge.rc:1338
#, c-format
msgid "Help"
-msgstr ""
+msgstr "Yard\xFDm"
#: Merge.rc:708
#, c-format
msgid "Files or Folders to Compare"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr\xFDlacak Dosyalar veya Klas\xF6rler"
#: Merge.rc:715
#, c-format
msgid "Visual SourceSafe"
-msgstr ""
+msgstr "Visual SourceSafe"
#: Merge.rc:720
#, c-format
msgid "Database:"
-msgstr ""
+msgstr "Veritaban\xFD:"
#: Merge.rc:723
#, c-format
msgid "Project:"
-msgstr ""
+msgstr "Proje:"
#: Merge.rc:726
#, c-format
msgid "User:"
-msgstr ""
+msgstr "Kullan\xFDc\xFD:"
#: Merge.rc:728
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "\xDEifre:"
#: Merge.rc:730
#, c-format
msgid "Link to Destination VSS project"
-msgstr ""
+msgstr "VSS Projesine Ba\xF0lant\xFD"
#: Merge.rc:732
#: Merge.rc:875
#, c-format
msgid "Apply to all items"
-msgstr ""
+msgstr "T\xFCm \xD6gelere Uygula"
#: Merge.rc:734
#, c-format
msgid "Check Out"
-msgstr ""
+msgstr "\xC7\xFDk\xFD\xFE Kontrol\xFC"
#: Merge.rc:735
#: Merge.rc:871
#, c-format
msgid "Save As..."
-msgstr ""
+msgstr "Farkl\xFD Kaydet..."
#: Merge.rc:741
#, c-format
msgid "Versioning System"
-msgstr ""
+msgstr "S\xFCr\xFCmleme Sistemi"
#: Merge.rc:744
#, c-format
msgid "&Versioning System:"
-msgstr ""
+msgstr "S\xFCr\xFCmleme Sistemi:"
#: Merge.rc:747
#: Merge.rc:2065
#, c-format
msgid "&Path to cleartool.exe:"
-msgstr ""
+msgstr "'cleartool.exe' Dizini:"
#: Merge.rc:754
#: Merge.rc:1941
#, c-format
msgid "General"
-msgstr ""
+msgstr "Genel"
#: Merge.rc:757
#, c-format
msgid "Automatically &scroll to first difference"
-msgstr ""
+msgstr "Otomatik Olarak \xDDlk Farka Git"
#: Merge.rc:760
#, c-format
msgid "&Disable Splash Screen"
-msgstr ""
+msgstr "A\xE7\xFDl\xFDr Pencereyi \xDDptal Et"
#: Merge.rc:762
#, c-format
msgid "Cl&ose windows with ESC"
-msgstr ""
+msgstr "Pencereleri ESC ile Kapat"
#: Merge.rc:764
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr ""
+msgstr "'A\xE7' \xDDleti\xFEim Kutusundaki Dizinleri Otomatik Do\xF0rula"
#: Merge.rc:767
-#, c-format
+#, fuzzy, c-format
msgid "All&ow only one instance to run"
-msgstr ""
+msgstr "Yaln\xFDzca Bir \xD6rne\xF0in \xC7al\xFD\xFEmas\xFDna \xDDzin Ver"
#: Merge.rc:769
#, c-format
msgid "As&k when closing multiple windows"
-msgstr ""
+msgstr "\xC7ok Say\xFDda Pencere Kapat\xFDl\xFDrken Sor"
#: Merge.rc:771
#, c-format
msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "Dosya Kar\xFE\xFDla\xFEt\xFDr\xFDrken Dosya Zaman\xFDn\xFD Koru"
#: Merge.rc:774
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "Ba\xFElang\xFD\xE7ta \"Dosyalar\xFD veya Klas\xF6rleri Se\xE7\" Penceresini G\xF6ster"
#: Merge.rc:776
#, c-format
msgid "O&pen-dialog Auto-Completion:"
-msgstr ""
+msgstr "'A\xE7' \xDD\xE7indeki Hedefi Otomatik Yaz:"
#: Merge.rc:779
#, c-format
msgid "Enable multiple compare windows for"
-msgstr ""
+msgstr "\xC7ok Say\xFDda Kar\xFE\xFDla\xFEt\xFDrma Penceresi Y\xFCkle"
#: Merge.rc:781
#: Merge.rc:1617
#, c-format
msgid "&Folder compare"
-msgstr ""
+msgstr "Klas\xF6r Kar\xFE\xFDla\xFEt\xFDr\xFDrken"
#: Merge.rc:783
#: Merge.rc:1619
#, c-format
msgid "Fil&e compare"
-msgstr ""
+msgstr "Dosya Kar\xFE\xFDla\xFEt\xFDr\xFDrken"
#: Merge.rc:785
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
+"\xC7ok kar\xFE\xFDla\xFE\xFDlan baz\xFD mesajlar\xFD gizleyebilirsiniz.\n"
+"T\xFCm mesajlar\xFD tekrar g\xF6r\xFCnebilir yapmak i\xE7in;\n"
+"'S\xFDf\xFDrla' d\xFC\xF0mesine bas\xFDn."
#: Merge.rc:787
#, c-format
msgid "Reset"
-msgstr ""
+msgstr "S\xFDf\xFDrla"
#: Merge.rc:794
#, c-format
msgid "Language"
-msgstr ""
+msgstr "Dil"
#: Merge.rc:801
#, c-format
msgid "Available languages:"
-msgstr ""
+msgstr "Y\xFCklenebilir Diller:"
#: Merge.rc:807
#, c-format
msgid "Find"
-msgstr ""
+msgstr "Bul"
#: Merge.rc:810
#: Merge.rc:837
#, c-format
msgid "Fi&nd what:"
-msgstr ""
+msgstr "Bul:"
#: Merge.rc:813
#: Merge.rc:843
#, c-format
msgid "Match &whole word only"
-msgstr ""
+msgstr "Tam S\xF6zc\xFC\xF0\xFC E\xFEle\xFEtir"
#: Merge.rc:815
#: Merge.rc:845
#, c-format
msgid "Match &case"
-msgstr ""
+msgstr "B\xFCy\xFCk-K\xFC\xE7\xFCk Harf E\xFEle\xFEtir"
#: Merge.rc:817
#: Merge.rc:847
#, c-format
msgid "Regular &expression"
-msgstr ""
+msgstr "Kurall\xFD \xDDfade"
#: Merge.rc:819
#, c-format
msgid "D&on't wrap end of file"
-msgstr ""
+msgstr "Dosyan\xFDn Sonuna Kayd\xFDrma!"
#: Merge.rc:822
#, c-format
msgid "Direction"
-msgstr ""
+msgstr "Y\xF6nerge"
#: Merge.rc:823
#, c-format
msgid "&Up"
-msgstr ""
+msgstr "Yukar\xFD"
#: Merge.rc:825
#, c-format
msgid "&Down"
-msgstr ""
+msgstr "A\xFEa\xF0\xFD"
#: Merge.rc:827
#: Merge.rc:857
#, c-format
msgid "&Find Next"
-msgstr ""
+msgstr "Sonrakini Bul"
#: Merge.rc:834
#, c-format
msgid "Replace"
-msgstr ""
+msgstr "De\xF0i\xFEtir"
#: Merge.rc:840
#, c-format
msgid "Re&place with:"
-msgstr ""
+msgstr "Yeni De\xF0er:"
#: Merge.rc:849
#, c-format
msgid "&Don't wrap end of file"
-msgstr ""
+msgstr "Dosyan\xFDn Sonuna Kayd\xFDrma!"
#: Merge.rc:852
#, c-format
msgid "Replace in"
-msgstr ""
+msgstr "Burada De\xF0i\xFEtir"
#: Merge.rc:853
#, c-format
msgid "&Selection"
-msgstr ""
+msgstr "Se\xE7im"
#: Merge.rc:855
#, c-format
msgid "Wh&ole file"
-msgstr ""
+msgstr "B\xFCt\xFCn Dosya"
#: Merge.rc:858
#, c-format
msgid "&Replace"
-msgstr ""
+msgstr "De\xF0i\xFEtir"
#: Merge.rc:859
#, c-format
msgid "Replace &All"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC De\xF0i\xFEtir"
#: Merge.rc:866
#: Merge.rc:2187
#, c-format
msgid "Rational ClearCase"
-msgstr ""
+msgstr "Rational ClearCase"
#: Merge.rc:869
#, c-format
msgid "CheckOut"
-msgstr ""
+msgstr "\xC7\xFDk\xFD\xFE Kontrol\xFC"
#: Merge.rc:874
#: Merge.rc:1179
#, c-format
msgid "Comments"
-msgstr ""
+msgstr "A\xE7\xFDklamalar"
#: Merge.rc:877
#, c-format
msgid "CheckIn after checkout"
-msgstr ""
+msgstr "\xC7\xFDk\xFD\xFE Kontrol\xFCnden Sonra Giri\xFE Kontrol\xFC"
#: Merge.rc:883
#, c-format
msgid "Linefilters"
-msgstr ""
+msgstr "Sat\xFDr Filtreleri"
#: Merge.rc:886
#, c-format
msgid "Enable Line Filters"
-msgstr ""
+msgstr "A\xFEa\xF0\xFDdaki Sat\xFDr Filtreleri Y\xFCklensin"
#: Merge.rc:889
#, c-format
msgid "Regular Expressions (one per line):"
-msgstr ""
+msgstr "Kurall\xFD \xDDfadeler (Bir Sat\xFDr Ba\xFE\xFDna D\xFC\xFEen):"
#: Merge.rc:896
#, c-format
msgid "Save"
-msgstr ""
+msgstr "Kaydet"
#: Merge.rc:897
#, c-format
msgid "New"
-msgstr ""
+msgstr "Yeni"
#: Merge.rc:898
#, c-format
msgid "Edit"
-msgstr ""
+msgstr "D\xFCzenle"
#: Merge.rc:899
#, c-format
msgid "Remove"
-msgstr ""
+msgstr "Kald\xFDr"
#: Merge.rc:904
#: Merge.rc:1944
#, c-format
msgid "Colors"
-msgstr ""
+msgstr "Renkler"
#: Merge.rc:907
#, c-format
msgid "Difference:"
-msgstr ""
+msgstr "Farkl\xFDl\xFDk:"
#: Merge.rc:911
#, c-format
msgid "Selected Difference:"
-msgstr ""
+msgstr "Se\xE7ili Farkl\xFDl\xFDk:"
#: Merge.rc:915
#: Merge.rc:1569
#, c-format
msgid "Background"
-msgstr ""
+msgstr "Arka Plan"
#: Merge.rc:916
#, c-format
msgid "Deleted"
-msgstr ""
+msgstr "Silinen"
#: Merge.rc:929
#: Merge.rc:1364
#: Merge.rc:1570
#, c-format
msgid "Text"
-msgstr ""
+msgstr "Metin"
#: Merge.rc:933
#, c-format
msgid "Ignored Difference:"
-msgstr ""
+msgstr "Yok Say\xFDlan Farkl\xFDl\xFDk:"
#: Merge.rc:943
#, c-format
msgid "Moved:"
-msgstr ""
+msgstr "Ta\xFE\xFDnan:"
#: Merge.rc:953
#, c-format
msgid "Selected Moved:"
-msgstr ""
+msgstr "Se\xE7ili Ta\xFE\xFDnan:"
#: Merge.rc:960
#, c-format
msgid "Word Difference:"
-msgstr ""
+msgstr "S\xF6zc\xFCk Farkl\xFDl\xFD\xF0\xFD:"
#: Merge.rc:967
#, c-format
msgid "Selected Word Diff:"
-msgstr ""
+msgstr "Se\xE7ili S\xF6zc\xFCk Farkl\xFDl\xFD\xF0\xFD:"
#: Merge.rc:974
#: Merge.rc:1053
@@ -1559,496 +1563,500 @@
#: Merge.rc:1410
#, c-format
msgid "Defaults"
-msgstr ""
+msgstr "Varsay\xFDlan Ayarlar"
#: Merge.rc:980
#: Merge.rc:1352
#: Merge.rc:1558
#, c-format
msgid "Dialog"
-msgstr ""
+msgstr "\xDDleti\xFEim"
#: Merge.rc:990
#: Merge.rc:1947
#, c-format
msgid "System"
-msgstr ""
+msgstr "Sistem"
#: Merge.rc:993
#, c-format
msgid "&Send deleted files to Recycle Bin"
-msgstr ""
+msgstr "Silinen Dosyalar\xFD Geri D\xF6n\xFC\xFE\xFCm Kutusuna G\xF6nder"
#: Merge.rc:995
#, c-format
msgid "&External editor:"
-msgstr ""
+msgstr "Harici D\xFCzenleyici:"
#: Merge.rc:998
#, c-format
msgid "&Filter folder:"
-msgstr ""
+msgstr "Filtre Klas\xF6r\xFC:"
#: Merge.rc:1000
#, c-format
msgid "B&rowse..."
-msgstr ""
+msgstr "G\xF6zat..."
#: Merge.rc:1001
#, c-format
msgid "Temporary files folder"
-msgstr ""
+msgstr "Ge\xE7ici Klas\xF6r Se\xE7iminizi Yap\xFDn\xFDz"
#: Merge.rc:1002
#, c-format
msgid "S&ystem's temp folder"
-msgstr ""
+msgstr "Ge\xE7ici Sistem Klas\xF6r\xFC"
#: Merge.rc:1004
#, c-format
msgid "C&ustom folder:"
-msgstr ""
+msgstr "\xD6zel Klas\xF6r:"
#: Merge.rc:1007
#: Merge.rc:1023
#, c-format
msgid "Br&owse..."
-msgstr ""
+msgstr "G\xF6zat..."
#: Merge.rc:1013
#, c-format
msgid "Patch Generator"
-msgstr ""
+msgstr "Yama Olu\xFEtur"
#: Merge.rc:1016
#, c-format
msgid "File&1:"
-msgstr ""
+msgstr "Dosya &1:"
#: Merge.rc:1020
#, c-format
msgid "File&2:"
-msgstr ""
+msgstr "Dosya &2:"
#: Merge.rc:1024
#, c-format
msgid "&Swap"
-msgstr ""
+msgstr "Yer De\xF0i\xFEtir"
#: Merge.rc:1025
#, c-format
msgid "&Append to existing file"
-msgstr ""
+msgstr "Dosyaya Sonu\xE7 Ekle"
#: Merge.rc:1027
#, c-format
msgid "&Result:"
-msgstr ""
+msgstr "Sonu\xE7:"
#: Merge.rc:1031
#, c-format
msgid "&Format"
-msgstr ""
+msgstr "Bi\xE7im"
#: Merge.rc:1032
#, c-format
msgid "St&yle:"
-msgstr ""
+msgstr "T\xFCr:"
#: Merge.rc:1035
-#, c-format
+#, fuzzy, c-format
msgid "&Context:"
-msgstr ""
+msgstr "S\xFDn\xFDr:"
#: Merge.rc:1038
#, c-format
msgid "W&hitespaces"
-msgstr ""
+msgstr "Bo\xFEluklar"
#: Merge.rc:1039
#, c-format
msgid "Com&pare"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:1041
#, c-format
msgid "I&gnore changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri Yok Say"
#: Merge.rc:1043
#, c-format
msgid "Ig&nore all"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC Yok Say"
#: Merge.rc:1045
#, c-format
msgid "Ignor&e blank lines"
-msgstr ""
+msgstr "Bo\xFE Sat\xFDrlar\xFD Yok Say"
#: Merge.rc:1047
#, c-format
msgid "Case sensi&tive"
-msgstr ""
+msgstr "B\xFCy\xFCk-K\xFC\xE7\xFCk Harf Duyarl\xFDl\xFD\xF0\xFD"
#: Merge.rc:1049
#, c-format
msgid "Inclu&de command line"
-msgstr ""
+msgstr "Komut Sat\xFDr\xFDn\xFD Dahil Et"
#: Merge.rc:1051
#, c-format
msgid "Open to e&xternal editor"
-msgstr ""
+msgstr "Harici D\xFCzenleyici \xDDle A\xE7"
#: Merge.rc:1073
#, c-format
msgid "Display Columns"
-msgstr ""
+msgstr "S\xFCtunlar\xFD G\xF6ster"
#: Merge.rc:1079
#, c-format
msgid "Move &Up"
-msgstr ""
+msgstr "Yukar\xFD Ta\xFE\xFD"
#: Merge.rc:1080
#, c-format
msgid "Move &Down"
-msgstr ""
+msgstr "A\xFEa\xF0\xFD Ta\xFE\xFD"
#: Merge.rc:1090
#, c-format
msgid "Select Unpacker"
-msgstr ""
+msgstr "\xC7\xFDkart\xFDc\xFD Se\xE7"
#: Merge.rc:1095
#, c-format
msgid "File unpacker:"
-msgstr ""
+msgstr "Dosya \xC7\xFDkart\xFDc\xFD:"
#: Merge.rc:1098
#, c-format
msgid "Display all unpackers, don't check the extension"
-msgstr ""
+msgstr "Uzant\xFDs\xFDna Bakmadan T\xFCm \xC7\xFDkart\xFDc\xFDlar\xFD G\xF6ster"
#: Merge.rc:1101
#, c-format
msgid "Extensions list:"
-msgstr ""
+msgstr "Uzant\xFD Listesi:"
#: Merge.rc:1102
#, c-format
msgid "Description:"
-msgstr ""
+msgstr "Tan\xFDm:"
#: Merge.rc:1113
#, c-format
msgid " Folder Compare Progress"
-msgstr ""
+msgstr "Klas\xF6r Kar\xFE\xFDla\xFEt\xFDrma \xDD\xFElemi"
#: Merge.rc:1116
#: Merge.rc:1894
#, c-format
msgid "Stop"
-msgstr ""
+msgstr "Dur"
#: Merge.rc:1121
#, c-format
msgid "Comparing items..."
-msgstr ""
+msgstr "\xD6geler Kar\xFE\xFDla\xFEt\xFDr\xFDl\xFDyor..."
#: Merge.rc:1122
#, c-format
msgid "Items compared:"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr\xFDlan \xD6geler:"
#: Merge.rc:1123
#, c-format
msgid "Items total:"
-msgstr ""
+msgstr "Toplam \xD6geler:"
#: Merge.rc:1129
#, c-format
msgid "Go To"
-msgstr ""
+msgstr "Git"
#: Merge.rc:1132
#, c-format
msgid "G&oto:"
-msgstr ""
+msgstr "Git:"
#: Merge.rc:1134
#, c-format
msgid "File"
-msgstr ""
+msgstr "Dosya"
#: Merge.rc:1139
#, c-format
msgid "Goto what"
-msgstr ""
+msgstr "Git"
#: Merge.rc:1140
#, c-format
msgid "Li&ne"
-msgstr ""
+msgstr "Sat\xFDr"
#: Merge.rc:1142
#, c-format
msgid "&Difference"
-msgstr ""
+msgstr "Farkl\xFDl\xFDk"
#: Merge.rc:1144
#, c-format
msgid "&Go To"
-msgstr ""
+msgstr "Git"
#: Merge.rc:1150
#: Merge.rc:1942
#, c-format
msgid "Compare"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDrma"
#: Merge.rc:1153
#, c-format
msgid "Whitespace"
-msgstr ""
+msgstr "Bo\xFEluk"
#: Merge.rc:1154
#, c-format
msgid "&Compare"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:1156
#, c-format
msgid "&Ignore change"
-msgstr ""
+msgstr "De\xF0i\xFEikli\xF0i Yok Say"
#: Merge.rc:1158
#, c-format
msgid "I&gnore all"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC Yok Say"
#: Merge.rc:1160
#, c-format
msgid "Ignore blan&k lines"
-msgstr ""
+msgstr "Bo\xFE Sat\xFDrlar\xFD Yok Say"
#: Merge.rc:1162
#, c-format
msgid "Ignore &case"
-msgstr ""
+msgstr "B\xFCy\xFCk-K\xFC\xE7\xFCk Harf Umursama"
#: Merge.rc:1164
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "Sat\xFDrba\xFE\xFD Farkl\xFDl\xFDklar\xFDn\xFD Yok Say (Windows/Unix/Mac)"
#: Merge.rc:1167
#, c-format
msgid "E&nable moved block detection"
-msgstr ""
+msgstr "Ta\xFE\xFDnan Blok Tespitini Y\xFCkle"
#: Merge.rc:1169
#, c-format
msgid "&Match similar lines"
-msgstr ""
+msgstr "Benzer Sat\xFDrlar\xFD E\xFEle\xFEtir"
#: Merge.rc:1171
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
-msgstr ""
+msgstr "3 Saniyeden Az Zaman Farkl\xFDl\xFDklar\xFDn\xFD Yok Say"
#: Merge.rc:1174
#, c-format
msgid "&File Compare method:"
-msgstr ""
+msgstr "Dosya Kar\xFE\xFDla\xFEt\xFDrma Y\xF6ntemi:"
#: Merge.rc:1177
#, c-format
msgid "S&top after first difference"
-msgstr ""
+msgstr "\xDDlk Farkl\xFDl\xFDktan Sonra Dur"
#: Merge.rc:1180
#, c-format
msgid "Filter Comments"
-msgstr ""
+msgstr "Filtre A\xE7\xFDklamalar\xFD"
#: Merge.rc:1187
#: Merge.rc:1943
#, c-format
msgid "Editor"
-msgstr ""
+msgstr "D\xFCzenleyici"
#: Merge.rc:1190
#, c-format
msgid "&Highlight syntax"
-msgstr ""
+msgstr "S\xF6zdizimi Vurgusu"
#: Merge.rc:1192
#, c-format
msgid "&Automatic rescan"
-msgstr ""
+msgstr "Otomatik Olarak Yeniden Tara"
#: Merge.rc:1194
#, c-format
msgid "&Preserve original EOL chars"
-msgstr ""
+msgstr "Orijinal Sat\xFDr Sonu (K\xFDsaca SS) Karakterlerini Koru"
#: Merge.rc:1196
#, c-format
msgid "Tabs"
-msgstr ""
+msgstr "Girinti Ayarlar\xFD"
#: Merge.rc:1197
#, c-format
msgid "&Tab size:"
-msgstr ""
+msgstr "Sekme Geni\xFEli\xF0i:"
#: Merge.rc:1200
#, c-format
msgid "&Insert Tabs"
-msgstr ""
+msgstr "Sekme Ekle"
#: Merge.rc:1202
#, c-format
msgid "Insert &Spaces"
-msgstr ""
+msgstr "Bo\xFEluk Ekle"
#: Merge.rc:1204
#, c-format
msgid "Line Difference Coloring"
-msgstr ""
+msgstr "Sat\xFDr Farkl\xFDl\xFDklar\xFDn\xFD Renklendir"
#: Merge.rc:1206
#, c-format
msgid "View line differences"
-msgstr ""
+msgstr "Sat\xFDr Farkl\xFDl\xFDklar\xFDn\xFD G\xF6ster"
#: Merge.rc:1208
#, c-format
msgid "&Character level"
-msgstr ""
+msgstr "Karakter B\xF6l\xFCm\xFC"
#: Merge.rc:1210
#, c-format
msgid "&Word-level:"
-msgstr ""
+msgstr "S\xF6zc\xFCk B\xF6l\xFCm\xFC:"
#: Merge.rc:1225
#, c-format
msgid "Filefilters"
-msgstr ""
+msgstr "Dosya Filtreleri"
#: Merge.rc:1231
#, c-format
msgid "Test"
-msgstr ""
+msgstr "Dene"
#: Merge.rc:1232
#, c-format
msgid "Install..."
-msgstr ""
+msgstr "Y\xFCkle..."
#: Merge.rc:1233
#, c-format
msgid "New..."
-msgstr ""
+msgstr "Yeni..."
#: Merge.rc:1234
#, c-format
msgid "Edit..."
-msgstr ""
+msgstr "D\xFCzenle..."
#: Merge.rc:1235
#, c-format
msgid "Delete..."
-msgstr ""
+msgstr "Sil..."
#: Merge.rc:1241
#, c-format
msgid "Save modified files?"
-msgstr ""
+msgstr "Dosya De\xF0i\xFEiklikleri Kaydedilsin mi?"
#: Merge.rc:1244
#, c-format
msgid "Left side file"
-msgstr ""
+msgstr "Sol Taraftaki Dosya"
#: Merge.rc:1247
#, c-format
msgid "&Save changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri Kaydet"
#: Merge.rc:1249
-#, c-format
+#, fuzzy, c-format
msgid "&Discard changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri Se\xE7imden \xC7\xFDkart"
#: Merge.rc:1251
#, c-format
msgid "Right side file"
-msgstr ""
+msgstr "Sa\xF0 Taraftaki Dosya"
#: Merge.rc:1254
#, c-format
msgid "S&ave changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri Kaydet"
#: Merge.rc:1256
-#, c-format
+#, fuzzy, c-format
msgid "Dis&card changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri Se\xE7imden \xC7\xFDkart"
#: Merge.rc:1258
-#, c-format
+#, fuzzy, c-format
msgid "Discard All"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC Se\xE7im D\xFD\xFE\xFD B\xFDrak"
#: Merge.rc:1265
#: Merge.rc:1513
#: Merge.rc:1949
#, c-format
msgid "Codepage"
-msgstr ""
+msgstr "Kod Sayfas\xFD"
#: Merge.rc:1268
#, c-format
msgid "Default Codepage"
-msgstr ""
+msgstr "Varsay\xFDlan Kod Sayfas\xFD"
#: Merge.rc:1269
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
-msgstr ""
+msgstr "Unicode Olmayan Dosyalar Y\xFCklenirken Dikkate Al\xFDnacak Varsay\xFDlan Kod Sayfas\xFDn\xFD Se\xE7iniz:"
#: Merge.rc:1271
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
+msgid ""
+"Detect codepage info for these files: .html, .rc, .xml \n"
+"need to restart session"
msgstr ""
+"Bu Dosyalar \xDD\xE7in Kod Sayfas\xFD Bilgisi Ara: .html, .rc, .xml \n"
+"Oturumu Yeniden Ba\xFElatmak Gerekir"
#: Merge.rc:1274
#, c-format
msgid "System codepage"
-msgstr ""
+msgstr "Sistem Kod Sayfas\xFD"
#: Merge.rc:1276
#, c-format
msgid "According to WinMerge User Interface"
-msgstr ""
+msgstr "WinMerge Kullan\xFDc\xFD Aray\xFCz\xFC"
#: Merge.rc:1278
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "\xD6zel Kod Sayfas\xFD:"
#: Merge.rc:1286
#, c-format
msgid "WinMerge - Archive support disabled"
-msgstr ""
+msgstr "WinMerge - S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i Kapal\xFD"
#: Merge.rc:1289
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
-msgstr ""
+msgstr "7-Zip Tespit Edilemedi (Ya da Y\xFCkl\xFC De\xF0il ?)"
#: Merge.rc:1292
#, c-format
@@ -2056,11 +2064,14 @@
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
"essential components to be copied to the program directory for standalone operation."
msgstr ""
+"S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i \xDD\xE7in;\n"
+"7-Zip'in 3.11 Ya da Daha \xDCst S\xFCr\xFCm\xFCn\xFCn Kurulu Olmas\xFD Gerekir,\n"
+"Veya Program Dizinine 7-Zip Temel Par\xE7alar\xFDn\xFD Kopyalaman\xFDz Gerekir."
#: Merge.rc:1294
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
-msgstr ""
+msgstr "Orada Ayr\xFDca Bir Aray\xFCz Eklentisi (Merge7z*.dll) Olmal\xFDd\xFDr."
#: Merge.rc:1296
#, c-format
@@ -2068,11 +2079,13 @@
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
"versions become available."
msgstr ""
+"Aray\xFCz Eklentileri \xDD\xE7in Son S\xFCr\xFCmler Daha Uygun Oldu\xF0undan,\n"
+"L\xFCtfen A\xFEa\xF0\xFDda \xD6nerilen 7-Zip S\xFCr\xFCm\xFCn\xFC Kullan\xFDn\xFDz."
#: Merge.rc:1298
#, c-format
msgid "Version"
-msgstr ""
+msgstr "S\xFCr\xFCm"
#: Merge.rc:1300
#, c-format
@@ -2080,128 +2093,134 @@
"Plugin required\n"
"(dllbuild %04u)"
msgstr ""
+"Gereken Eklenti\n"
+"(dllbuild %04u)"
#: Merge.rc:1302
#, c-format
msgid "Recommended version of 7-Zip:"
-msgstr ""
+msgstr "\xD6nerilen 7-Zip S\xFCr\xFCm\xFC:"
#: Merge.rc:1305
#: Merge.rc:1308
#, c-format
msgid "present"
-msgstr ""
+msgstr "Mevcut"
#: Merge.rc:1306
#, c-format
msgid "Merge7z000U.dll"
-msgstr ""
+msgstr "Merge7z000U.dll"
#: Merge.rc:1309
#, c-format
msgid "7-Zip software installed on your computer:"
-msgstr ""
+msgstr "Bilgisayar\xFDn\xFDzda Y\xFCkl\xFC 7-Zip Yaz\xFDl\xFDm\xFD:"
#: Merge.rc:1311
#: Merge.rc:1316
#, c-format
msgid "none"
-msgstr ""
+msgstr "Yok"
#: Merge.rc:1313
#, c-format
msgid "missing"
-msgstr ""
+msgstr "Yok"
#: Merge.rc:1314
#, c-format
msgid "7-Zip components for standalone operation:"
-msgstr ""
+msgstr "7-Zip Temel Par\xE7alar\xFD:"
#: Merge.rc:1318
#, c-format
msgid "outdated"
-msgstr ""
+msgstr "Zaman\xFD Ge\xE7mi\xFE"
#: Merge.rc:1319
#, c-format
msgid "Plugins on path:"
-msgstr ""
+msgstr "Eklentilerin Oldu\xF0u Dizin:"
#: Merge.rc:1320
#, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
msgstr ""
+"Bu Mesaj\xFD Tekrar G\xF6sterme!\n"
+"(Bu Mesaj\xFD Yeniden G\xF6rmek \xDD\xE7in Yard\xFDm Men\xFCs\xFCn\xFC Kullanabilirsiniz.)"
#: Merge.rc:1324
#, c-format
msgid "Plugin Download"
-msgstr ""
+msgstr "Eklenti \xDDndir"
#: Merge.rc:1333
#, c-format
msgid "Options"
-msgstr ""
+msgstr "Ayarlar"
#: Merge.rc:1344
#, c-format
msgid " Categories"
-msgstr ""
+msgstr " KATEGOR\xDDLER"
#: Merge.rc:1346
#, c-format
msgid "Import..."
-msgstr ""
+msgstr "\xDD\xE7e Aktar..."
#: Merge.rc:1347
#, c-format
msgid "Export..."
-msgstr ""
+msgstr "D\xFD\xFEa Aktar..."
#: Merge.rc:1355
#, c-format
msgid "Keywords:"
-msgstr ""
+msgstr "Anahtar S\xF6zc\xFCkler:"
#: Merge.rc:1356
#, c-format
msgid "Function names:"
-msgstr ""
+msgstr "Fonksiyon Adlar\xFD:"
#: Merge.rc:1357
#, c-format
msgid "Comments:"
-msgstr ""
+msgstr "A\xE7\xFDklamalar:"
#: Merge.rc:1358
#, c-format
msgid "Numbers:"
-msgstr ""
+msgstr "Numaralar:"
#: Merge.rc:1359
#, c-format
msgid "Operators:"
-msgstr ""
+msgstr "\xDD\xFElemciler:"
#: Merge.rc:1360
#, c-format
msgid "Strings:"
-msgstr ""
+msgstr "Dizgiler:"
#: Merge.rc:1361
#, c-format
msgid "Preprocessor:"
-msgstr ""
+msgstr "\xD6ni\xFElemci:"
#: Merge.rc:1362
#, c-format
msgid "User 1:"
-msgstr ""
+msgstr "Kullan\xFDc\xFD 1:"
#: Merge.rc:1363
#, c-format
msgid "User 2:"
-msgstr ""
+msgstr "Kullan\xFDc\xFD 2:"
#: Merge.rc:1368
#: Merge.rc:1373
@@ -2214,17 +2233,17 @@
#: Merge.rc:1408
#, c-format
msgid "Bold"
-msgstr ""
+msgstr "Kal\xFDn"
#: Merge.rc:1416
#, c-format
msgid "Folder Compare Report"
-msgstr ""
+msgstr "Klas\xF6r Kar\xFE\xFDla\xFEt\xFDrma Raporu"
#: Merge.rc:1419
#, c-format
msgid "Report &File:"
-msgstr ""
+msgstr "Rapor Dosyas\xFD:"
#: Merge.rc:1422
#: Merge.rc:1596
@@ -2232,387 +2251,387 @@
#: Merge.rc:1627
#, c-format
msgid "Browse..."
-msgstr ""
+msgstr "G\xF6zat..."
#: Merge.rc:1423
#, c-format
msgid "&Style:"
-msgstr ""
+msgstr "Rapor T\xFCr\xFC:"
#: Merge.rc:1426
#, c-format
msgid "&Copy to Clipboard"
-msgstr ""
+msgstr "Panoya Kopyala"
#: Merge.rc:1434
#, c-format
msgid "Shared or Private Filter"
-msgstr ""
+msgstr "\xD6zel Veya Ortak Filtre"
#: Merge.rc:1437
#, c-format
msgid "Which type of filter do you want to create?"
-msgstr ""
+msgstr "Ne T\xFCr Filtre Haz\xFDrlamak \xDDstiyorsunuz?"
#: Merge.rc:1439
#, c-format
msgid "Shared Filter (for all users on this machine)"
-msgstr ""
+msgstr "Ortak Filtre (T\xFCm Kullan\xFDc\xFDlar \xDD\xE7in)"
#: Merge.rc:1441
#, c-format
msgid "Private Filter (only for current user)"
-msgstr ""
+msgstr "\xD6zel Filtre (Sadece Ge\xE7erli Kullan\xFDc\xFD \xDD\xE7in)"
#: Merge.rc:1449
#: Merge.rc:1950
#, c-format
msgid "Archive Support"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i"
#: Merge.rc:1452
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i \xDD\xE7in 7-Zip Eklentisi Kurulu Olmal\xFDd\xFDr:"
#: Merge.rc:1454
#, c-format
msgid "Download 7-zip Plugin"
-msgstr ""
+msgstr "7-Zip Eklentisi \xDDndir"
#: Merge.rc:1455
#, c-format
msgid "&Enable archive file support"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0ini Y\xFCkle"
#: Merge.rc:1457
#, c-format
msgid "&Use stand-alone 7-Zip if available"
-msgstr ""
+msgstr "Varsa Kurulu 7-Zip Program\xFDn\xFD Kullan"
#: Merge.rc:1460
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
-msgstr ""
+msgstr "WinMerge Klas\xF6r\xFCndeki 7-Zip'i Kullan"
#: Merge.rc:1462
#, c-format
msgid "&Detect archive type from file signature"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDrma T\xFCr\xFCn\xFC Tespit Et"
#: Merge.rc:1470
#, c-format
msgid "Compare Statistics"
-msgstr ""
+msgstr "Say\xFDsal Verileri Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:1473
#, c-format
msgid "Folders:"
-msgstr ""
+msgstr "Klas\xF6rler:"
#: Merge.rc:1474
#, c-format
msgid "Files:"
-msgstr ""
+msgstr "Dosyalar:"
#: Merge.rc:1475
#: Merge.rc:2341
#, c-format
msgid "Different"
-msgstr ""
+msgstr "Farkl\xFDl\xFDk"
#: Merge.rc:1476
#, c-format
msgid "Text:"
-msgstr ""
+msgstr "Metin:"
#: Merge.rc:1479
#: Merge.rc:1498
-#, c-format
+#, fuzzy, c-format
msgid "Binary:"
-msgstr ""
+msgstr "Binary:"
#: Merge.rc:1482
#, c-format
msgid "Unique"
-msgstr ""
+msgstr "Benzersiz"
#: Merge.rc:1483
#, c-format
msgid "Left:"
-msgstr ""
+msgstr "Sol:"
#: Merge.rc:1488
#, c-format
msgid "Right:"
-msgstr ""
+msgstr "Sa\xF0:"
#: Merge.rc:1493
#: Merge.rc:2335
#, c-format
msgid "Identical"
-msgstr ""
+msgstr "Ayn\xFD"
#: Merge.rc:1502
#, c-format
msgid "Total:"
-msgstr ""
+msgstr "Toplam:"
#: Merge.rc:1507
#, c-format
msgid "Close"
-msgstr ""
+msgstr "Kapat"
#: Merge.rc:1516
#, c-format
msgid "Affects"
-msgstr ""
+msgstr "Etkiler"
#: Merge.rc:1519
#: Merge.rc:1522
#, c-format
msgid "(Affects)"
-msgstr ""
+msgstr "(Etkiler)"
#: Merge.rc:1523
#, c-format
msgid "Select Codepage for"
-msgstr ""
+msgstr "Kod Sayfas\xFD Se\xE7"
#: Merge.rc:1524
#, c-format
msgid "&File Loading:"
-msgstr ""
+msgstr "Dosya Y\xFCkleniyor:"
#: Merge.rc:1526
#: Merge.rc:1529
#, c-format
msgid "..."
-msgstr ""
+msgstr "..."
#: Merge.rc:1527
#, c-format
msgid "File &Saving:"
-msgstr ""
+msgstr "Dosya Kaydediliyor:"
#: Merge.rc:1530
#, c-format
msgid "&Use same codepage for both"
-msgstr ""
+msgstr "\xDDkisi \xDD\xE7in Ayn\xFD Kod Sayfas\xFDn\xFD Kullan"
#: Merge.rc:1533
#, c-format
msgid "&Apply"
-msgstr ""
+msgstr "Uygula"
#: Merge.rc:1534
#: Merge.rc:1916
#, c-format
msgid "&Cancel"
-msgstr ""
+msgstr "\xDDptal"
#: Merge.rc:1539
#, c-format
msgid "Test Filter"
-msgstr ""
+msgstr "Filtreyi Dene"
#: Merge.rc:1542
#, c-format
msgid "Testing filter ..."
-msgstr ""
+msgstr "Filtre Deneniyor..."
#: Merge.rc:1544
#, c-format
msgid "&Enter text to test:"
-msgstr ""
+msgstr "Deneme Metni Giriniz:"
#: Merge.rc:1546
#, c-format
msgid "&Folder Name"
-msgstr ""
+msgstr "Klas\xF6r Ad\xFD"
#: Merge.rc:1548
#, c-format
msgid "Result:"
-msgstr ""
+msgstr "Sonu\xE7:"
#: Merge.rc:1552
#, c-format
msgid "&Test"
-msgstr ""
+msgstr "Dene"
#: Merge.rc:1553
#, c-format
msgid "&Close"
-msgstr ""
+msgstr "Kapat"
#: Merge.rc:1561
#, c-format
msgid "&Use customized text colors"
-msgstr ""
+msgstr "\xD6zel Metin Rengi Kullan"
#: Merge.rc:1564
#, c-format
msgid "Custom text colors"
-msgstr ""
+msgstr "\xD6zel Metin Renkleri"
#: Merge.rc:1566
#, c-format
msgid "Whitespace:"
-msgstr ""
+msgstr "Bo\xFEluk:"
#: Merge.rc:1567
#, c-format
msgid "Regular text:"
-msgstr ""
+msgstr "Normal Metin:"
#: Merge.rc:1568
#, c-format
msgid "Selection:"
-msgstr ""
+msgstr "Se\xE7im:"
#: Merge.rc:1591
#, c-format
msgid "Paths"
-msgstr ""
+msgstr "Dizinler"
#: Merge.rc:1597
#, c-format
msgid "R&ead-only"
-msgstr ""
+msgstr "Salt Okunur"
#: Merge.rc:1601
#, c-format
msgid "Re&ad-only"
-msgstr ""
+msgstr "Salt Okunur"
#: Merge.rc:1607
#, c-format
msgid "Open..."
-msgstr ""
+msgstr "A\xE7..."
#: Merge.rc:1608
#, c-format
msgid "Save..."
-msgstr ""
+msgstr "Kaydet..."
#: Merge.rc:1613
#: Merge.rc:1951
#, c-format
msgid "Backup Files"
-msgstr ""
+msgstr "Yedek Dosyalar\xFD"
#: Merge.rc:1616
#, c-format
msgid "Create backup files in:"
-msgstr ""
+msgstr "Yedek Al:"
#: Merge.rc:1621
#, c-format
msgid "Create backup files into:"
-msgstr ""
+msgstr "Yedek Dosyalar\xFDn\xFDn Olu\xFEturulaca\xF0\xFD Yer:"
#: Merge.rc:1622
#, c-format
msgid "&Original file's folder"
-msgstr ""
+msgstr "Orijinal Dosyan\xFDn Oldu\xF0u Klas\xF6r"
#: Merge.rc:1624
#, c-format
msgid "&Global backup folder:"
-msgstr ""
+msgstr "Yedekler \xDD\xE7in \xD6zel Bir Klas\xF6r Belirle:"
#: Merge.rc:1628
#, c-format
msgid "Backup filename:"
-msgstr ""
+msgstr "Yedek Dosyas\xFD Adland\xFDr\xFDl\xFDrken:"
#: Merge.rc:1629
#, c-format
msgid "&Append .bak -extension"
-msgstr ""
+msgstr "Sonuna '.bak' Uzant\xFDs\xFD Ekle"
#: Merge.rc:1631
#, c-format
msgid "A&ppend timestamp"
-msgstr ""
+msgstr "Sonuna Tarih Damgas\xFD Ekle"
#: Merge.rc:1638
#: Merge.rc:2243
#, c-format
msgid "Confirm Copy"
-msgstr ""
+msgstr "Kopyay\xFD Do\xF0rula"
#: Merge.rc:1642
#, c-format
msgid "Are you sure you want to copy XXX items?"
-msgstr ""
+msgstr "XXX \xD6gelerini Kopyalamak \xDDstedi\xF0inize Emin misiniz?"
#: Merge.rc:1644
#, c-format
msgid "From left"
-msgstr ""
+msgstr "Soldan"
#: Merge.rc:1647
#, c-format
msgid "To right"
-msgstr ""
+msgstr "Sa\xF0a"
#: Merge.rc:1650
#, c-format
msgid "Yes"
-msgstr ""
+msgstr "Evet"
#: Merge.rc:1651
#, c-format
msgid "No"
-msgstr ""
+msgstr "Hay\xFDr"
#: Merge.rc:1657
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Eklentiler"
#: Merge.rc:1660
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "Eklentileri Y\xFCkle"
#: Merge.rc:1671
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Sa\xF0 Tu\xFE Eklentisi"
#: Merge.rc:1674
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "WinMerge'i Sa\xF0 Tu\xFEa Eklemek \xDDster misiniz?"
#: Merge.rc:1675
#, c-format
msgid "E&nable advanced menu"
-msgstr ""
+msgstr "Geli\xFEmi\xFE Men\xFCy\xFC Y\xFCkle"
#: Merge.rc:1677
#, c-format
msgid "In&clude subfolders by default"
-msgstr ""
+msgstr "Varsay\xFDlan Olarak Alt Klas\xF6rleri Dahil Et"
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "Sa\xF0 Tu\xFE Men\xFCs\xFCne Ekle"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "WinMerge'de Dosya veya Klas\xF6r Kar\xFE\xFDla\xFEt\xFDr\xFDrken"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "\xD6gelere T\xFDkland\xFD\xF0\xFDnda, (Windows) Sa\xF0 Tu\xFE Men\xFCs\xFC G\xF6ster"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -2629,37 +2648,37 @@
#: Merge.rc:1739
#, c-format
msgid "Ready"
-msgstr ""
+msgstr "Haz\xFDr"
#: Merge.rc:1745
#, c-format
msgid "EXT"
-msgstr ""
+msgstr "EXT"
#: Merge.rc:1746
#, c-format
msgid "CAP"
-msgstr ""
+msgstr "CAP"
#: Merge.rc:1747
#, c-format
msgid "NUM"
-msgstr ""
+msgstr "NUM"
#: Merge.rc:1748
#, c-format
msgid "SCRL"
-msgstr ""
+msgstr "SCRL"
#: Merge.rc:1749
#, c-format
msgid "OVR"
-msgstr ""
+msgstr "OVR"
#: Merge.rc:1750
#, c-format
msgid "REC"
-msgstr ""
+msgstr "REC"
#: Merge.rc:1756
#, c-format
@@ -2667,6 +2686,8 @@
"Create empty documents\n"
"New Documents (Ctrl+N)"
msgstr ""
+"Bo\xFE Belgeler Olu\xFEtur\n"
+"Yeni Belgeler (Ctrl+N)"
#: Merge.rc:1757
#, c-format
@@ -2674,6 +2695,8 @@
"Open an existing document\n"
"Open (Ctrl+O)"
msgstr ""
+"Varolan Bir Belgeyi A\xE7\n"
+"A\xE7 (Ctrl+O)"
#: Merge.rc:1758
#, c-format
@@ -2681,6 +2704,8 @@
"Close the active document\n"
"Close"
msgstr ""
+"Aktif Belgeyi Kapat\n"
+"Kapat"
#: Merge.rc:1759
#, c-format
@@ -2688,6 +2713,8 @@
"Save the active document\n"
"Save (Ctrl+S)"
msgstr ""
+"Aktif Belgeyi Kaydet\n"
+"Kaydet (Ctrl+S)"
#: Merge.rc:1760
#, c-format
@@ -2695,6 +2722,8 @@
"Save the active document with a new name\n"
"Save As"
msgstr ""
+"Aktif Belgeyi Ba\xFEka Bir \xDDsimle Kaydet\n"
+"Farkl\xFD Kaydet"
#: Merge.rc:1761
#, c-format
@@ -2702,6 +2731,8 @@
"Change the printing options\n"
"Page Setup"
msgstr ""
+"Yazd\xFDrma Se\xE7eneklerini De\xF0i\xFEtir\n"
+"Sayfa Yap\xFDs\xFD"
#: Merge.rc:1762
#, c-format
@@ -2709,6 +2740,8 @@
"Change the printer and printing options\n"
"Print Setup"
msgstr ""
+"Yaz\xFDc\xFDy\xFD ve Yazd\xFDrma Se\xE7eneklerini De\xF0i\xFEtir\n"
+"Sayfa Yap\xFDs\xFD"
#: Merge.rc:1763
#, c-format
@@ -2716,6 +2749,8 @@
"Print the active document\n"
"Print"
msgstr ""
+"Aktif Belgeyi Yazd\xFDr\n"
+"Yazd\xFDr"
#: Merge.rc:1764
#, c-format
@@ -2723,26 +2758,28 @@
"Display full pages\n"
"Print Preview"
msgstr ""
+"Sayfalar\xFDn Tamam\xFDn\xFD G\xF6ster\n"
+"Bask\xFD \xD6nizleme"
#: Merge.rc:1769
#, c-format
msgid "Make all hidden items visible again"
-msgstr ""
+msgstr "T\xFCm Gizli \xD6geleri Tekrar G\xF6r\xFClebilir Yap"
#: Merge.rc:1770
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "A\xF0a\xE7 G\xF6r\xFCn\xFCm\xFCn\xFC A\xE7-Kapat"
#: Merge.rc:1771
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "T\xFCm Alt Klas\xF6rleri Geni\xFElet"
#: Merge.rc:1772
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "T\xFCm Alt Klas\xF6rleri Daralt"
#: Merge.rc:1778
#, c-format
@@ -2750,31 +2787,33 @@
"Open project file\n"
"Project file (Ctrl+J)"
msgstr ""
+"Proje Dosyas\xFD A\xE7\n"
+"Proje Dosyas\xFD (Ctrl+J)"
#: Merge.rc:1779
#, c-format
msgid "Unknown error attempting to open project file"
-msgstr ""
+msgstr "Proje Dosyas\xFD A\xE7\xFDl\xFDrken Bilinmeyen Bir Hata \xDDle Kar\xFE\xFDla\xFE\xFDld\xFD"
#: Merge.rc:1780
#, c-format
msgid "Unknown error attempting to save project file"
-msgstr ""
+msgstr "Proje Dosyas\xFD Kaydedilirken Bilinmeyen Bir Hata \xDDle Kar\xFE\xFDla\xFE\xFDld\xFD"
#: Merge.rc:1781
#, c-format
msgid "Project File"
-msgstr ""
+msgstr "Proje Dosyas\xFD"
#: Merge.rc:1782
#, c-format
msgid "Project file successfully loaded."
-msgstr ""
+msgstr "Proje Dosyas\xFD Ba\xFEar\xFDyla Y\xFCklendi."
#: Merge.rc:1783
#, c-format
msgid "Project file successfully saved."
-msgstr ""
+msgstr "Proje Dosyas\xFD Ba\xFEar\xFDyla Kaydedildi."
#: Merge.rc:1784
#, c-format
@@ -2782,6 +2821,8 @@
"Save current paths and options to project file\n"
"Save Project File"
msgstr ""
+"Proje Dosyas\xFDna \xDEimdiki Dizinleri ve Ayarlar\xFD Kaydet\n"
+"Proje Dosyas\xFDn\xFD Kaydet"
#: Merge.rc:1789
#, c-format
@@ -2789,6 +2830,8 @@
"Display program information, version number and copyright\n"
"About"
msgstr ""
+"Program Bilgisi, S\xFCr\xFCm Numaras\xFD ve Telif Haklar\xFDn\xFD G\xF6ster\n"
+"Hakk\xFDnda"
#: Merge.rc:1790
#, c-format
@@ -2796,6 +2839,8 @@
"Quit the application; prompts to save documents\n"
"Exit"
msgstr ""
+"Belgeler Kaydedilince Uygulamay\xFD Kapat\n"
+"\xC7\xFDk"
#: Merge.rc:1796
#: Merge.rc:1797
@@ -2815,7 +2860,7 @@
#: Merge.rc:1811
#, c-format
msgid "Open this document"
-msgstr ""
+msgstr "Bu Belgeyi A\...
[truncated message content] |
|
From: <ge...@us...> - 2009-07-28 06:55:21
|
Revision: 6937
http://winmerge.svn.sourceforge.net/winmerge/?rev=6937&view=rev
Author: gerundt
Date: 2009-07-28 06:55:10 +0000 (Tue, 28 Jul 2009)
Log Message:
-----------
PATCH: [ 2827820 ] Turkish Translation - NEW - (Unstable Trunk)
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/Turkish.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-07-26 17:17:18 UTC (rev 6936)
+++ trunk/Docs/Users/ChangeLog.txt 2009-07-28 06:55:10 UTC (rev 6937)
@@ -19,7 +19,7 @@
Translation updates:
- Dutch (#2801690, #2804979)
- Swedish (#2805726)
- - Turkish (#2825130, #2825132)
+ - Turkish (#2825130, #2825132, #2827820)
- Ukrainian (#2817835)
WinMerge 2.13.8 - 2009-05-26 (r6791)
Modified: trunk/Translations/WinMerge/Turkish.po
===================================================================
--- trunk/Translations/WinMerge/Turkish.po 2009-07-26 17:17:18 UTC (rev 6936)
+++ trunk/Translations/WinMerge/Turkish.po 2009-07-28 06:55:10 UTC (rev 6937)
@@ -13,7 +13,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-07-22 02:24+0100\n"
+"PO-Revision-Date: 2009-07-27 13:47+0200\n"
"Last-Translator: Afyonlu <af...@us...>\n"
"Language-Team: Turkish <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -120,21 +120,21 @@
#: Merge.rc:315
#, c-format
msgid "&File"
-msgstr "&Dosya"
+msgstr "Dosya"
#: Merge.rc:112
#: Merge.rc:196
#: Merge.rc:317
#, c-format
msgid "&New\tCtrl+N"
-msgstr "&Yeni\tCtrl+N"
+msgstr "Yeni\tCtrl+N"
#: Merge.rc:113
#: Merge.rc:197
#: Merge.rc:318
#, c-format
msgid "&Open...\tCtrl+O"
-msgstr "&A\xE7...\tCtrl+O"
+msgstr "A\xE7...\tCtrl+O"
#: Merge.rc:114
#: Merge.rc:198
@@ -148,7 +148,7 @@
#: Merge.rc:321
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
-msgstr "Proje A\xE7..."
+msgstr "Proje A\xE7...\tCtrl+J"
#: Merge.rc:117
#: Merge.rc:201
@@ -167,28 +167,28 @@
#: Merge.rc:354
#, c-format
msgid "E&xit"
-msgstr "\xC7\xFDk\xFD&\xFE"
+msgstr "\xC7\xFDk\xFD\xFE"
#: Merge.rc:123
#: Merge.rc:210
#: Merge.rc:356
#, c-format
msgid "&Edit"
-msgstr "&D\xFCzen"
+msgstr "D\xFCzen"
#: Merge.rc:125
#: Merge.rc:214
#: Merge.rc:390
#, c-format
msgid "&Options..."
-msgstr "&Ayarlar..."
+msgstr "Ayarlar..."
#: Merge.rc:127
#: Merge.rc:216
#: Merge.rc:392
#, c-format
msgid "&View"
-msgstr "&G\xF6r\xFCn\xFCm"
+msgstr "G\xF6r\xFCn\xFCm"
#: Merge.rc:129
#: Merge.rc:231
@@ -202,7 +202,7 @@
#: Merge.rc:395
#, c-format
msgid "Use Default F&ont"
-msgstr "&Varsay\xFDlan Yaz\xFD Tipini Kullan"
+msgstr "Varsay\xFDlan Yaz\xFD Tipini Kullan"
#: Merge.rc:132
#: Merge.rc:234
@@ -251,35 +251,35 @@
#: Merge.rc:427
#, c-format
msgid "&Language..."
-msgstr "&Dil..."
+msgstr "Dil..."
#: Merge.rc:143
#: Merge.rc:265
#: Merge.rc:449
#, c-format
msgid "&Tools"
-msgstr "&Ara\xE7lar"
+msgstr "Ara\xE7lar"
#: Merge.rc:145
#: Merge.rc:268
#: Merge.rc:451
#, c-format
msgid "&Filters..."
-msgstr "&Filtreler..."
+msgstr "Filtreler..."
#: Merge.rc:146
#: Merge.rc:269
#: Merge.rc:452
#, c-format
msgid "&Generate Patch..."
-msgstr "&Yama Olu\xFEtur..."
+msgstr "Yama Olu\xFEtur..."
#: Merge.rc:148
#: Merge.rc:272
#: Merge.rc:455
#, c-format
msgid "&Plugins"
-msgstr "&Eklentiler"
+msgstr "Eklentiler"
#: Merge.rc:150
#: Merge.rc:274
@@ -289,14 +289,14 @@
msgstr "Listele..."
#: Merge.rc:152
-#, c-format
+#, fuzzy, c-format
msgid "Ma&nual Prediffer"
-msgstr ""
+msgstr "\xD6ncelikli Fark (Elle)"
#: Merge.rc:153
-#, c-format
+#, fuzzy, c-format
msgid "A&utomatic Prediffer"
-msgstr ""
+msgstr "\xD6ncelikli Fark (Otomatik)"
#: Merge.rc:155
#: Merge.rc:276
@@ -310,7 +310,7 @@
#: Merge.rc:460
#, c-format
msgid "&Automatic Unpacking"
-msgstr "\xC7\xFDkart (&Otomatik)"
+msgstr "\xC7\xFDkart (Otomatik)"
#: Merge.rc:158
#: Merge.rc:279
@@ -324,7 +324,7 @@
#: Merge.rc:469
#, c-format
msgid "&Reload plugins"
-msgstr "Eklentileri &Tekrar Y\xFCkle"
+msgstr "Eklentileri Tekrar Y\xFCkle"
#: Merge.rc:162
#: Merge.rc:283
@@ -359,7 +359,7 @@
#: Merge.rc:478
#, c-format
msgid "Cl&ose"
-msgstr "&Kapat"
+msgstr "Kapat"
#: Merge.rc:170
#: Merge.rc:291
@@ -373,28 +373,28 @@
#: Merge.rc:481
#, c-format
msgid "Change &Pane\tF6"
-msgstr "&Di\xF0er Paneli Aktifle\xFEtir\tF6"
+msgstr "Di\xF0er Paneli Aktifle\xFEtir\tF6"
#: Merge.rc:174
#: Merge.rc:295
#: Merge.rc:483
#, c-format
msgid "Tile &Horizontally"
-msgstr "&Yatay D\xF6\xFEe"
+msgstr "Yatay D\xF6\xFEe"
#: Merge.rc:175
#: Merge.rc:296
#: Merge.rc:484
#, c-format
msgid "Tile &Vertically"
-msgstr "&Dikey D\xF6\xFEe"
+msgstr "Dikey D\xF6\xFEe"
#: Merge.rc:176
#: Merge.rc:297
#: Merge.rc:485
#, c-format
msgid "&Cascade"
-msgstr "&S\xFDrala"
+msgstr "Basamakla"
#: Merge.rc:178
#: Merge.rc:299
@@ -402,14 +402,14 @@
#: Merge.rc:1948
#, c-format
msgid "&Help"
-msgstr "&Yard\xFDm"
+msgstr "Yard\xFDm"
#: Merge.rc:180
#: Merge.rc:301
#: Merge.rc:489
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr "WinMerge Yard\xFDm\xFD"
+msgstr "WinMerge Yard\xFDm\xFD\tF1"
#: Merge.rc:182
#: Merge.rc:303
@@ -437,7 +437,7 @@
#: Merge.rc:494
#, c-format
msgid "A&rchive Support disabled..."
-msgstr "&S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i Kapal\xFD"
+msgstr "S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i Kapal\xFD"
#: Merge.rc:187
#: Merge.rc:308
@@ -451,7 +451,7 @@
#: Merge.rc:497
#, c-format
msgid "&About WinMerge..."
-msgstr "&WinMerge Hakk\xFDnda..."
+msgstr "WinMerge Hakk\xFDnda..."
#: Merge.rc:203
#: Merge.rc:340
@@ -474,7 +474,7 @@
#: Merge.rc:366
#, c-format
msgid "Select &All\tCtrl+A"
-msgstr "&T\xFCm\xFCn\xFC Se\xE7\tCtrl+A"
+msgstr "T\xFCm\xFCn\xFC Se\xE7\tCtrl+A"
#: Merge.rc:218
#, c-format
@@ -535,65 +535,65 @@
#: Merge.rc:429
#, c-format
msgid "Refre&sh\tF5"
-msgstr "Ta&zele\tF5"
+msgstr "Tazele\tF5"
#: Merge.rc:247
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
-msgstr "Se\xE7ili Olan\xFD Tazele"
+msgstr "Se\xE7ili Olan\xFD Tazele\tCtrl+F5"
#: Merge.rc:249
#: Merge.rc:431
#, c-format
msgid "&Merge"
-msgstr "&Birle\xFEtir"
+msgstr "Birle\xFEtir"
#: Merge.rc:251
#, c-format
msgid "Co&mpare\tEnter"
-msgstr "Kar\xFE\xFDla\xFEt\xFDr"
+msgstr "Kar\xFE\xFDla\xFEt\xFDr\tEnter"
#: Merge.rc:253
#: Merge.rc:433
#, c-format
msgid "&Next Difference\tAlt+Down"
-msgstr "&Sonraki Fark\tAlt+Down"
+msgstr "Sonraki Fark\tAlt+Down"
#: Merge.rc:254
#: Merge.rc:434
#, c-format
msgid "&Previous Difference\tAlt+Up"
-msgstr "&\xD6nceki Fark\tAlt+Up"
+msgstr "\xD6nceki Fark\tAlt+Up"
#: Merge.rc:256
#: Merge.rc:436
#, c-format
msgid "&First Difference\tAlt+Home"
-msgstr "&\xDDlk Fark\tAlt+Home"
+msgstr "\xDDlk Fark\tAlt+Home"
#: Merge.rc:257
#: Merge.rc:437
#, c-format
msgid "&Current Difference\tAlt+Enter"
-msgstr "&\xDEimdiki Fark\tAlt+Enter"
+msgstr "\xDEimdiki Fark\tAlt+Enter"
#: Merge.rc:258
#: Merge.rc:438
#, c-format
msgid "&Last Difference\tAlt+End"
-msgstr "S&on Fark\tAlt+End"
+msgstr "Son Fark\tAlt+End"
#: Merge.rc:260
#: Merge.rc:440
#, c-format
msgid "Copy to &Right\tAlt+Right"
-msgstr "S&a\xF0a Kopyala\tAlt+Right"
+msgstr "Sa\xF0a Kopyala\tAlt+Right"
#: Merge.rc:261
#: Merge.rc:441
#, c-format
msgid "Copy to L&eft\tAlt+Left"
-msgstr "So&la Kopyala\tAlt+Left"
+msgstr "Sola Kopyala\tAlt+Left"
#: Merge.rc:263
#, c-format
@@ -604,7 +604,7 @@
#: Merge.rc:566
#, c-format
msgid "&Customize Columns..."
-msgstr "S\xFCtunlar\xFD &\xD6zelle\xFEtir..."
+msgstr "S\xFCtunlar\xFD \xD6zelle\xFEtir..."
#: Merge.rc:270
#: Merge.rc:453
@@ -615,29 +615,29 @@
#: Merge.rc:324
#, c-format
msgid "&Save\tCtrl+S"
-msgstr "&Kaydet\tCtrl+S"
+msgstr "Kaydet\tCtrl+S"
#: Merge.rc:325
#, c-format
msgid "Save &Left"
-msgstr "S&olu Kaydet "
+msgstr "Solu Kaydet "
#: Merge.rc:327
#: Merge.rc:332
#, c-format
msgid "&Save"
-msgstr "&Kaydet"
+msgstr "Kaydet"
#: Merge.rc:328
#: Merge.rc:333
#, c-format
msgid "Save &As..."
-msgstr "&Farkl\xFD Kaydet..."
+msgstr "Farkl\xFD Kaydet..."
#: Merge.rc:330
#, c-format
msgid "Save &Right"
-msgstr "&Sa\xF0\xFD Kaydet"
+msgstr "Sa\xF0\xFD Kaydet"
#: Merge.rc:336
#, c-format
@@ -677,7 +677,7 @@
#: Merge.rc:350
#, c-format
msgid "&Merge Mode\tF9"
-msgstr "Birle\xFEtirme &Durumu\tF9"
+msgstr "Birle\xFEtirme Durumu\tF9"
#: Merge.rc:352
#, c-format
@@ -687,7 +687,7 @@
#: Merge.rc:358
#, c-format
msgid "&Undo\tCtrl+Z"
-msgstr "&Geri Al\tCtrl+Z"
+msgstr "Geri Al\tCtrl+Z"
#: Merge.rc:359
#, c-format
@@ -697,37 +697,37 @@
#: Merge.rc:361
#, c-format
msgid "Cu&t\tCtrl+X"
-msgstr "&Kes\tCtrl+X"
+msgstr "Kes\tCtrl+X"
#: Merge.rc:362
#, c-format
msgid "&Copy\tCtrl+C"
-msgstr "Ko&pyala\tCtrl+C"
+msgstr "Kopyala\tCtrl+C"
#: Merge.rc:363
#, c-format
msgid "&Paste\tCtrl+V"
-msgstr "&Yap\xFD\xFEt\xFDr\tCtrl+V"
+msgstr "Yap\xFD\xFEt\xFDr\tCtrl+V"
#: Merge.rc:365
#, c-format
msgid "Select Line &Difference\tF4"
-msgstr "Farkl\xFD Olan Sat\xFDrlar\xFD Se\xE7"
+msgstr "Farkl\xFD Olan Sat\xFDrlar\xFD Se\xE7\tF4"
#: Merge.rc:368
#, c-format
msgid "F&ind...\tCtrl+F"
-msgstr "&Bul...\tCtrl+F"
+msgstr "Bul...\tCtrl+F"
#: Merge.rc:369
#, c-format
msgid "Repla&ce...\tCtrl+H"
-msgstr "&De\xF0i\xFEtir...\tCtrl+H"
+msgstr "De\xF0i\xFEtir...\tCtrl+H"
#: Merge.rc:371
#, c-format
msgid "&Scripts"
-msgstr "&Yaz\xFD D\xFCzeni"
+msgstr "Yaz\xFD D\xFCzeni"
#: Merge.rc:373
#: Merge.rc:2807
@@ -743,7 +743,7 @@
#: Merge.rc:378
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
-msgstr "Sat\xFDr Numaralar\xFD \xDDle Kopyala"
+msgstr "Sat\xFDr Numaralar\xFD \xDDle Kopyala\tCtrl+Shift+C"
#: Merge.rc:381
#, c-format
@@ -753,17 +753,17 @@
#: Merge.rc:383
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
-msgstr "S\xFDk Kullan\xFDlanlar\xFD A\xE7-Kapat"
+msgstr "S\xFDk Kullan\xFDlanlar\xFD A\xE7-Kapat\tCtrl+F2"
#: Merge.rc:384
#, c-format
msgid "&Next Bookmark\tF2"
-msgstr "Sonraki S\xFDk Kullan\xFDlan"
+msgstr "Sonraki S\xFDk Kullan\xFDlan\tF2"
#: Merge.rc:385
#, c-format
msgid "&Previous bookmark\tShift+F2"
-msgstr "\xD6nceki S\xFDk Kullan\xFDlan"
+msgstr "\xD6nceki S\xFDk Kullan\xFDlan\tShift+F2"
#: Merge.rc:386
#, c-format
@@ -773,7 +773,7 @@
#: Merge.rc:388
#, c-format
msgid "&Go To...\tCtrl+G"
-msgstr "&Git...\tCtrl+G"
+msgstr "Git...\tCtrl+G"
#: Merge.rc:396
#, c-format
@@ -783,12 +783,12 @@
#: Merge.rc:398
#, c-format
msgid "Zoom &In\tCtrl++"
-msgstr "Yak\xFDnla\xFEt\xFDr"
+msgstr "Yak\xFDnla\xFEt\xFDr\tCtrl++"
#: Merge.rc:399
#, c-format
msgid "Zoom &Out\tCtrl+-"
-msgstr "Uzakla\xFEt\xFDr"
+msgstr "Uzakla\xFEt\xFDr\tCtrl+-"
#. Zoom to normal
#: Merge.rc:400
@@ -809,7 +809,7 @@
#: Merge.rc:408
#, c-format
msgid "&View Whitespace"
-msgstr "&Bo\xFEluklar\xFD G\xF6ster"
+msgstr "Bo\xFEluklar\xFD G\xF6ster"
#: Merge.rc:409
#, c-format
@@ -859,12 +859,12 @@
#: Merge.rc:446
#, c-format
msgid "Copy &All to Right"
-msgstr "&T\xFCm\xFCn\xFC Sa\xF0a Kopyala"
+msgstr "T\xFCm\xFCn\xFC Sa\xF0a Kopyala"
#: Merge.rc:447
#, c-format
msgid "Cop&y All to Left"
-msgstr "T&\xFCm\xFCn\xFC Sola Kopyala"
+msgstr "T\xFCm\xFCn\xFC Sola Kopyala"
#: Merge.rc:464
#, fuzzy, c-format
@@ -889,7 +889,7 @@
#: Merge.rc:509
#, c-format
msgid "&HEX"
-msgstr ""
+msgstr "&HEX"
#: Merge.rc:514
#, c-format
@@ -976,19 +976,19 @@
msgstr "Yol Adlar\xFDn\xFD Kopyala"
#: Merge.rc:548
-#, fuzzy, c-format
+#, c-format
msgid "&Left (%1 of %2)"
-msgstr "Soldaki (%1 Adet)"
+msgstr "Soldaki (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:549
-#, fuzzy, c-format
+#, c-format
msgid "&Right (%1 of %2)"
-msgstr "Sa\xF0daki (%1 Adet)"
+msgstr "Sa\xF0daki (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:550
-#, fuzzy, c-format
+#, c-format
msgid "&Both (%1 of %2)"
-msgstr "Her \xDDkisindeki (Toplam %2 Adet)"
+msgstr "Her \xDDki Taraftaki (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:552
#, c-format
@@ -1001,19 +1001,19 @@
msgstr "S\xFDk\xFD\xFEt\xFDr (&Zip'le)"
#: Merge.rc:556
-#, fuzzy, c-format
+#, c-format
msgid "&Left... (%1 of %2)"
-msgstr "Soldakini... (%1 Adet)"
+msgstr "Soldakini... (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:557
-#, fuzzy, c-format
+#, c-format
msgid "&Right... (%1 of %2)"
-msgstr "Sa\xF0dakini... (%1 Adet)"
+msgstr "Sa\xF0dakini... (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:558
-#, fuzzy, c-format
+#, c-format
msgid "&Both... (%1 of %2)"
-msgstr "Her \xDDkisini... (Toplam %2 Adet)"
+msgstr "Her \xDDki Taraftakini... (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:559
#, c-format
@@ -1458,7 +1458,7 @@
#: Merge.rc:872
#: Merge.rc:2205
-#, fuzzy, c-format
+#, c-format
msgid "Rational ClearCase"
msgstr "Rational ClearCase"
@@ -1943,7 +1943,7 @@
#: Merge.rc:1209
#, c-format
msgid "W&ord break characters:"
-msgstr ""
+msgstr "S\xF6zc\xFCk B\xF6lme Karakterleri:"
#: Merge.rc:1222
#, c-format
@@ -1991,9 +1991,9 @@
msgstr "De\xF0i\xFEiklikleri Kaydet"
#: Merge.rc:1246
-#, c-format
+#, fuzzy, c-format
msgid "&Discard changes"
-msgstr "De\xF0i\xFEiklikleri \xDDptal Et"
+msgstr "De\xF0i\xFEiklikleri Se\xE7imden \xC7\xFDkart"
#: Merge.rc:1248
#, c-format
@@ -2006,14 +2006,14 @@
msgstr "De\xF0i\xFEiklikleri Kaydet"
#: Merge.rc:1253
-#, c-format
+#, fuzzy, c-format
msgid "Dis&card changes"
-msgstr "De\xF0i\xFEiklikleri \xDDptal Et"
+msgstr "De\xF0i\xFEiklikleri Se\xE7imden \xC7\xFDkart"
#: Merge.rc:1255
-#, c-format
+#, fuzzy, c-format
msgid "Disca&rd All"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC Se\xE7im D\xFD\xFE\xFD B\xFDrak"
#: Merge.rc:1262
#: Merge.rc:1510
@@ -2651,7 +2651,7 @@
#: Merge.rc:1689
#, c-format
msgid "&Compare method:"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDrma Y\xF6ntemi:"
#: Merge.rc:1691
#, c-format
@@ -2666,12 +2666,12 @@
#: Merge.rc:1695
#, c-format
msgid "&Include unique subfolders contents"
-msgstr ""
+msgstr "Benzersiz Alt Klas\xF6r \xDD\xE7eri\xF0ini Dahil Et"
#: Merge.rc:1697
#, c-format
msgid "&Quick compare limit (MB):"
-msgstr ""
+msgstr "H\xFDzl\xFD Kar\xFE\xFDla\xFEt\xFDrma Limiti (MB):"
#. StringFileInfo.Block
#: Merge.rc:1723
@@ -2927,7 +2927,7 @@
"Cascade Windows"
msgstr ""
"Pencereleri Birbiri \xDCst\xFCne S\xFDrala\n"
-"Pencereleri D\xF6\xFEe"
+"Pencereleri Basamakla"
#: Merge.rc:1839
#, c-format
@@ -3194,7 +3194,7 @@
#: Merge.rc:1930
#, c-format
msgid "&Ok"
-msgstr "Tamam"
+msgstr "TAMAM"
#: Merge.rc:1932
#, c-format
@@ -3264,7 +3264,7 @@
#: Merge.rc:1961
#, c-format
msgid "Syntax"
-msgstr ""
+msgstr "S\xF6zdizimi"
#: Merge.rc:1963
#, c-format
@@ -4070,76 +4070,76 @@
#: Merge.rc:2222
#, c-format
msgid "Right to Left (%1)"
-msgstr "Sa\xF0dakini Sola (%1)"
+msgstr "Sa\xF0dakini Sola (%1 Tane)"
#: Merge.rc:2223
#, c-format
msgid "Left to Right (%1)"
-msgstr "Soldakini Sa\xF0a (&1)"
+msgstr "Soldakini Sa\xF0a (%1 Tane)"
#: Merge.rc:2224
#, c-format
msgid "Right to Left (%1 of %2)"
-msgstr "Sa\xF0dakini Sola (%2 \xD6genin %1 tanesi)"
+msgstr "Sa\xF0dakini Sola (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:2225
#, c-format
msgid "Left to Right (%1 of %2)"
-msgstr "Soldakini Sa\xF0a (%2 \xD6genin %1 tanesi)"
+msgstr "Soldakini Sa\xF0a (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:2226
#: Merge.rc:2242
#, c-format
msgid "Left to... (%1)"
-msgstr "Soldakini \xDEuraya... (%1)"
+msgstr "Soldakini \xDEuraya... (%1 Tane)"
#: Merge.rc:2227
#: Merge.rc:2243
#, c-format
msgid "Right to... (%1)"
-msgstr "Sa\xF0dakini \xDEuraya... (%1)"
+msgstr "Sa\xF0dakini \xDEuraya... (%1 Tane)"
#: Merge.rc:2228
#: Merge.rc:2244
#, c-format
msgid "Left to... (%1 of %2)"
-msgstr "Soldakini \xDEuraya... (%2 \xD6genin %1 tanesi)"
+msgstr "Soldakini \xDEuraya... (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:2229
#: Merge.rc:2245
#, c-format
msgid "Right to... (%1 of %2)"
-msgstr "Sa\xF0dakini \xDEuraya... (%2 \xD6genin %1 tanesi)"
+msgstr "Sa\xF0dakini \xDEuraya... (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:2235
#, c-format
msgid "Left (%1)"
-msgstr "Soldakini (%1 Adet)"
+msgstr "Soldakini (%1 Tane)"
#: Merge.rc:2236
#, c-format
msgid "Right (%1)"
-msgstr "Sa\xF0dakini (%1 Adet)"
+msgstr "Sa\xF0dakini (%1 Tane)"
#: Merge.rc:2237
#, c-format
msgid "Both (%1)"
-msgstr "Her \xDDkisini de (%1 Adet)"
+msgstr "Her \xDDkisini de (%1 Tane)"
#: Merge.rc:2238
-#, fuzzy, c-format
+#, c-format
msgid "Left (%1 of %2)"
-msgstr "Soldakini (%1 Adet)"
+msgstr "Soldakini (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:2239
-#, fuzzy, c-format
+#, c-format
msgid "Right (%1 of %2)"
-msgstr "Sa\xF0dakini (%1 Adet)"
+msgstr "Sa\xF0dakini (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:2240
-#, fuzzy, c-format
+#, c-format
msgid "Both (%1 of %2)"
-msgstr "Her \xDDkisindekini de (Toplam %2 Adet)"
+msgstr "Her \xDDki Tarafta da Olan\xFD (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:2241
#, c-format
@@ -4971,7 +4971,7 @@
#: Merge.rc:2511
#, c-format
msgid "Select file for import"
-msgstr "Select file for import"
+msgstr "\xDD\xE7e Aktarmak \xDD\xE7in Dosya Se\xE7"
#: Merge.rc:2512
#, c-format
@@ -5087,7 +5087,7 @@
#: Merge.rc:2542
#, c-format
msgid "Unmatched ) or \\)"
-msgstr "E\xFEle\xFEmeyen ) veya \\)"
+msgstr "E\xFEle\xFEmeyen ) Veya \\)"
#: Merge.rc:2548
#, c-format
@@ -5333,7 +5333,7 @@
#: Merge.rc:2635
#, c-format
msgid "Approximates ISO-8859-2"
-msgstr "Approximates ISO-8859-2"
+msgstr "Yakla\xFE\xFDk ISO-8859-2"
#: Merge.rc:2638
#, c-format
@@ -5553,7 +5553,7 @@
#: Merge.rc:2706
#, c-format
msgid "Toggle bookmark"
-msgstr "S\xFDk Kullan\xFDlan\xFD A\xE7-Kapa"
+msgstr "S\xFDk Kullan\xFDlanlar\xFD A\xE7-Kapa"
#: Merge.rc:2707
#, c-format
@@ -6018,9 +6018,9 @@
msgstr "\xDDmlecin Alt\xFDndaki Farkl\xFDl\xFD\xF0a Git"
#: Merge.rc:2828
-#, fuzzy, c-format
+#, c-format
msgid "G&oto Diff %1 of %2"
-msgstr "%1. Farkl\xFDl\xFD\xF0a Git"
+msgstr "%2 Farktan %1. Farka Git"
#: Merge.rc:2829
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-26 17:17:28
|
Revision: 6936
http://winmerge.svn.sourceforge.net/winmerge/?rev=6936&view=rev
Author: kimmov
Date: 2009-07-26 17:17:18 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
Catch out of memory error when converting byte array to string.
Modified Paths:
--------------
trunk/Src/Common/UniFile.cpp
trunk/Src/Common/unicoder.cpp
trunk/Src/Common/unicoder.h
trunk/Src/UniMarkdownFile.cpp
Modified: trunk/Src/Common/UniFile.cpp
===================================================================
--- trunk/Src/Common/UniFile.cpp 2009-07-26 16:26:58 UTC (rev 6935)
+++ trunk/Src/Common/UniFile.cpp 2009-07-26 17:17:18 UTC (rev 6936)
@@ -456,7 +456,7 @@
* @param [out] line Line read.
* @param [out] eol EOL bytes read (if any).
* @param [out] lossy TRUE if there were lossy encoding.
- * @return TRUE if there is more lines to read, TRUE when last line is read.
+ * @return true if there is more lines to read, false when last line is read.
*/
bool UniMemFile::ReadString(String & line, String & eol, bool * lossy)
{
@@ -581,7 +581,11 @@
RecordZero(m_txtstats, offset);
}
}
- line = ucr::maketstring((LPCSTR)m_current, eolptr - m_current, m_codepage, lossy);
+ bool success = ucr::maketstring(line, (LPCSTR)m_current, eolptr - m_current, m_codepage, lossy);
+ if (!success)
+ {
+ return false;
+ }
if (lossy && *lossy)
++m_txtstats.nlosses;
if (!eof)
Modified: trunk/Src/Common/unicoder.cpp
===================================================================
--- trunk/Src/Common/unicoder.cpp 2009-07-26 16:26:58 UTC (rev 6935)
+++ trunk/Src/Common/unicoder.cpp 2009-07-26 17:17:18 UTC (rev 6936)
@@ -463,18 +463,27 @@
}
/**
- * @brief Convert series of bytes (8-bit chars) to TCHARs, using specified codepage
+ * @brief Convert series of bytes (8-bit chars) to TCHARs.
*
- * TODO: This doesn't inform the caller whether translation was lossy
+ * @param [out] str String returned.
+ * @param [in] lpd Original byte array to convert.
+ * @param [in] len Length of the original byte array.
+ * @param [in] codepage Codepage used.
+ * @param [out] lossy Was conversion lossy?
+ * @return true if conversion succeeds, false otherwise.
+ * @todo This doesn't inform the caller whether translation was lossy
* In fact, this doesn't even know. Probably going to have to make
* two passes, the first with MB_ERR_INVALID_CHARS. Ugh. :(
*/
-String maketstring(const char* lpd, unsigned int len, int codepage, bool * lossy)
+bool maketstring(String & str, const char* lpd, unsigned int len, int codepage, bool * lossy)
{
int defcodepage = getDefaultCodepage();
if (!len)
- return _T("");
+ {
+ str.clear();
+ return true;
+ }
// 0 is a valid value (CP_ACP)!
if (codepage == -1)
@@ -485,8 +494,17 @@
// TCHAR is wchar_t, so convert into String (str)
DWORD flags = MB_ERR_INVALID_CHARS;
int wlen = len * 2 + 6;
- String str;
- str.resize(wlen);
+
+ try
+ {
+ str.resize(wlen);
+ }
+ catch (std::bad_alloc)
+ {
+ // Not enough memory - exit
+ return false;
+ }
+
LPWSTR wbuff = &*str.begin();
do
{
@@ -508,15 +526,23 @@
ASSERT(FALSE);
--n;
}
- str.resize(n);
- return str;
+ try
+ {
+ str.resize(n);
+ }
+ catch (std::bad_alloc)
+ {
+ // Not enough memory - exit
+ return false;
+ }
+ return true;
}
*lossy = true;
flags ^= MB_ERR_INVALID_CHARS;
}
while (flags == 0 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION);
str = _T('?');
- return str;
+ return true;
#else
if (EqualCodepages(codepage, defcodepage))
@@ -526,8 +552,8 @@
return String(lpd, len);
}
- String str = CrossConvertToStringA(lpd, len, codepage, defcodepage, lossy);
- return str;
+ str = CrossConvertToStringA(lpd, len, codepage, defcodepage, lossy);
+ return true;
#endif
}
Modified: trunk/Src/Common/unicoder.h
===================================================================
--- trunk/Src/Common/unicoder.h 2009-07-26 16:26:58 UTC (rev 6935)
+++ trunk/Src/Common/unicoder.h 2009-07-26 17:17:18 UTC (rev 6936)
@@ -52,7 +52,7 @@
String maketchar(unsigned int ch, bool & lossy);
int writeBom(void* dest, UNICODESET unicoding);
unsigned int get_unicode_char(unsigned char * ptr, UNICODESET unicoding, int codepage = 0);
-String maketstring(const char* lpd, unsigned int len, int codepage, bool * lossy);
+bool maketstring(String & str, const char* lpd, unsigned int len, int codepage, bool * lossy);
String maketchar(unsigned int unich, bool & lossy);
String maketchar(unsigned int unich, bool & lossy, unsigned int codepage);
unsigned int byteToUnicode(unsigned char ch);
Modified: trunk/Src/UniMarkdownFile.cpp
===================================================================
--- trunk/Src/UniMarkdownFile.cpp 2009-07-26 16:26:58 UTC (rev 6935)
+++ trunk/Src/UniMarkdownFile.cpp 2009-07-26 17:17:18 UTC (rev 6936)
@@ -138,7 +138,8 @@
String UniMarkdownFile::maketstring(LPCSTR lpd, UINT len)
{
bool lossy = false;
- String s = ucr::maketstring(lpd, len, m_codepage, &lossy);
+ String s;
+ ucr::maketstring(s, lpd, len, m_codepage, &lossy);
if (lossy)
++m_txtstats.nlosses;
return s;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-26 16:27:07
|
Revision: 6935
http://winmerge.svn.sourceforge.net/winmerge/?rev=6935&view=rev
Author: kimmov
Date: 2009-07-26 16:26:58 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
Astyle formatting.
Modified Paths:
--------------
trunk/Src/Common/UniFile.cpp
trunk/Src/Common/UniFile.h
trunk/Src/Common/unicoder.cpp
trunk/Src/Common/unicoder.h
Modified: trunk/Src/Common/UniFile.cpp
===================================================================
--- trunk/Src/Common/UniFile.cpp 2009-07-26 15:22:14 UTC (rev 6934)
+++ trunk/Src/Common/UniFile.cpp 2009-07-26 16:26:58 UTC (rev 6935)
@@ -52,7 +52,7 @@
*/
UniFile::UniError::UniError()
{
- ClearError();
+ ClearError();
}
/**
@@ -195,11 +195,11 @@
/////////////
UniMemFile::UniMemFile()
-: m_handle(INVALID_HANDLE_VALUE)
-, m_hMapping(INVALID_HANDLE_VALUE)
-, m_base(NULL)
-, m_data(NULL)
-, m_current(NULL)
+ : m_handle(INVALID_HANDLE_VALUE)
+ , m_hMapping(INVALID_HANDLE_VALUE)
+ , m_base(NULL)
+ , m_data(NULL)
+ , m_current(NULL)
{
}
@@ -354,25 +354,25 @@
m_charsize = 1;
bool unicode = false;
bool bom = false;
-
+
m_unicoding = ucr::DetermineEncoding(lpByte, m_filesize, &bom);
switch (m_unicoding)
{
- case ucr::UCS2LE:
- case ucr::UCS2BE:
- m_charsize = 2;
- m_data = lpByte + 2;
- unicode = true;
- break;
- case ucr::UTF8:
- if (bom)
- m_data = lpByte + 3;
- else
- m_data = lpByte;
- unicode = true;
- break;
- default:
- break;
+ case ucr::UCS2LE:
+ case ucr::UCS2BE:
+ m_charsize = 2;
+ m_data = lpByte + 2;
+ unicode = true;
+ break;
+ case ucr::UTF8:
+ if (bom)
+ m_data = lpByte + 3;
+ else
+ m_data = lpByte;
+ unicode = true;
+ break;
+ default:
+ break;
}
m_bom = bom;
@@ -463,9 +463,9 @@
line.erase();
eol.erase();
LPCTSTR pchLine = (LPCTSTR)m_current;
-
+
// shortcut methods in case file is in the same encoding as our Strings
-
+
#ifdef _UNICODE
if (m_unicoding == ucr::UCS2LE)
{
@@ -560,19 +560,19 @@
}
#endif
- if (m_current - m_base + (m_charsize-1) >= m_filesize)
+ if (m_current - m_base + (m_charsize - 1) >= m_filesize)
return false;
// Handle 8-bit strings in line chunks because of multibyte codings (eg, 936)
if (m_unicoding == ucr::NONE)
{
- bool eof=true;
- LPBYTE eolptr=0;
- for (eolptr = m_current; (eolptr - m_base + (m_charsize-1) < m_filesize); ++eolptr)
+ bool eof = true;
+ LPBYTE eolptr = 0;
+ for (eolptr = m_current; (eolptr - m_base + (m_charsize - 1) < m_filesize); ++eolptr)
{
if (*eolptr == '\n' || *eolptr == '\r')
{
- eof=false;
+ eof = false;
break;
}
if (*eolptr == 0)
@@ -581,16 +581,16 @@
RecordZero(m_txtstats, offset);
}
}
- line = ucr::maketstring((LPCSTR)m_current, eolptr-m_current, m_codepage, lossy);
+ line = ucr::maketstring((LPCSTR)m_current, eolptr - m_current, m_codepage, lossy);
if (lossy && *lossy)
++m_txtstats.nlosses;
if (!eof)
{
- eol += (TCHAR)*eolptr;
+ eol += (TCHAR) * eolptr;
++m_lineno;
if (*eolptr == '\r')
{
- if (eolptr - m_base + (m_charsize-1) < m_filesize && eolptr[1] == '\n')
+ if (eolptr - m_base + (m_charsize - 1) < m_filesize && eolptr[1] == '\n')
{
eol += '\n';
++m_txtstats.ncrlfs;
@@ -606,11 +606,11 @@
return !eof;
}
- while (m_current - m_base + (m_charsize-1) < m_filesize)
+ while (m_current - m_base + (m_charsize - 1) < m_filesize)
{
- UINT ch=0;
- UINT utf8len=0;
- bool doneline=false;
+ UINT ch = 0;
+ UINT utf8len = 0;
+ bool doneline = false;
if (m_unicoding == ucr::UTF8)
{
@@ -627,7 +627,7 @@
else if (utf8len < 1 || utf8len > 4)
{
ch = '?';
- utf8len=1;
+ utf8len = 1;
}
else
{
@@ -662,7 +662,7 @@
{
// For UTF-8, this ch will be wrong if character is non-ASCII
// but we only check it against \n here, so it doesn't matter
- UINT ch = ucr::get_unicode_char(m_current+m_charsize, (ucr::UNICODESET)m_unicoding);
+ UINT ch = ucr::get_unicode_char(m_current + m_charsize, (ucr::UNICODESET)m_unicoding);
if (ch == '\n')
{
crlf = true;
@@ -725,8 +725,8 @@
/////////////
UniStdioFile::UniStdioFile()
-: m_fp(0)
-, m_data(0)
+ : m_fp(0)
+ , m_data(0)
{
m_pucrbuff = new ucr::buffer(128);
}
@@ -734,7 +734,7 @@
UniStdioFile::~UniStdioFile()
{
Close();
- delete (ucr::buffer *)m_pucrbuff;
+ delete(ucr::buffer *)m_pucrbuff;
m_pucrbuff = 0;
}
@@ -781,11 +781,11 @@
}
bool UniStdioFile::OpenCreateUtf8(LPCTSTR filename)
{
- if (!OpenCreate(filename))
+ if (!OpenCreate(filename))
return false;
SetUnicoding(ucr::UTF8);
return true;
-
+
}
bool UniStdioFile::Open(LPCTSTR filename, LPCTSTR mode)
{
@@ -800,7 +800,7 @@
bool UniStdioFile::DoOpen(LPCTSTR filename, LPCTSTR mode)
{
Close();
-
+
m_filepath = filename;
m_filename = filename; // TODO: Make canonical ?
@@ -866,25 +866,25 @@
m_charsize = 1;
bool unicode = false;
bool bom = false;
-
+
m_unicoding = ucr::DetermineEncoding(buff, bytes, &bom);
switch (m_unicoding)
{
- case ucr::UCS2LE:
- case ucr::UCS2BE:
- m_charsize = 2;
- m_data = 2;
- unicode = true;
- break;
- case ucr::UTF8:
- if (bom)
- m_data = 3;
- else
- m_data = 0;
- unicode = true;
- break;
- default:
- break;
+ case ucr::UCS2LE:
+ case ucr::UCS2BE:
+ m_charsize = 2;
+ m_data = 2;
+ unicode = true;
+ break;
+ case ucr::UTF8:
+ if (bom)
+ m_data = 3;
+ else
+ m_data = 0;
+ unicode = true;
+ break;
+ default:
+ break;
}
delete[] buff;
@@ -975,8 +975,8 @@
}
ucr::buffer * buff = (ucr::buffer *)m_pucrbuff;
- ucr::UNICODESET unicoding1=ucr::NONE;
- int codepage1=0;
+ ucr::UNICODESET unicoding1 = ucr::NONE;
+ int codepage1 = 0;
ucr::getInternalEncoding(&unicoding1, &codepage1); // What String & TCHARs represent
const unsigned char * src = (const UCHAR *)line.c_str();
size_t srcbytes = line.length() * sizeof(TCHAR);
Modified: trunk/Src/Common/UniFile.h
===================================================================
--- trunk/Src/Common/UniFile.h 2009-07-26 15:22:14 UTC (rev 6934)
+++ trunk/Src/Common/UniFile.h 2009-07-26 16:26:58 UTC (rev 6935)
@@ -1,4 +1,4 @@
-/**
+/**
* @file UniFile.h
* @author Perry Rapp, Creator, 2003-2006
* @date Created: 2003-10
@@ -20,7 +20,7 @@
class UniFile
{
public:
-
+
/**
* @brief A struct for error message or error code.
*/
Modified: trunk/Src/Common/unicoder.cpp
===================================================================
--- trunk/Src/Common/unicoder.cpp 2009-07-26 15:22:14 UTC (rev 6934)
+++ trunk/Src/Common/unicoder.cpp 2009-07-26 16:26:58 UTC (rev 6935)
@@ -32,10 +32,11 @@
#define WC_NO_BEST_FIT_CHARS 0x00000400
#endif
-namespace ucr {
+namespace ucr
+{
// current OS version
-static bool f_osvi_fetched=false;
+static bool f_osvi_fetched = false;
static OSVERSIONINFO f_osvi;
/**
@@ -132,7 +133,7 @@
}
/**
- * @brief return #bytes required to represent Unicode codepoint as UTF-8
+ * @brief return #bytes required to represent Unicode codepoint as UTF-8
*/
int Utf8len_fromCodepoint(unsigned int ch)
{
@@ -146,7 +147,7 @@
}
/**
- * @brief How many bytes will it take to write string as UTF-8 ?
+ * @brief How many bytes will it take to write string as UTF-8 ?
*
* @param size size argument as filemapping are not 0 terminated
*
@@ -154,8 +155,8 @@
*/
unsigned int Utf8len_of_string(const wchar_t* text, int size)
{
- unsigned int len=0;
- for (int i=0; i<size; ++i)
+ unsigned int len = 0;
+ for (int i = 0; i < size; ++i)
{
int chlen = Utf8len_fromCodepoint(text[i]);
if (chlen < 1) chlen = 1;
@@ -164,7 +165,7 @@
return len;
}
/**
- * @brief How many chars in this UTF-8 string ?
+ * @brief How many chars in this UTF-8 string ?
*
* @param size size argument as filemapping are not 0 terminated
*
@@ -172,8 +173,8 @@
*/
unsigned int stringlen_of_utf8(const char* text, int size)
{
- unsigned int len=0;
- for (int i=0; i<size; )
+ unsigned int len = 0;
+ for (int i = 0; i < size;)
{
int chlen = Utf8len_fromLeadByte(text[i]);
if (chlen < 1) chlen = 1;
@@ -189,41 +190,48 @@
unsigned int GetUtf8Char(unsigned char * str)
{
/* test short cases first, as probably much more common */
- if (!(*str & 0x80 && *str & 0x40)) {
+ if (!(*str & 0x80 && *str & 0x40))
+ {
return str[0];
}
- if (!(*str & 0x20)) {
+ if (!(*str & 0x20))
+ {
unsigned int ch = ((str[0] & 0x1F) << 6)
- + (str[1] & 0x3F);
+ + (str[1] & 0x3F);
return ch;
}
- if (!(*str & 0x10)) {
+ if (!(*str & 0x10))
+ {
unsigned int ch = ((str[0] & 0x0f) << 12)
- + ((str[1] & 0x3F) << 6)
- + (str[2] & 0x3F);
+ + ((str[1] & 0x3F) << 6)
+ + (str[2] & 0x3F);
return ch;
}
- if (!(*str & 0x08)) {
+ if (!(*str & 0x08))
+ {
unsigned int ch = ((str[0] & 0x0F) << 18)
- + ((str[1] & 0x3F) << 12)
- + ((str[2] & 0x3F) << 6)
- + (str[3] & 0x3F);
+ + ((str[1] & 0x3F) << 12)
+ + ((str[2] & 0x3F) << 6)
+ + (str[3] & 0x3F);
return ch;
}
- if (!(*str & 0x04)) {
+ if (!(*str & 0x04))
+ {
unsigned int ch = ((str[0] & 0x0F) << 24)
- + ((str[1] & 0x3F) << 18)
- + ((str[2] & 0x3F) << 12)
- + ((str[3] & 0x3F) << 6)
- + (str[4] & 0x3F);
+ + ((str[1] & 0x3F) << 18)
+ + ((str[2] & 0x3F) << 12)
+ + ((str[3] & 0x3F) << 6)
+ + (str[4] & 0x3F);
return ch;
- } else {
+ }
+ else
+ {
unsigned int ch = ((str[0] & 0x0F) << 30)
- + ((str[1] & 0x3F) << 24)
- + ((str[2] & 0x3F) << 18)
- + ((str[3] & 0x3F) << 12)
- + ((str[4] & 0x3F) << 6)
- + (str[5] & 0x3F);
+ + ((str[1] & 0x3F) << 24)
+ + ((str[2] & 0x3F) << 18)
+ + ((str[3] & 0x3F) << 12)
+ + ((str[4] & 0x3F) << 6)
+ + (str[5] & 0x3F);
return ch;
}
}
@@ -322,21 +330,21 @@
wchar_t wch = (wchar_t)unich;
if (!lossy)
{
- static bool vercheck=false;
- static bool has_no_best_fit=false;
+ static bool vercheck = false;
+ static bool has_no_best_fit = false;
if (!vercheck)
{
if (!f_osvi_fetched) fetch_verinfo();
// Need 2000 (5.x) or 98 (4.10)
- has_no_best_fit = f_osvi.dwMajorVersion>=5 || (f_osvi.dwMajorVersion==4 && f_osvi.dwMinorVersion>=10);
+ has_no_best_fit = f_osvi.dwMajorVersion >= 5 || (f_osvi.dwMajorVersion == 4 && f_osvi.dwMinorVersion >= 10);
vercheck = true;
}
// So far it isn't lossy, so try for lossless conversion
TCHAR outch;
- BOOL defaulted=FALSE;
+ BOOL defaulted = FALSE;
DWORD flags = has_no_best_fit ? WC_NO_BEST_FIT_CHARS : 0;
if (WideCharToMultiByte(codepage, flags, &wch, 1, &outch, 1, NULL, &defaulted)
- && !defaulted)
+ && !defaulted)
{
String s(1, outch);
return s;
@@ -344,12 +352,12 @@
lossy = TRUE;
}
// already lossy, so make our best shot
- DWORD flags = WC_COMPOSITECHECK+WC_DISCARDNS+WC_SEPCHARS+WC_DEFAULTCHAR;
+ DWORD flags = WC_COMPOSITECHECK + WC_DISCARDNS + WC_SEPCHARS + WC_DEFAULTCHAR;
TCHAR outbuff[16];
- int n = WideCharToMultiByte(codepage, flags, &wch, 1, outbuff, sizeof(outbuff)-1, NULL, NULL);
- if (n>0)
+ int n = WideCharToMultiByte(codepage, flags, &wch, 1, outbuff, sizeof(outbuff) - 1, NULL, NULL);
+ if (n > 0)
{
- outbuff[n] =0;
+ outbuff[n] = 0;
return outbuff;
}
return _T("?");
@@ -359,7 +367,7 @@
/**
* @brief convert 8-bit character input to Unicode codepoint and return it
*/
-unsigned int byteToUnicode (unsigned char ch)
+unsigned int byteToUnicode(unsigned char ch)
{
static unsigned int codepage = CP_ACP;
// NB: Windows always draws in CP_ACP, not CP_THREAD_ACP, so we must use CP_ACP as an internal codepage
@@ -370,7 +378,7 @@
/**
* @brief convert 8-bit character input to Unicode codepoint and return it
*/
-unsigned int byteToUnicode (unsigned char ch, unsigned int codepage)
+unsigned int byteToUnicode(unsigned char ch, unsigned int codepage)
{
if (ch < 0x80)
@@ -378,8 +386,8 @@
DWORD flags = 0;
wchar_t wbuff;
- int n = MultiByteToWideChar(codepage, flags, (const char*)&ch, 1, &wbuff, 1);
- if (n>0)
+ int n = MultiByteToWideChar(codepage, flags, (const char*) & ch, 1, &wbuff, 1);
+ if (n > 0)
return wbuff;
else
return '?';
@@ -482,12 +490,12 @@
LPWSTR wbuff = &*str.begin();
do
{
- int n = MultiByteToWideChar(codepage, flags, lpd, len, wbuff, wlen-1);
+ int n = MultiByteToWideChar(codepage, flags, lpd, len, wbuff, wlen - 1);
if (n)
{
/*
- NB: MultiByteToWideChar is documented as only zero-terminating
- if input was zero-terminated, but it appears that it can
+ NB: MultiByteToWideChar is documented as only zero-terminating
+ if input was zero-terminated, but it appears that it can
zero-terminate even if input wasn't.
So we check if it zero-terminated and adjust count accordingly.
*/
@@ -505,7 +513,8 @@
}
*lossy = true;
flags ^= MB_ERR_INVALID_CHARS;
- } while (flags == 0 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION);
+ }
+ while (flags == 0 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION);
str = _T('?');
return str;
@@ -528,7 +537,7 @@
#ifndef UNICODE
String CrossConvertToStringA(const char* src, unsigned int srclen, int cpin, int cpout, bool * lossy)
{
- int wlen = srclen*2+6;
+ int wlen = srclen * 2 + 6;
int clen = wlen * 2 + 6;
String str;
str.resize(clen);
@@ -550,9 +559,9 @@
// Convert input to Unicode, using specified codepage
DWORD flags = 0;
- int wlen = srclen*2+6;
+ int wlen = srclen * 2 + 6;
wchar_t * wbuff = new wchar_t[wlen];
- int n = MultiByteToWideChar(cpin, flags, (const char*)src, srclen, wbuff, wlen-1);
+ int n = MultiByteToWideChar(cpin, flags, (const char*)src, srclen, wbuff, wlen - 1);
if (!n)
{
int nsyserr = ::GetLastError();
@@ -562,8 +571,8 @@
return 1;
}
/*
- NB: MultiByteToWideChar is documented as only zero-terminating
- if input was zero-terminated, but it appears that it can
+ NB: MultiByteToWideChar is documented as only zero-terminating
+ if input was zero-terminated, but it appears that it can
zero-terminate even if input wasn't.
So we check if it zero-terminated and adjust count accordingly.
*/
@@ -574,14 +583,14 @@
// Now convert to TCHAR (which means defcodepage)
flags = WC_NO_BEST_FIT_CHARS; // TODO: Think about this
wlen = n;
- BOOL defaulted=FALSE;
+ BOOL defaulted = FALSE;
BOOL * pdefaulted = &defaulted;
if (cpout == CP_UTF8)
{
flags = 0;
pdefaulted = NULL;
}
- n = WideCharToMultiByte(cpout, flags, wbuff, n, dest, destsize-1, NULL, pdefaulted);
+ n = WideCharToMultiByte(cpout, flags, wbuff, n, dest, destsize - 1, NULL, pdefaulted);
if (!n)
{
int nsyserr = ::GetLastError();
@@ -642,11 +651,11 @@
return true;
}
if ((unicoding1 == UCS2LE && unicoding2 == UCS2BE)
- || (unicoding1 == UCS2BE && unicoding2 == UCS2LE))
+ || (unicoding1 == UCS2BE && unicoding2 == UCS2LE))
{
// simple byte swap
dest->resize(srcbytes);
- for (int i=0; i<srcbytes; i += 2)
+ for (int i = 0; i < srcbytes; i += 2)
{
// Byte-swap into destination
dest->ptr[i] = src[i+1];
@@ -671,12 +680,12 @@
int destcp = (unicoding2 == UTF8 ? CP_UTF8 : codepage2);
DWORD flags = 0;
- int bytes = WideCharToMultiByte(destcp, flags, (const wchar_t*)src, srcbytes/2, 0, 0, NULL, NULL);
+ int bytes = WideCharToMultiByte(destcp, flags, (const wchar_t*)src, srcbytes / 2, 0, 0, NULL, NULL);
dest->resize(bytes);
int losses = 0;
- bytes = WideCharToMultiByte(destcp, flags, (const wchar_t*)src, srcbytes/2, (char *)dest->ptr, dest->capacity, NULL, NULL);
+ bytes = WideCharToMultiByte(destcp, flags, (const wchar_t*)src, srcbytes / 2, (char *)dest->ptr, dest->capacity, NULL, NULL);
dest->size = bytes;
- return losses==0;
+ return losses == 0;
}
else
{
@@ -685,7 +694,7 @@
DWORD flags = 0;
int wchars = MultiByteToWideChar(srccp, flags, (const char*)src, srcbytes, 0, 0);
dest->resize(wchars*2);
- wchars = MultiByteToWideChar(srccp, flags, (const char*)src, srcbytes, (LPWSTR)dest->ptr, dest->capacity/2);
+ wchars = MultiByteToWideChar(srccp, flags, (const char*)src, srcbytes, (LPWSTR)dest->ptr, dest->capacity / 2);
dest->size = wchars * 2;
return true;
}
@@ -697,11 +706,11 @@
* @param [in] size Size of the buffer.
* @param [out] pBom Returns true if buffer had BOM bytes, false otherwise.
* @return One of UNICODESET values as encoding.
- * EF BB BF UTF-8
- * FF FE UTF-16, little endian
- * FE FF UTF-16, big endian
- * FF FE 00 00 UTF-32, little endian
- * 00 00 FE FF UTF-32, big-endian
+ * EF BB BF UTF-8
+ * FF FE UTF-16, little endian
+ * FE FF UTF-16, big endian
+ * FF FE 00 00 UTF-32, little endian
+ * 00 00 FE FF UTF-32, big-endian
*/
UNICODESET DetermineEncoding(PBYTE pBuffer, __int64 size, bool * pBom)
{
@@ -731,14 +740,14 @@
}
if (size >= 4)
{
- if (pBuffer[0] == 0xFF && pBuffer[1] == 0xFE &&
- pBuffer[2] == 0x00 && pBuffer[3] == 0x00)
+ if (pBuffer[0] == 0xFF && pBuffer[1] == 0xFE &&
+ pBuffer[2] == 0x00 && pBuffer[3] == 0x00)
{
- unicoding = ucr::UCS4LE; //UTF-32, little endian
+ unicoding = ucr::UCS4LE; //UTF-32, little endian
*pBom = true;
}
- else if (pBuffer[0] == 0x00 && pBuffer[1] == 0x00 &&
- pBuffer[2] == 0xFE && pBuffer[3] == 0xFF)
+ else if (pBuffer[0] == 0x00 && pBuffer[1] == 0x00 &&
+ pBuffer[2] == 0xFE && pBuffer[3] == 0xFF)
{
unicoding = ucr::UCS4BE; //UTF-32, big endian
*pBom = true;
@@ -770,7 +779,7 @@
if (cp == CP_THREAD_ACP) // should only happen on Win2000+
{
TCHAR buff[32];
- if (GetLocaleInfo(GetThreadLocale(), LOCALE_IDEFAULTANSICODEPAGE, buff, sizeof(buff)/sizeof(buff[0])))
+ if (GetLocaleInfo(GetThreadLocale(), LOCALE_IDEFAULTANSICODEPAGE, buff, sizeof(buff) / sizeof(buff[0])))
cp = _ttol(buff);
else
// a valid codepage is better than no codepage
@@ -787,5 +796,5 @@
bool EqualCodepages(int cp1, int cp2)
{
return (cp1 == cp2)
- || (NormalizeCodepage(cp1) == NormalizeCodepage(cp2));
+ || (NormalizeCodepage(cp1) == NormalizeCodepage(cp2));
}
Modified: trunk/Src/Common/unicoder.h
===================================================================
--- trunk/Src/Common/unicoder.h 2009-07-26 15:22:14 UTC (rev 6934)
+++ trunk/Src/Common/unicoder.h 2009-07-26 16:26:58 UTC (rev 6935)
@@ -5,7 +5,7 @@
* @date Edited: 2006-02-20 (Perry Rapp)
*
* @brief Declaration of utility unicode conversion routines
- */
+ */
// ID line follows -- this is updated by SVN
// $Id$
@@ -14,12 +14,14 @@
#include "UnicodeString.h"
-namespace ucr {
+namespace ucr
+{
/**
* @brief A simple buffer struct.
*/
-struct buffer {
+struct buffer
+{
unsigned char * ptr; /**< Pointer to a buffer. */
unsigned int capacity; /**< Buffer's size in bytes. */
unsigned int size; /**< Size of the data in the buffer, <= capacity. */
@@ -49,7 +51,7 @@
int to_utf8_advance(unsigned int u, unsigned char * &lpd);
String maketchar(unsigned int ch, bool & lossy);
int writeBom(void* dest, UNICODESET unicoding);
-unsigned int get_unicode_char(unsigned char * ptr, UNICODESET unicoding, int codepage=0);
+unsigned int get_unicode_char(unsigned char * ptr, UNICODESET unicoding, int codepage = 0);
String maketstring(const char* lpd, unsigned int len, int codepage, bool * lossy);
String maketchar(unsigned int unich, bool & lossy);
String maketchar(unsigned int unich, bool & lossy, unsigned int codepage);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-26 15:22:20
|
Revision: 6934
http://winmerge.svn.sourceforge.net/winmerge/?rev=6934&view=rev
Author: kimmov
Date: 2009-07-26 15:22:14 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
Astyle formatting of Src/DirView.cpp and Src/DirView.h.
Modified Paths:
--------------
trunk/Src/DirView.cpp
trunk/Src/DirView.h
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2009-07-26 14:07:03 UTC (rev 6933)
+++ trunk/Src/DirView.cpp 2009-07-26 15:22:14 UTC (rev 6934)
@@ -18,7 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
/////////////////////////////////////////////////////////////////////////////
-/**
+/**
* @file DirView.cpp
*
* @brief Main implementation file for CDirView
@@ -109,21 +109,21 @@
/////////////////////////////////////////////////////////////////////////////
// CDirView
-enum { COLUMN_REORDER=99 };
+enum { COLUMN_REORDER = 99 };
IMPLEMENT_DYNCREATE(CDirView, CListView)
CDirView::CDirView()
-: m_numcols(-1)
-, m_dispcols(-1)
-, m_pList(NULL)
-, m_nHiddenItems(0)
-, m_pCmpProgressDlg(NULL)
-, m_compareStart(0)
-, m_bTreeMode(false)
-, m_pShellContextMenuLeft(NULL)
-, m_pShellContextMenuRight(NULL)
-, m_hCurrentMenu(NULL)
+ : m_numcols(-1)
+ , m_dispcols(-1)
+ , m_pList(NULL)
+ , m_nHiddenItems(0)
+ , m_pCmpProgressDlg(NULL)
+ , m_compareStart(0)
+ , m_bTreeMode(false)
+ , m_pShellContextMenuLeft(NULL)
+ , m_pShellContextMenuRight(NULL)
+ , m_hCurrentMenu(NULL)
{
m_dwDefaultStyle &= ~LVS_TYPEMASK;
// Show selection all the time, so user can see current item even when
@@ -260,7 +260,7 @@
ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged)
ON_NOTIFY_REFLECT(LVN_BEGINLABELEDIT, OnBeginLabelEdit)
ON_NOTIFY_REFLECT(LVN_ENDLABELEDIT, OnEndLabelEdit)
- ON_NOTIFY_REFLECT(NM_CLICK, OnClick)
+ ON_NOTIFY_REFLECT(NM_CLICK, OnClick)
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
@@ -278,7 +278,7 @@
/////////////////////////////////////////////////////////////////////////////
// CDirView message handlers
-void CDirView::OnInitialUpdate()
+void CDirView::OnInitialUpdate()
{
const int iconCX = 16;
const int iconCY = 16;
@@ -300,7 +300,7 @@
// Load the icons used for the list view (to reflect diff status)
// NOTE: these must be in the exactly the same order than in enum
// definition in begin of this file!
- VERIFY (m_imageList.Create (iconCX, iconCY, ILC_COLOR32 | ILC_MASK, 15, 1));
+ VERIFY(m_imageList.Create(iconCX, iconCY, ILC_COLOR32 | ILC_MASK, 15, 1));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_LFILE)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_RFILE)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_NOTEQUALFILE)));
@@ -320,7 +320,7 @@
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_COMPARE_ABORTED)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_NOTEQUALTEXTFILE)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_EQUALTEXTFILE)));
- m_pList->SetImageList (&m_imageList, LVSIL_SMALL);
+ m_pList->SetImageList(&m_imageList, LVSIL_SMALL);
// Load the icons used for the list view (expanded/collapsed state icons)
VERIFY(m_imageState.Create(IDB_TREE_STATE, 16, 1, RGB(255, 0, 255)));
@@ -338,7 +338,7 @@
// Also enable infotips if they have new enough version for our
// custom draw code
// LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
- if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71))
+ if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4, 71))
exstyle |= LVS_EX_INFOTIP;
m_pList->SetExtendedStyle(exstyle);
}
@@ -425,7 +425,7 @@
* @brief Called when folder compare row is double-clicked with mouse.
* Selected item is opened to folder or file compare.
*/
-void CDirView::OnLButtonDblClk(UINT nFlags, CPoint point)
+void CDirView::OnLButtonDblClk(UINT nFlags, CPoint point)
{
LVHITTESTINFO lvhti;
lvhti.pt = point;
@@ -463,9 +463,9 @@
/**
* @brief Redisplay items in subfolder
- * @param [in] diffpos First item position in subfolder.
+ * @param [in] diffpos First item position in subfolder.
* @param [in] level Indent level
- * @param [in,out] index Index of the item to be inserted.
+ * @param [in,out] index Index of the item to be inserted.
* @param [in,out] alldiffs Number of different items
*/
void CDirView::RedisplayChildren(UINT_PTR diffpos, int level, UINT &index, int &alldiffs)
@@ -531,7 +531,7 @@
// If non-recursive compare, add special item(s)
String leftParent, rightParent;
if (!pDoc->GetRecursive() ||
- pDoc->AllowUpwardDirectory(leftParent, rightParent) == CDirDoc::AllowUpwardDirectory::ParentIsTempPath)
+ pDoc->AllowUpwardDirectory(leftParent, rightParent) == CDirDoc::AllowUpwardDirectory::ParentIsTempPath)
{
cnt += AddSpecialItems();
}
@@ -554,7 +554,7 @@
// Make sure window is active
GetParentFrame()->ActivateFrame();
- int i=0;
+ int i = 0;
if (point.x == -1 && point.y == -1)
{
//keystroke invocation
@@ -564,7 +564,9 @@
point = rect.TopLeft();
point.Offset(5, 5);
- } else {
+ }
+ else
+ {
// Check if user right-clicked on header
// convert screen coordinates to client coordinates of listview
CPoint insidePt = point;
@@ -574,7 +576,7 @@
HDHITTESTINFO hhti;
memset(&hhti, 0, sizeof(hhti));
hhti.pt = insidePt;
- int col = GetListCtrl().GetHeaderCtrl()->SendMessage(HDM_HITTEST, 0, (LPARAM)&hhti);
+ int col = GetListCtrl().GetHeaderCtrl()->SendMessage(HDM_HITTEST, 0, (LPARAM) & hhti);
if (col >= 0)
{
// Presumably hhti.flags & HHT_ONHEADER is true
@@ -589,7 +591,7 @@
lhti.pt = insidePt;
i = GetListCtrl().HitTest(insidePt);
TRACE(_T("i=%d\n"), i);
- if (i<0)
+ if (i < 0)
return;
}
@@ -733,8 +735,8 @@
// note the prediffer flag for 'files present on both sides and not skipped'
if (!di.diffcode.isDirectory() && !di.diffcode.isBin() &&
- !di.diffcode.isSideLeftOnly() && !di.diffcode.isSideRightOnly() &&
- !di.diffcode.isResultFiltered())
+ !di.diffcode.isSideLeftOnly() && !di.diffcode.isSideRightOnly() &&
+ !di.diffcode.isResultFiltered())
{
String leftPath(di.getLeftFilepath(pDoc->GetLeftBasePath()));
leftPath = paths_ConcatPath(leftPath, di.left.filename);
@@ -770,14 +772,14 @@
// invoke context menu
// this will invoke all the OnUpdate methods to enable/disable the individual items
BOOL nCmd = pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, point.x, point.y,
- AfxGetMainWnd());
+ AfxGetMainWnd());
if (nCmd)
{
HWND hWnd = AfxGetMainWnd()->GetSafeHwnd();
- ( m_pShellContextMenuLeft && m_pShellContextMenuLeft->InvokeCommand(nCmd, hWnd) )
- || ( m_pShellContextMenuRight && m_pShellContextMenuRight->InvokeCommand(nCmd, hWnd) )
- // we have called TrackPopupMenu with TPM_RETURNCMD flag so we have to post message ourselves
- || PostMessage(WM_COMMAND, MAKEWPARAM(nCmd, 0), 0);
+ (m_pShellContextMenuLeft && m_pShellContextMenuLeft->InvokeCommand(nCmd, hWnd))
+ || (m_pShellContextMenuRight && m_pShellContextMenuRight->InvokeCommand(nCmd, hWnd))
+ // we have called TrackPopupMenu with TPM_RETURNCMD flag so we have to post message ourselves
+ || PostMessage(WM_COMMAND, MAKEWPARAM(nCmd, 0), 0);
}
pFrame->m_bAutoMenuEnable = TRUE;
}
@@ -798,8 +800,8 @@
// invoke context menu
// this will invoke all the OnUpdate methods to enable/disable the individual items
pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, point.x, point.y,
- AfxGetMainWnd());
-}
+ AfxGetMainWnd());
+}
/**
* @brief Gets Explorer's context menu for a group of selected files.
@@ -825,8 +827,8 @@
continue;
String currentDir = (side == SIDE_LEFT) ?
- di.getLeftFilepath(pDoc->GetLeftBasePath()) :
- di.getRightFilepath(pDoc->GetRightBasePath());
+ di.getLeftFilepath(pDoc->GetLeftBasePath()) :
+ di.getRightFilepath(pDoc->GetRightBasePath());
String filename = ((side == SIDE_LEFT) ? di.left.filename : di.right.filename);
@@ -851,7 +853,7 @@
{
CString s;
LangFormatString1(s, nStringResource, szPath);
- pPopup->ModifyMenu(nMenuId, MF_BYCOMMAND|MF_STRING, nMenuId, s);
+ pPopup->ModifyMenu(nMenuId, MF_BYCOMMAND | MF_STRING, nMenuId, s);
}
@@ -894,23 +896,23 @@
}
/// Update context menu Copy Right to Left item
-void CDirView::OnUpdateCtxtDirCopyRightToLeft(CCmdUI* pCmdUI)
+void CDirView::OnUpdateCtxtDirCopyRightToLeft(CCmdUI* pCmdUI)
{
DoUpdateDirCopyRightToLeft(pCmdUI, eContext);
}
/// Update context menu Copy Left to Right item
-void CDirView::OnUpdateCtxtDirCopyLeftToRight(CCmdUI* pCmdUI)
+void CDirView::OnUpdateCtxtDirCopyLeftToRight(CCmdUI* pCmdUI)
{
DoUpdateDirCopyLeftToRight(pCmdUI, eContext);
}
/// Update main menu Copy Right to Left item
-void CDirView::OnUpdateDirCopyRightToLeft(CCmdUI* pCmdUI)
+void CDirView::OnUpdateDirCopyRightToLeft(CCmdUI* pCmdUI)
{
DoUpdateDirCopyRightToLeft(pCmdUI, eMain);
}
/// Update main menu Copy Left to Right item
-void CDirView::OnUpdateDirCopyLeftToRight(CCmdUI* pCmdUI)
+void CDirView::OnUpdateDirCopyLeftToRight(CCmdUI* pCmdUI)
{
DoUpdateDirCopyLeftToRight(pCmdUI, eMain);
}
@@ -922,8 +924,8 @@
pCmdUI->Enable(FALSE);
else
{
- int sel=-1;
- int legalcount=0, selcount=0;
+ int sel = -1;
+ int legalcount = 0, selcount = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -931,8 +933,8 @@
++legalcount;
++selcount;
}
- pCmdUI->Enable(legalcount>0);
- if (menuType==eContext)
+ pCmdUI->Enable(legalcount > 0);
+ if (menuType == eContext)
{
CString s;
if (legalcount == selcount)
@@ -951,8 +953,8 @@
pCmdUI->Enable(FALSE);
else
{
- int sel=-1;
- int legalcount=0, selcount=0;
+ int sel = -1;
+ int legalcount = 0, selcount = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -960,8 +962,8 @@
++legalcount;
++selcount;
}
- pCmdUI->Enable(legalcount>0);
- if (menuType==eContext)
+ pCmdUI->Enable(legalcount > 0);
+ if (menuType == eContext)
{
CString s;
if (legalcount == selcount)
@@ -1023,7 +1025,7 @@
}
/// Do any last minute work as view closes
-void CDirView::OnDestroy()
+void CDirView::OnDestroy()
{
DeleteAllDisplayItems();
@@ -1039,9 +1041,9 @@
/**
* @brief Open selected item when user presses ENTER key.
*/
-void CDirView::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags)
+void CDirView::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags)
{
- if(nChar==VK_RETURN)
+ if (nChar == VK_RETURN)
{
int sel = GetFocusedItem();
if (sel >= 0)
@@ -1067,7 +1069,7 @@
/**
* @brief Expand/collapse subfolder when user presses right/left arrow key.
*/
-void CDirView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
+void CDirView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
{
int sel = GetFocusedItem();
switch (nChar)
@@ -1204,7 +1206,7 @@
// fall through (no break!)
case CDirDoc::AllowUpwardDirectory::ParentIsRegularPath:
GetMainFrame()->DoFileOpen(leftParent.c_str(), rightParent.c_str(),
- FFILEOPEN_NOMRU, FFILEOPEN_NOMRU, pDoc->GetRecursive(), pDoc);
+ FFILEOPEN_NOMRU, FFILEOPEN_NOMRU, pDoc->GetRecursive(), pDoc);
// fall through (no break!)
case CDirDoc::AllowUpwardDirectory::No:
break;
@@ -1229,7 +1231,7 @@
if (*sel2 == -1)
return true;
int extra = m_pList->GetNextItem(*sel2, LVNI_SELECTED);
- return (extra ==-1);
+ return (extra == -1);
}
/**
@@ -1256,7 +1258,7 @@
{
// Browse to parent folder(s) selected
// SPECIAL_ITEM_POS is position for
- // special items, but there is currenly
+ // special items, but there is currenly
// only one (parent folder)
OpenParentDirectory();
}
@@ -1410,7 +1412,7 @@
}
// Ensure that di1 is on left (swap if needed)
if ((*di1)->diffcode.isSideRightOnly() || ((*di1)->diffcode.isSideBoth() &&
- (*di2)->diffcode.isSideLeftOnly()))
+ (*di2)->diffcode.isSideLeftOnly()))
{
DIFFITEM * temp = *di1;
*di1 = *di2;
@@ -1431,7 +1433,7 @@
{
LangMessageBox(IDS_INVALID_DIRECTORY, MB_ICONSTOP);
return false;
- }
+ }
}
return true;
}
@@ -1452,7 +1454,7 @@
// First, figure out what was selected (store into pos1 & pos2)
UINT_PTR pos1 = NULL, pos2 = NULL;
- int sel1=-1, sel2=-1;
+ int sel1 = -1, sel2 = -1;
if (!GetSelectedItems(&sel1, &sel2))
{
// Must have 1 or 2 items selected
@@ -1514,7 +1516,7 @@
// Binary attributes are set after files are unpacked
// so after plugins such as the MS-Office plugins have had a chance to make them textual
- // We haven't done unpacking yet in this diff, but if a binary flag is already set,
+ // We haven't done unpacking yet in this diff, but if a binary flag is already set,
// then it was set in a previous diff after unpacking, so we trust it
// Close open documents first (ask to save unsaved data)
@@ -1538,7 +1540,7 @@
DWORD rightFlags = bRightRO ? FFILEOPEN_READONLY : 0;
GetMainFrame()->ShowMergeDoc(pDoc, filelocLeft, filelocRight,
- leftFlags, rightFlags, infoUnpacker);
+ leftFlags, rightFlags, infoUnpacker);
}
}
@@ -1548,7 +1550,7 @@
// First, figure out what was selected (store into pos1 & pos2)
UINT_PTR pos1 = NULL, pos2 = NULL;
- int sel1=-1, sel2=-1;
+ int sel1 = -1, sel2 = -1;
if (!GetSelectedItems(&sel1, &sel2))
{
// Must have 1 or 2 items selected
@@ -1630,12 +1632,12 @@
}
/// Enable/disable Delete Right menu choice on context menu
-void CDirView::OnUpdateCtxtDirDelRight(CCmdUI* pCmdUI)
+void CDirView::OnUpdateCtxtDirDelRight(CCmdUI* pCmdUI)
{
DoUpdateCtxtDirDelRight(pCmdUI);
}
/// Enable/disable Delete Both menu choice on context menu
-void CDirView::OnUpdateCtxtDirDelBoth(CCmdUI* pCmdUI)
+void CDirView::OnUpdateCtxtDirDelBoth(CCmdUI* pCmdUI)
{
DoUpdateCtxtDirDelBoth(pCmdUI);
}
@@ -1647,8 +1649,8 @@
pCmdUI->Enable(FALSE);
else
{
- int sel=-1;
- int count=0, total=0;
+ int sel = -1;
+ int count = 0, total = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1656,7 +1658,7 @@
++count;
++total;
}
- pCmdUI->Enable(count>0);
+ pCmdUI->Enable(count > 0);
CString s;
if (count == total)
@@ -1668,14 +1670,14 @@
}
/// Should Delete right be enabled or disabled ?
-void CDirView::DoUpdateCtxtDirDelRight(CCmdUI* pCmdUI)
+void CDirView::DoUpdateCtxtDirDelRight(CCmdUI* pCmdUI)
{
if (GetDocument()->GetReadOnly(FALSE))
pCmdUI->Enable(FALSE);
else
{
- int sel=-1;
- int count=0, total=0;
+ int sel = -1;
+ int count = 0, total = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1683,8 +1685,8 @@
++count;
++total;
}
- pCmdUI->Enable(count>0);
-
+ pCmdUI->Enable(count > 0);
+
CString s;
if (count == total)
LangFormatString1(s, IDS_DEL_RIGHT_FMT, NumToStr(total).c_str());
@@ -1697,14 +1699,14 @@
/**
* @brief Should Delete both be enabled or disabled ?
*/
-void CDirView::DoUpdateCtxtDirDelBoth(CCmdUI* pCmdUI)
+void CDirView::DoUpdateCtxtDirDelBoth(CCmdUI* pCmdUI)
{
if (GetDocument()->GetReadOnly(TRUE) || GetDocument()->GetReadOnly(FALSE))
pCmdUI->Enable(FALSE);
else
{
- int sel=-1;
- int count=0, total=0;
+ int sel = -1;
+ int count = 0, total = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1712,7 +1714,7 @@
++count;
++total;
}
- pCmdUI->Enable(count>0);
+ pCmdUI->Enable(count > 0);
CString s;
if (count == total)
@@ -1726,10 +1728,10 @@
/**
* @brief Enable/disable "Copy | Left to..." and update item text
*/
-void CDirView::DoUpdateCtxtDirCopyLeftTo(CCmdUI* pCmdUI)
+void CDirView::DoUpdateCtxtDirCopyLeftTo(CCmdUI* pCmdUI)
{
- int sel=-1;
- int count=0, total=0;
+ int sel = -1;
+ int count = 0, total = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1737,7 +1739,7 @@
++count;
++total;
}
- pCmdUI->Enable(count>0);
+ pCmdUI->Enable(count > 0);
CString s;
if (count == total)
@@ -1750,10 +1752,10 @@
/**
* @brief Enable/disable "Copy | Right to..." and update item text
*/
-void CDirView::DoUpdateCtxtDirCopyRightTo(CCmdUI* pCmdUI)
+void CDirView::DoUpdateCtxtDirCopyRightTo(CCmdUI* pCmdUI)
{
- int sel=-1;
- int count=0, total=0;
+ int sel = -1;
+ int count = 0, total = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1761,7 +1763,7 @@
++count;
++total;
}
- pCmdUI->Enable(count>0);
+ pCmdUI->Enable(count > 0);
CString s;
if (count == total)
@@ -1774,10 +1776,10 @@
/**
* @brief Enable/disable "Move | Left to..." and update item text
*/
-void CDirView::DoUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI)
+void CDirView::DoUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI)
{
- int sel=-1;
- int count=0, total=0;
+ int sel = -1;
+ int count = 0, total = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1785,7 +1787,7 @@
++count;
++total;
}
- pCmdUI->Enable(count>0);
+ pCmdUI->Enable(count > 0);
CString s;
if (count == total)
@@ -1798,10 +1800,10 @@
/**
* @brief Enable/disable "Move | Right to..." and update item text
*/
-void CDirView::DoUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI)
+void CDirView::DoUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI)
{
- int sel=-1;
- int count=0, total=0;
+ int sel = -1;
+ int count = 0, total = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1809,7 +1811,7 @@
++count;
++total;
}
- pCmdUI->Enable(count>0);
+ pCmdUI->Enable(count > 0);
CString s;
if (count == total)
@@ -1866,7 +1868,7 @@
DIFFITEM & CDirView::GetDiffItemRef(int sel)
{
UINT_PTR diffpos = GetItemKey(sel);
-
+
// If it is special item, return empty DIFFITEM
if (diffpos == SPECIAL_ITEM_POS)
{
@@ -1948,7 +1950,7 @@
// return selected item index, or -1 if none or multiple
int CDirView::GetSingleSelectedItem() const
{
- int sel=-1, sel2=-1;
+ int sel = -1, sel2 = -1;
sel = m_pList->GetNextItem(sel, LVNI_SELECTED);
if (sel == -1) return -1;
sel2 = m_pList->GetNextItem(sel, LVNI_SELECTED);
@@ -1980,7 +1982,7 @@
// Used for Open
void CDirView::DoUpdateOpen(CCmdUI* pCmdUI)
{
- int sel1=-1, sel2=-1;
+ int sel1 = -1, sel2 = -1;
if (!GetSelectedItems(&sel1, &sel2))
{
// 0 items or more than 2 items seleted
@@ -2022,7 +2024,7 @@
sel = -1;
}
- pCmdUI->Enable(sel>=0);
+ pCmdUI->Enable(sel >= 0);
}
// used for OpenRight
@@ -2036,7 +2038,7 @@
sel = -1;
}
- pCmdUI->Enable(sel>=0);
+ pCmdUI->Enable(sel >= 0);
}
// used for OpenLeftWith
@@ -2050,7 +2052,7 @@
sel = -1;
}
- pCmdUI->Enable(sel>=0);
+ pCmdUI->Enable(sel >= 0);
}
// used for OpenRightWith
@@ -2064,7 +2066,7 @@
sel = -1;
}
- pCmdUI->Enable(sel>=0);
+ pCmdUI->Enable(sel >= 0);
}
/**
@@ -2095,7 +2097,7 @@
{
const DIFFITEM& di = GetDiffItem(sel);
if (di.diffcode.diffcode != 0 &&
- (IsItemDeletableOnLeft(di) || IsItemDeletableOnRight(di)))
+ (IsItemDeletableOnLeft(di) || IsItemDeletableOnRight(di)))
{
++count;
}
@@ -2108,7 +2110,7 @@
*/
void CDirView::DoUpdateCopyFilenames(CCmdUI* pCmdUI)
{
- int sel =- 1;
+ int sel = - 1;
int count = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
@@ -2147,7 +2149,7 @@
int sel = m_pList->GetNextItem(ind, LVNI_SELECTED);
DIFFITEM &di = GetDiffItemRef(ind);
ind = sel;
-
+
return di;
}
@@ -2320,7 +2322,7 @@
{
selected = m_pList->GetItemState(i, LVIS_SELECTED);
focused = m_pList->GetItemState(i, LVIS_FOCUSED);
-
+
if (selected == LVIS_SELECTED && focused == LVIS_FOCUSED)
{
m_pList->EnsureVisible(i, FALSE);
@@ -2332,7 +2334,7 @@
void CDirView::OnUpdateCurdiff(CCmdUI* pCmdUI)
{
- int selection = GetFirstSelectedInd();
+ int selection = GetFirstSelectedInd();
if (selection > -1)
pCmdUI->Enable(TRUE);
else
@@ -2349,7 +2351,7 @@
while (i < count && found == FALSE)
{
- focused = m_pList->GetItemState(i, LVIS_FOCUSED);
+ focused = m_pList->GetItemState(i, LVIS_FOCUSED);
if (focused == LVIS_FOCUSED)
{
retInd = i;
@@ -2372,7 +2374,7 @@
const DIFFITEM &di = GetItemAt(i);
if (IsItemNavigableDiff(di))
{
- foundInd = i;
+ foundInd = i;
found = TRUE;
}
i++;
@@ -2392,7 +2394,7 @@
const DIFFITEM &di = GetItemAt(i);
if (IsItemNavigableDiff(di))
{
- foundInd = i;
+ foundInd = i;
found = TRUE;
}
i--;
@@ -2418,7 +2420,7 @@
* @brief Move focus to specified item (and selection if multiple items not selected)
*
* Moves the focus from item [currentInd] to item [i]
- * Additionally, if there are not multiple items selected,
+ * Additionally, if there are not multiple items selected,
* deselects item [currentInd] and selects item [i]
*/
void CDirView::MoveFocus(int currentInd, int i, int selCount)
@@ -2553,14 +2555,14 @@
return 0; // return value unused
}
-BOOL CDirView::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
+BOOL CDirView::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
{
NMHDR * hdr = reinterpret_cast<NMHDR *>(lParam);
if (hdr->code == HDN_ENDDRAG)
return OnHeaderEndDrag((LPNMHEADER)hdr, pResult);
if (hdr->code == HDN_BEGINDRAG)
return OnHeaderBeginDrag((LPNMHEADER)hdr, pResult);
-
+
return CListView::OnNotify(wParam, lParam, pResult);
}
@@ -2602,7 +2604,7 @@
int dest = hdr->pitem->iOrder;
BOOL allowDrop = TRUE;
*pResult = !allowDrop;
- if (allowDrop && src!=dest && dest!=-1)
+ if (allowDrop && src != dest && dest != -1)
{
MoveColumn(src, dest);
}
@@ -2615,7 +2617,7 @@
void CDirView::FixReordering()
{
// LVCOLUMN.iOrder is present with version 4.70+
- if (GetDllVersion(_T("shlwapi.dll")) < PACKVERSION(4,70))
+ if (GetDllVersion(_T("shlwapi.dll")) < PACKVERSION(4, 70))
return;
LVCOLUMN lvcol;
@@ -2624,7 +2626,7 @@
lvcol.cx = 0;
lvcol.pszText = 0;
lvcol.iSubItem = 0;
- for (int i=0; i<m_numcols; ++i)
+ for (int i = 0; i < m_numcols; ++i)
{
lvcol.iOrder = i;
GetListCtrl().SetColumn(i, &lvcol);
@@ -2640,14 +2642,14 @@
if (h->GetItemCount())
{
dummyflag = true;
- while (m_pList->GetHeaderCtrl()->GetItemCount()>1)
+ while (m_pList->GetHeaderCtrl()->GetItemCount() > 1)
m_pList->DeleteColumn(1);
}
- for (int i=0; i<m_dispcols; ++i)
+ for (int i = 0; i < m_dispcols; ++i)
{
LVCOLUMN lvc;
- lvc.mask = LVCF_FMT+LVCF_SUBITEM+LVCF_TEXT;
+ lvc.mask = LVCF_FMT + LVCF_SUBITEM + LVCF_TEXT;
lvc.fmt = LVCFMT_LEFT;
lvc.cx = 0;
lvc.pszText = _T("text");
@@ -2663,7 +2665,7 @@
// Necessary when user reorders columns
void CDirView::SetColumnWidths()
{
- for (int i=0; i<m_numcols; ++i)
+ for (int i = 0; i < m_numcols; ++i)
{
int phy = ColLogToPhys(i);
if (phy >= 0)
@@ -2678,7 +2680,7 @@
/** @brief store current column widths into registry */
void CDirView::SaveColumnWidths()
{
- for (int i=0; i < m_numcols; i++)
+ for (int i = 0; i < m_numcols; i++)
{
int phy = ColLogToPhys(i);
if (phy >= 0)
@@ -2696,7 +2698,7 @@
PostMessage(WM_TIMER, COLUMN_REORDER);
}
-void CDirView::OnTimer(UINT_PTR nIDEvent)
+void CDirView::OnTimer(UINT_PTR nIDEvent)
{
if (nIDEvent == COLUMN_REORDER)
{
@@ -2777,7 +2779,7 @@
SaveColumnOrders();
}
-void CDirView::OnCtxtOpenWithUnpacker()
+void CDirView::OnCtxtOpenWithUnpacker()
{
int sel = -1;
sel = m_pList->GetNextItem(sel, LVNI_SELECTED);
@@ -2798,7 +2800,7 @@
}
-void CDirView::OnUpdateCtxtOpenWithUnpacker(CCmdUI* pCmdUI)
+void CDirView::OnUpdateCtxtOpenWithUnpacker(CCmdUI* pCmdUI)
{
if (!GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED))
{
@@ -2811,7 +2813,7 @@
pCmdUI->Enable(FALSE);
else
{
- int sel=-1;
+ int sel = -1;
sel = m_pList->GetNextItem(sel, LVNI_SELECTED);
const DIFFITEM& di = GetDiffItem(sel);
if (IsItemDeletableOnBoth(di))
@@ -2827,7 +2829,7 @@
void CDirView::GetCurrentColRegKeys(CStringArray & colKeys)
{
int nphyscols = GetListCtrl().GetHeaderCtrl()->GetItemCount();
- for (int col=0; col<nphyscols; ++col)
+ for (int col = 0; col < nphyscols; ++col)
{
int logcol = ColPhysToLog(col);
colKeys.Add(GetColRegValueNameBase(logcol));
@@ -2837,7 +2839,7 @@
/**
* @brief Generate report from dir compare results.
*/
-void CDirView::OnToolsGenerateReport()
+void CDirView::OnToolsGenerateReport()
{
CDirDoc *pDoc = GetDocument();
if (!pDoc->HasDiffs())
@@ -2917,7 +2919,7 @@
/**
* @brief Zip selected files from left side.
*/
-void CDirView::OnCtxtDirZipLeft()
+void CDirView::OnCtxtDirZipLeft()
{
if (!HasZipSupport())
{
@@ -2928,14 +2930,14 @@
DirItemEnumerator
(
this, LVNI_SELECTED
- | DirItemEnumerator::Left
+ | DirItemEnumerator::Left
).CompressArchive();
}
/**
* @brief Zip selected files from right side.
*/
-void CDirView::OnCtxtDirZipRight()
+void CDirView::OnCtxtDirZipRight()
{
if (!HasZipSupport())
{
@@ -2946,14 +2948,14 @@
DirItemEnumerator
(
this, LVNI_SELECTED
- | DirItemEnumerator::Right
+ | DirItemEnumerator::Right
).CompressArchive();
}
/**
* @brief Zip selected files from both sides, using original/altered format.
*/
-void CDirView::OnCtxtDirZipBoth()
+void CDirView::OnCtxtDirZipBoth()
{
if (!HasZipSupport())
{
@@ -2964,16 +2966,16 @@
DirItemEnumerator
(
this, LVNI_SELECTED
- | DirItemEnumerator::Original
- | DirItemEnumerator::Altered
- | DirItemEnumerator::BalanceFolders
+ | DirItemEnumerator::Original
+ | DirItemEnumerator::Altered
+ | DirItemEnumerator::BalanceFolders
).CompressArchive();
}
/**
* @brief Zip selected diffs from both sides, using original/altered format.
*/
-void CDirView::OnCtxtDirZipBothDiffsOnly()
+void CDirView::OnCtxtDirZipBothDiffsOnly()
{
if (!HasZipSupport())
{
@@ -2984,10 +2986,10 @@
DirItemEnumerator
(
this, LVNI_SELECTED
- | DirItemEnumerator::Original
- | DirItemEnumerator::Altered
- | DirItemEnumerator::BalanceFolders
- | DirItemEnumerator::DiffsOnly
+ | DirItemEnumerator::Original
+ | DirItemEnumerator::Altered
+ | DirItemEnumerator::BalanceFolders
+ | DirItemEnumerator::DiffsOnly
).CompressArchive();
}
@@ -3067,7 +3069,7 @@
*/
void CDirView::ResetColumnWidths()
{
- for (int i=0; i < m_numcols; i++)
+ for (int i = 0; i < m_numcols; i++)
{
int phy = ColLogToPhys(i);
if (phy >= 0)
@@ -3266,19 +3268,19 @@
/**
* @brief update menu item
*/
-void CDirView::OnUpdateHideFilenames(CCmdUI* pCmdUI)
+void CDirView::OnUpdateHideFilenames(CCmdUI* pCmdUI)
{
pCmdUI->Enable(m_pList->GetSelectedCount() != 0);
}
/// User chose (context menu) Move left to...
-void CDirView::OnCtxtDirMoveLeftTo()
+void CDirView::OnCtxtDirMoveLeftTo()
{
DoMoveLeftTo();
}
/// User chose (context menu) Move right to...
-void CDirView::OnCtxtDirMoveRightTo()
+void CDirView::OnCtxtDirMoveRightTo()
{
DoMoveRightTo();
}
@@ -3286,7 +3288,7 @@
/**
* @brief Update "Move | Right to..." item
*/
-void CDirView::OnUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI)
+void CDirView::OnUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI)
{
// Because move deletes original item, origin side
// cannot be read-only
@@ -3301,7 +3303,7 @@
/**
* @brief Update "Move | Left to..." item
*/
-void CDirView::OnUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI)
+void CDirView::OnUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI)
{
// Because move deletes original item, origin side
// cannot be read-only
@@ -3349,7 +3351,7 @@
// If item's selected state changed
if ((pNMListView->uOldState & LVIS_SELECTED) !=
- (pNMListView->uNewState & LVIS_SELECTED))
+ (pNMListView->uNewState & LVIS_SELECTED))
{
CString msg;
int items = GetSelectedCount();
@@ -3443,7 +3445,7 @@
/**
* @brief Called to update the item count in the status bar
*/
-void CDirView::OnUpdateStatusNum(CCmdUI* pCmdUI)
+void CDirView::OnUpdateStatusNum(CCmdUI* pCmdUI)
{
CString s; // text to display
@@ -3473,7 +3475,7 @@
--focusItem;
--count;
}
- sIdx.Format(_T("%ld"), focusItem+1);
+ sIdx.Format(_T("%ld"), focusItem + 1);
sCnt.Format(_T("%ld"), count);
// "Item %1 of %2"
LangFormatString2(s, IDS_DIRVIEW_STATUS_FMT_FOCUS, sIdx, sCnt);
@@ -3609,7 +3611,7 @@
/**
* @brief Update "File Encoding" item
*/
-void CDirView::OnUpdateFileEncoding(CCmdUI* pCmdUI)
+void CDirView::OnUpdateFileEncoding(CCmdUI* pCmdUI)
{
DoUpdateFileEncodingDialog(pCmdUI);
}
@@ -3641,7 +3643,7 @@
/**
* @brief Allow edit "Paste" when renaming an item.
*/
-void CDirView::OnEditCopy()
+void CDirView::OnEditCopy()
{
CEdit *pEdit = m_pList->GetEditControl();
if (NULL != pEdit)
@@ -3653,7 +3655,7 @@
/**
* @brief Allow edit "Cut" when renaming an item.
*/
-void CDirView::OnEditCut()
+void CDirView::OnEditCut()
{
CEdit *pEdit = m_pList->GetEditControl();
if (NULL != pEdit)
@@ -3665,7 +3667,7 @@
/**
* @brief Allow edit "Paste" when renaming an item.
*/
-void CDirView::OnEditPaste()
+void CDirView::OnEditPaste()
{
CEdit *pEdit = m_pList->GetEditControl();
if (NULL != pEdit)
@@ -3677,7 +3679,7 @@
/**
* @brief Allow edit "Undo" when renaming an item.
*/
-void CDirView::OnEditUndo()
+void CDirView::OnEditUndo()
{
CEdit *pEdit = m_pList->GetEditControl();
if (NULL != pEdit)
@@ -3716,7 +3718,7 @@
* @brief Returns CShellContextMenu object that owns given HMENU.
*
* @param [in] hMenu Handle to the menu to check ownership of.
- * @return Either m_pShellContextMenuLeft, m_pShellContextMenuRight
+ * @return Either m_pShellContextMenuLeft, m_pShellContextMenuRight
* or NULL if hMenu is not owned by these two.
*/
CShellContextMenu* CDirView::GetCorrespondingShellContextMenu(HMENU hMenu) const
Modified: trunk/Src/DirView.h
===================================================================
--- trunk/Src/DirView.h 2009-07-26 14:07:03 UTC (rev 6933)
+++ trunk/Src/DirView.h 2009-07-26 15:22:14 UTC (rev 6934)
@@ -21,7 +21,7 @@
* @file DirView.h
*
* @brief Declaration of class CDirView
- */
+ */
//
// ID line follows -- this is updated by SVN
// $Id$
@@ -60,15 +60,15 @@
// and each set of flags is in a different hex digit
// to make debugging easier
// These can always be packed down in the future
- INVALID_CODE=0,
- VISIBILITY=0x3, VISIBLE=0x1, HIDDEN=0x2, EXPANDED=0x4
+ INVALID_CODE = 0,
+ VISIBILITY = 0x3, VISIBLE = 0x1, HIDDEN = 0x2, EXPANDED = 0x4
};
};
/**
* @brief Position value for special items (..) in directory compare view.
*/
-const UINT_PTR SPECIAL_ITEM_POS = (UINT_PTR)-1L;
+const UINT_PTR SPECIAL_ITEM_POS = (UINT_PTR) - 1L;
/** Default column width in directory compare */
const UINT DefColumnWidth = 150;
@@ -127,7 +127,7 @@
// Implementation types
private:
- typedef enum { SIDE_LEFT=1, SIDE_RIGHT } SIDE_TYPE;
+ typedef enum { SIDE_LEFT = 1, SIDE_RIGHT } SIDE_TYPE;
// Implementation in DirActions.cpp
private:
@@ -230,9 +230,9 @@
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDirView)
- public:
+public:
virtual void OnInitialUpdate();
- protected:
+protected:
virtual BOOL PreTranslateMessage(MSG* pMsg);
virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
virtual BOOL OnChildNotify(UINT, WPARAM, LPARAM, LRESULT*);
@@ -251,9 +251,9 @@
void WarnContentsChanged(const CString & failedPath);
void OpenSpecialItems(UINT_PTR pos1, UINT_PTR pos2);
bool OpenOneItem(UINT_PTR pos1, DIFFITEM **di1, DIFFITEM **di2,
- String &path1, String &path2, int & sel1, bool & isDir);
+ String &path1, String &path2, int & sel1, bool & isDir);
bool OpenTwoItems(UINT_PTR pos1, UINT_PTR pos2, DIFFITEM **di1, DIFFITEM **di2,
- String &path1, String &path2, int & sel1, int & sel2, bool & isDir);
+ String &path1, String &path2, int & sel1, int & sel2, bool & isDir);
bool CreateFoldersPair(DIFFITEM & di, bool side1);
// Implementation data
@@ -265,7 +265,7 @@
CListCtrl * m_pList;
int m_numcols;
int m_dispcols;
- std::vector<int> m_colorder; /**< colorder[logical#]=physical# */
+ std::vector<int> m_colorder; /**< colorder[logical#]=physical# */
std::vector<int> m_invcolorder; /**< invcolorder[physical]=logical# */
BOOL m_bEscCloses; /**< Cached value for option for ESC closing window */
CFont m_font; /**< User-selected font */
@@ -449,7 +449,7 @@
#ifndef _DEBUG // debug version in DirView.cpp
inline CDirDoc* CDirView::GetDocument()
- { return (CDirDoc*)m_pDocument; }
+{ return (CDirDoc*)m_pDocument; }
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-26 14:07:15
|
Revision: 6933
http://winmerge.svn.sourceforge.net/winmerge/?rev=6933&view=rev
Author: kimmov
Date: 2009-07-26 14:07:03 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
Astyle formatting with new formatting options.
Modified Paths:
--------------
trunk/ShellExtension/ShellExtension.cpp
trunk/ShellExtension/WinMergeShell.cpp
trunk/ShellExtension/WinMergeShell.h
Modified: trunk/ShellExtension/ShellExtension.cpp
===================================================================
--- trunk/ShellExtension/ShellExtension.cpp 2009-07-26 14:04:31 UTC (rev 6932)
+++ trunk/ShellExtension/ShellExtension.cpp 2009-07-26 14:07:03 UTC (rev 6933)
@@ -108,13 +108,13 @@
LONG lRet;
lRet = reg.Open(HKEY_LOCAL_MACHINE,
- _T("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"));
+ _T("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"));
if (ERROR_SUCCESS != lRet)
return E_ACCESSDENIED;
lRet = reg.WriteString(_T("WinMerge_Shell Extension"),
- _T("{4E716236-AA30-4C65-B225-D68BBA81E9C2}"));
+ _T("{4E716236-AA30-4C65-B225-D68BBA81E9C2}"));
if (ERROR_SUCCESS != lRet)
return E_ACCESSDENIED;
@@ -140,8 +140,8 @@
LONG lRet;
lRet = reg.Open(HKEY_LOCAL_MACHINE,
- _T("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"),
- KEY_SET_VALUE);
+ _T("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"),
+ KEY_SET_VALUE);
if (ERROR_SUCCESS == lRet)
{
Modified: trunk/ShellExtension/WinMergeShell.cpp
===================================================================
--- trunk/ShellExtension/WinMergeShell.cpp 2009-07-26 14:04:31 UTC (rev 6932)
+++ trunk/ShellExtension/WinMergeShell.cpp 2009-07-26 14:07:03 UTC (rev 6933)
@@ -145,7 +145,7 @@
// compress or stretch icon bitmap according to menu item height
m_MergeBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(IDB_WINMERGE), IMAGE_BITMAP,
- GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK), LR_DEFAULTCOLOR);
+ GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK), LR_DEFAULTCOLOR);
}
/// Default destructor, unloads bitmap
@@ -156,7 +156,7 @@
/// Reads selected paths
HRESULT CWinMergeShell::Initialize(LPCITEMIDLIST pidlFolder,
- LPDATAOBJECT pDataObj, HKEY hProgID)
+ LPDATAOBJECT pDataObj, HKEY hProgID)
{
USES_WINMERGELOCALE;
HRESULT hr = E_INVALIDARG;
@@ -238,7 +238,7 @@
/// Adds context menu item
HRESULT CWinMergeShell::QueryContextMenu(HMENU hmenu, UINT uMenuIndex,
- UINT uidFirstCmd, UINT uidLastCmd, UINT uFlags)
+ UINT uidFirstCmd, UINT uidLastCmd, UINT uFlags)
{
int nItemsAdded = 0;
USES_WINMERGELOCALE;
@@ -282,7 +282,7 @@
/// Gets string shown explorer's status bar when menuitem selected
HRESULT CWinMergeShell::GetCommandString(UINT_PTR idCmd, UINT uFlags,
- UINT* pwReserved, LPSTR pszName, UINT cchMax)
+ UINT* pwReserved, LPSTR pszName, UINT cchMax)
{
USES_CONVERSION;
USES_WINMERGELOCALE;
@@ -399,7 +399,7 @@
bAlterSubFolders = TRUE;
String strCommandLine = FormatCmdLine(strWinMergePath, m_strPaths[0],
- m_strPaths[1], bAlterSubFolders);
+ m_strPaths[1], bAlterSubFolders);
// Finally start a new WinMerge process
BOOL retVal = FALSE;
@@ -408,8 +408,8 @@
PROCESS_INFORMATION processInfo = {0};
retVal = CreateProcess(NULL, (LPTSTR)strCommandLine.c_str(),
- NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL,
- &stInfo, &processInfo);
+ NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL,
+ &stInfo, &processInfo);
if (!retVal)
return S_FALSE;
@@ -446,8 +446,8 @@
// Check extension
if (_tcsicmp(sExt.c_str(), _T("exe")) == 0 ||
- _tcsicmp(sExt.c_str(), _T("cmd")) == 0 ||
- _tcsicmp(sExt.c_str(), _T("bat")) == 0)
+ _tcsicmp(sExt.c_str(), _T("cmd")) == 0 ||
+ _tcsicmp(sExt.c_str(), _T("bat")) == 0)
{
// Check if file exists
struct _stati64 statBuffer;
@@ -460,7 +460,7 @@
/// Create menu for simple mode
int CWinMergeShell::DrawSimpleMenu(HMENU hmenu, UINT uMenuIndex,
- UINT uidFirstCmd)
+ UINT uidFirstCmd)
{
String strMenu = GetResourceString(IDS_CONTEXT_MENU);
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd, strMenu.c_str());
@@ -478,7 +478,7 @@
/// Create menu for advanced mode
int CWinMergeShell::DrawAdvancedMenu(HMENU hmenu, UINT uMenuIndex,
- UINT uidFirstCmd)
+ UINT uidFirstCmd)
{
String strCompare = GetResourceString(IDS_COMPARE);
String strCompareEllipsis = GetResourceString(IDS_COMPARE_ELLIPSIS);
@@ -492,11 +492,11 @@
// Select item as first item to compare
case MENU_ONESEL_NOPREV:
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompareTo.c_str());
+ strCompareTo.c_str());
uMenuIndex++;
uidFirstCmd++;
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompareEllipsis.c_str());
+ strCompareEllipsis.c_str());
nItemsAdded = 2;
break;
@@ -504,11 +504,11 @@
// Allow re-selecting first item or selecting second item
case MENU_ONESEL_PREV:
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompare.c_str());
+ strCompare.c_str());
uMenuIndex++;
uidFirstCmd++;
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strReselect.c_str());
+ strReselect.c_str());
nItemsAdded = 2;
break;
@@ -516,13 +516,13 @@
// Select both items for compare
case MENU_TWOSEL:
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompare.c_str());
+ strCompare.c_str());
nItemsAdded = 1;
break;
default:
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompare.c_str());
+ strCompare.c_str());
nItemsAdded = 1;
break;
}
@@ -597,7 +597,7 @@
/// Format commandline used to start WinMerge
String CWinMergeShell::FormatCmdLine(const String &winmergePath,
- const String &path1, const String &path2, BOOL bAlterSubFolders)
+ const String &path1, const String &path2, BOOL bAlterSubFolders)
{
String strCommandline(winmergePath);
Modified: trunk/ShellExtension/WinMergeShell.h
===================================================================
--- trunk/ShellExtension/WinMergeShell.h 2009-07-26 14:04:31 UTC (rev 6932)
+++ trunk/ShellExtension/WinMergeShell.h 2009-07-26 14:07:03 UTC (rev 6933)
@@ -74,7 +74,7 @@
int DrawAdvancedMenu(HMENU hmenu, UINT uMenuIndex, UINT uidFirstCmd);
String GetHelpText(UINT_PTR idCmd);
String FormatCmdLine(const String &winmergePath,
- const String &path1, const String &path2, BOOL bAlterSubFolders);
+ const String &path1, const String &path2, BOOL bAlterSubFolders);
public:
// IShellExtInit
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-26 14:04:38
|
Revision: 6932
http://winmerge.svn.sourceforge.net/winmerge/?rev=6932&view=rev
Author: kimmov
Date: 2009-07-26 14:04:31 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
Astyle formatting.
Modified Paths:
--------------
trunk/Src/CompareEngines/ByteComparator.cpp
trunk/Src/CompareEngines/ByteComparator.h
trunk/Src/CompareEngines/ByteCompare.cpp
trunk/Src/CompareEngines/ByteCompare.h
trunk/Src/CompareEngines/DiffUtils.cpp
trunk/Src/CompareEngines/DiffUtils.h
trunk/Src/CompareEngines/TimeSizeCompare.cpp
trunk/Src/CompareEngines/TimeSizeCompare.h
Modified: trunk/Src/CompareEngines/ByteComparator.cpp
===================================================================
--- trunk/Src/CompareEngines/ByteComparator.cpp 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/ByteComparator.cpp 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file ByteComparator.cpp
*
* @brief Implements ByteComparator class.
@@ -27,7 +27,7 @@
*/
static inline bool iseolch(TCHAR ch)
{
- return ch=='\n' || ch=='\r';
+ return ch == '\n' || ch == '\r';
}
/**
@@ -38,7 +38,7 @@
*/
static inline bool iswsch(TCHAR ch)
{
- return ch==' ' || ch=='\t';
+ return ch == ' ' || ch == '\t';
}
/**
@@ -53,7 +53,7 @@
* @param [in] offset Byte offset in whole file (among several buffers).
*/
static void TextScan(FileTextStats & stats, LPCSTR ptr, LPCSTR end, bool eof,
- bool crflag, __int64 offset)
+ bool crflag, __int64 offset)
{
LPCSTR start = ptr; // remember for recording zero-byte offsets
@@ -70,7 +70,7 @@
++stats.ncrs;
}
}
- for ( ; ptr < end; ++ptr)
+ for (; ptr < end; ++ptr)
{
char ch = *ptr;
if (ch == 0)
@@ -83,7 +83,7 @@
}
else if (ch == '\r')
{
- if (ptr+1 < end)
+ if (ptr + 1 < end)
{
if (ptr[1] == '\n')
{
@@ -122,17 +122,17 @@
*/
ByteComparator::ByteComparator(const QuickCompareOptions * options)
// settings
-: m_ignore_case(options->m_bIgnoreCase)
-, m_ignore_eol_diff(options->m_bIgnoreEOLDifference)
-, m_ignore_blank_lines(options->m_bIgnoreBlankLines)
+ : m_ignore_case(options->m_bIgnoreCase)
+ , m_ignore_eol_diff(options->m_bIgnoreEOLDifference)
+ , m_ignore_blank_lines(options->m_bIgnoreBlankLines)
// state
-, m_wsflag(false)
-, m_eol0(false)
-, m_eol1(false)
-, m_cr0(false)
-, m_cr1(false)
-, m_bol0(true)
-, m_bol1(true)
+ , m_wsflag(false)
+ , m_eol0(false)
+ , m_eol1(false)
+ , m_cr0(false)
+ , m_cr1(false)
+ , m_bol0(true)
+ , m_bol1(true)
{
if (options->m_ignoreWhitespace == WHITESPACE_IGNORE_CHANGE)
m_ignore_space_change = true;
@@ -186,16 +186,16 @@
// skip over all whitespace
while (ptr0 < end0 && iswsch(*ptr0))
{
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
}
// skip over all whitespace
while (ptr1 < end1 && iswsch(*ptr1))
{
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
- if ( (ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1) )
+ if ((ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1))
{
goto need_more;
}
@@ -203,9 +203,9 @@
if (m_ignore_space_change)
{
// Skip over whitespace change
- // Also skip whitespace on one side if
+ // Also skip whitespace on one side if
// either end of line or end of file on other
-
+
// Handle case of whitespace on side0
// (First four cases)
if (ptr0 < end0 && iswsch(*ptr0))
@@ -218,16 +218,16 @@
{
// whitespace on both sides
m_wsflag = true;
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
else if (iseolch(*ptr1))
{
// whitespace on side 0 (end of line on side 1)
m_wsflag = true;
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
}
}
@@ -243,7 +243,7 @@
{
// Whitespace on side0, eof on side1
m_wsflag = true;
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
}
}
@@ -268,7 +268,7 @@
{
// whitespace on side 1 (eol on side 0)
m_wsflag = true;
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
}
@@ -284,7 +284,7 @@
{
// Whitespace on side1, eof on side0
m_wsflag = true;
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
}
@@ -296,16 +296,16 @@
// skip over consecutive whitespace
while (ptr0 < end0 && iswsch(*ptr0))
{
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
}
// skip over consecutive whitespace
while (ptr1 < end1 && iswsch(*ptr1))
{
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
- if ( (ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1) )
+ if ((ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1))
{
// if run out of buffer on either side
// must fetch more, to continue skipping whitespace
@@ -330,7 +330,7 @@
// m_bol1 not used because m_ignore_eol_diff
++ptr1;
}
- if ( (ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1) )
+ if ((ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1))
{
goto need_more;
}
@@ -342,7 +342,7 @@
if (m_cr0 || m_cr1)
{
- // these flags mean possible split CR/LF
+ // these flags mean possible split CR/LF
goto need_more;
}
if (m_eol0 || m_eol1)
@@ -376,16 +376,16 @@
++ptr1;
}
}
- if ( (ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1) )
+ if ((ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1))
{
goto need_more;
}
}
}
- if ( ptr0 == end0 || ptr1 == end1)
+ if (ptr0 == end0 || ptr1 == end1)
{
- if ( ptr0 == end0 && ptr1 == end1)
+ if (ptr0 == end0 && ptr1 == end1)
{
if (!eof0 || !eof1)
goto need_more;
@@ -431,7 +431,7 @@
else
return NEED_MORE_0;
}
- else if(ptr1 == end1 && !eof1)
+ else if (ptr1 == end1 && !eof1)
{
return NEED_MORE_1;
}
Modified: trunk/Src/CompareEngines/ByteComparator.h
===================================================================
--- trunk/Src/CompareEngines/ByteComparator.h 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/ByteComparator.h 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file ByteComparator.h
*
* @brief Declaration file for ByteComparator class.
@@ -41,8 +41,8 @@
} COMP_RESULT;
COMP_RESULT CompareBuffers(FileTextStats & stats0, FileTextStats & stats1,
- const char* &ptr0, const char* &ptr1, const char* end0, const char* end1,
- bool eof0, bool eof1, __int64 offset0, __int64 offset1);
+ const char* &ptr0, const char* &ptr1, const char* end0, const char* end1,
+ bool eof0, bool eof1, __int64 offset0, __int64 offset1);
protected:
void HandleSide0Eol(char **ptr, const char *end, bool eof);
Modified: trunk/Src/CompareEngines/ByteCompare.cpp
===================================================================
--- trunk/Src/CompareEngines/ByteCompare.cpp 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/ByteCompare.cpp 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file ByteCompare.cpp
*
* @brief Implementation file for ByteCompare
@@ -31,9 +31,9 @@
* @brief Default constructor.
*/
ByteCompare::ByteCompare()
-: m_pOptions(NULL)
-, m_piAbortable(NULL)
-, m_inf(NULL)
+ : m_pOptions(NULL)
+ , m_piAbortable(NULL)
+ , m_inf(NULL)
{
}
@@ -102,7 +102,7 @@
}
-/**
+/**
* @brief Compare two specified files, byte-by-byte
* @param [in] bStopAfterFirstDiff Stop compare after we find first difference?
* @param [in] piAbortable Interface allowing to abort compare
@@ -127,7 +127,7 @@
bool eof[2]; // if we've finished file
// initialize our buffer pointers and end of file flags
- for (i=0; i<2; ++i)
+ for (i = 0; i < 2; ++i)
{
bfstart[i] = bfend[i] = 0;
eof[i] = false;
@@ -146,13 +146,13 @@
return DIFFCODE::CMPABORT;
// load or update buffers as appropriate
- for (i=0; i<2; ++i)
+ for (i = 0; i < 2; ++i)
{
- if (!eof[i] && bfstart[i]==countof(buff[i]))
+ if (!eof[i] && bfstart[i] == countof(buff[i]))
{
bfstart[i] = bfend[i] = 0;
}
- if (!eof[i] && bfend[i]<countof(buff[i])-1)
+ if (!eof[i] && bfend[i] < countof(buff[i]) - 1)
{
// Assume our blocks are in range of int
int space = RTL_NUMBER_OF(buff[i]) - (int) bfend[i];
@@ -186,7 +186,7 @@
// are these two buffers the same?
result = comparator.CompareBuffers(m_textStats[0], m_textStats[1],
- ptr0, ptr1, end0, end1, eof[0], eof[1], offset0, offset1);
+ ptr0, ptr1, end0, end1, eof[0], eof[1], offset0, offset1);
if (result == ByteComparator::RESULT_DIFF)
{
if (m_pOptions->m_bStopAfterFirstDiff)
@@ -212,7 +212,7 @@
const int m = (int)(ptr0 - &buff[0][0]);
const int l = (int)(end0 - ptr0);
//move uncompared data to begin of buff0
- memcpy( &buff[0][0], &buff[0][m], l );
+ memcpy(&buff[0][0], &buff[0][m], l);
bfstart[0] = 0;
bfstart[1] = ptr1 - orig1;
bfend[0] = l;
@@ -222,9 +222,9 @@
const int m = (int)(ptr1 - &buff[1][0]);
const int l = (int)(end1 - ptr1);
//move uncompared data to begin of buff1
- memcpy( &buff[1][0], &buff[1][m], l );
- bfstart[1]=0;
- bfstart[0]=ptr0 - orig0;
+ memcpy(&buff[1][0], &buff[1][m], l);
+ bfstart[1] = 0;
+ bfstart[0] = ptr0 - orig0;
bfend[1] = l;
}
else if (result == ByteComparator::NEED_MORE_BOTH)
@@ -243,7 +243,7 @@
const int m = (int)(ptr0 - orig0);
const int l = (int)(end0 - ptr0);
//move uncompared data to begin of buff0
- memcpy( &buff[0][0], &buff[0][m], l );
+ memcpy(&buff[0][0], &buff[0][m], l);
bfstart[0] = 0;
bfend[0] = l;
}
@@ -252,7 +252,7 @@
const int m = (int)(ptr1 - orig1);
const int l = (int)(end1 - ptr1);
//move uncompared data to begin of buff1
- memcpy( &buff[1][0], &buff[1][ m], l );
+ memcpy(&buff[1][0], &buff[1][ m], l);
bfstart[1] = 0;
bfend[1] = l;
}
@@ -264,8 +264,8 @@
// then the result is reliable.
if (eof[0] && eof[1])
{
- BOOL bBin0 = (m_textStats[0].nzeros>0);
- BOOL bBin1 = (m_textStats[1].nzeros>0);
+ BOOL bBin0 = (m_textStats[0].nzeros > 0);
+ BOOL bBin1 = (m_textStats[1].nzeros > 0);
if (bBin0 && bBin1)
diffcode |= DIFFCODE::BIN;
Modified: trunk/Src/CompareEngines/ByteCompare.h
===================================================================
--- trunk/Src/CompareEngines/ByteCompare.h 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/ByteCompare.h 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file ByteCompare.h
*
* @brief Declaration file for ByteCompare
Modified: trunk/Src/CompareEngines/DiffUtils.cpp
===================================================================
--- trunk/Src/CompareEngines/DiffUtils.cpp 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/DiffUtils.cpp 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file DiffUtils.cpp
*
* @brief Implementation file for DiffUtils class.
@@ -22,9 +22,9 @@
* @brief Default constructor.
*/
DiffUtils::DiffUtils()
- : m_pOptions(NULL)
- , m_pFilterList(NULL)
- , m_inf(NULL)
+ : m_pOptions(NULL)
+ , m_pFilterList(NULL)
+ , m_inf(NULL)
{
}
@@ -120,14 +120,14 @@
if (script && m_pFilterList && m_pFilterList->HasRegExps())
{
struct change *next = script;
- struct change *thisob=0, *end=0;
-
+ struct change *thisob = 0, *end = 0;
+
while (next)
{
/* Find a set of changes that belong together. */
thisob = next;
end = find_change(next);
-
+
/* Disconnect them from the rest of the changes,
making them a hunk, and remember the rest for next iteration. */
next = end->link;
@@ -136,21 +136,21 @@
debug_script(thisob);
#endif
- {
+ {
/* Determine range of line numbers involved in each file. */
- int first0=0, last0=0, first1=0, last1=0, deletes=0, inserts=0;
- analyze_hunk (thisob, &first0, &last0, &first1, &last1, &deletes, &inserts);
+ int first0 = 0, last0 = 0, first1 = 0, last1 = 0, deletes = 0, inserts = 0;
+ analyze_hunk(thisob, &first0, &last0, &first1, &last1, &deletes, &inserts);
if (deletes || inserts || thisob->trivial)
{
/* Print the lines that the first file has. */
- int trans_a0=0, trans_b0=0, trans_a1=0, trans_b1=0;
+ int trans_a0 = 0, trans_b0 = 0, trans_a1 = 0, trans_b1 = 0;
translate_range(&m_inf[0], first0, last0, &trans_a0, &trans_b0);
translate_range(&m_inf[1], first1, last1, &trans_a1, &trans_b1);
//Determine quantity of lines in this block for both sides
int QtyLinesLeft = (trans_b0 - trans_a0);
int QtyLinesRight = (trans_b1 - trans_a1);
-
+
// Match lines against regular expression filters
// Our strategy is that every line in both sides must
// match regexp before we mark difference as ignored.
@@ -172,7 +172,7 @@
// Free change script (which we don't want)
if (script != NULL)
{
- struct change *p,*e;
+ struct change *p, *e;
for (e = script; e; e = p)
{
if (!e->trivial)
@@ -180,7 +180,7 @@
else
++m_ntrivialdiffs;
p = e->link;
- free (e);
+ free(e);
}
if (m_ndiffs > 0)
code = code & ~DIFFCODE::SAME | DIFFCODE::DIFF;
@@ -196,11 +196,14 @@
code = code & ~DIFFCODE::TEXT;
switch (bin_file)
{
- case BINFILE_SIDE1: code |= DIFFCODE::BINSIDE1;
+ case BINFILE_SIDE1:
+ code |= DIFFCODE::BINSIDE1;
break;
- case BINFILE_SIDE2: code |= DIFFCODE::BINSIDE2;
+ case BINFILE_SIDE2:
+ code |= DIFFCODE::BINSIDE2;
break;
- case BINFILE_SIDE1 | BINFILE_SIDE2: code |= DIFFCODE::BIN;
+ case BINFILE_SIDE1 | BINFILE_SIDE2:
+ code |= DIFFCODE::BIN;
break;
default:
_RPTF1(_CRT_ERROR, "Invalid bin_file value: %d", bin_file);
@@ -231,9 +234,9 @@
bool DiffUtils::RegExpFilter(int StartPos, int EndPos, int FileNo)
{
if (m_pFilterList == NULL)
- {
+ {
_RPTF0(_CRT_ERROR, "DiffUtils::RegExpFilter() called when "
- "filterlist doesn't exist (=NULL)");
+ "filterlist doesn't exist (=NULL)");
return false;
}
@@ -276,14 +279,14 @@
* @return TRUE when compare succeeds, FALSE if error happened during compare.
*/
bool DiffUtils::Diff2Files(struct change ** diffs, int depth,
- int * bin_status, bool bMovedBlocks, int * bin_file)
+ int * bin_status, bool bMovedBlocks, int * bin_file)
{
bool bRet = true;
__try
{
- *diffs = diff_2_files (m_inf, depth, bin_status, bMovedBlocks, bin_file);
+ *diffs = diff_2_files(m_inf, depth, bin_status, bMovedBlocks, bin_file);
}
- __except (EXCEPTION_EXECUTE_HANDLER)
+ __except(EXCEPTION_EXECUTE_HANDLER)
{
*diffs = NULL;
bRet = false;
Modified: trunk/Src/CompareEngines/DiffUtils.h
===================================================================
--- trunk/Src/CompareEngines/DiffUtils.h 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/DiffUtils.h 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file DiffUtils.h
*
* @brief Declaration of DiffUtils class.
@@ -41,7 +41,7 @@
void GetDiffCounts(int & diffs, int & trivialDiffs);
void GetTextStats(int side, FileTextStats *stats);
bool Diff2Files(struct change ** diffs, int depth,
- int * bin_status, bool bMovedBlocks, int * bin_file);
+ int * bin_status, bool bMovedBlocks, int * bin_file);
void SetCodepage(int codepage) { m_codepage = codepage; }
protected:
Modified: trunk/Src/CompareEngines/TimeSizeCompare.cpp
===================================================================
--- trunk/Src/CompareEngines/TimeSizeCompare.cpp 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/TimeSizeCompare.cpp 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file TimeSizeCompare.cpp
*
* @brief Implementation file for TimeSizeCompare
@@ -15,7 +15,7 @@
{
TimeSizeCompare::TimeSizeCompare()
-: m_ignoreSmallDiff(false)
+ : m_ignoreSmallDiff(false)
{
}
@@ -32,7 +32,7 @@
m_ignoreSmallDiff = ignoreSmallDiff;
}
-/**
+/**
* @brief Compare two specified files, byte-by-byte
* @param [in] compMethod Compare method used.
* @param [in] di Diffitem info.
@@ -70,7 +70,7 @@
else
code = DIFFCODE::CMPERR;
}
-
+
// This is actual CMP_DATE_SIZE method..
// If file sizes differ mark them different
if (compMethod == CMP_DATE_SIZE)
Modified: trunk/Src/CompareEngines/TimeSizeCompare.h
===================================================================
--- trunk/Src/CompareEngines/TimeSizeCompare.h 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/TimeSizeCompare.h 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file TimeSizeCompare.h
*
* @brief Declaration file for TimeSizeCompare compare engine.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-26 14:03:56
|
Revision: 6931
http://winmerge.svn.sourceforge.net/winmerge/?rev=6931&view=rev
Author: kimmov
Date: 2009-07-26 14:03:45 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
Tweak Astyle formatting options a bit:
- force using tabs
- indent continued statements with two tabs
- do not break one line code blocks
Modified Paths:
--------------
trunk/runastyle.bat
Modified: trunk/runastyle.bat
===================================================================
--- trunk/runastyle.bat 2009-07-26 12:54:32 UTC (rev 6930)
+++ trunk/runastyle.bat 2009-07-26 14:03:45 UTC (rev 6931)
@@ -4,17 +4,17 @@
REM $Id$
REM Src is Ansi-style - tab-indent
-astyle --style=ansi --indent=tab --pad-oper --unpad-paren Src/*.cpp
-astyle --style=ansi --indent=tab --pad-oper --unpad-paren Src/*.h
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/*.cpp
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/*.h
-astyle --style=ansi --indent=tab --pad-oper --unpad-paren Src/Common/*.cpp
-astyle --style=ansi --indent=tab --pad-oper --unpad-paren Src/Common/*.h
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/Common/*.cpp
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/Common/*.h
-astyle --style=ansi --indent=tab --pad-oper --unpad-paren Src/CompareEngines/*.cpp
-astyle --style=ansi --indent=tab --pad-oper --unpad-paren Src/CompareEngines/*.h
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/CompareEngines/*.cpp
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks Src/CompareEngines/*.h
-astyle --style=ansi --indent=tab --pad-oper --unpad-paren ShellExtension/*.cpp
-astyle --style=ansi --indent=tab --pad-oper --unpad-paren ShellExtension/*.h
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks ShellExtension/*.cpp
+astyle --style=ansi --indent=force-tab --pad-oper --unpad-paren --max-instatement-indent=2 --keep-one-line-blocks ShellExtension/*.h
REM Editor code is GNU style - 2 space indent
astyle --style=gnu --pad-oper --unpad-paren Src/editlib/*.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-26 12:54:45
|
Revision: 6930
http://winmerge.svn.sourceforge.net/winmerge/?rev=6930&view=rev
Author: kimmov
Date: 2009-07-26 12:54:32 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
Astyle fixes for ShellExtension sources.
Modified Paths:
--------------
trunk/ShellExtension/Resource.h
trunk/ShellExtension/ShellExtension.cpp
trunk/ShellExtension/WinMergeShell.cpp
trunk/ShellExtension/WinMergeShell.h
Modified: trunk/ShellExtension/Resource.h
===================================================================
--- trunk/ShellExtension/Resource.h 2009-07-26 12:53:24 UTC (rev 6929)
+++ trunk/ShellExtension/Resource.h 2009-07-26 12:54:32 UTC (rev 6930)
@@ -17,7 +17,7 @@
#define IDB_WINMERGE 202
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 203
Modified: trunk/ShellExtension/ShellExtension.cpp
===================================================================
--- trunk/ShellExtension/ShellExtension.cpp 2009-07-26 12:53:24 UTC (rev 6929)
+++ trunk/ShellExtension/ShellExtension.cpp 2009-07-26 12:54:32 UTC (rev 6930)
@@ -7,7 +7,7 @@
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or (at
// your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -19,11 +19,11 @@
/////////////////////////////////////////////////////////////////////////////
// Look at http://www.codeproject.com/shell/ for excellent guide
// to Windows Shell programming by Michael Dunn.
-//
+//
// $Id$
// Note: Proxy/Stub Information
-// To build a separate proxy/stub DLL,
+// To build a separate proxy/stub DLL,
// run nmake -f ShellExtensionps.mk in the project directory.
#include "stdafx.h"
@@ -48,10 +48,10 @@
BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
{
if (dwReason == DLL_PROCESS_ATTACH)
-{
+ {
_Module.Init(ObjectMap, hInstance, &LIBID_SHELLEXTENSIONLib);
DisableThreadLibraryCalls(hInstance);
-}
+ }
else if (dwReason == DLL_PROCESS_DETACH)
_Module.Term();
return TRUE; // ok
@@ -62,7 +62,7 @@
STDAPI DllCanUnloadNow(void)
{
- return (_Module.GetLockCount()==0) ? S_OK : S_FALSE;
+ return (_Module.GetLockCount() == 0) ? S_OK : S_FALSE;
}
/////////////////////////////////////////////////////////////////////////////
@@ -70,7 +70,7 @@
STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
{
- return _Module.GetClassObject(rclsid, riid, ppv);
+ return _Module.GetClassObject(rclsid, riid, ppv);
}
/////////////////////////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@
// If we're on NT, add ourselves to the list of approved shell extensions.
// Note that you should *NEVER* use the overload of CRegKey::SetValue with
- // 4 parameters. It lets you set a value in one call, without having to
+ // 4 parameters. It lets you set a value in one call, without having to
// call CRegKey::Open() first. However, that version of SetValue() has a
// bug in that it requests KEY_ALL_ACCESS to the key. That will fail if the
// user is not an administrator. (The code should request KEY_WRITE, which
@@ -108,20 +108,20 @@
LONG lRet;
lRet = reg.Open(HKEY_LOCAL_MACHINE,
- _T("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"));
+ _T("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"));
if (ERROR_SUCCESS != lRet)
return E_ACCESSDENIED;
- lRet = reg.WriteString(_T("WinMerge_Shell Extension"),
- _T("{4E716236-AA30-4C65-B225-D68BBA81E9C2}"));
+ lRet = reg.WriteString(_T("WinMerge_Shell Extension"),
+ _T("{4E716236-AA30-4C65-B225-D68BBA81E9C2}"));
if (ERROR_SUCCESS != lRet)
return E_ACCESSDENIED;
}
// registers object, typelib and all interfaces in typelib
- return _Module.RegisterServer(TRUE);
+ return _Module.RegisterServer(TRUE);
}
/////////////////////////////////////////////////////////////////////////////
@@ -140,15 +140,15 @@
LONG lRet;
lRet = reg.Open(HKEY_LOCAL_MACHINE,
- _T("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"),
- KEY_SET_VALUE);
+ _T("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"),
+ KEY_SET_VALUE);
if (ERROR_SUCCESS == lRet)
{
- lRet = reg.DeleteValue( _T("{4E716236-AA30-4C65-B225-D68BBA81E9C2}"));
+ lRet = reg.DeleteValue(_T("{4E716236-AA30-4C65-B225-D68BBA81E9C2}"));
}
}
-
+
return _Module.UnregisterServer(TRUE);
}
Modified: trunk/ShellExtension/WinMergeShell.cpp
===================================================================
--- trunk/ShellExtension/WinMergeShell.cpp 2009-07-26 12:53:24 UTC (rev 6929)
+++ trunk/ShellExtension/WinMergeShell.cpp 2009-07-26 12:54:32 UTC (rev 6930)
@@ -4,7 +4,7 @@
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or (at
// your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -16,7 +16,7 @@
/////////////////////////////////////////////////////////////////////////////
// Look at http://www.codeproject.com/shell/ for excellent guide
// to Windows Shell programming by Michael Dunn.
-//
+//
// This extension needs two registry values to be defined:
// HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge\ContextMenuEnabled
// defines if context menu is shown (extension enabled) and if
@@ -31,7 +31,7 @@
// overwrites 'Executable' if defined. Useful to overwrite
// option set from UI when debugging/testing.
/////////////////////////////////////////////////////////////////////////////
-/**
+/**
* @file WinMergeShell.cpp
*
* @brief Implementation of the ShellExtension class
@@ -48,7 +48,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-/**
+/**
* @brief Flags for enabling and other settings of context menu.
*/
enum ExtensionFlags
@@ -60,7 +60,7 @@
/// Max. filecount to select
static const int MaxFileCount = 2;
-/// Registry path to WinMerge
+/// Registry path to WinMerge
#define REGDIR _T("Software\\Thingamahoochie\\WinMerge")
static const TCHAR f_RegDir[] = REGDIR;
static const TCHAR f_RegLocaleDir[] = REGDIR _T("\\Locale");
@@ -68,7 +68,7 @@
/**
* @name Registry valuenames.
*/
-/*@{*/
+/*@{*/
/** Shell context menuitem enabled/disabled */
static const TCHAR f_RegValueEnabled[] = _T("ContextMenuEnabled");
/** 'Saved' path in advanced mode */
@@ -103,18 +103,20 @@
private:
LCID m_lcidOld;
public:
- CWinMergeTempLocale() {
+ CWinMergeTempLocale()
+ {
CRegKeyEx reg;
if (reg.Open(HKEY_CURRENT_USER, f_RegLocaleDir) != ERROR_SUCCESS)
return;
m_lcidOld = GetThreadLocale();
- int iLangId = reg.ReadDword(f_LanguageId, (DWORD)-1);
+ int iLangId = reg.ReadDword(f_LanguageId, (DWORD) - 1);
if (iLangId != -1)
SetThreadLocale(MAKELCID(iLangId, SORT_DEFAULT));
}
- ~CWinMergeTempLocale() {
+ ~CWinMergeTempLocale()
+ {
SetThreadLocale(m_lcidOld);
}
};
@@ -128,7 +130,7 @@
{
TCHAR resStr[1024] = {0};
int res = LoadString(_Module.GetModuleInstance(), resourceID, resStr, 1024);
- ATLASSERT(res!= 0);
+ ATLASSERT(res != 0);
String strResource = resStr;
return strResource;
}
@@ -142,8 +144,8 @@
m_dwMenuState = 0;
// compress or stretch icon bitmap according to menu item height
- m_MergeBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(IDB_WINMERGE), IMAGE_BITMAP,
- GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK), LR_DEFAULTCOLOR);
+ m_MergeBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(IDB_WINMERGE), IMAGE_BITMAP,
+ GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK), LR_DEFAULTCOLOR);
}
/// Default destructor, unloads bitmap
@@ -154,7 +156,7 @@
/// Reads selected paths
HRESULT CWinMergeShell::Initialize(LPCITEMIDLIST pidlFolder,
- LPDATAOBJECT pDataObj, HKEY hProgID)
+ LPDATAOBJECT pDataObj, HKEY hProgID)
{
USES_WINMERGELOCALE;
HRESULT hr = E_INVALIDARG;
@@ -179,7 +181,7 @@
return E_INVALIDARG;
// Sanity check & make sure there is at least one filename.
- UINT uNumFilesDropped = DragQueryFile (hDropInfo, 0xFFFFFFFF, NULL, 0);
+ UINT uNumFilesDropped = DragQueryFile(hDropInfo, 0xFFFFFFFF, NULL, 0);
m_nSelectedItems = uNumFilesDropped;
if (uNumFilesDropped == 0)
@@ -236,7 +238,7 @@
/// Adds context menu item
HRESULT CWinMergeShell::QueryContextMenu(HMENU hmenu, UINT uMenuIndex,
- UINT uidFirstCmd, UINT uidLastCmd, UINT uFlags)
+ UINT uidFirstCmd, UINT uidLastCmd, UINT uFlags)
{
int nItemsAdded = 0;
USES_WINMERGELOCALE;
@@ -280,7 +282,7 @@
/// Gets string shown explorer's status bar when menuitem selected
HRESULT CWinMergeShell::GetCommandString(UINT_PTR idCmd, UINT uFlags,
- UINT* pwReserved, LPSTR pszName, UINT cchMax)
+ UINT* pwReserved, LPSTR pszName, UINT cchMax)
{
USES_CONVERSION;
USES_WINMERGELOCALE;
@@ -357,7 +359,7 @@
m_strPaths[1] = m_strPaths[0];
m_strPaths[0] = m_strPreviousPath;
bCompare = TRUE;
-
+
// Forget previous selection
if (reg.Open(HKEY_CURRENT_USER, f_RegDir) == ERROR_SUCCESS)
reg.WriteString(f_FirstSelection, _T(""));
@@ -397,17 +399,17 @@
bAlterSubFolders = TRUE;
String strCommandLine = FormatCmdLine(strWinMergePath, m_strPaths[0],
- m_strPaths[1], bAlterSubFolders);
+ m_strPaths[1], bAlterSubFolders);
// Finally start a new WinMerge process
BOOL retVal = FALSE;
STARTUPINFO stInfo = {0};
stInfo.cb = sizeof(STARTUPINFO);
PROCESS_INFORMATION processInfo = {0};
-
+
retVal = CreateProcess(NULL, (LPTSTR)strCommandLine.c_str(),
- NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL,
- &stInfo, &processInfo);
+ NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL,
+ &stInfo, &processInfo);
if (!retVal)
return S_FALSE;
@@ -423,7 +425,7 @@
CRegKeyEx reg;
if (!reg.QueryRegUser(f_RegDir))
return FALSE;
-
+
// Try first reading debug/test value
strDir = reg.ReadString(f_RegValuePriPath, _T(""));
if (strDir.empty())
@@ -431,7 +433,7 @@
strDir = reg.ReadString(f_RegValuePath, _T(""));
if (strDir.empty())
return FALSE;
- }
+ }
return TRUE;
}
@@ -444,8 +446,8 @@
// Check extension
if (_tcsicmp(sExt.c_str(), _T("exe")) == 0 ||
- _tcsicmp(sExt.c_str(), _T("cmd")) == 0 ||
- _tcsicmp(sExt.c_str(), _T("bat")) == 0)
+ _tcsicmp(sExt.c_str(), _T("cmd")) == 0 ||
+ _tcsicmp(sExt.c_str(), _T("bat")) == 0)
{
// Check if file exists
struct _stati64 statBuffer;
@@ -458,73 +460,73 @@
/// Create menu for simple mode
int CWinMergeShell::DrawSimpleMenu(HMENU hmenu, UINT uMenuIndex,
- UINT uidFirstCmd)
+ UINT uidFirstCmd)
{
String strMenu = GetResourceString(IDS_CONTEXT_MENU);
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd, strMenu.c_str());
-
+
// Add bitmap
if (m_MergeBmp != NULL)
SetMenuItemBitmaps(hmenu, uMenuIndex, MF_BYPOSITION, m_MergeBmp, NULL);
-
+
// Show menu item as grayed if more than two items selected
if (m_nSelectedItems > MaxFileCount)
EnableMenuItem(hmenu, uMenuIndex, MF_BYPOSITION | MF_GRAYED);
-
+
return 1;
}
/// Create menu for advanced mode
int CWinMergeShell::DrawAdvancedMenu(HMENU hmenu, UINT uMenuIndex,
- UINT uidFirstCmd)
+ UINT uidFirstCmd)
{
String strCompare = GetResourceString(IDS_COMPARE);
String strCompareEllipsis = GetResourceString(IDS_COMPARE_ELLIPSIS);
String strCompareTo = GetResourceString(IDS_COMPARE_TO);
String strReselect = GetResourceString(IDS_RESELECT_FIRST);
int nItemsAdded = 0;
-
+
switch (m_dwMenuState)
{
- // No items selected earlier
- // Select item as first item to compare
+ // No items selected earlier
+ // Select item as first item to compare
case MENU_ONESEL_NOPREV:
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompareTo.c_str());
+ strCompareTo.c_str());
uMenuIndex++;
uidFirstCmd++;
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompareEllipsis.c_str());
+ strCompareEllipsis.c_str());
nItemsAdded = 2;
break;
- // One item selected earlier:
- // Allow re-selecting first item or selecting second item
+ // One item selected earlier:
+ // Allow re-selecting first item or selecting second item
case MENU_ONESEL_PREV:
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompare.c_str());
+ strCompare.c_str());
uMenuIndex++;
uidFirstCmd++;
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strReselect.c_str());
+ strReselect.c_str());
nItemsAdded = 2;
break;
- // Two items selected
- // Select both items for compare
+ // Two items selected
+ // Select both items for compare
case MENU_TWOSEL:
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompare.c_str());
+ strCompare.c_str());
nItemsAdded = 1;
break;
default:
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompare.c_str());
+ strCompare.c_str());
nItemsAdded = 1;
break;
}
-
+
// Add bitmap
if (m_MergeBmp != NULL)
{
@@ -532,7 +534,7 @@
SetMenuItemBitmaps(hmenu, uMenuIndex - 1, MF_BYPOSITION, m_MergeBmp, NULL);
SetMenuItemBitmaps(hmenu, uMenuIndex, MF_BYPOSITION, m_MergeBmp, NULL);
}
-
+
// Show menu item as grayed if more than two items selected
if (m_nSelectedItems > MaxFileCount)
{
@@ -567,12 +569,12 @@
case MENU_ONESEL_NOPREV:
strHelp = GetResourceString(IDS_HELP_SAVETHIS);
break;
-
+
case MENU_ONESEL_PREV:
strHelp = GetResourceString(IDS_HELP_COMPARESAVED);
string_replace(strHelp, _T("%1"), m_strPreviousPath);
break;
-
+
case MENU_TWOSEL:
strHelp = GetResourceString(IDS_CONTEXT_HELP);
break;
@@ -595,7 +597,7 @@
/// Format commandline used to start WinMerge
String CWinMergeShell::FormatCmdLine(const String &winmergePath,
- const String &path1, const String &path2, BOOL bAlterSubFolders)
+ const String &path1, const String &path2, BOOL bAlterSubFolders)
{
String strCommandline(winmergePath);
@@ -608,9 +610,9 @@
strCommandline += _T(" /r");
else if (!bAlterSubFolders && bSubfoldersByDefault)
strCommandline += _T(" /r");
-
+
strCommandline += _T(" \"") + path1 + _T("\"");
-
+
if (!m_strPaths[1].empty())
strCommandline += _T(" \"") + path2 + _T("\"");
Modified: trunk/ShellExtension/WinMergeShell.h
===================================================================
--- trunk/ShellExtension/WinMergeShell.h 2009-07-26 12:53:24 UTC (rev 6929)
+++ trunk/ShellExtension/WinMergeShell.h 2009-07-26 12:54:32 UTC (rev 6930)
@@ -4,7 +4,7 @@
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or (at
// your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -16,7 +16,7 @@
/////////////////////////////////////////////////////////////////////////////
// Look at http://www.codeproject.com/shell/ for excellent guide
// to Windows Shell programming by Michael Dunn.
-/**
+/**
* @file WinMergeShell.h
*
* @brief Declaration file for ShellExtension class
@@ -34,30 +34,30 @@
#include "resource.h" // main symbols
#include "UnicodeString.h"
-/**
+/**
* @brief Class for handling shell extension tasks
*/
-class ATL_NO_VTABLE CWinMergeShell :
- public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CWinMergeShell, &CLSID_WinMergeShell>,
- public IDispatchImpl<IWinMergeShell, &IID_IWinMergeShell, &LIBID_SHELLEXTENSIONLib>,
- public IShellExtInit,
- public IContextMenu
+class ATL_NO_VTABLE CWinMergeShell :
+ public CComObjectRootEx<CComSingleThreadModel>,
+ public CComCoClass<CWinMergeShell, &CLSID_WinMergeShell>,
+ public IDispatchImpl<IWinMergeShell, &IID_IWinMergeShell, &LIBID_SHELLEXTENSIONLib>,
+ public IShellExtInit,
+ public IContextMenu
{
public:
CWinMergeShell();
~CWinMergeShell();
-DECLARE_REGISTRY_RESOURCEID(IDR_WINMERGESHELL)
+ DECLARE_REGISTRY_RESOURCEID(IDR_WINMERGESHELL)
-DECLARE_PROTECT_FINAL_CONSTRUCT()
+ DECLARE_PROTECT_FINAL_CONSTRUCT()
-BEGIN_COM_MAP(CWinMergeShell)
+ BEGIN_COM_MAP(CWinMergeShell)
COM_INTERFACE_ENTRY(IWinMergeShell)
COM_INTERFACE_ENTRY(IDispatch)
COM_INTERFACE_ENTRY(IShellExtInit)
COM_INTERFACE_ENTRY(IContextMenu)
-END_COM_MAP()
+ END_COM_MAP()
// IWinMergeShell
protected:
@@ -74,16 +74,16 @@
int DrawAdvancedMenu(HMENU hmenu, UINT uMenuIndex, UINT uidFirstCmd);
String GetHelpText(UINT_PTR idCmd);
String FormatCmdLine(const String &winmergePath,
- const String &path1, const String &path2, BOOL bAlterSubFolders);
+ const String &path1, const String &path2, BOOL bAlterSubFolders);
public:
- // IShellExtInit
- STDMETHOD(Initialize)(LPCITEMIDLIST, LPDATAOBJECT, HKEY);
+ // IShellExtInit
+ STDMETHOD(Initialize)(LPCITEMIDLIST, LPDATAOBJECT, HKEY);
- // IContextMenu
- STDMETHOD(GetCommandString)(UINT_PTR, UINT, UINT*, LPSTR, UINT);
- STDMETHOD(InvokeCommand)(LPCMINVOKECOMMANDINFO);
- STDMETHOD(QueryContextMenu)(HMENU, UINT, UINT, UINT, UINT);
+ // IContextMenu
+ STDMETHOD(GetCommandString)(UINT_PTR, UINT, UINT*, LPSTR, UINT);
+ STDMETHOD(InvokeCommand)(LPCMINVOKECOMMANDINFO);
+ STDMETHOD(QueryContextMenu)(HMENU, UINT, UINT, UINT, UINT);
};
#endif //__WINMERGESHELL_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-26 12:53:33
|
Revision: 6929
http://winmerge.svn.sourceforge.net/winmerge/?rev=6929&view=rev
Author: kimmov
Date: 2009-07-26 12:53:24 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
Add ShellExtension folder to astyle batch.
Modified Paths:
--------------
trunk/runastyle.bat
Modified: trunk/runastyle.bat
===================================================================
--- trunk/runastyle.bat 2009-07-26 12:37:02 UTC (rev 6928)
+++ trunk/runastyle.bat 2009-07-26 12:53:24 UTC (rev 6929)
@@ -13,6 +13,9 @@
astyle --style=ansi --indent=tab --pad-oper --unpad-paren Src/CompareEngines/*.cpp
astyle --style=ansi --indent=tab --pad-oper --unpad-paren Src/CompareEngines/*.h
+astyle --style=ansi --indent=tab --pad-oper --unpad-paren ShellExtension/*.cpp
+astyle --style=ansi --indent=tab --pad-oper --unpad-paren ShellExtension/*.h
+
REM Editor code is GNU style - 2 space indent
astyle --style=gnu --pad-oper --unpad-paren Src/editlib/*.cpp
astyle --style=gnu --pad-oper --unpad-paren Src/editlib/*.h
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-26 12:37:11
|
Revision: 6928
http://winmerge.svn.sourceforge.net/winmerge/?rev=6928&view=rev
Author: kimmov
Date: 2009-07-26 12:37:02 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
PATCH: [ 2823536 ] Add accelerator keys for Shell context menu
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/ShellExtension/Languages/ShellExtensionBrazilian.rc
trunk/ShellExtension/Languages/ShellExtensionBulgarian.rc
trunk/ShellExtension/Languages/ShellExtensionCatalan.rc
trunk/ShellExtension/Languages/ShellExtensionChineseSimplified.rc
trunk/ShellExtension/Languages/ShellExtensionChineseTraditional.rc
trunk/ShellExtension/Languages/ShellExtensionCroatian.rc
trunk/ShellExtension/Languages/ShellExtensionCzech.rc
trunk/ShellExtension/Languages/ShellExtensionDanish.rc
trunk/ShellExtension/Languages/ShellExtensionFrench.rc
trunk/ShellExtension/Languages/ShellExtensionGalician.rc
trunk/ShellExtension/Languages/ShellExtensionGerman.rc
trunk/ShellExtension/Languages/ShellExtensionGreek.rc
trunk/ShellExtension/Languages/ShellExtensionHungarian.rc
trunk/ShellExtension/Languages/ShellExtensionItalian.rc
trunk/ShellExtension/Languages/ShellExtensionJapanese.rc
trunk/ShellExtension/Languages/ShellExtensionKorean.rc
trunk/ShellExtension/Languages/ShellExtensionNorwegian.rc
trunk/ShellExtension/Languages/ShellExtensionPolish.rc
trunk/ShellExtension/Languages/ShellExtensionPortuguese.rc
trunk/ShellExtension/Languages/ShellExtensionRomanian.rc
trunk/ShellExtension/Languages/ShellExtensionRussian.rc
trunk/ShellExtension/Languages/ShellExtensionSlovak.rc
trunk/ShellExtension/Languages/ShellExtensionSlovenian.rc
trunk/ShellExtension/Languages/ShellExtensionSpanish.rc
trunk/ShellExtension/Languages/ShellExtensionSwedish.rc
trunk/ShellExtension/Languages/ShellExtensionUkrainian.rc
trunk/ShellExtension/ShellExtension.rc
trunk/Translations/ShellExtension/English.pot
trunk/versions.ini
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/Docs/Users/ChangeLog.txt 2009-07-26 12:37:02 UTC (rev 6928)
@@ -10,6 +10,7 @@
Add new options dialog panel for folder compare options (#2819626)
Allow disabling reading of unique folder contents (#2820067)
Add options GUI for quick compare limit (#2825628)
+ Add accelerator keys for Shell context menu (#2823536)
Bugfix: Did not export changed options values (#2799149)
Bugfix: Don't highlight identical words if whitespaces are ignored (#2798360)
Bugfix: Did not reset folder compare method back to original (#2803152)
Modified: trunk/ShellExtension/Languages/ShellExtensionBrazilian.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionBrazilian.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionBrazilian.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Portuguese (Brazil) resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PTB)
#ifdef _WIN32
@@ -28,7 +32,11 @@
// String Table
//
-STRINGTABLE
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
+STRINGTABLE
BEGIN
IDS_PROJNAME "Extens\xE3o do Shell"
IDS_CONTEXT_MENU "WinMerge"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Re-selecionar Primeiro"
END
-#endif // Portuguese (Brazil) resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionBulgarian.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionBulgarian.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionBulgarian.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Bulgarian resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_BGR)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "\xCF\xF0\xE5\xE8\xE7\xE1\xE5\xF0\xE8 \xEF\xFA\xF0\xE2\xEE\xF2\xEE"
END
-#endif // Bulgarian resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionCatalan.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionCatalan.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionCatalan.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Catalan resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CAT)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Torna a seleccionar el primer"
END
-#endif // Catalan resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionChineseSimplified.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionChineseSimplified.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionChineseSimplified.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Chinese (Simplified) resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "\xD6\xD8\xD0\xC2ѡ\xD4\xF1\xB5\xDAһ\xB8\xF6·\xBE\xB6"
END
-#endif // Chinese (Traditional) resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionChineseTraditional.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionChineseTraditional.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionChineseTraditional.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Chinese (Traditional) resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHT)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "\xA8t\xB2Τ\xB6\xAD\xB1\xA9\xB5\xA6\xF9"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "\xAD\xAB\xBF\xEF\xB2Ĥ@\xAD\xD3"
END
-#endif // Chinese (Traditional) resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionCroatian.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionCroatian.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionCroatian.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Croatian resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HRV)
#ifdef _WIN32
@@ -28,7 +32,11 @@
// String Table
//
-STRINGTABLE
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
+STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
IDS_CONTEXT_MENU "WinMerge"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Ponovni odabir"
END
-#endif // Croatian resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionCzech.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionCzech.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionCzech.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Czech resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CSY)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Porovnat znovu"
END
-#endif // Czech resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionDanish.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionDanish.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionDanish.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Danish resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DAN)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Genv\xE6lg f\xF8rste"
END
-#endif // Danish resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionFrench.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionFrench.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionFrench.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Ressaisir le premier"
END
-#endif // French (France) resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionGalician.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionGalician.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionGalician.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,4 +1,9 @@
//Microsoft Developer Studio generated resource script.
+//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -14,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Galician (RAG) resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
#ifdef _WIN32
@@ -45,5 +50,5 @@
IDS_RESELECT_FIRST "Voltar seleccionar a primeira"
END
-#endif // Galician (RAG) resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionGerman.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionGerman.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionGerman.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// German (Germany) resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Ersten erneut w\xE4hlen"
END
-#endif // German (Germany) resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionGreek.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionGreek.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionGreek.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,9 +1,8 @@
//Microsoft Developer Studio generated resource script.
//
-// This is a template file for new ShellExtension translations:
-// 1. Copy this file as a [YourLanguage].rc
-// 2. Translate strings in the end of the file
-// 3. Save the file and send it to WinMerge developers
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
//
// $Id$
@@ -20,11 +19,11 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Greek resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ELL)
#ifdef _WIN32
-LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
+LANGUAGE LANG_GREEK, SUBLANG_GREEK
#pragma code_page(1253)
#endif //_WIN32
@@ -36,8 +35,8 @@
//
// *** TRANSLATED STRINGS ***
// Translate strings below
-//
-STRINGTABLE
+//
+STRINGTABLE
BEGIN
IDS_PROJNAME "\xC5\xF0\xDD\xEA\xF4\xE1\xF3\xE7 \xD0\xE5\xF1\xE9\xE2\xDC\xEB\xEB\xEF\xED\xF4\xEF\xF2"
IDS_CONTEXT_MENU "WinMerge"
@@ -51,5 +50,5 @@
IDS_RESELECT_FIRST "\xC5\xF0\xE1\xED\xE5\xF0\xE9\xEB\xEF\xE3\xDE \xD0\xF1\xFE\xF4\xEF\xF5"
END
-#endif // Greek resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionHungarian.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionHungarian.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionHungarian.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HUN)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Re-select First"
END
-#endif // English (U.S.) resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionItalian.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionItalian.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionItalian.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Italian (Italy) resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Torna a selezionare il primo"
END
-#endif // Italian (Italy) resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionJapanese.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionJapanese.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionJapanese.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// \x93\xFA\x96{\x8C\xEA resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
#ifdef _WIN32
@@ -28,7 +32,11 @@
// String Table
//
-STRINGTABLE DISCARDABLE
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
+STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
IDS_CONTEXT_MENU "WinMerge"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "\x88\xEA\x82ڂ̃t\x83@\x83C\x83\x8B\x82\xF0\x8DđI\x91\xF0"
END
-#endif // \x93\xFA\x96{\x8C\xEA resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionKorean.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionKorean.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionKorean.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Korean resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_KOR)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Re-select First"
END
-#endif // Korean resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionNorwegian.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionNorwegian.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionNorwegian.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,11 +19,11 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Norwegian (Bokmal) resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NOR)
#ifdef _WIN32
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
#pragma code_page(1252)
#endif //_WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Re-select First"
END
-#endif // Norwegian (Bokmal) resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionPolish.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionPolish.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionPolish.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Polish resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PLK)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Wybierz pwt\xF3rnie"
END
-#endif // Polish resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionPortuguese.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionPortuguese.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionPortuguese.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Portuguese (Portugal) resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PTG)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Seleccione novamente a primeira"
END
-#endif // Portuguese (Portugal) resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionRomanian.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionRomanian.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionRomanian.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Romanian resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ROM)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Re-selecteaza prima cale"
END
-#endif // Romanian resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionRussian.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionRussian.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionRussian.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Russian resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Re-select First"
END
-#endif // Russian resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionSlovak.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionSlovak.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionSlovak.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Slovak resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SKY)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Najprv znova ozna\xE8te"
END
-#endif // Slovak resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionSlovenian.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionSlovenian.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionSlovenian.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,11 +1,10 @@
//Microsoft Developer Studio generated resource script.
//
-// This is a template file for new ShellExtension translations:
-// 1. Copy this file as a [YourLanguage].rc
-// 2. Translate strings in the end of the file
-// 3. Save the file and send it to WinMerge developers
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
//
-// $Id: ShellExtensionTemplate.rc 5137 2008-03-08 08:17:20Z kimmov $
+// $Id: ShellExtensionTemplate.rc 6792 2009-05-26 20:33:42Z gerundt $
#include "../resource.h"
@@ -20,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SLV)
#ifdef _WIN32
@@ -43,7 +42,7 @@
IDS_CONTEXT_MENU "WinMerge"
IDS_CONTEXT_HELP "Open with WinMerge"
IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items"
- IDS_COMPARE "Primerjaj"
+ IDS_COMPARE "Compare"
IDS_COMPARE_ELLIPSIS "Compare..."
IDS_COMPARE_TO "Compare To"
IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path."
@@ -51,5 +50,5 @@
IDS_RESELECT_FIRST "Re-select First"
END
-#endif // English (U.S.) resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionSpanish.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionSpanish.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionSpanish.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Spanish (Modern) resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "Re-select First"
END
-#endif // Spanish (Modern) resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionSwedish.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionSwedish.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionSwedish.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Swedish resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "\xC5ter-v\xE4lj F\xF6rsta"
END
-#endif // Swedish resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/Languages/ShellExtensionUkrainian.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionUkrainian.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/Languages/ShellExtensionUkrainian.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Russian resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_UKR)
#ifdef _WIN32
@@ -28,6 +32,10 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
@@ -42,5 +50,5 @@
IDS_RESELECT_FIRST "\xCF\xE5\xF0\xE5\xEE\xE1\xF0\xE0\xF2\xE8 \xEF\xE5\xF0\xF8\xE8\xE9"
END
-#endif // Ukrainian resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/ShellExtension/ShellExtension.rc
===================================================================
--- trunk/ShellExtension/ShellExtension.rc 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/ShellExtension/ShellExtension.rc 2009-07-26 12:37:02 UTC (rev 6928)
@@ -342,15 +342,15 @@
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
- IDS_CONTEXT_MENU "WinMerge"
+ IDS_CONTEXT_MENU "&WinMerge"
IDS_CONTEXT_HELP "Open with WinMerge"
IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items"
- IDS_COMPARE "Compare"
- IDS_COMPARE_ELLIPSIS "Compare..."
- IDS_COMPARE_TO "Compare To"
+ IDS_COMPARE "&Compare"
+ IDS_COMPARE_ELLIPSIS "&Compare..."
+ IDS_COMPARE_TO "&Compare To"
IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path."
IDS_HELP_COMPARESAVED "Compare to saved path (%1)"
- IDS_RESELECT_FIRST "Re-select First"
+ IDS_RESELECT_FIRST "&Re-select First"
END
#endif // English (U.S.) resources
Modified: trunk/Translations/ShellExtension/English.pot
===================================================================
--- trunk/Translations/ShellExtension/English.pot 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/Translations/ShellExtension/English.pot 2009-07-26 12:37:02 UTC (rev 6928)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge Shell Extension\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2009-05-23 13:10+0000\n"
+"POT-Creation-Date: 2009-07-26 14:36+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -19,70 +19,70 @@
"X-Poedit-SourceCharset: CP1252\n"
"X-Poedit-Basepath: ../../ShellExtension/Languages/\n"
-#. AFX_TARG
-#: ShellExtensionTemplate.rc:25
+#. AFX_TARG_*
+#: ShellExtensionTemplate.rc:24
#, c-format
msgid "AFX_TARG_ENU"
msgstr ""
#. LANGUAGE, SUBLANGUAGE
-#: ShellExtensionTemplate.rc:27
+#: ShellExtensionTemplate.rc:26
#, c-format
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr ""
#. Codepage
-#: ShellExtensionTemplate.rc:28
+#: ShellExtensionTemplate.rc:27
#, c-format
msgid "1252"
msgstr ""
-#: ShellExtensionTemplate.rc:42
+#: ShellExtensionTemplate.rc:41
#, c-format
msgid "ShellExtension"
msgstr ""
-#: ShellExtensionTemplate.rc:43
+#: ShellExtensionTemplate.rc:42
#, c-format
msgid "WinMerge"
msgstr ""
-#: ShellExtensionTemplate.rc:44
+#: ShellExtensionTemplate.rc:43
#, c-format
msgid "Open with WinMerge"
msgstr ""
-#: ShellExtensionTemplate.rc:45
+#: ShellExtensionTemplate.rc:44
#, c-format
msgid "Please select no more than 2 items"
msgstr ""
-#: ShellExtensionTemplate.rc:46
+#: ShellExtensionTemplate.rc:45
#, c-format
msgid "Compare"
msgstr ""
-#: ShellExtensionTemplate.rc:47
+#: ShellExtensionTemplate.rc:46
#, c-format
msgid "Compare..."
msgstr ""
-#: ShellExtensionTemplate.rc:48
+#: ShellExtensionTemplate.rc:47
#, c-format
msgid "Compare To"
msgstr ""
-#: ShellExtensionTemplate.rc:49
+#: ShellExtensionTemplate.rc:48
#, c-format
msgid "Save this path. Select another path to compare with this path."
msgstr ""
-#: ShellExtensionTemplate.rc:50
+#: ShellExtensionTemplate.rc:49
#, c-format
msgid "Compare to saved path (%1)"
msgstr ""
-#: ShellExtensionTemplate.rc:51
+#: ShellExtensionTemplate.rc:50
#, c-format
msgid "Re-select First"
msgstr ""
Modified: trunk/versions.ini
===================================================================
--- trunk/versions.ini 2009-07-25 17:19:56 UTC (rev 6927)
+++ trunk/versions.ini 2009-07-26 12:37:02 UTC (rev 6928)
@@ -19,7 +19,7 @@
type = WinRC
description = ShellExtension
path = ShellExtension/ShellExtension.rc
-version = "1.15.2"
+version = "1.16.0"
[Manual]
type = Docbook
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-07-25 17:20:04
|
Revision: 6927
http://winmerge.svn.sourceforge.net/winmerge/?rev=6927&view=rev
Author: gerundt
Date: 2009-07-25 17:19:56 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
PATCH: [ 2825132 ] ShellExtension - Turkish Translation
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Docs/Users/Contributors.txt
branches/R2_12/ShellExtension/Languages/ShellExtensionTurkish.rc
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-07-25 17:14:18 UTC (rev 6926)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-07-25 17:19:56 UTC (rev 6927)
@@ -6,6 +6,7 @@
WinMerge 2.12.6
Translation updates:
- Dutch (#2804979)
+ - Turkish (#2825132)
- Ukrainian (#2817835)
WinMerge 2.12.4 - 2009-06-09 (r6833)
Modified: branches/R2_12/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_12/Docs/Users/Contributors.txt 2009-07-25 17:14:18 UTC (rev 6926)
+++ branches/R2_12/Docs/Users/Contributors.txt 2009-07-25 17:19:56 UTC (rev 6927)
@@ -123,6 +123,7 @@
G\xF6ran H\xE5kansson <gor...@te...>
* Turkish:
+ Afyonlu <af...@us...>
Ozkan UNVER <tur...@us...>
* Ukranian
Modified: branches/R2_12/ShellExtension/Languages/ShellExtensionTurkish.rc
===================================================================
--- branches/R2_12/ShellExtension/Languages/ShellExtensionTurkish.rc 2009-07-25 17:14:18 UTC (rev 6926)
+++ branches/R2_12/ShellExtension/Languages/ShellExtensionTurkish.rc 2009-07-25 17:19:56 UTC (rev 6927)
@@ -15,7 +15,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Turkish (U.S.) resources
+// Turkish resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_TRK)
#ifdef _WIN32
@@ -32,14 +32,14 @@
BEGIN
IDS_PROJNAME "ShellExtension"
IDS_CONTEXT_MENU "WinMerge"
- IDS_CONTEXT_HELP "Open with WinMerge"
- IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items"
- IDS_COMPARE "Compare"
- IDS_COMPARE_ELLIPSIS "Compare..."
- IDS_COMPARE_TO "Compare To"
- IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path."
- IDS_HELP_COMPARESAVED "Compare to saved path (%1)"
- IDS_RESELECT_FIRST "Re-select First"
+ IDS_CONTEXT_HELP "WinMerge \xDDle A\xE7"
+ IDS_CONTEXT_HELP_MANYITEMS "L\xFCtfen \xD6ge Say\xFDs\xFD 2'yi Ge\xE7meyecek \xDEekilde Se\xE7im Yap\xFDn\xFDz"
+ IDS_COMPARE "Kar\xFE\xFDla\xFEt\xFDr"
+ IDS_COMPARE_ELLIPSIS "Kar\xFE\xFDla\xFEt\xFDr..."
+ IDS_COMPARE_TO "\xDEununla Kar\xFE\xFDla\xFEt\xFDr"
+ IDS_HELP_SAVETHIS "Bu Dizini Kaydet. Bu Dizinle Kar\xFE\xFDla\xFEt\xFDrmak \xDD\xE7in Ba\xFEka Bir Dizin Se\xE7."
+ IDS_HELP_COMPARESAVED "Kaydedilen Dizini Kar\xFE\xFDla\xFEt\xFDr (%1)"
+ IDS_RESELECT_FIRST "Birincisini Yeniden Se\xE7"
END
#endif // Turkish resources
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-07-25 17:14:26
|
Revision: 6926
http://winmerge.svn.sourceforge.net/winmerge/?rev=6926&view=rev
Author: gerundt
Date: 2009-07-25 17:14:18 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
PATCH: [ 2825132 ] ShellExtension - Turkish Translation
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/ShellExtension/Languages/ShellExtensionTurkish.rc
trunk/Translations/ShellExtension/Turkish.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-07-25 17:00:41 UTC (rev 6925)
+++ trunk/Docs/Users/ChangeLog.txt 2009-07-25 17:14:18 UTC (rev 6926)
@@ -18,7 +18,7 @@
Translation updates:
- Dutch (#2801690, #2804979)
- Swedish (#2805726)
- - Turkish (#2825130)
+ - Turkish (#2825130, #2825132)
- Ukrainian (#2817835)
WinMerge 2.13.8 - 2009-05-26 (r6791)
Modified: trunk/ShellExtension/Languages/ShellExtensionTurkish.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionTurkish.rc 2009-07-25 17:00:41 UTC (rev 6925)
+++ trunk/ShellExtension/Languages/ShellExtensionTurkish.rc 2009-07-25 17:14:18 UTC (rev 6926)
@@ -1,5 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
// $Id$
#include "../resource.h"
@@ -15,7 +19,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Turkish (U.S.) resources
+// Resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_TRK)
#ifdef _WIN32
@@ -28,19 +32,23 @@
// String Table
//
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
IDS_CONTEXT_MENU "WinMerge"
- IDS_CONTEXT_HELP "Open with WinMerge"
- IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items"
- IDS_COMPARE "Compare"
- IDS_COMPARE_ELLIPSIS "Compare..."
- IDS_COMPARE_TO "Compare To"
- IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path."
- IDS_HELP_COMPARESAVED "Compare to saved path (%1)"
- IDS_RESELECT_FIRST "Re-select First"
+ IDS_CONTEXT_HELP "WinMerge \xDDle A\xE7"
+ IDS_CONTEXT_HELP_MANYITEMS "L\xFCtfen \xD6ge Say\xFDs\xFD 2'yi Ge\xE7meyecek \xDEekilde Se\xE7im Yap\xFDn\xFDz"
+ IDS_COMPARE "Kar\xFE\xFDla\xFEt\xFDr"
+ IDS_COMPARE_ELLIPSIS "Kar\xFE\xFDla\xFEt\xFDr..."
+ IDS_COMPARE_TO "\xDEununla Kar\xFE\xFDla\xFEt\xFDr"
+ IDS_HELP_SAVETHIS "Bu Dizini Kaydet. Bu Dizinle Kar\xFE\xFDla\xFEt\xFDrmak \xDD\xE7in Ba\xFEka Bir Dizin Se\xE7."
+ IDS_HELP_COMPARESAVED "Kaydedilen Dizini Kar\xFE\xFDla\xFEt\xFDr (%1)"
+ IDS_RESELECT_FIRST "Birincisini Yeniden Se\xE7"
END
-#endif // Turkish resources
+#endif // Resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Translations/ShellExtension/Turkish.po
===================================================================
--- trunk/Translations/ShellExtension/Turkish.po 2009-07-25 17:00:41 UTC (rev 6925)
+++ trunk/Translations/ShellExtension/Turkish.po 2009-07-25 17:14:18 UTC (rev 6926)
@@ -1,6 +1,9 @@
# This file is part from WinMerge <http://winmerge.org/>
# Released under the "GNU General Public License"
#
+# Translators:
+# * Afyonlu <af...@us...>
+#
# ID line follows -- this is updated by SVN
# $Id$
#
@@ -9,8 +12,8 @@
"Project-Id-Version: WinMerge Shell Extension\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2009-07-22 02:27+0100\n"
+"Last-Translator: Afyonlu <af...@us...>\n"
"Language-Team: Turkish <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1254\n"
@@ -40,50 +43,50 @@
#: ShellExtensionTemplate.rc:42
#, c-format
msgid "ShellExtension"
-msgstr ""
+msgstr "ShellExtension"
#: ShellExtensionTemplate.rc:43
#, c-format
msgid "WinMerge"
-msgstr ""
+msgstr "WinMerge"
#: ShellExtensionTemplate.rc:44
#, c-format
msgid "Open with WinMerge"
-msgstr ""
+msgstr "WinMerge \xDDle A\xE7"
#: ShellExtensionTemplate.rc:45
#, c-format
msgid "Please select no more than 2 items"
-msgstr ""
+msgstr "L\xFCtfen \xD6ge Say\xFDs\xFD 2'yi Ge\xE7meyecek \xDEekilde Se\xE7im Yap\xFDn\xFDz"
#: ShellExtensionTemplate.rc:46
#, c-format
msgid "Compare"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr"
#: ShellExtensionTemplate.rc:47
#, c-format
msgid "Compare..."
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr..."
#: ShellExtensionTemplate.rc:48
#, c-format
msgid "Compare To"
-msgstr ""
+msgstr "\xDEununla Kar\xFE\xFDla\xFEt\xFDr"
#: ShellExtensionTemplate.rc:49
#, c-format
msgid "Save this path. Select another path to compare with this path."
-msgstr ""
+msgstr "Bu Dizini Kaydet. Bu Dizinle Kar\xFE\xFDla\xFEt\xFDrmak \xDD\xE7in Ba\xFEka Bir Dizin Se\xE7."
#: ShellExtensionTemplate.rc:50
#, c-format
msgid "Compare to saved path (%1)"
-msgstr ""
+msgstr "Kaydedilen Dizini Kar\xFE\xFDla\xFEt\xFDr (%1)"
#: ShellExtensionTemplate.rc:51
#, c-format
msgid "Re-select First"
-msgstr ""
+msgstr "Birincisini Yeniden Se\xE7"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-07-25 17:00:52
|
Revision: 6925
http://winmerge.svn.sourceforge.net/winmerge/?rev=6925&view=rev
Author: gerundt
Date: 2009-07-25 17:00:41 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
PATCH: [ 2825130 ] Turkish Translation Update
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Docs/Users/Contributors.txt
trunk/Translations/WinMerge/Turkish.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-07-25 08:43:31 UTC (rev 6924)
+++ trunk/Docs/Users/ChangeLog.txt 2009-07-25 17:00:41 UTC (rev 6925)
@@ -18,6 +18,7 @@
Translation updates:
- Dutch (#2801690, #2804979)
- Swedish (#2805726)
+ - Turkish (#2825130)
- Ukrainian (#2817835)
WinMerge 2.13.8 - 2009-05-26 (r6791)
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2009-07-25 08:43:31 UTC (rev 6924)
+++ trunk/Docs/Users/Contributors.txt 2009-07-25 17:00:41 UTC (rev 6925)
@@ -124,6 +124,7 @@
G\xF6ran H\xE5kansson <gor...@te...>
* Turkish:
+ Afyonlu <af...@us...>
Ozkan UNVER <tur...@us...>
* Ukranian
Modified: trunk/Translations/WinMerge/Turkish.po
===================================================================
--- trunk/Translations/WinMerge/Turkish.po 2009-07-25 08:43:31 UTC (rev 6924)
+++ trunk/Translations/WinMerge/Turkish.po 2009-07-25 17:00:41 UTC (rev 6925)
@@ -2,6 +2,7 @@
# Released under the "GNU General Public License"
#
# Translators:
+# * Afyonlu <af...@us...>
# * Ozkan UNVER <turquaz37915 at users.sourceforge.net>
#
# ID line follows -- this is updated by SVN
@@ -12,8 +13,8 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2009-07-22 02:24+0100\n"
+"Last-Translator: Afyonlu <af...@us...>\n"
"Language-Team: Turkish <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1254\n"
@@ -40,79 +41,79 @@
#: Merge.rc:99
#, c-format
msgid "C&opy to Right"
-msgstr ""
+msgstr "Sa\xF0a Kopyala"
#: Merge.rc:73
#: Merge.rc:100
#, c-format
msgid "Cop&y to Left"
-msgstr ""
+msgstr "Sola Kopyala"
#: Merge.rc:75
#, c-format
msgid "&Select Line Difference"
-msgstr ""
+msgstr "Farkl\xFD Olan Sat\xFDrlar\xFD Se\xE7"
#: Merge.rc:77
#, c-format
msgid "&Undo"
-msgstr ""
+msgstr "Geri Al"
#: Merge.rc:78
#, c-format
msgid "&Redo"
-msgstr ""
+msgstr "Yinele"
#: Merge.rc:80
#: Merge.rc:102
#, c-format
msgid "Cu&t"
-msgstr ""
+msgstr "Kes"
#: Merge.rc:81
#: Merge.rc:103
#: Merge.rc:512
#, c-format
msgid "&Copy"
-msgstr ""
+msgstr "Kopyala"
#: Merge.rc:82
#: Merge.rc:104
#, c-format
msgid "&Paste"
-msgstr ""
+msgstr "Yap\xFD\xFEt\xFDr"
#: Merge.rc:84
#: Merge.rc:593
#, c-format
msgid "&Goto..."
-msgstr ""
+msgstr "Git..."
#: Merge.rc:86
#, c-format
msgid "Op&en"
-msgstr ""
+msgstr "A\xE7"
#: Merge.rc:88
#: Merge.rc:535
#: Merge.rc:541
#, c-format
msgid "with &Registered Application"
-msgstr ""
+msgstr "Kay\xFDtl\xFD Uygulama \xDDle"
#: Merge.rc:89
#: Merge.rc:536
#: Merge.rc:542
#, c-format
msgid "with &External Editor"
-msgstr ""
+msgstr "Harici D\xFCzenleyici \xDDle"
#: Merge.rc:90
#: Merge.rc:537
#: Merge.rc:543
#, c-format
msgid "&with..."
-msgstr ""
+msgstr "Birlikte A\xE7..."
#: Merge.rc:110
#: Merge.rc:194
@@ -140,26 +141,26 @@
#: Merge.rc:319
#, c-format
msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "Fark Dosyas\xFD A\xE7..."
#: Merge.rc:116
#: Merge.rc:200
#: Merge.rc:321
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
-msgstr ""
+msgstr "Proje A\xE7..."
#: Merge.rc:117
#: Merge.rc:201
#: Merge.rc:322
#, c-format
msgid "Sa&ve Project..."
-msgstr ""
+msgstr "Projeyi Kaydet..."
#: Merge.rc:119
#, c-format
msgid "Recent Projects"
-msgstr ""
+msgstr "Son Kullan\xFDlan Projeler"
#: Merge.rc:121
#: Merge.rc:208
@@ -180,7 +181,7 @@
#: Merge.rc:390
#, c-format
msgid "&Options..."
-msgstr "&Se\xE7enekler..."
+msgstr "&Ayarlar..."
#: Merge.rc:127
#: Merge.rc:216
@@ -194,42 +195,42 @@
#: Merge.rc:394
#, c-format
msgid "Select &Font..."
-msgstr "Fo&nt Se\xE7"
+msgstr "Yaz\xFD Tipi Se\xE7..."
#: Merge.rc:130
#: Merge.rc:232
#: Merge.rc:395
#, c-format
msgid "Use Default F&ont"
-msgstr "&Varsay\xFDlan Fontu Kullan"
+msgstr "&Varsay\xFDlan Yaz\xFD Tipini Kullan"
#: Merge.rc:132
#: Merge.rc:234
#: Merge.rc:416
#, c-format
msgid "&Toolbar"
-msgstr ""
+msgstr "Ara\xE7 \xC7ubu\xF0u"
#: Merge.rc:134
#: Merge.rc:236
#: Merge.rc:418
#, c-format
msgid "&None"
-msgstr ""
+msgstr "Yok"
#: Merge.rc:135
#: Merge.rc:237
#: Merge.rc:419
#, c-format
msgid "&Small"
-msgstr ""
+msgstr "K\xFC\xE7\xFCk"
#: Merge.rc:136
#: Merge.rc:238
#: Merge.rc:420
#, c-format
msgid "&Big"
-msgstr ""
+msgstr "B\xFCy\xFCk"
#: Merge.rc:138
#: Merge.rc:240
@@ -243,14 +244,14 @@
#: Merge.rc:423
#, c-format
msgid "Ta&b Bar"
-msgstr ""
+msgstr "Sekme \xC7ubu\xF0u"
#: Merge.rc:141
#: Merge.rc:244
#: Merge.rc:427
#, c-format
msgid "&Language..."
-msgstr "&Dil"
+msgstr "&Dil..."
#: Merge.rc:143
#: Merge.rc:265
@@ -264,14 +265,14 @@
#: Merge.rc:451
#, c-format
msgid "&Filters..."
-msgstr "&Filtreler"
+msgstr "&Filtreler..."
#: Merge.rc:146
#: Merge.rc:269
#: Merge.rc:452
#, c-format
msgid "&Generate Patch..."
-msgstr "&Yama \xDCret..."
+msgstr "&Yama Olu\xFEtur..."
#: Merge.rc:148
#: Merge.rc:272
@@ -285,7 +286,7 @@
#: Merge.rc:457
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "Listele..."
#: Merge.rc:152
#, c-format
@@ -302,21 +303,21 @@
#: Merge.rc:459
#, c-format
msgid "&Manual Unpacking"
-msgstr "&Manuel A\xE7mak"
+msgstr "\xC7\xFDkart (Elle)"
#: Merge.rc:156
#: Merge.rc:277
#: Merge.rc:460
#, c-format
msgid "&Automatic Unpacking"
-msgstr "&Otomatik A\xE7mak"
+msgstr "\xC7\xFDkart (&Otomatik)"
#: Merge.rc:158
#: Merge.rc:279
#: Merge.rc:462
#, c-format
msgid "&Edit with Unpacker"
-msgstr "&A\xE7\xFDc\xFDyla D\xFCzenler"
+msgstr "\xC7\xFDkartma Program\xFD \xDDle D\xFCzenle"
#: Merge.rc:160
#: Merge.rc:281
@@ -330,21 +331,21 @@
#: Merge.rc:471
#, c-format
msgid "&Debug"
-msgstr ""
+msgstr "Hata Onar\xFDm\xFD"
#: Merge.rc:164
#: Merge.rc:285
#: Merge.rc:473
#, c-format
msgid "&Load Config..."
-msgstr ""
+msgstr "Ayarlar\xFD Y\xFCkle..."
#: Merge.rc:165
#: Merge.rc:286
#: Merge.rc:474
#, c-format
msgid "&Reset Options"
-msgstr ""
+msgstr "S\xFDf\xFDrlama Se\xE7enekleri"
#: Merge.rc:167
#: Merge.rc:288
@@ -365,14 +366,14 @@
#: Merge.rc:479
#, c-format
msgid "Clo&se All"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC Kapat"
#: Merge.rc:172
#: Merge.rc:293
#: Merge.rc:481
#, c-format
msgid "Change &Pane\tF6"
-msgstr "&Pencere De\xF0itir\tF6"
+msgstr "&Di\xF0er Paneli Aktifle\xFEtir\tF6"
#: Merge.rc:174
#: Merge.rc:295
@@ -398,7 +399,7 @@
#: Merge.rc:178
#: Merge.rc:299
#: Merge.rc:487
-#: Merge.rc:1947
+#: Merge.rc:1948
#, c-format
msgid "&Help"
msgstr "&Yard\xFDm"
@@ -408,42 +409,42 @@
#: Merge.rc:489
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr ""
+msgstr "WinMerge Yard\xFDm\xFD"
#: Merge.rc:182
#: Merge.rc:303
#: Merge.rc:491
#, c-format
msgid "R&elease Notes"
-msgstr ""
+msgstr "S\xFCr\xFCm Notlar\xFD"
#: Merge.rc:183
#: Merge.rc:304
#: Merge.rc:492
#, c-format
msgid "&Translations"
-msgstr ""
+msgstr "\xC7eviriler"
#: Merge.rc:184
#: Merge.rc:305
#: Merge.rc:493
#, c-format
msgid "C&onfiguration"
-msgstr ""
+msgstr "Yap\xFDland\xFDrma Kayd\xFD"
#: Merge.rc:185
#: Merge.rc:306
#: Merge.rc:494
#, c-format
msgid "A&rchive Support disabled..."
-msgstr "&Yedekleme Deste\xF0i Kapal\xFD"
+msgstr "&S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i Kapal\xFD"
#: Merge.rc:187
#: Merge.rc:308
#: Merge.rc:496
#, c-format
msgid "&GNU General Public License"
-msgstr ""
+msgstr "GNU General Public Lisans\xFD"
#: Merge.rc:188
#: Merge.rc:309
@@ -456,18 +457,18 @@
#: Merge.rc:340
#, c-format
msgid "L&eft Read-only"
-msgstr "Salt Okunur S&ol"
+msgstr "Sol Taraf\xFD Salt Okunur Yap"
#: Merge.rc:204
#: Merge.rc:341
#, c-format
msgid "Ri&ght Read-only"
-msgstr "Salt Okunu&r Sa\xF0"
+msgstr "Sa\xF0 Taraf\xFD Salt Okunur Yap"
#: Merge.rc:206
#, c-format
msgid "File En&coding"
-msgstr ""
+msgstr "Dosya Kodlamas\xFD"
#: Merge.rc:212
#: Merge.rc:366
@@ -478,57 +479,57 @@
#: Merge.rc:218
#, c-format
msgid "Show &Identical Items"
-msgstr ""
+msgstr "Ayn\xFD \xD6geleri G\xF6ster"
#: Merge.rc:219
#, c-format
msgid "Show &Different Items"
-msgstr ""
+msgstr "Farkl\xFD \xD6geleri G\xF6ster"
#: Merge.rc:220
#, c-format
msgid "Show L&eft Unique Items"
-msgstr ""
+msgstr "Soldaki Benzersiz \xD6geleri G\xF6ster"
#: Merge.rc:221
#, c-format
msgid "Show Ri&ght Unique Items"
-msgstr ""
+msgstr "Sa\xF0daki Benzersiz \xD6geleri G\xF6ster"
#: Merge.rc:222
#, c-format
msgid "Show S&kipped Items"
-msgstr ""
+msgstr "Atlanan \xD6geleri G\xF6ster"
#: Merge.rc:223
#, c-format
msgid "S&how Binary Files"
-msgstr ""
+msgstr "Binary Dosyalar\xFDn\xFD G\xF6ster"
#: Merge.rc:225
#, c-format
msgid "Show Hidd&en Items"
-msgstr ""
+msgstr "Gizli \xD6geleri G\xF6ster"
#: Merge.rc:227
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "A\xF0a\xE7 G\xF6r\xFCn\xFCm\xFC"
#: Merge.rc:228
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "T\xFCm Alt Klas\xF6rleri Geni\xFElet"
#: Merge.rc:229
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "T\xFCm Alt Klas\xF6rleri Daralt"
#: Merge.rc:242
#, c-format
msgid "Compa&re Statistics"
-msgstr ""
+msgstr "Say\xFDsal Verileri Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:246
#: Merge.rc:429
@@ -539,18 +540,18 @@
#: Merge.rc:247
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
-msgstr ""
+msgstr "Se\xE7ili Olan\xFD Tazele"
#: Merge.rc:249
#: Merge.rc:431
#, c-format
msgid "&Merge"
-msgstr "&Birle\xFEtirme"
+msgstr "&Birle\xFEtir"
#: Merge.rc:251
#, c-format
msgid "Co&mpare\tEnter"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:253
#: Merge.rc:433
@@ -574,7 +575,7 @@
#: Merge.rc:437
#, c-format
msgid "&Current Difference\tAlt+Enter"
-msgstr "&\xDEu Anki Fark\tAlt+Enter"
+msgstr "&\xDEimdiki Fark\tAlt+Enter"
#: Merge.rc:258
#: Merge.rc:438
@@ -597,19 +598,19 @@
#: Merge.rc:263
#, c-format
msgid "&Delete\tDel"
-msgstr ""
+msgstr "Sil"
#: Merge.rc:267
#: Merge.rc:566
#, c-format
msgid "&Customize Columns..."
-msgstr "Kolonlar\xFD &\xD6zelle\xFEtir"
+msgstr "S\xFCtunlar\xFD &\xD6zelle\xFEtir..."
#: Merge.rc:270
#: Merge.rc:453
#, c-format
msgid "Generate &Report..."
-msgstr ""
+msgstr "Rapor Haz\xFDrla..."
#: Merge.rc:324
#, c-format
@@ -631,7 +632,7 @@
#: Merge.rc:333
#, c-format
msgid "Save &As..."
-msgstr "&Farkl\xFD Kaydet"
+msgstr "&Farkl\xFD Kaydet..."
#: Merge.rc:330
#, c-format
@@ -641,37 +642,37 @@
#: Merge.rc:336
#, c-format
msgid "&Print..."
-msgstr ""
+msgstr "Yazd\xFDr..."
#: Merge.rc:337
#, c-format
msgid "Page Se&tup"
-msgstr ""
+msgstr "Sayfa Yap\xFDs\xFD"
#: Merge.rc:338
#, c-format
msgid "Print Previe&w"
-msgstr ""
+msgstr "Bask\xFD \xD6nizleme"
#: Merge.rc:343
#, c-format
msgid "&Convert Line Endings to"
-msgstr ""
+msgstr "Sat\xFDr Sonlar\xFDn\xFD D\xF6n\xFC\xFEt\xFCr"
#: Merge.rc:345
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:346
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:347
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:350
#, c-format
@@ -681,7 +682,7 @@
#: Merge.rc:352
#, c-format
msgid "&File Encoding..."
-msgstr ""
+msgstr "Dosya Kodlamas\xFD..."
#: Merge.rc:358
#, c-format
@@ -691,7 +692,7 @@
#: Merge.rc:359
#, c-format
msgid "&Redo\tCtrl+Y"
-msgstr "&Geri Al\xFD Geri Al\tCtrl+Y"
+msgstr "\xDDleri Al\tCtrl+Y"
#: Merge.rc:361
#, c-format
@@ -711,7 +712,7 @@
#: Merge.rc:365
#, c-format
msgid "Select Line &Difference\tF4"
-msgstr ""
+msgstr "Farkl\xFD Olan Sat\xFDrlar\xFD Se\xE7"
#: Merge.rc:368
#, c-format
@@ -726,10 +727,10 @@
#: Merge.rc:371
#, c-format
msgid "&Scripts"
-msgstr "&Senaryolar(Scripts)"
+msgstr "&Yaz\xFD D\xFCzeni"
#: Merge.rc:373
-#: Merge.rc:2803
+#: Merge.rc:2807
#, c-format
msgid "< Empty >"
msgstr "< Bo\xFE >"
@@ -737,37 +738,37 @@
#: Merge.rc:376
#, c-format
msgid "Advanced"
-msgstr ""
+msgstr "Geli\xFEmi\xFE"
#: Merge.rc:378
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
-msgstr ""
+msgstr "Sat\xFDr Numaralar\xFD \xDDle Kopyala"
#: Merge.rc:381
#, c-format
msgid "&Bookmarks"
-msgstr ""
+msgstr "S\xFDk Kullan\xFDlanlar"
#: Merge.rc:383
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
-msgstr ""
+msgstr "S\xFDk Kullan\xFDlanlar\xFD A\xE7-Kapat"
#: Merge.rc:384
#, c-format
msgid "&Next Bookmark\tF2"
-msgstr ""
+msgstr "Sonraki S\xFDk Kullan\xFDlan"
#: Merge.rc:385
#, c-format
msgid "&Previous bookmark\tShift+F2"
-msgstr ""
+msgstr "\xD6nceki S\xFDk Kullan\xFDlan"
#: Merge.rc:386
#, c-format
msgid "&Clear All Bookmarks"
-msgstr ""
+msgstr "S\xFDk Kullan\xFDlanlar\xFD Temizle"
#: Merge.rc:388
#, c-format
@@ -777,33 +778,33 @@
#: Merge.rc:396
#, c-format
msgid "&Zoom"
-msgstr ""
+msgstr "Yak\xFDnla\xFEt\xFDr"
#: Merge.rc:398
#, c-format
msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "Yak\xFDnla\xFEt\xFDr"
#: Merge.rc:399
#, c-format
msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "Uzakla\xFEt\xFDr"
#. Zoom to normal
#: Merge.rc:400
#, c-format
msgid "&Normal\tCtrl+*"
-msgstr ""
+msgstr "&Normal\tCtrl+*"
#: Merge.rc:402
#, c-format
msgid "Syntax Highlight"
-msgstr ""
+msgstr "S\xF6zdizimi Vurgusu"
#: Merge.rc:407
#, c-format
msgid "&Lock Panes"
-msgstr ""
+msgstr "Panelleri Kilitle"
#: Merge.rc:408
#, c-format
@@ -813,27 +814,27 @@
#: Merge.rc:409
#, c-format
msgid "Vie&w Line Differences"
-msgstr ""
+msgstr "Sat\xFDr Farkl\xFDl\xFDklar\xFDn\xFD G\xF6ster"
#: Merge.rc:410
#, c-format
msgid "View Line &Numbers"
-msgstr ""
+msgstr "Sat\xFDr Numaralar\xFDn\xFD G\xF6ster"
#: Merge.rc:411
#, c-format
msgid "View &Margins"
-msgstr ""
+msgstr "S\xFDn\xFDrlar\xFD G\xF6ster"
#: Merge.rc:412
#, c-format
msgid "W&rap Lines"
-msgstr ""
+msgstr "Sat\xFDrlar\xFD Kayd\xFDr"
#: Merge.rc:414
#, c-format
msgid "Sw&ap Panes"
-msgstr ""
+msgstr "Panelleri Yer De\xF0i\xFEtir"
#: Merge.rc:424
#, c-format
@@ -843,17 +844,17 @@
#: Merge.rc:425
#, c-format
msgid "Lo&cation Pane"
-msgstr "Pozisyon Penceresi"
+msgstr "Durum Penceresi"
#: Merge.rc:443
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "&Geli\xFEmi\xFE Sa\xF0a Kopyala\tAlt+Ctrl+Right"
+msgstr "Sa\xF0a Kopyala ve \xDDlerle\tAlt+Ctrl+Right"
#: Merge.rc:444
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "G&eli\xFEmi\xFE Sola Kopyala\tAlt+Ctrl+Left"
+msgstr "Sola Kopyala ve \xDDlerle\tAlt+Ctrl+Left"
#: Merge.rc:446
#, c-format
@@ -866,24 +867,24 @@
msgstr "T&\xFCm\xFCn\xFC Sola Kopyala"
#: Merge.rc:464
-#, c-format
+#, fuzzy, c-format
msgid "&Prediffer"
-msgstr "&\xD6ncelikli Fark"
+msgstr "\xD6ncelikli Fark"
#: Merge.rc:505
#, c-format
msgid "Comp&are"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:506
#, c-format
msgid "Co&mpare Special"
-msgstr ""
+msgstr "\xD6zel Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:508
#, c-format
msgid "&XML"
-msgstr ""
+msgstr "&XML"
#: Merge.rc:509
#, c-format
@@ -893,201 +894,201 @@
#: Merge.rc:514
#, c-format
msgid "&Left to Right"
-msgstr ""
+msgstr "Solu Sa\xF0a"
#: Merge.rc:515
#, c-format
msgid "L&eft to..."
-msgstr ""
+msgstr "Solu \xDEuraya..."
#: Merge.rc:516
#, c-format
msgid "&Right to Left"
-msgstr ""
+msgstr "Sa\xF0\xFD Sola"
#: Merge.rc:517
#, c-format
msgid "R&ight to..."
-msgstr ""
+msgstr "Sa\xF0\xFD \xDEuraya..."
#: Merge.rc:519
#, c-format
msgid "&Move"
-msgstr ""
+msgstr "Ta\xFE\xFD"
#: Merge.rc:521
#, c-format
msgid "&Left to..."
-msgstr ""
+msgstr "Solu \xDEuraya..."
#: Merge.rc:522
#, c-format
msgid "&Right to..."
-msgstr ""
+msgstr "Sa\xF0\xFD \xDEuraya..."
#: Merge.rc:524
#, c-format
msgid "&Delete"
-msgstr ""
+msgstr "Sil"
#: Merge.rc:526
#: Merge.rc:1147
-#: Merge.rc:1531
+#: Merge.rc:1514
#, c-format
msgid "&Left"
-msgstr ""
+msgstr "Sol"
#: Merge.rc:527
#: Merge.rc:1149
-#: Merge.rc:1534
+#: Merge.rc:1517
#, c-format
msgid "&Right"
-msgstr ""
+msgstr "Sa\xF0"
#: Merge.rc:528
#, c-format
msgid "&Both"
-msgstr ""
+msgstr "Her \xDDkisi"
#: Merge.rc:530
#, c-format
msgid "Re&name"
-msgstr ""
+msgstr "Yeniden Adland\xFDr"
#: Merge.rc:531
#, c-format
msgid "&Hide Items"
-msgstr ""
+msgstr "\xD6geleri Gizle"
#: Merge.rc:533
#, c-format
msgid "&Open Left"
-msgstr ""
+msgstr "Sola A\xE7"
#: Merge.rc:539
#, c-format
msgid "O&pen Right"
-msgstr ""
+msgstr "Sa\xF0a A\xE7"
#: Merge.rc:546
#, c-format
msgid "Cop&y Pathnames"
-msgstr ""
+msgstr "Yol Adlar\xFDn\xFD Kopyala"
#: Merge.rc:548
-#, c-format
+#, fuzzy, c-format
msgid "&Left (%1 of %2)"
-msgstr ""
+msgstr "Soldaki (%1 Adet)"
#: Merge.rc:549
-#, c-format
+#, fuzzy, c-format
msgid "&Right (%1 of %2)"
-msgstr ""
+msgstr "Sa\xF0daki (%1 Adet)"
#: Merge.rc:550
-#, c-format
+#, fuzzy, c-format
msgid "&Both (%1 of %2)"
-msgstr ""
+msgstr "Her \xDDkisindeki (Toplam %2 Adet)"
#: Merge.rc:552
#, c-format
msgid "Copy &Filenames"
-msgstr ""
+msgstr "Dosya Adlar\xFDn\xFD Kopyala"
#: Merge.rc:554
#, c-format
msgid "&Zip"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDr (&Zip'le)"
#: Merge.rc:556
-#, c-format
+#, fuzzy, c-format
msgid "&Left... (%1 of %2)"
-msgstr ""
+msgstr "Soldakini... (%1 Adet)"
#: Merge.rc:557
-#, c-format
+#, fuzzy, c-format
msgid "&Right... (%1 of %2)"
-msgstr ""
+msgstr "Sa\xF0dakini... (%1 Adet)"
#: Merge.rc:558
-#, c-format
+#, fuzzy, c-format
msgid "&Both... (%1 of %2)"
-msgstr ""
+msgstr "Her \xDDkisini... (Toplam %2 Adet)"
#: Merge.rc:559
#, c-format
msgid "&Differences... (%1 of %2)"
-msgstr ""
+msgstr "Farkl\xFD Olanlar\xFD... (%2 \xD6genin %1 Tanesi)"
#: Merge.rc:562
#, c-format
msgid "&Refresh"
-msgstr ""
+msgstr "Tazele"
#: Merge.rc:574
#, c-format
msgid "&Copy Full Path"
-msgstr ""
+msgstr "Tam Yolu Kopyala"
#: Merge.rc:575
#, c-format
msgid "Copy &Filename"
-msgstr ""
+msgstr "Dosya Ad\xFDn\xFD Kopyala"
#: Merge.rc:581
-#, c-format
+#, fuzzy, c-format
msgid "Prediffer Settings"
-msgstr ""
+msgstr "\xD6ncelikli Fark Ayarlar\xFD"
#: Merge.rc:583
-#, c-format
+#, fuzzy, c-format
msgid "&No prediffer"
-msgstr ""
+msgstr "\xD6ncelikli Fark Yok"
#: Merge.rc:584
-#, c-format
+#, fuzzy, c-format
msgid "Auto prediffer"
-msgstr ""
+msgstr "Otomatik \xD6ncelikli Fark"
#: Merge.rc:592
#, c-format
msgid "G&oto Diff"
-msgstr ""
+msgstr "Farka Git"
#: Merge.rc:595
#, c-format
msgid "&No Moved Blocks"
-msgstr ""
+msgstr "Ta\xFE\xFDnan Blok Yok"
#: Merge.rc:596
#, c-format
msgid "&All Moved Blocks"
-msgstr ""
+msgstr "Ta\xFE\xFDnan Bloklar\xFDn Hepsi"
#: Merge.rc:597
#, c-format
msgid "Moved Block for &Current Diff"
-msgstr ""
+msgstr "Ge\xE7erli Fark\xFDn Yerine Ta\xFE\xFDnan Blok"
#: Merge.rc:668
#, c-format
msgid "About WinMerge"
-msgstr ""
+msgstr "WinMerge Hakk\xFDnda"
#: Merge.rc:674
#, c-format
msgid "(Private Build)"
-msgstr ""
+msgstr "(\xD6zel Yap\xFDm)"
#: Merge.rc:675
#, c-format
msgid "All rights reserved."
-msgstr ""
+msgstr "T\xFCm Haklar\xFD Sakl\xFDd\xFDr."
#: Merge.rc:676
#, c-format
msgid "Visit the WinMerge HomePage!"
-msgstr ""
+msgstr "WinMerge Sitesini Ziyaret Ediniz."
#: Merge.rc:679
#: Merge.rc:711
@@ -1096,31 +1097,31 @@
#: Merge.rc:1066
#: Merge.rc:1095
#: Merge.rc:1105
-#: Merge.rc:1273
-#: Merge.rc:1337
-#: Merge.rc:1350
-#: Merge.rc:1442
-#: Merge.rc:1457
-#: Merge.rc:1679
+#: Merge.rc:1256
+#: Merge.rc:1320
+#: Merge.rc:1333
+#: Merge.rc:1425
+#: Merge.rc:1440
+#: Merge.rc:1662
#, c-format
msgid "OK"
-msgstr ""
+msgstr "TAMAM"
#: Merge.rc:680
#, c-format
msgid "Contributors"
-msgstr ""
+msgstr "Destekleyenler"
#: Merge.rc:687
#, c-format
msgid "Select Files or Folders"
-msgstr ""
+msgstr "Dosyalar\xFD veya Klas\xF6rleri Se\xE7"
#: Merge.rc:690
-#: Merge.rc:1608
+#: Merge.rc:1591
#, c-format
msgid "&Left:"
-msgstr ""
+msgstr "Sol:"
#: Merge.rc:694
#: Merge.rc:755
@@ -1128,52 +1129,52 @@
#: Merge.rc:1031
#, c-format
msgid "&Browse..."
-msgstr ""
+msgstr "G\xF6zat..."
#: Merge.rc:695
-#: Merge.rc:1612
+#: Merge.rc:1595
#, c-format
msgid "&Right:"
-msgstr ""
+msgstr "Sa\xF0:"
#: Merge.rc:699
#: Merge.rc:1042
#, c-format
msgid "Bro&wse..."
-msgstr ""
+msgstr "G\xF6zat..."
#: Merge.rc:700
-#: Merge.rc:1616
+#: Merge.rc:1599
#, c-format
msgid "&Filter:"
-msgstr ""
+msgstr "Filtre:"
#: Merge.rc:703
-#: Merge.rc:1618
+#: Merge.rc:1601
#, c-format
msgid "Select..."
-msgstr ""
+msgstr "Se\xE7..."
#: Merge.rc:704
#, c-format
msgid "&Unpacker:"
-msgstr ""
+msgstr "\xC7\xFDkart\xFDc\xFD:"
#: Merge.rc:707
#, c-format
msgid "&Select..."
-msgstr ""
+msgstr "Se\xE7..."
#: Merge.rc:708
-#: Merge.rc:1619
+#: Merge.rc:1602
#, c-format
msgid "&Include Subfolders"
-msgstr ""
+msgstr "Alt Klas\xF6rler Dahil"
#: Merge.rc:710
#, c-format
msgid "Status:"
-msgstr ""
+msgstr "Durum:"
#: Merge.rc:712
#: Merge.rc:742
@@ -1185,1639 +1186,1702 @@
#: Merge.rc:1096
#: Merge.rc:1106
#: Merge.rc:1157
-#: Merge.rc:1274
-#: Merge.rc:1351
-#: Merge.rc:1443
-#: Merge.rc:1458
-#: Merge.rc:1680
+#: Merge.rc:1257
+#: Merge.rc:1334
+#: Merge.rc:1426
+#: Merge.rc:1441
+#: Merge.rc:1663
#, c-format
msgid "Cancel"
-msgstr ""
+msgstr "\xDDptal"
#: Merge.rc:713
-#: Merge.rc:1352
+#: Merge.rc:1335
#, c-format
msgid "Help"
-msgstr ""
+msgstr "Yard\xFDm"
#: Merge.rc:714
#, c-format
msgid "Files or Folders to Compare"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr\xFDlacak Dosyalar veya Klas\xF6rler"
#: Merge.rc:721
#, c-format
msgid "Visual SourceSafe"
-msgstr ""
+msgstr "Visual SourceSafe"
#: Merge.rc:726
#, c-format
msgid "Database:"
-msgstr ""
+msgstr "Veritaban\xFD:"
#: Merge.rc:729
#, c-format
msgid "Project:"
-msgstr ""
+msgstr "Proje:"
#: Merge.rc:732
#, c-format
msgid "User:"
-msgstr ""
+msgstr "Kullan\xFDc\xFD:"
#: Merge.rc:734
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "\xDEifre:"
#: Merge.rc:736
#, c-format
msgid "Link to Destination VSS project"
-msgstr ""
+msgstr "VSS Projesine Ba\xF0lant\xFD"
#: Merge.rc:738
#: Merge.rc:881
#, c-format
msgid "Apply to all items"
-msgstr ""
+msgstr "T\xFCm \xD6gelere Uygula"
#: Merge.rc:740
#, c-format
msgid "Check Out"
-msgstr ""
+msgstr "\xC7\xFDk\xFD\xFE Kontrol\xFC"
#: Merge.rc:741
#: Merge.rc:877
#, c-format
msgid "Save As..."
-msgstr ""
+msgstr "Farkl\xFD Kaydet..."
#: Merge.rc:747
#, c-format
msgid "Versioning System"
-msgstr ""
+msgstr "S\xFCr\xFCmleme Sistemi"
#: Merge.rc:750
#, c-format
msgid "&Versioning System:"
-msgstr ""
+msgstr "S\xFCr\xFCmleme Sistemi:"
#: Merge.rc:753
-#: Merge.rc:2079
+#: Merge.rc:2083
#, c-format
msgid "&Path to cleartool.exe:"
-msgstr ""
+msgstr "'cleartool.exe' Dizini:"
#: Merge.rc:760
-#: Merge.rc:1955
+#: Merge.rc:1956
+#: Merge.rc:1969
#, c-format
msgid "General"
-msgstr ""
+msgstr "Genel"
#: Merge.rc:763
#, c-format
msgid "Automatically &scroll to first difference"
-msgstr ""
+msgstr "Otomatik Olarak \xDDlk Farka Git"
#: Merge.rc:766
#, c-format
msgid "&Disable Splash Screen"
-msgstr ""
+msgstr "A\xE7\xFDl\xFDr Pencereyi \xDDptal Et"
#: Merge.rc:768
#, c-format
msgid "Cl&ose windows with ESC"
-msgstr ""
+msgstr "Pencereleri ESC ile Kapat"
#: Merge.rc:770
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr ""
+msgstr "'A\xE7' \xDDleti\xFEim Kutusundaki Dizinleri Otomatik Do\xF0rula"
#: Merge.rc:773
-#, c-format
+#, fuzzy, c-format
msgid "All&ow only one instance to run"
-msgstr ""
+msgstr "Yaln\xFDzca Bir \xD6rne\xF0in \xC7al\xFD\xFEmas\xFDna \xDDzin Ver"
#: Merge.rc:775
#, c-format
msgid "As&k when closing multiple windows"
-msgstr ""
+msgstr "\xC7ok Say\xFDda Pencere Kapat\xFDl\xFDrken Sor"
#: Merge.rc:777
#, c-format
msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "Dosya Kar\xFE\xFDla\xFEt\xFDr\xFDrken Dosya Zaman\xFDn\xFD Koru"
#: Merge.rc:780
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "Ba\xFElang\xFD\xE7ta \"Dosyalar\xFD veya Klas\xF6rleri Se\xE7\" Penceresini G\xF6ster"
#: Merge.rc:782
#, c-format
msgid "O&pen-dialog Auto-Completion:"
-msgstr ""
+msgstr "'A\xE7' \xDD\xE7indeki Hedefi Otomatik Yaz:"
#: Merge.rc:785
#, c-format
msgid "Enable multiple compare windows for"
-msgstr ""
+msgstr "\xC7ok Say\xFDda Kar\xFE\xFDla\xFEt\xFDrma Penceresi Y\xFCkle"
#: Merge.rc:787
-#: Merge.rc:1631
+#: Merge.rc:1614
#, c-format
msgid "&Folder compare"
-msgstr ""
+msgstr "Klas\xF6r Kar\xFE\xFDla\xFEt\xFDr\xFDrken"
#: Merge.rc:789
-#: Merge.rc:1633
+#: Merge.rc:1616
#, c-format
msgid "Fil&e compare"
-msgstr ""
+msgstr "Dosya Kar\xFE\xFDla\xFEt\xFDr\xFDrken"
#: Merge.rc:791
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
+"\xC7ok kar\xFE\xFDla\xFE\xFDlan baz\xFD mesajlar\xFD gizleyebilirsiniz.\n"
+"T\xFCm mesajlar\xFD tekrar g\xF6r\xFCnebilir yapmak i\xE7in;\n"
+"'S\xFDf\xFDrla' d\xFC\xF0mesine bas\xFDn."
#: Merge.rc:793
#, c-format
msgid "Reset"
-msgstr ""
+msgstr "S\xFDf\xFDrla"
#: Merge.rc:800
#, c-format
msgid "Language"
-msgstr ""
+msgstr "Dil"
#: Merge.rc:807
#, c-format
msgid "Available languages:"
-msgstr ""
+msgstr "Y\xFCklenebilir Diller:"
#: Merge.rc:813
#, c-format
msgid "Find"
-msgstr ""
+msgstr "Bul"
#: Merge.rc:816
#: Merge.rc:843
#, c-format
msgid "Fi&nd what:"
-msgstr ""
+msgstr "Bul:"
#: Merge.rc:819
#: Merge.rc:849
#, c-format
msgid "Match &whole word only"
-msgstr ""
+msgstr "Tam S\xF6zc\xFC\xF0\xFC E\xFEle\xFEtir"
#: Merge.rc:821
#: Merge.rc:851
#, c-format
msgid "Match &case"
-msgstr ""
+msgstr "B\xFCy\xFCk-K\xFC\xE7\xFCk Harf E\xFEle\xFEtir"
#: Merge.rc:823
#: Merge.rc:853
#, c-format
msgid "Regular &expression"
-msgstr ""
+msgstr "Kurall\xFD \xDDfade"
#: Merge.rc:825
#, c-format
msgid "D&on't wrap end of file"
-msgstr ""
+msgstr "Dosyan\xFDn Sonuna Kayd\xFDrma!"
#: Merge.rc:828
#, c-format
msgid "Direction"
-msgstr ""
+msgstr "Y\xF6nerge"
#: Merge.rc:829
#, c-format
msgid "&Up"
-msgstr ""
+msgstr "Yukar\xFD"
#: Merge.rc:831
#, c-format
msgid "&Down"
-msgstr ""
+msgstr "A\xFEa\xF0\xFD"
#: Merge.rc:833
#: Merge.rc:863
#, c-format
msgid "&Find Next"
-msgstr ""
+msgstr "Sonrakini Bul"
#: Merge.rc:840
#, c-format
msgid "Replace"
-msgstr ""
+msgstr "De\xF0i\xFEtir"
#: Merge.rc:846
#, c-format
msgid "Re&place with:"
-msgstr ""
+msgstr "Yeni De\xF0er:"
#: Merge.rc:855
#, c-format
msgid "&Don't wrap end of file"
-msgstr ""
+msgstr "Dosyan\xFDn Sonuna Kayd\xFDrma!"
#: Merge.rc:858
#, c-format
msgid "Replace in"
-msgstr ""
+msgstr "Burada De\xF0i\xFEtir"
#: Merge.rc:859
#, c-format
msgid "&Selection"
-msgstr ""
+msgstr "Se\xE7im"
#: Merge.rc:861
#, c-format
msgid "Wh&ole file"
-msgstr ""
+msgstr "B\xFCt\xFCn Dosya"
#: Merge.rc:864
#, c-format
msgid "&Replace"
-msgstr ""
+msgstr "De\xF0i\xFEtir"
#: Merge.rc:865
#, c-format
msgid "Replace &All"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC De\xF0i\xFEtir"
#: Merge.rc:872
-#: Merge.rc:2201
-#, c-format
+#: Merge.rc:2205
+#, fuzzy, c-format
msgid "Rational ClearCase"
-msgstr ""
+msgstr "Rational ClearCase"
#: Merge.rc:875
#, c-format
msgid "CheckOut"
-msgstr ""
+msgstr "\xC7\xFDk\xFD\xFE Kontrol\xFC"
#: Merge.rc:880
-#: Merge.rc:1191
+#: Merge.rc:1175
#, c-format
msgid "Comments"
-msgstr ""
+msgstr "A\xE7\xFDklamalar"
#: Merge.rc:883
#, c-format
msgid "CheckIn after checkout"
-msgstr ""
+msgstr "\xC7\xFDk\xFD\xFE Kontrol\xFCnden Sonra Giri\xFE Kontrol\xFC"
#: Merge.rc:889
#, c-format
msgid "Linefilters"
-msgstr ""
+msgstr "Sat\xFDr Filtreleri"
#: Merge.rc:892
#, c-format
msgid "Enable Line Filters"
-msgstr ""
+msgstr "A\xFEa\xF0\xFDdaki Sat\xFDr Filtreleri Y\xFCklensin"
#: Merge.rc:895
#, c-format
msgid "Regular Expressions (one per line):"
-msgstr ""
+msgstr "Kurall\xFD \xDDfadeler (Bir Sat\xFDr Ba\xFE\xFDna D\xFC\xFEen):"
#: Merge.rc:902
#, c-format
msgid "Save"
-msgstr ""
+msgstr "Kaydet"
#: Merge.rc:903
#, c-format
msgid "New"
-msgstr ""
+msgstr "Yeni"
#: Merge.rc:904
#, c-format
msgid "Edit"
-msgstr ""
+msgstr "D\xFCzenle"
#: Merge.rc:905
#, c-format
msgid "Remove"
-msgstr ""
+msgstr "Kald\xFDr"
#: Merge.rc:910
-#: Merge.rc:1958
+#: Merge.rc:1959
#, c-format
msgid "Colors"
-msgstr ""
+msgstr "Renkler"
#: Merge.rc:913
#, c-format
msgid "Difference:"
-msgstr ""
+msgstr "Farkl\xFDl\xFDk:"
#: Merge.rc:917
#, c-format
msgid "Selected Difference:"
-msgstr ""
+msgstr "Se\xE7ili Farkl\xFDl\xFDk:"
#: Merge.rc:921
-#: Merge.rc:1583
+#: Merge.rc:1566
#, c-format
msgid "Background"
-msgstr ""
+msgstr "Arka Plan"
#: Merge.rc:922
#, c-format
msgid "Deleted"
-msgstr ""
+msgstr "Silinen"
#: Merge.rc:935
-#: Merge.rc:1378
-#: Merge.rc:1584
+#: Merge.rc:1361
+#: Merge.rc:1567
+#: Merge.rc:1960
#, c-format
msgid "Text"
-msgstr ""
+msgstr "Metin"
#: Merge.rc:939
#, c-format
msgid "Ignored Difference:"
-msgstr ""
+msgstr "Yok Say\xFDlan Farkl\xFDl\xFDk:"
#: Merge.rc:949
#, c-format
msgid "Moved:"
-msgstr ""
+msgstr "Ta\xFE\xFDnan:"
#: Merge.rc:959
#, c-format
msgid "Selected Moved:"
-msgstr ""
+msgstr "Se\xE7ili Ta\xFE\xFDnan:"
#: Merge.rc:966
#, c-format
msgid "Word Difference:"
-msgstr ""
+msgstr "S\xF6zc\xFCk Farkl\xFDl\xFD\xF0\xFD:"
#: Merge.rc:976
#, c-format
msgid "Selected Word Diff:"
-msgstr ""
+msgstr "Se\xE7ili S\xF6zc\xFCk Farkl\xFDl\xFD\xF0\xFD:"
#: Merge.rc:986
#: Merge.rc:1065
#: Merge.rc:1094
-#: Merge.rc:1194
-#: Merge.rc:1424
+#: Merge.rc:1177
+#: Merge.rc:1407
+#: Merge.rc:1699
#, c-format
msgid "Defaults"
-msgstr ""
+msgstr "Varsay\xFDlan Ayarlar"
#: Merge.rc:992
-#: Merge.rc:1366
-#: Merge.rc:1572
+#: Merge.rc:1349
+#: Merge.rc:1555
#, c-format
msgid "Dialog"
-msgstr ""
+msgstr "\xDDleti\xFEim"
#: Merge.rc:1002
-#: Merge.rc:1961
+#: Merge.rc:1962
#, c-format
msgid "System"
-msgstr ""
+msgstr "Sistem"
#: Merge.rc:1005
#, c-format
msgid "&Send deleted files to Recycle Bin"
-msgstr ""
+msgstr "Silinen Dosyalar\xFD Geri D\xF6n\xFC\xFE\xFCm Kutusuna G\xF6nder"
#: Merge.rc:1007
#, c-format
msgid "&External editor:"
-msgstr ""
+msgstr "Harici D\xFCzenleyici:"
#: Merge.rc:1010
#, c-format
msgid "&Filter folder:"
-msgstr ""
+msgstr "Filtre Klas\xF6r\xFC:"
#: Merge.rc:1012
#, c-format
msgid "B&rowse..."
-msgstr ""
+msgstr "G\xF6zat..."
#: Merge.rc:1013
#, c-format
msgid "Temporary files folder"
-msgstr ""
+msgstr "Ge\xE7ici Klas\xF6r Se\xE7iminizi Yap\xFDn\xFDz"
#: Merge.rc:1014
#, c-format
msgid "S&ystem's temp folder"
-msgstr ""
+msgstr "Ge\xE7ici Sistem Klas\xF6r\xFC"
#: Merge.rc:1016
#, c-format
msgid "C&ustom folder:"
-msgstr ""
+msgstr "\xD6zel Klas\xF6r:"
#: Merge.rc:1019
#: Merge.rc:1035
#, c-format
msgid "Br&owse..."
-msgstr ""
+msgstr "G\xF6zat..."
#: Merge.rc:1025
#, c-format
msgid "Patch Generator"
-msgstr ""
+msgstr "Yama Olu\xFEtur"
#: Merge.rc:1028
#, c-format
msgid "File&1:"
-msgstr ""
+msgstr "Dosya &1:"
#: Merge.rc:1032
#, c-format
msgid "File&2:"
-msgstr ""
+msgstr "Dosya &2:"
#: Merge.rc:1036
#, c-format
msgid "&Swap"
-msgstr ""
+msgstr "Yer De\xF0i\xFEtir"
#: Merge.rc:1037
#, c-format
msgid "&Append to existing file"
-msgstr ""
+msgstr "Dosyaya Sonu\xE7 Ekle"
#: Merge.rc:1039
#, c-format
msgid "&Result:"
-msgstr ""
+msgstr "Sonu\xE7:"
#: Merge.rc:1043
#, c-format
msgid "&Format"
-msgstr ""
+msgstr "Bi\xE7im"
#: Merge.rc:1044
#, c-format
msgid "St&yle:"
-msgstr ""
+msgstr "T\xFCr:"
#: Merge.rc:1047
-#, c-format
+#, fuzzy, c-format
msgid "&Context:"
-msgstr ""
+msgstr "S\xFDn\xFDr:"
#: Merge.rc:1050
#, c-format
msgid "W&hitespaces"
-msgstr ""
+msgstr "Bo\xFEluklar"
#: Merge.rc:1051
#, c-format
msgid "Com&pare"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr"
#: Merge.rc:1053
#, c-format
msgid "I&gnore changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri Yok Say"
#: Merge.rc:1055
#, c-format
msgid "Ig&nore all"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC Yok Say"
#: Merge.rc:1057
#, c-format
msgid "Ignor&e blank lines"
-msgstr ""
+msgstr "Bo\xFE Sat\xFDrlar\xFD Yok Say"
#: Merge.rc:1059
#, c-format
msgid "Case sensi&tive"
-msgstr ""
+msgstr "B\xFCy\xFCk-K\xFC\xE7\xFCk Harf Duyarl\xFDl\xFD\xF0\xFD"
#: Merge.rc:1061
#, c-format
msgid "Inclu&de command line"
-msgstr ""
+msgstr "Komut Sat\xFDr\xFDn\xFD Dahil Et"
#: Merge.rc:1063
#, c-format
msgid "Open to e&xternal editor"
-msgstr ""
+msgstr "Harici D\xFCzenleyici \xDDle A\xE7"
#: Merge.rc:1085
#, c-format
msgid "Display Columns"
-msgstr ""
+msgstr "S\xFCtunlar\xFD G\xF6ster"
#: Merge.rc:1091
#, c-format
msgid "Move &Up"
-msgstr ""
+msgstr "Yukar\xFD Ta\xFE\xFD"
#: Merge.rc:1092
#, c-format
msgid "Move &Down"
-msgstr ""
+msgstr "A\xFEa\xF0\xFD Ta\xFE\xFD"
#: Merge.rc:1102
#, c-format
msgid "Select Unpacker"
-msgstr ""
+msgstr "\xC7\xFDkart\xFDc\xFD Se\xE7"
#: Merge.rc:1107
#, c-format
msgid "File unpacker:"
-msgstr ""
+msgstr "Dosya \xC7\xFDkart\xFDc\xFD:"
#: Merge.rc:1110
#, c-format
msgid "Display all unpackers, don't check the extension"
-msgstr ""
+msgstr "Uzant\xFDs\xFDna Bakmadan T\xFCm \xC7\xFDkart\xFDc\xFDlar\xFD G\xF6ster"
#: Merge.rc:1113
#, c-format
msgid "Extensions list:"
-msgstr ""
+msgstr "Uzant\xFD Listesi:"
#: Merge.rc:1114
#, c-format
msgid "Description:"
-msgstr ""
+msgstr "Tan\xFDm:"
#: Merge.rc:1125
#, c-format
msgid " Folder Compare Progress"
-msgstr ""
+msgstr "Klas\xF6r Kar\xFE\xFDla\xFEt\xFDrma \xDD\xFElemi"
#: Merge.rc:1128
-#: Merge.rc:1908
+#: Merge.rc:1909
#, c-format
msgid "Stop"
-msgstr ""
+msgstr "Dur"
#: Merge.rc:1133
#, c-format
msgid "Comparing items..."
-msgstr ""
+msgstr "\xD6geler Kar\xFE\xFDla\xFEt\xFDr\xFDl\xFDyor..."
#: Merge.rc:1134
#, c-format
msgid "Items compared:"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr\xFDlan \xD6geler:"
#: Merge.rc:1135
#, c-format
msgid "Items total:"
-msgstr ""
+msgstr "Toplam \xD6geler:"
#: Merge.rc:1141
#, c-format
msgid "Go To"
-msgstr ""
+msgstr "Git"
#: Merge.rc:1144
#, c-format
msgid "G&oto:"
-msgstr ""
+msgstr "Git:"
#: Merge.rc:1146
#, c-format
msgid "File"
-msgstr ""
+msgstr "Dosya"
#: Merge.rc:1151
#, c-format
msgid "Goto what"
-msgstr ""
+msgstr "Git"
#: Merge.rc:1152
#, c-format
msgid "Li&ne"
-msgstr ""
+msgstr "Sat\xFDr"
#: Merge.rc:1154
#, c-format
msgid "&Difference"
-msgstr ""
+msgstr "Farkl\xFDl\xFDk"
#: Merge.rc:1156
#, c-format
msgid "&Go To"
-msgstr ""
+msgstr "Git"
#: Merge.rc:1162
-#: Merge.rc:1956
+#: Merge.rc:1957
#, c-format
msgid "Compare"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDrma"
#: Merge.rc:1165
#, c-format
msgid "Whitespace"
-msgstr ""
+msgstr "Bo\xFEluk"
#: Merge.rc:1166
#, c-format
msgid "&Compare"
-msgstr ""
+msgstr "Kar\xFE\xFDla\xFEt\xFDr"
-#: Merge.rc:1168
+#: Merge.rc:1167
#, c-format
msgid "&Ignore change"
-msgstr ""
+msgstr "De\xF0i\xFEikli\xF0i Yok Say"
-#: Merge.rc:1170
+#: Merge.rc:1168
#, c-format
msgid "I&gnore all"
-msgstr ""
+msgstr "T\xFCm\xFCn\xFC Yok Say"
-#: Merge.rc:1172
+#: Merge.rc:1169
#, c-format
msgid "Ignore blan&k lines"
-msgstr ""
+msgstr "Bo\xFE Sat\xFDrlar\xFD Yok Say"
-#: Merge.rc:1174
+#: Merge.rc:1170
#, c-format
msgid "Ignore &case"
-msgstr ""
+msgstr "B\xFCy\xFCk-K\xFC\xE7\xFCk Harf Umursama"
-#: Merge.rc:1176
+#: Merge.rc:1171
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "Sat\xFDrba\xFE\xFD Farkl\xFDl\xFDklar\xFDn\xFD Yok Say (Windows/Unix/Mac)"
-#: Merge.rc:1179
+#: Merge.rc:1173
#, c-format
msgid "E&nable moved block detection"
-msgstr ""
+msgstr "Ta\xFE\xFDnan Blok Tespitini Y\xFCkle"
-#: Merge.rc:1181
+#: Merge.rc:1174
#, c-format
msgid "&Match similar lines"
-msgstr ""
+msgstr "Benzer Sat\xFDrlar\xFD E\xFEle\xFEtir"
-#: Merge.rc:1183
+#: Merge.rc:1176
#, c-format
-msgid "Ign&ore time differences less than 3 seconds"
-msgstr ""
-
-#: Merge.rc:1186
-#, c-format
-msgid "&File Compare method:"
-msgstr ""
-
-#: Merge.rc:1189
-#, c-format
-msgid "S&top after first difference"
-msgstr ""
-
-#: Merge.rc:1192
-#, c-format
msgid "Filter Comments"
-msgstr ""
+msgstr "Filtre A\xE7\xFDklamalar\xFD"
-#: Merge.rc:1199
-#: Merge.rc:1957
+#: Merge.rc:1182
+#: Merge.rc:1958
#, c-format
msgid "Editor"
-msgstr ""
+msgstr "D\xFCzenleyici"
-#: Merge.rc:1202
+#: Merge.rc:1185
#, c-format
msgid "&Highlight syntax"
-msgstr ""
+msgstr "S\xF6zdizimi Vurgusu"
-#: Merge.rc:1204
+#: Merge.rc:1187
#, c-format
msgid "&Automatic rescan"
-msgstr ""
+msgstr "Otomatik Olarak Yeniden Tara"
-#: Merge.rc:1206
+#: Merge.rc:1189
#, c-format
msgid "&Preserve original EOL chars"
-msgstr ""
+msgstr "Orijinal Sat\xFDr Sonu (K\xFDsaca SS) Karakterlerini Koru"
-#: Merge.rc:1208
+#: Merge.rc:1191
#, c-format
msgid "Tabs"
-msgstr ""
+msgstr "Girinti Ayarlar\xFD"
-#: Merge.rc:1209
+#: Merge.rc:1192
#, c-format
msgid "&Tab size:"
-msgstr ""
+msgstr "Sekme Geni\xFEli\xF0i:"
-#: Merge.rc:1212
+#: Merge.rc:1195
#, c-format
msgid "&Insert Tabs"
-msgstr ""
+msgstr "Sekme Ekle"
-#: Merge.rc:1214
+#: Merge.rc:1197
#, c-format
msgid "Insert &Spaces"
-msgstr ""
+msgstr "Bo\xFEluk Ekle"
-#: Merge.rc:1216
+#: Merge.rc:1199
#, c-format
msgid "Line Difference Coloring"
-msgstr ""
+msgstr "Sat\xFDr Farkl\xFDl\xFDklar\xFDn\xFD Renklendir"
-#: Merge.rc:1218
+#: Merge.rc:1201
#, c-format
msgid "View line differences"
-msgstr ""
+msgstr "Sat\xFDr Farkl\xFDl\xFDklar\xFDn\xFD G\xF6ster"
-#: Merge.rc:1220
+#: Merge.rc:1203
#, c-format
msgid "&Character level"
-msgstr ""
+msgstr "Karakter B\xF6l\xFCm\xFC"
-#: Merge.rc:1222
+#: Merge.rc:1205
#, c-format
msgid "&Word-level:"
-msgstr ""
+msgstr "S\xF6zc\xFCk B\xF6l\xFCm\xFC:"
-#: Merge.rc:1226
+#: Merge.rc:1209
#, c-format
msgid "W&ord break characters:"
msgstr ""
-#: Merge.rc:1239
+#: Merge.rc:1222
#, c-format
msgid "Filefilters"
-msgstr ""
+msgstr "Dosya Filtreleri"
-#: Merge.rc:1245
+#: Merge.rc:1228
#, c-format
msgid "Test"
-msgstr ""
+msgstr "Dene"
-#: Merge.rc:1246
+#: Merge.rc:1229
#, c-format
msgid "Install..."
-msgstr ""
+msgstr "Y\xFCkle..."
-#: Merge.rc:1247
+#: Merge.rc:1230
#, c-format
msgid "New..."
-msgstr ""
+msgstr "Yeni..."
-#: Merge.rc:1248
+#: Merge.rc:1231
#, c-format
msgid "Edit..."
-msgstr ""
+msgstr "D\xFCzenle..."
-#: Merge.rc:1249
+#: Merge.rc:1232
#, c-format
msgid "Delete..."
-msgstr ""
+msgstr "Sil..."
-#: Merge.rc:1255
+#: Merge.rc:1238
#, c-format
msgid "Save modified files?"
-msgstr ""
+msgstr "Dosya De\xF0i\xFEiklikleri Kaydedilsin mi?"
-#: Merge.rc:1258
+#: Merge.rc:1241
#, c-format
msgid "Left side file"
-msgstr ""
+msgstr "Sol Taraftaki Dosya"
-#: Merge.rc:1261
+#: Merge.rc:1244
#, c-format
msgid "&Save changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri Kaydet"
-#: Merge.rc:1263
+#: Merge.rc:1246
#, c-format
msgid "&Discard changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri \xDDptal Et"
-#: Merge.rc:1265
+#: Merge.rc:1248
#, c-format
msgid "Right side file"
-msgstr ""
+msgstr "Sa\xF0 Taraftaki Dosya"
-#: Merge.rc:1268
+#: Merge.rc:1251
#, c-format
msgid "S&ave changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri Kaydet"
-#: Merge.rc:1270
+#: Merge.rc:1253
#, c-format
msgid "Dis&card changes"
-msgstr ""
+msgstr "De\xF0i\xFEiklikleri \xDDptal Et"
-#: Merge.rc:1272
+#: Merge.rc:1255
#, c-format
msgid "Disca&rd All"
msgstr ""
-#: Merge.rc:1279
-#: Merge.rc:1527
-#: Merge.rc:1963
+#: Merge.rc:1262
+#: Merge.rc:1510
+#: Merge.rc:1964
#, c-format
msgid "Codepage"
-msgstr ""
+msgstr "Kod Sayfas\xFD"
-#: Merge.rc:1282
+#: Merge.rc:1265
#, c-format
msgid "Default Codepage"
-msgstr ""
+msgstr "Varsay\xFDlan Kod Sayfas\xFD"
-#: Merge.rc:1283
+#: Merge.rc:1266
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
-msgstr ""
+msgstr "Unicode Olmayan Dosyalar Y\xFCklenirken Dikkate Al\xFDnacak Varsay\xFDlan Kod Sayfas\xFDn\xFD Se\xE7iniz:"
-#: Merge.rc:1285
+#: Merge.rc:1268
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
+msgid ""
+"Detect codepage info for these files: .html, .rc, .xml \n"
+"need to restart session"
msgstr ""
+"Bu Dosyalar \xDD\xE7in Kod Sayfas\xFD Bilgisi Ara: .html, .rc, .xml \n"
+"Oturumu Yeniden Ba\xFElatmak Gerekir"
-#: Merge.rc:1288
+#: Merge.rc:1271
#, c-format
msgid "System codepage"
-msgstr ""
+msgstr "Sistem Kod Sayfas\xFD"
-#: Merge.rc:1290
+#: Merge.rc:1273
#, c-format
msgid "According to WinMerge User Interface"
-msgstr ""
+msgstr "WinMerge Kullan\xFDc\xFD Aray\xFCz\xFC"
-#: Merge.rc:1292
+#: Merge.rc:1275
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "\xD6zel Kod Sayfas\xFD:"
-#: Merge.rc:1300
+#: Merge.rc:1283
#, c-format
msgid "WinMerge - Archive support disabled"
-msgstr ""
+msgstr "WinMerge - S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i Kapal\xFD"
-#: Merge.rc:1303
+#: Merge.rc:1286
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
-msgstr ""
+msgstr "7-Zip Tespit Edilemedi (Ya da Y\xFCkl\xFC De\xF0il ?)"
-#: Merge.rc:1306
+#: Merge.rc:1289
#, c-format
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
"essential components to be copied to the program directory for standalone operation."
msgstr ""
+"S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i \xDD\xE7in;\n"
+"7-Zip'in 3.11 Ya da Daha \xDCst S\xFCr\xFCm\xFCn\xFCn Kurulu Olmas\xFD Gerekir,\n"
+"Veya Program Dizinine 7-Zip Temel Par\xE7alar\xFDn\xFD Kopyalaman\xFDz Gerekir."
-#: Merge.rc:1308
+#: Merge.rc:1291
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
-msgstr ""
+msgstr "Orada Ayr\xFDca Bir Aray\xFCz Eklentisi (Merge7z*.dll) Olmal\xFDd\xFDr."
-#: Merge.rc:1310
+#: Merge.rc:1293
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
"versions become available."
msgstr ""
+"Aray\xFCz Eklentileri \xDD\xE7in Son S\xFCr\xFCmler Daha Uygun Oldu\xF0undan,\n"
+"L\xFCtfen A\xFEa\xF0\xFDda \xD6nerilen 7-Zip S\xFCr\xFCm\xFCn\xFC Kullan\xFDn\xFDz."
-#: Merge.rc:1312
+#: Merge.rc:1295
#, c-format
msgid "Version"
-msgstr ""
+msgstr "S\xFCr\xFCm"
-#: Merge.rc:1314
+#: Merge.rc:1297
#, c-format
msgid ""
"Plugin required\n"
"(dllbuild %04u)"
msgstr ""
+"Gereken Eklenti\n"
+"(dllbuild %04u)"
-#: Merge.rc:1316
+#: Merge.rc:1299
#, c-format
msgid "Recommended version of 7-Zip:"
-msgstr ""
+msgstr "\xD6nerilen 7-Zip S\xFCr\xFCm\xFC:"
-#: Merge.rc:1319
-#: Merge.rc:1322
+#: Merge.rc:1302
+#: Merge.rc:1305
#, c-format
msgid "present"
-msgstr ""
+msgstr "Mevcut"
-#: Merge.rc:1320
+#: Merge.rc:1303
#, c-format
msgid "Merge7z000U.dll"
-msgstr ""
+msgstr "Merge7z000U.dll"
-#: Merge.rc:1323
+#: Merge.rc:1306
#, c-format
msgid "7-Zip software installed on your computer:"
-msgstr ""
+msgstr "Bilgisayar\xFDn\xFDzda Y\xFCkl\xFC 7-Zip Yaz\xFDl\xFDm\xFD:"
-#: Merge.rc:1325
-#: Merge.rc:1330
+#: Merge.rc:1308
+#: Merge.rc:1313
#, c-format
msgid "none"
-msgstr ""
+msgstr "Yok"
-#: Merge.rc:1327
+#: Merge.rc:1310
#, c-format
msgid "missing"
-msgstr ""
+msgstr "Yok"
-#: Merge.rc:1328
+#: Merge.rc:1311
#, c-format
msgid "7-Zip components for standalone operation:"
-msgstr ""
+msgstr "7-Zip Temel Par\xE7alar\xFD:"
-#: Merge.rc:1332
+#: Merge.rc:1315
#, c-format
msgid "outdated"
-msgstr ""
+msgstr "Zaman\xFD Ge\xE7mi\xFE"
-#: Merge.rc:1333
+#: Merge.rc:1316
#, c-format
msgid "Plugins on path:"
-msgstr ""
+msgstr "Eklentilerin Oldu\xF0u Dizin:"
-#: Merge.rc:1334
+#: Merge.rc:1317
#, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
msgstr ""
+"Bu Mesaj\xFD Tekrar G\xF6sterme!\n"
+"(Bu Mesaj\xFD Yeniden G\xF6rmek \xDD\xE7in Yard\xFDm Men\xFCs\xFCn\xFC Kullanabilirsiniz.)"
-#: Merge.rc:1338
+#: Merge.rc:1321
#, c-format
msgid "Plugin Download"
-msgstr ""
+msgstr "Eklenti \xDDndir"
-#: Merge.rc:1347
+#: Merge.rc:1330
#, c-format
msgid "Options"
-msgstr ""
+msgstr "Ayarlar"
-#: Merge.rc:1358
+#: Merge.rc:1341
#, c-format
msgid " Categories"
-msgstr ""
+msgstr " KATEGOR\xDDLER"
-#: Merge.rc:1360
+#: Merge.rc:1343
#, c-format
msgid "Import..."
-msgstr ""
+msgstr "\xDD\xE7e Aktar..."
-#: Merge.rc:1361
+#: Merge.rc:1344
#, c-format
msgid "Export..."
-msgstr ""
+msgstr "D\xFD\xFEa Aktar..."
-#: Merge.rc:1369
+#: Merge.rc:1352
#, c-format
msgid "Keywords:"
-msgstr ""
+msgstr "Anahtar S\xF6zc\xFCkler:"
-#: Merge.rc:1370
+#: Merge.rc:1353
#, c-format
msgid "Function names:"
-msgstr ""
+msgstr "Fonksiyon Adlar\xFD:"
-#: Merge.rc:1371
+#: Merge.rc:1354
#, c-format
msgid "Comments:"
-msgstr ""
+msgstr "A\xE7\xFDklamalar:"
-#: Merge.rc:1372
+#: Merge.rc:1355
#, c-format
msgid "Numbers:"
-msgstr ""
+msgstr "Numaralar:"
-#: Merge.rc:1373
+#: Merge.rc:1356
#, c-format
msgid "Operators:"
-msgstr ""
+msgstr "\xDD\xFElemciler:"
-#: Merge.rc:1374
+#: Merge.rc:1357
#, c-format
msgid "Strings:"
-msgstr ""
+msgstr "Dizgiler:"
-#: Merge.rc:1375
+#: Merge.rc:1358
#, c-format
msgid "Preprocessor:"
-msgstr ""
+msgstr "\xD6ni\xFElemci:"
-#: Merge.rc:1376
+#: Merge.rc:1359
#, c-format
msgid "User 1:"
-msgstr ""
+msgstr "Kullan\xFDc\xFD 1:"
-#: Merge.rc:1377
+#: Merge.rc:1360
#, c-format
msgid "User 2:"
-msgstr ""
+msgstr "Kullan\xFDc\xFD 2:"
-#: Merge.rc:1382
-#: Merge.rc:1387
-#: Merge.rc:1392
-#: Merge.rc:1397
-#: Merge.rc:1402
-#: Merge.rc:1407
-#: Merge.rc:1412
-#: Merge.rc:1417
-#: Merge.rc:1422
+#: Merge.rc:1365
+#: Merge.rc:1370
+#: Merge.rc:1375
+#: Merge.rc:1380
+#: Merge.rc:1385
+#: Merge.rc:1390
+#: Merge.rc:1395
+#: Merge.rc:1400
+#: Merge.rc:1405
#, c-format
msgid "Bold"
-msgstr ""
+msgstr "Kal\xFDn"
-#: Merge.rc:1430
+#: Merge.rc:1413
#, c-format
msgid "Folder Compare Report"
-msgstr ""
+msgstr "Klas\xF6r Kar\xFE\xFDla\xFEt\xFDrma Raporu"
-#: Merge.rc:1433
+#: Merge.rc:1416
#, c-format
msgid "Report &File:"
-msgstr ""
+msgstr "Rapor Dosyas\xFD:"
-#: Merge.rc:1436
-#: Merge.rc:1610
-#: Merge.rc:1614
-#: Merge.rc:1641
+#: Merge.rc:1419
+#: Merge.rc:1593
+#: Merge.rc:1597
+#: Merge.rc:1624
#, c-format
msgid "Browse..."
-msgstr ""
+msgstr "G\xF6zat..."
-#: Merge.rc:1437
+#: Merge.rc:1420
#, c-format
msgid "&Style:"
-msgstr ""
+msgstr "Rapor T\xFCr\xFC:"
-#: Merge.rc:1440
+#: Merge.rc:1423
#, c-format
msgid "&Copy to Clipboard"
-msgstr ""
+msgstr "Panoya Kopyala"
-#: Merge.rc:1448
+#: Merge.rc:1431
#, c-format
msgid "Shared or Private Filter"
-msgstr ""
+msgstr "\xD6zel Veya Ortak Filtre"
-#: Merge.rc:1451
+#: Merge.rc:1434
#, c-format
msgid "Which type of filter do you want to create?"
-msgstr ""
+msgstr "Ne T\xFCr Filtre Haz\xFDrlamak \xDDstiyorsunuz?"
-#: Merge.rc:1453
+#: Merge.rc:1436
#, c-format
msgid "Shared Filter (for all users on this machine)"
-msgstr ""
+msgstr "Ortak Filtre (T\xFCm Kullan\xFDc\xFDlar \xDD\xE7in)"
-#: Merge.rc:1455
+#: Merge.rc:1438
#, c-format
msgid "Private Filter (only for current user)"
-msgstr ""
+msgstr "\xD6zel Filtre (Sadece Ge\xE7erli Kullan\xFDc\xFD \xDD\xE7in)"
-#: Merge.rc:1463
-#: Merge.rc:1964
+#: Merge.rc:1446
+#: Merge.rc:1965
#, c-format
msgid "Archive Support"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i"
-#: Merge.rc:1466
+#: Merge.rc:1449
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0i \xDD\xE7in 7-Zip Eklentisi Kurulu Olmal\xFDd\xFDr:"
-#: Merge.rc:1468
+#: Merge.rc:1451
#, c-format
msgid "Download 7-zip Plugin"
-msgstr ""
+msgstr "7-Zip Eklentisi \xDDndir"
-#: Merge.rc:1469
+#: Merge.rc:1452
#, c-format
msgid "&Enable archive file support"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDr\xFDlm\xFD\xFE Dosya Deste\xF0ini Y\xFCkle"
-#: Merge.rc:1471
+#: Merge.rc:1454
#, c-format
msgid "&Use stand-alone 7-Zip if available"
-msgstr ""
+msgstr "Varsa Kurulu 7-Zip Program\xFDn\xFD Kullan"
-#: Merge.rc:1474
+#: Merge.rc:1457
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
-msgstr ""
+msgstr "WinMerge Klas\xF6r\xFCndeki 7-Zip'i Kullan"
-#: Merge.rc:1476
+#: Merge.rc:1459
#, c-format
msgid "&Detect archive type from file signature"
-msgstr ""
+msgstr "S\xFDk\xFD\xFEt\xFDrma T\xFCr\xFCn\xFC Tespit Et"
-#: Merge.rc:1484
+#: Merge.rc:1467
#, c-format
msgid "Compare Statistics"
-msgstr ""
+msgstr "Say\xFDsal Verileri Kar\xFE\xFDla\xFEt\xFDr"
-#: Merge.rc:1487
+#: Merge.rc:1470
#, c-format
msgid "Folders:"
-msgstr ""
+msgstr "Klas\xF6rler:"
-#: Merge.rc:1488
+#: Merge.rc:1471
#, c-format
msgid "Files:"
-msgstr ""
+msgstr "Dosyalar:"
-#: Merge.rc:1489
-#: Merge.rc:2355
+#: Merge.rc:1472
+#: Merge.rc:2359
#, c-format
msgid "Different"
-msgstr ""
+msgstr "Farkl\xFDl\xFDk"
-#: Merge.rc:1490
+#: Merge.rc:1473
#, c-format
msgid "Text:"
-msgstr ""
+msgstr "Metin:"
-#: Merge.rc:1493
-#: Merge.rc:1512
-#, c-format
+#: Merge.rc:1476
+#: Merge.rc:1495
+#, fuzzy, c-format
msgid "Binary:"
-msgstr ""
+msgstr "Binary:"
-#: Merge.rc:1496
+#: Merge.rc:1479
#, c-format
msgid "Unique"
-msgstr ""
+msgstr "Benzersiz"
-#: Merge.rc:1497
+#: Merge.rc:1480
#, c-format
msgid "Left:"
-msgstr ""
+msgstr "Sol:"
-#: Merge.rc:1502
+#: Merge.rc:1485
#, c-format
msgid "Right:"
-msgstr ""
+msgstr "Sa\xF0:"
-#: Merge.rc:1507
-#: Merge.rc:2349
+#: Merge.rc:1490
+#: Merge.rc:2353
#, c-format
msgid "Identical"
-msgstr ""
+msgstr "Ayn\xFD"
-#: Merge.rc:1516
+#: Merge.rc:1499
#, c-format
msgid "Total:"
-msgstr ""
+msgstr "Toplam:"
-#: Merge.rc:1521
+#: Merge.rc:1504
#, c-format
msgid "Close"
-msgstr ""
+msgstr "Kapat"
-#: Merge.rc:1530
+#: Merge.rc:1513
#, c-format
msgid "Affects"
-msgstr ""
+msgstr "Etkiler"
-#: Merge.rc:1533
-#: Merge.rc:1536
+#: Merge.rc:1516
+#: Merge.rc:1519
#, c-format
msgid "(Affects)"
-msgstr ""
+msgstr "(Etkiler)"
-#: Merge.rc:1537
+#: Merge.rc:1520
#, c-format
msgid "Select Codepage for"
-msgstr ""
+msgstr "Kod Sayfas\xFD Se\xE7"
-#: Merge.rc:1538
+#: Merge.rc:1521
#, c-format
msgid "&File Loading:"
-msgstr ""
+msgstr "Dosya Y\xFCkleniyor:"
-#: Merge.rc:1540
-#: Merge.rc:1543
+#: Merge.rc:1523
+#: Merge.rc:1526
#, c-format
msgid "..."
-msgstr ""
+msgstr "..."
-#: Merge.rc:1541
+#: Merge.rc:1524
#, c-format
msgid "File &Saving:"
-msgstr ""
+msgstr "Dosya Kaydediliyor:"
-#: Merge.rc:1544
+#: Merge.rc:1527
#, c-format
msgid "&Use same codepage for both"
-msgstr ""
+msgstr "\xDDkisi \xDD\xE7in Ayn\xFD Kod Sayfas\xFDn\xFD Kullan"
-#: Merge.rc:1547
+#: Merge.rc:1530
#, c-format
msgid "&Apply"
-msgstr ""
+msgstr "Uygula"
-#: Merge.rc:1548
-#: Merge.rc:1930
+#: Merge.rc:1531
+#: Merge.rc:1931
#, c-format
msgid "&Cancel"
-msgstr ""
+msgstr "\xDDptal"
-#: Merge.rc:1553
+#: Merge.rc:1536
#, c-format
msgid "Test Filter"
-msgstr ""
+msgstr "Filtreyi Dene"
-#: Merge.rc:1556
+#: Merge.rc:1539
#, c-format
msgid "Testing filter ..."
-msgstr ""
+msgstr "Filtre Deneniyor..."
-#: Merge.rc:1558
+#: Merge.rc:1541
#, c-format
msgid "&Enter text to test:"
-msgstr ""
+msgstr "Deneme Metni Giriniz:"
-#: Merge.rc:1560
+#: Merge.rc:1543
#, c-format
msgid "&Folder Name"
-msgstr ""
+msgstr "Klas\xF6r Ad\xFD"
-#: Merge.rc:1562
+#: Merge.rc:1545
#, c-format
msgid "Result:"
-msgstr ""
+msgstr "Sonu\xE7:"
-#: Merge.rc:1566
+#: Merge.rc:1549
#, c-format
msgid "&Test"
-msgstr ""
+msgstr "Dene"
-#: Merge.rc:1567
+#: Merge.rc:1550
#, c-format
msgid "&Close"
-msgstr ""
+msgstr "Kapat"
-#: Merge.rc:1575
+#: Merge.rc:1558
#, c-format
msgid "&Use customized text colors"
-msgstr ""
+msgstr "\xD6zel Metin Rengi Kullan"
-#: Merge.rc:1578
+#: Merge.rc:1561
#, c-format
msgid "Custom text colors"
-msgstr ""
+msgstr "\xD6zel Metin Renkleri"
-#: Merge.rc:1580
+#: Merge.rc:1563
#, c-format
msgid "Whitespace:"
-msgstr ""
+msgstr "Bo\xFEluk:"
-#: Merge.rc:1581
+#: Merge.rc:1564
#, c-format
msgid "Regular text:"
-msgstr ""
+msgstr "Normal Metin:"
-#: Merge.rc:1582
+#: Merge.rc:1565
#, c-format
msgid "Selection:"
-msgstr ""
+msgstr "Se\xE7im:"
-#: Merge.rc:1605
+#: Merge.rc:1588
#, c-format
msgid "Paths"
-msgstr ""
+msgstr "Dizinler"
-#: Merge.rc:1611
+#: Merge.rc:1594
#, c-format
msgid "R&ead-only"
-msgstr ""
+msgstr "Salt Okunur"
-#: Merge.rc:1615
+#: Merge.rc:1598
#, c-format
msgid "Re&ad-only"
-msgstr ""
+msgstr "Salt Okunur"
-#: Merge.rc:1621
+#: Merge.rc:1604
#, c-format
msgid "Open..."
-msgstr ""
+msgstr "A\xE7..."
-#: Merge.rc:1622
+#: Merge.rc:1605
#, c-format
msgid "Save..."
-msgstr ""
+msgstr "Kaydet..."
-#: Merge.rc:1627
-#: Merge.rc:1965
+#: Merge.rc:1610
+#: Merge.rc:1966
#, c-format
msgid "Backup Files"
-msgstr ""
+msgstr "Yedek Dosyalar\xFD"
-#: Merge.rc:1630
+#: Merge.rc:1613
#, c-format
msgid "Create backup files in:"
-msgstr ""
+msgstr "Yedek Al:"
-#: Merge.rc:1635
+#: Merge.rc:1618
#, c-format
msgid "Create backup files into:"
-msgstr ""
+msgstr "Yedek Dosyalar\xFDn\xFDn Olu\xFEturulaca\xF0\xFD Yer:"
-#: Merge.rc:1636
+#: Merge.rc:1619
#, c-format
msgid "&Original file's folder"
-msgstr ""
+msgstr "Orijinal Dosyan\xFDn Oldu\xF0u Klas\xF6r"
-#: Merge.rc:1638
+#: Merge.rc:1621
#, c-format
msgid "&Global backup folder:"
-msgstr ""
+msgstr "Yedekler \xDD\xE7in \xD6zel Bir Klas\xF6r Belirle:"
-#: Merge.rc:1642
+#: Merge.rc:1625
#, c-format
msgid "Backup filename:"
-msgstr ""
+msgstr "Yedek Dosyas\xFD Adland\xFDr\xFDl\xFDrken:"
-#: Merge.rc:1643
+#: Merge.rc:1626
#, c-format
msgid "&Append .bak -extension"
-msgstr ""
+msgstr "Sonuna '.bak' Uzant\xFDs\xFD Ekle"
-#: Merge.rc:1645
+#: Merge.rc:1628
#, c-format
msgid "A&ppend timestamp"
-msgstr ""
+msgstr "Sonuna Tarih Damgas\xFD Ekle"
-#: Merge.rc:1652
-#: Merge.rc:2257
+#: Merge.rc:1635
+#: Merge.rc:2261
#, c-format
msgid "Confirm Copy"
-msgstr ""
+msgstr "Kopyay\xFD Do\xF0rula"
-#: Merge.rc:1656
+#: Merge.rc:1639
#, c-format
msgid "Are you sure you want to copy XXX items?"
-msgstr ""
+msgstr "XXX \xD6gelerini Kopyalamak \xDDstedi\xF0inize Emin misiniz?"
-#: Merge.rc:1658
+#: Merge.rc:1641
#, c-format
msgid "From left"
-msgstr ""
+msgstr "Soldan"
-#: Merge.rc:1661
+#: Merge.rc:1644
#, c-format
msgid "To right"
-msgstr ""
+msgstr "Sa\xF0a"
-#: Merge.rc:1664
+#: Merge.rc:1647
#, c-format
msgid "Yes"
-msgstr ""
+msgstr "Evet"
-#: Merge.rc:1665
+#: Merge.rc:1648
#, c-format
msgid "No"
-msgstr ""
+msgstr "Hay\xFDr"
-#: Merge.rc:1671
+#: Merge.rc:1654
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Eklentiler"
-#: Merge.rc:1674
+#: Merge.rc:1657
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "Eklentileri Y\xFCkle"
-#: Merge.rc:1685
-#: Merge.rc:1966
+#: Merge.rc:1668
+#: Merge.rc:1967
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Sa\xF0 Tu\xFE Eklentisi"
-#: Merge.rc:1688
+#: Merge.rc:1671
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "WinMerge'i Sa\xF0 Tu\xFEa Eklemek \xDDster misiniz?"
-#: Merge.rc:1689
+#: Merge.rc:1672
#, c-format
msgid "E&nable advanced menu"
-msgstr ""
+msgstr "Geli\xFEmi\xFE Men\xFCy\xFC Y\xFCkle"
-#: Merge.rc:1691
+#: Merge.rc:1674
#, c-format
msgid "In&clude subfolders by default"
-msgstr ""
+msgstr "Varsay\xFDlan Olarak Alt Klas\xF6rleri Dahil Et"
-#: Merge.rc:1693
+#: Merge.rc:1676
#, c-format
msgid "&Add to context menu"
+msgstr "Sa\xF0 Tu\xFE Men\xFCs\xFCne Ekle"
+
+#: Merge.rc:1678
+#, c-format
+msgid "Folder compare"
+msgstr "WinMerge'de Dosya veya Klas\xF6r Kar\xFE\xFDla\xFEt\xFDr\xFDrken"
+
+#: Merge.rc:1679
+#, c-format
+msgid "Add &Shell menu to context menu"
+msgstr "\xD6gelere T\xFDkland\xFD\xF0\xFDnda, (Windows) Sa\xF0 Tu\xFE Men\xFCs\xFC G\xF6ster"
+
+#: Merge.rc:1686
+#: Merge.rc:1970
+#: Merge.rc:2307
+#, c-format
+msgid "Folder"
+msgstr "Klas\xF6r"
+
+#: Merge.rc:1689
+#, c-format
+msgid "&Compare method:"
msgstr ""
+#: Merge.rc:1691
+#, c-format
+msgid "S&top after first difference"
+msgstr "\xDDlk Farkl\xFDl\xFDktan Sonra Dur"
+
+#: Merge.rc:1693
+#, c-format
+msgid "Ign&ore time differences less than 3 seconds"
+msgstr "3 Saniyeden Az Zaman Farkl\xFDl\xFDklar\xFDn\xFD Yok Say"
+
#: Merge.rc:1695
#, c-format
-msgid "Folder compare"
+msgid "&Include unique subfolders contents"
msgstr ""
-#: Merge.rc:1696
+#: Merge.rc:1697
#, c-format
-msgid "Add &Shell menu to context menu"
+msgid "&Quick compare limit (MB):"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1722
+#: Merge.rc:1723
#, c-format
msgid "040904e4"
msgstr "041f04e6"
#. VarFileInfo.Translation
-#: Merge.rc:1738
+#: Merge.rc:1739
#, c-format
msgid "0x409, 1252"
msgstr "0x41f, 1254"
-#: Merge.rc:1753
+#: Merge.rc:1754
#, c-format
msgid "Ready"
-msgstr ""
+msgstr "Haz\xFDr"
-#: Merge.rc:1759
+#: Merge.rc:1760
#, c-format
msgid "EXT"
-msgstr ""
+msgstr "EXT"
-#: Merge.rc:1760
+#: Merge.rc:1761
#, c-format
msgid "CAP"
-msgstr ""
+msgstr "CAP"
-#: Merge.rc:1761
+#: Merge.rc:1762
#, c-format
msgid "NUM"
-msgstr ""
+msgstr "NUM"
-#: Merge.rc:1762
+#: Merge.rc:1763
#, c-format
msgid "SCRL"
-msgstr ""
+msgstr "SCRL"
-#: Merge.rc:1763
+#: Merge.rc:1764
#, c-format
msgid "OVR"
-msgstr ""
+msgstr "OVR"
-#: Merge.rc:1764
+#: Merge.rc:1765
#, c-format
msgid "REC"
-msgstr ""
+msgstr "REC"
-#: Merge.rc:1770
+#: Merge.rc:1771
#, c-format
msgid ""
"Create empty documents\n"
"New Documents (Ctrl+N)"
msgstr ""
+"Bo\xFE Belgeler Olu\xFEtur\n"
+"Yeni Belgeler (Ctrl+N)"
-#: Merge.rc:1771
+#: Merge.rc:1772
#, c-format
msgid ""
"Open an existing document\n"
"Open (Ctrl+O)"
msgstr ""
+"Varolan Bir Belgeyi A\xE7\n"
+"A\xE7 (Ctrl+O)"
-#: Merge.rc:1772
+#: Merge.rc:1773
#, c-format
msgid ""
"Close the active document\n"
"Close"
msgstr ""
+"Aktif Belgeyi Kapat\n"
+"Kapat"
-#: Merge.rc:1773
+#: Merge.rc:1774
#, c-format
msgid ""
"Save the active document\n"
"Save (Ctrl+S)"
msgstr ""
+"Aktif Belgeyi Kaydet\n"
+"Kaydet (Ctrl+S)"
-#: Merge.rc:1774
+#: Merge.rc:1775
#, c-format
msgid ""
"Save the active document with a new name\n"
"Save As"
msgstr ""
+"Aktif Belgeyi Ba\xFEka Bir \xDDsimle Kaydet\n"
+"Farkl\xFD Kaydet"
-#: Merge.rc:1775
+#: Merge.rc:1776
#, c-format
msgid ""
"Change the printing options\n"
"Page Setup"
msgstr ""
+"Yazd\xFDrma Se\xE7eneklerini De\xF0i\xFEtir\n"
+"Sayfa Yap\xFDs\xFD"
-#: Merge.rc:1776
+#: Merge.rc:1777
#, c-format
msgid ""
"Change the printer and printing options\n"
"Print Setup"
msgstr ""
+"Yaz\xFDc\xFDy\xFD ve Yazd\xFDrma Se\xE7eneklerini De\xF0i\xFEtir\n"
+"Sayfa Yap\xFDs\xFD"
-#: Merge.rc:1777
+#: Merge.rc:1778
#, c-format
msgid ""
"Print the active document\n"
"Print"
msgstr ""
+"Aktif Belgeyi Yazd\xFDr\n"
+"Yazd\xFDr"
-#: Merge.rc:1778
+#: Merge.rc:1779
#, c-format
msgid ""
"Display full pages\n"
"Print Preview"
msgstr ""
+"Sayfalar\xFDn Tamam\xFDn\xFD G\xF6ster\n"
+"Bask\xFD \xD6nizleme"
-#: Merge.rc:1783
+#: Merge.rc:1784
#, c-format
msgid "Make all hidden items visible again"
-msgstr ""
+msgstr "T\xFCm Gizli \xD6geleri Tekrar G\xF6r\xFClebilir Yap"
-#: Merge.rc:1784
+#: Merge.rc:1785
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "A\xF0a\xE7 G\xF6r\xFCn\xFCm\xFCn\xFC A\xE7-Kapat"
-#: Merge.rc:1785
+#: Merge.rc:1786
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "T\xFCm Alt Klas\xF6rleri Geni\xFElet"
-#: Merge.rc:1786
+#: Merge.rc:1787
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "T\xFCm Alt Klas\xF6rleri Daralt"
-#: Merge.rc:1792
+#: Merge.rc:1793
#, c-format
msgid ""
"Open project file\n"
"Project file (Ctrl+J)"
msgstr ""
+"Proje Dosyas\xFD A\xE7\n"
+"Proje Dosyas\xFD (Ctrl+J)"
-#: Merge.rc:1793
+#: Merge...
[truncated message content] |
|
From: <ki...@us...> - 2009-07-25 08:43:43
|
Revision: 6924
http://winmerge.svn.sourceforge.net/winmerge/?rev=6924&view=rev
Author: kimmov
Date: 2009-07-25 08:43:31 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
Make SanityCheckDiff() a const method. Its task is to check diffs not modify anything.
Modified Paths:
--------------
trunk/Src/MergeDoc.cpp
trunk/Src/MergeDoc.h
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2009-07-23 16:07:15 UTC (rev 6923)
+++ trunk/Src/MergeDoc.cpp 2009-07-25 08:43:31 UTC (rev 6924)
@@ -805,7 +805,7 @@
* @param [in] dr Difference to check.
* @return TRUE if difference lines match, FALSE otherwise.
*/
-bool CMergeDoc::SanityCheckDiff(DIFFRANGE dr)
+bool CMergeDoc::SanityCheckDiff(DIFFRANGE dr) const
{
const int cd_dbegin = dr.dbegin0;
const int cd_dend = dr.dend0;
Modified: trunk/Src/MergeDoc.h
===================================================================
--- trunk/Src/MergeDoc.h 2009-07-23 16:07:15 UTC (rev 6923)
+++ trunk/Src/MergeDoc.h 2009-07-25 08:43:31 UTC (rev 6924)
@@ -162,7 +162,7 @@
bool Undo();
void CopyAllList(int srcPane, int dstPane);
void CopyMultipleList(int srcPane, int dstPane, int firstDiff, int lastDiff);
- bool SanityCheckDiff(DIFFRANGE dr);
+ bool SanityCheckDiff(DIFFRANGE dr) const;
bool ListCopy(int srcPane, int dstPane, int nDiff = -1, bool bGroupWithPrevious = false);
bool TrySaveAs(CString &strPath, int &nLastErrorCode, String & sError,
int nBuffer, PackingInfo * pInfoTempUnpacker);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-23 16:07:24
|
Revision: 6923
http://winmerge.svn.sourceforge.net/winmerge/?rev=6923&view=rev
Author: kimmov
Date: 2009-07-23 16:07:15 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
Add batch file for running Astyle for WinMerge sources.
Added Paths:
-----------
trunk/runastyle.bat
Added: trunk/runastyle.bat
===================================================================
--- trunk/runastyle.bat (rev 0)
+++ trunk/runastyle.bat 2009-07-23 16:07:15 UTC (rev 6923)
@@ -0,0 +1,18 @@
+REM Run Astyle to format source code
+REM Get Astyle from:
+REM http://astyle.sourceforge.net/
+REM $Id$
+
+REM Src is Ansi-style - tab-indent
+astyle --style=ansi --indent=tab --pad-oper --unpad-paren Src/*.cpp
+astyle --style=ansi --indent=tab --pad-oper --unpad-paren Src/*.h
+
+astyle --style=ansi --indent=tab --pad-oper --unpad-paren Src/Common/*.cpp
+astyle --style=ansi --indent=tab --pad-oper --unpad-paren Src/Common/*.h
+
+astyle --style=ansi --indent=tab --pad-oper --unpad-paren Src/CompareEngines/*.cpp
+astyle --style=ansi --indent=tab --pad-oper --unpad-paren Src/CompareEngines/*.h
+
+REM Editor code is GNU style - 2 space indent
+astyle --style=gnu --pad-oper --unpad-paren Src/editlib/*.cpp
+astyle --style=gnu --pad-oper --unpad-paren Src/editlib/*.h
\ No newline at end of file
Property changes on: trunk/runastyle.bat
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-23 15:41:03
|
Revision: 6922
http://winmerge.svn.sourceforge.net/winmerge/?rev=6922&view=rev
Author: kimmov
Date: 2009-07-23 15:40:59 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
PATCH: [ 2818451 ] Make color options hierarchical
Change options page caption from "Merge" to "Differences".
Modified Paths:
--------------
trunk/Src/Merge.rc
trunk/Translations/WinMerge/English.pot
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2009-07-23 15:20:41 UTC (rev 6921)
+++ trunk/Src/Merge.rc 2009-07-23 15:40:59 UTC (rev 6922)
@@ -1965,7 +1965,7 @@
IDS_OPTIONSPG_ARCHIVE "Archive Support"
IDS_OPTIONSPG_BACKUPS "Backup Files"
IDS_OPTIONSPG_SHELL "Shell Integration"
- IDS_OPTIONSPG_MERGECOLORS "Merge"
+ IDS_OPTIONSPG_MERGECOLORS "Differences"
IDS_OPTIONSPG_GENCOMPARE "General"
IDS_OPTIONSPG_FOLDERCOMPARE "Folder"
END
Modified: trunk/Translations/WinMerge/English.pot
===================================================================
--- trunk/Translations/WinMerge/English.pot 2009-07-23 15:20:41 UTC (rev 6921)
+++ trunk/Translations/WinMerge/English.pot 2009-07-23 15:40:59 UTC (rev 6922)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2009-07-23 18:17+0000\n"
+"POT-Creation-Date: 2009-07-23 18:36+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -3084,9 +3084,9 @@
msgstr ""
#: Merge.rc:1968
-#: Merge.rc:2121
+#: Merge.rc:2339
#, c-format
-msgid "Merge"
+msgid "Differences"
msgstr ""
#: Merge.rc:1977
@@ -3436,6 +3436,11 @@
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
+#: Merge.rc:2121
+#, c-format
+msgid "Merge"
+msgstr ""
+
#: Merge.rc:2122
#, c-format
msgid "Difference %1 of %2"
@@ -4069,11 +4074,6 @@
msgid "Ignored Diff."
msgstr ""
-#: Merge.rc:2339
-#, c-format
-msgid "Differences"
-msgstr ""
-
#: Merge.rc:2340
#: Merge.rc:2651
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-23 15:20:44
|
Revision: 6921
http://winmerge.svn.sourceforge.net/winmerge/?rev=6921&view=rev
Author: kimmov
Date: 2009-07-23 15:20:41 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
PATCH: [ 2825628 ] Add option GUI for Quick compare limit option
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Merge.rc
trunk/Src/PropCompareFolder.cpp
trunk/Src/PropCompareFolder.h
trunk/Src/resource.h
trunk/Translations/WinMerge/English.pot
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-07-23 15:11:41 UTC (rev 6920)
+++ trunk/Docs/Users/ChangeLog.txt 2009-07-23 15:20:41 UTC (rev 6921)
@@ -9,6 +9,7 @@
Improve character-level difference highlight accuracy (#2723613)
Add new options dialog panel for folder compare options (#2819626)
Allow disabling reading of unique folder contents (#2820067)
+ Add options GUI for quick compare limit (#2825628)
Bugfix: Did not export changed options values (#2799149)
Bugfix: Don't highlight identical words if whitespaces are ignored (#2798360)
Bugfix: Did not reset folder compare method back to original (#2803152)
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2009-07-23 15:11:41 UTC (rev 6920)
+++ trunk/Src/Merge.rc 2009-07-23 15:20:41 UTC (rev 6921)
@@ -1694,6 +1694,8 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,39,222,10
CONTROL "&Include unique subfolders contents",IDC_COMPARE_WALKSUBDIRS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,222,10
+ LTEXT "&Quick compare limit (MB):",IDC_STATIC,7,60,200,8
+ EDITTEXT IDC_COMPARE_QUICKC_LIMIT,7,70,50,14,ES_AUTOHSCROLL,ES_NUMBER
PUSHBUTTON "Defaults",IDC_COMPAREFOLDER_DEFAULTS,7,184,70,14
END
Modified: trunk/Src/PropCompareFolder.cpp
===================================================================
--- trunk/Src/PropCompareFolder.cpp 2009-07-23 15:11:41 UTC (rev 6920)
+++ trunk/Src/PropCompareFolder.cpp 2009-07-23 15:20:41 UTC (rev 6921)
@@ -19,6 +19,8 @@
static char THIS_FILE[] = __FILE__;
#endif
+static const int Mega = 1024 * 1024;
+
/**
* @brief Constructor.
* @param [in] optionsMgr Pointer to COptionsMgr.
@@ -29,6 +31,7 @@
, m_bStopAfterFirst(FALSE)
, m_bIgnoreSmallTimeDiff(FALSE)
, m_bIncludeUniqFolders(TRUE)
+ , m_nQuickCompareLimit(4 * Mega)
{
}
@@ -40,6 +43,7 @@
DDX_Check(pDX, IDC_COMPARE_STOPFIRST, m_bStopAfterFirst);
DDX_Check(pDX, IDC_IGNORE_SMALLTIMEDIFF, m_bIgnoreSmallTimeDiff);
DDX_Check(pDX, IDC_COMPARE_WALKSUBDIRS, m_bIncludeUniqFolders);
+ DDX_Text(pDX, IDC_COMPARE_QUICKC_LIMIT, m_nQuickCompareLimit);
//}}AFX_DATA_MAP
}
@@ -62,6 +66,7 @@
m_bStopAfterFirst = GetOptionsMgr()->GetBool(OPT_CMP_STOP_AFTER_FIRST);
m_bIgnoreSmallTimeDiff = GetOptionsMgr()->GetBool(OPT_IGNORE_SMALL_FILETIME);
m_bIncludeUniqFolders = GetOptionsMgr()->GetBool(OPT_CMP_WALK_UNIQUE_DIRS);
+ m_nQuickCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_QUICK_LIMIT) / Mega ;
}
/**
@@ -75,6 +80,10 @@
GetOptionsMgr()->SaveOption(OPT_CMP_STOP_AFTER_FIRST, m_bStopAfterFirst == TRUE);
GetOptionsMgr()->SaveOption(OPT_IGNORE_SMALL_FILETIME, m_bIgnoreSmallTimeDiff == TRUE);
GetOptionsMgr()->SaveOption(OPT_CMP_WALK_UNIQUE_DIRS, m_bIncludeUniqFolders == TRUE);
+
+ if (m_nQuickCompareLimit > 2000)
+ m_nQuickCompareLimit = 2000;
+ GetOptionsMgr()->SaveOption(OPT_CMP_QUICK_LIMIT, m_nQuickCompareLimit * Mega);
}
/**
@@ -120,6 +129,8 @@
m_bStopAfterFirst = tmp;
GetOptionsMgr()->GetDefault(OPT_CMP_WALK_UNIQUE_DIRS, tmp);
m_bIncludeUniqFolders = tmp;
+ GetOptionsMgr()->GetDefault(OPT_CMP_QUICK_LIMIT, tmp);
+ m_nQuickCompareLimit = tmp / Mega;
UpdateData(FALSE);
}
Modified: trunk/Src/PropCompareFolder.h
===================================================================
--- trunk/Src/PropCompareFolder.h 2009-07-23 15:11:41 UTC (rev 6920)
+++ trunk/Src/PropCompareFolder.h 2009-07-23 15:20:41 UTC (rev 6921)
@@ -43,6 +43,7 @@
BOOL m_bStopAfterFirst;
BOOL m_bIgnoreSmallTimeDiff;
BOOL m_bIncludeUniqFolders;
+ UINT m_nQuickCompareLimit;
//}}AFX_DATA
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2009-07-23 15:11:41 UTC (rev 6920)
+++ trunk/Src/resource.h 2009-07-23 15:20:41 UTC (rev 6921)
@@ -451,6 +451,7 @@
#define IDC_SEL_WORDDIFF_DELETED_COLOR 1347
#define IDC_COMPAREFOLDER_DEFAULTS 1348
#define IDC_COMPARE_WALKSUBDIRS 1349
+#define IDC_COMPARE_QUICKC_LIMIT 1350
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
@@ -1092,7 +1093,7 @@
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 239
#define _APS_NEXT_COMMAND_VALUE 33178
-#define _APS_NEXT_CONTROL_VALUE 1350
+#define _APS_NEXT_CONTROL_VALUE 1351
#define _APS_NEXT_SYMED_VALUE 113
#endif
#endif
Modified: trunk/Translations/WinMerge/English.pot
===================================================================
--- trunk/Translations/WinMerge/English.pot 2009-07-23 15:11:41 UTC (rev 6920)
+++ trunk/Translations/WinMerge/English.pot 2009-07-23 15:20:41 UTC (rev 6921)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2009-07-09 09:29+0000\n"
+"POT-Creation-Date: 2009-07-23 18:17+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -395,7 +395,7 @@
#: Merge.rc:178
#: Merge.rc:299
#: Merge.rc:487
-#: Merge.rc:1947
+#: Merge.rc:1948
#, c-format
msgid "&Help"
msgstr ""
@@ -726,7 +726,7 @@
msgstr ""
#: Merge.rc:373
-#: Merge.rc:2804
+#: Merge.rc:2807
#, c-format
msgid "< Empty >"
msgstr ""
@@ -929,14 +929,14 @@
#: Merge.rc:526
#: Merge.rc:1147
-#: Merge.rc:1531
+#: Merge.rc:1514
#, c-format
msgid "&Left"
msgstr ""
#: Merge.rc:527
#: Merge.rc:1149
-#: Merge.rc:1534
+#: Merge.rc:1517
#, c-format
msgid "&Right"
msgstr ""
@@ -1093,12 +1093,12 @@
#: Merge.rc:1066
#: Merge.rc:1095
#: Merge.rc:1105
-#: Merge.rc:1273
-#: Merge.rc:1337
-#: Merge.rc:1350
-#: Merge.rc:1442
-#: Merge.rc:1457
-#: Merge.rc:1679
+#: Merge.rc:1256
+#: Merge.rc:1320
+#: Merge.rc:1333
+#: Merge.rc:1425
+#: Merge.rc:1440
+#: Merge.rc:1662
#, c-format
msgid "OK"
msgstr ""
@@ -1114,7 +1114,7 @@
msgstr ""
#: Merge.rc:690
-#: Merge.rc:1608
+#: Merge.rc:1591
#, c-format
msgid "&Left:"
msgstr ""
@@ -1128,7 +1128,7 @@
msgstr ""
#: Merge.rc:695
-#: Merge.rc:1612
+#: Merge.rc:1595
#, c-format
msgid "&Right:"
msgstr ""
@@ -1140,13 +1140,13 @@
msgstr ""
#: Merge.rc:700
-#: Merge.rc:1616
+#: Merge.rc:1599
#, c-format
msgid "&Filter:"
msgstr ""
#: Merge.rc:703
-#: Merge.rc:1618
+#: Merge.rc:1601
#, c-format
msgid "Select..."
msgstr ""
@@ -1162,7 +1162,7 @@
msgstr ""
#: Merge.rc:708
-#: Merge.rc:1619
+#: Merge.rc:1602
#, c-format
msgid "&Include Subfolders"
msgstr ""
@@ -1182,17 +1182,17 @@
#: Merge.rc:1096
#: Merge.rc:1106
#: Merge.rc:1157
-#: Merge.rc:1274
-#: Merge.rc:1351
-#: Merge.rc:1443
-#: Merge.rc:1458
-#: Merge.rc:1680
+#: Merge.rc:1257
+#: Merge.rc:1334
+#: Merge.rc:1426
+#: Merge.rc:1441
+#: Merge.rc:1663
#, c-format
msgid "Cancel"
msgstr ""
#: Merge.rc:713
-#: Merge.rc:1352
+#: Merge.rc:1335
#, c-format
msgid "Help"
msgstr ""
@@ -1260,13 +1260,14 @@
msgstr ""
#: Merge.rc:753
-#: Merge.rc:2080
+#: Merge.rc:2083
#, c-format
msgid "&Path to cleartool.exe:"
msgstr ""
#: Merge.rc:760
-#: Merge.rc:1955
+#: Merge.rc:1956
+#: Merge.rc:1969
#, c-format
msgid "General"
msgstr ""
@@ -1322,13 +1323,13 @@
msgstr ""
#: Merge.rc:787
-#: Merge.rc:1631
+#: Merge.rc:1614
#, c-format
msgid "&Folder compare"
msgstr ""
#: Merge.rc:789
-#: Merge.rc:1633
+#: Merge.rc:1616
#, c-format
msgid "Fil&e compare"
msgstr ""
@@ -1449,7 +1450,7 @@
msgstr ""
#: Merge.rc:872
-#: Merge.rc:2202
+#: Merge.rc:2205
#, c-format
msgid "Rational ClearCase"
msgstr ""
@@ -1460,7 +1461,7 @@
msgstr ""
#: Merge.rc:880
-#: Merge.rc:1191
+#: Merge.rc:1175
#, c-format
msgid "Comments"
msgstr ""
@@ -1506,7 +1507,7 @@
msgstr ""
#: Merge.rc:910
-#: Merge.rc:1958
+#: Merge.rc:1959
#, c-format
msgid "Colors"
msgstr ""
@@ -1522,7 +1523,7 @@
msgstr ""
#: Merge.rc:921
-#: Merge.rc:1583
+#: Merge.rc:1566
#, c-format
msgid "Background"
msgstr ""
@@ -1533,8 +1534,8 @@
msgstr ""
#: Merge.rc:935
-#: Merge.rc:1378
-#: Merge.rc:1584
+#: Merge.rc:1361
+#: Merge.rc:1567
#: Merge.rc:1960
#, c-format
msgid "Text"
@@ -1568,21 +1569,22 @@
#: Merge.rc:986
#: Merge.rc:1065
#: Merge.rc:1094
-#: Merge.rc:1194
-#: Merge.rc:1424
+#: Merge.rc:1177
+#: Merge.rc:1407
+#: Merge.rc:1699
#, c-format
msgid "Defaults"
msgstr ""
#: Merge.rc:992
-#: Merge.rc:1366
-#: Merge.rc:1572
+#: Merge.rc:1349
+#: Merge.rc:1555
#, c-format
msgid "Dialog"
msgstr ""
#: Merge.rc:1002
-#: Merge.rc:1961
+#: Merge.rc:1962
#, c-format
msgid "System"
msgstr ""
@@ -1759,7 +1761,7 @@
msgstr ""
#: Merge.rc:1128
-#: Merge.rc:1908
+#: Merge.rc:1909
#, c-format
msgid "Stop"
msgstr ""
@@ -1815,7 +1817,7 @@
msgstr ""
#: Merge.rc:1162
-#: Merge.rc:1956
+#: Merge.rc:1957
#, c-format
msgid "Compare"
msgstr ""
@@ -1830,960 +1832,976 @@
msgid "&Compare"
msgstr ""
-#: Merge.rc:1168
+#: Merge.rc:1167
#, c-format
msgid "&Ignore change"
msgstr ""
-#: Merge.rc:1170
+#: Merge.rc:1168
#, c-format
msgid "I&gnore all"
msgstr ""
-#: Merge.rc:1172
+#: Merge.rc:1169
#, c-format
msgid "Ignore blan&k lines"
msgstr ""
-#: Merge.rc:1174
+#: Merge.rc:1170
#, c-format
msgid "Ignore &case"
msgstr ""
-#: Merge.rc:1176
+#: Merge.rc:1171
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr ""
-#: Merge.rc:1179
+#: Merge.rc:1173
#, c-format
msgid "E&nable moved block detection"
msgstr ""
-#: Merge.rc:1181
+#: Merge.rc:1174
#, c-format
msgid "&Match similar lines"
msgstr ""
-#: Merge.rc:1183
+#: Merge.rc:1176
#, c-format
-msgid "Ign&ore time differences less than 3 seconds"
-msgstr ""
-
-#: Merge.rc:1186
-#, c-format
-msgid "&File Compare method:"
-msgstr ""
-
-#: Merge.rc:1189
-#, c-format
-msgid "S&top after first difference"
-msgstr ""
-
-#: Merge.rc:1192
-#, c-format
msgid "Filter Comments"
msgstr ""
-#: Merge.rc:1199
-#: Merge.rc:1957
+#: Merge.rc:1182
+#: Merge.rc:1958
#, c-format
msgid "Editor"
msgstr ""
-#: Merge.rc:1202
+#: Merge.rc:1185
#, c-format
msgid "&Highlight syntax"
msgstr ""
-#: Merge.rc:1204
+#: Merge.rc:1187
#, c-format
msgid "&Automatic rescan"
msgstr ""
-#: Merge.rc:1206
+#: Merge.rc:1189
#, c-format
msgid "&Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1208
+#: Merge.rc:1191
#, c-format
msgid "Tabs"
msgstr ""
-#: Merge.rc:1209
+#: Merge.rc:1192
#, c-format
msgid "&Tab size:"
msgstr ""
-#: Merge.rc:1212
+#: Merge.rc:1195
#, c-format
msgid "&Insert Tabs"
msgstr ""
-#: Merge.rc:1214
+#: Merge.rc:1197
#, c-format
msgid "Insert &Spaces"
msgstr ""
-#: Merge.rc:1216
+#: Merge.rc:1199
#, c-format
msgid "Line Difference Coloring"
msgstr ""
-#: Merge.rc:1218
+#: Merge.rc:1201
#, c-format
msgid "View line differences"
msgstr ""
-#: Merge.rc:1220
+#: Merge.rc:1203
#, c-format
msgid "&Character level"
msgstr ""
-#: Merge.rc:1222
+#: Merge.rc:1205
#, c-format
msgid "&Word-level:"
msgstr ""
-#: Merge.rc:1226
+#: Merge.rc:1209
#, c-format
msgid "W&ord break characters:"
msgstr ""
-#: Merge.rc:1239
+#: Merge.rc:1222
#, c-format
msgid "Filefilters"
msgstr ""
-#: Merge.rc:1245
+#: Merge.rc:1228
#, c-format
msgid "Test"
msgstr ""
-#: Merge.rc:1246
+#: Merge.rc:1229
#, c-format
msgid "Install..."
msgstr ""
-#: Merge.rc:1247
+#: Merge.rc:1230
#, c-format
msgid "New..."
msgstr ""
-#: Merge.rc:1248
+#: Merge.rc:1231
#, c-format
msgid "Edit..."
msgstr ""
-#: Merge.rc:1249
+#: Merge.rc:1232
#, c-format
msgid "Delete..."
msgstr ""
-#: Merge.rc:1255
+#: Merge.rc:1238
#, c-format
msgid "Save modified files?"
msgstr ""
-#: Merge.rc:1258
+#: Merge.rc:1241
#, c-format
msgid "Left side file"
msgstr ""
-#: Merge.rc:1261
+#: Merge.rc:1244
#, c-format
msgid "&Save changes"
msgstr ""
-#: Merge.rc:1263
+#: Merge.rc:1246
#, c-format
msgid "&Discard changes"
msgstr ""
-#: Merge.rc:1265
+#: Merge.rc:1248
#, c-format
msgid "Right side file"
msgstr ""
-#: Merge.rc:1268
+#: Merge.rc:1251
#, c-format
msgid "S&ave changes"
msgstr ""
-#: Merge.rc:1270
+#: Merge.rc:1253
#, c-format
msgid "Dis&card changes"
msgstr ""
-#: Merge.rc:1272
+#: Merge.rc:1255
#, c-format
msgid "Disca&rd All"
msgstr ""
-#: Merge.rc:1279
-#: Merge.rc:1527
-#: Merge.rc:1963
+#: Merge.rc:1262
+#: Merge.rc:1510
+#: Merge.rc:1964
#, c-format
msgid "Codepage"
msgstr ""
-#: Merge.rc:1282
+#: Merge.rc:1265
#, c-format
msgid "Default Codepage"
msgstr ""
-#: Merge.rc:1283
+#: Merge.rc:1266
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr ""
-#: Merge.rc:1285
+#: Merge.rc:1268
#, c-format
msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
msgstr ""
-#: Merge.rc:1288
+#: Merge.rc:1271
#, c-format
msgid "System codepage"
msgstr ""
-#: Merge.rc:1290
+#: Merge.rc:1273
#, c-format
msgid "According to WinMerge User Interface"
msgstr ""
-#: Merge.rc:1292
+#: Merge.rc:1275
#, c-format
msgid "Custom codepage:"
msgstr ""
-#: Merge.rc:1300
+#: Merge.rc:1283
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr ""
-#: Merge.rc:1303
+#: Merge.rc:1286
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr ""
-#: Merge.rc:1306
+#: Merge.rc:1289
#, c-format
msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation."
msgstr ""
-#: Merge.rc:1308
+#: Merge.rc:1291
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr ""
-#: Merge.rc:1310
+#: Merge.rc:1293
#, c-format
msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available."
msgstr ""
-#: Merge.rc:1312
+#: Merge.rc:1295
#, c-format
msgid "Version"
msgstr ""
-#: Merge.rc:1314
+#: Merge.rc:1297
#, c-format
msgid "Plugin required\n(dllbuild %04u)"
msgstr ""
-#: Merge.rc:1316
+#: Merge.rc:1299
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr ""
-#: Merge.rc:1319
-#: Merge.rc:1322
+#: Merge.rc:1302
+#: Merge.rc:1305
#, c-format
msgid "present"
msgstr ""
-#: Merge.rc:1320
+#: Merge.rc:1303
#, c-format
msgid "Merge7z000U.dll"
msgstr ""
-#: Merge.rc:1323
+#: Merge.rc:1306
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr ""
-#: Merge.rc:1325
-#: Merge.rc:1330
+#: Merge.rc:1308
+#: Merge.rc:1313
#, c-format
msgid "none"
msgstr ""
-#: Merge.rc:1327
+#: Merge.rc:1310
#, c-format
msgid "missing"
msgstr ""
-#: Merge.rc:1328
+#: Merge.rc:1311
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr ""
-#: Merge.rc:1332
+#: Merge.rc:1315
#, c-format
msgid "outdated"
msgstr ""
-#: Merge.rc:1333
+#: Merge.rc:1316
#, c-format
msgid "Plugins on path:"
msgstr ""
-#: Merge.rc:1334
+#: Merge.rc:1317
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
msgstr ""
-#: Merge.rc:1338
+#: Merge.rc:1321
#, c-format
msgid "Plugin Download"
msgstr ""
-#: Merge.rc:1347
+#: Merge.rc:1330
#, c-format
msgid "Options"
msgstr ""
-#: Merge.rc:1358
+#: Merge.rc:1341
#, c-format
msgid " Categories"
msgstr ""
-#: Merge.rc:1360
+#: Merge.rc:1343
#, c-format
msgid "Import..."
msgstr ""
-#: Merge.rc:1361
+#: Merge.rc:1344
#, c-format
msgid "Export..."
msgstr ""
-#: Merge.rc:1369
+#: Merge.rc:1352
#, c-format
msgid "Keywords:"
msgstr ""
-#: Merge.rc:1370
+#: Merge.rc:1353
#, c-format
msgid "Function names:"
msgstr ""
-#: Merge.rc:1371
+#: Merge.rc:1354
#, c-format
msgid "Comments:"
msgstr ""
-#: Merge.rc:1372
+#: Merge.rc:1355
#, c-format
msgid "Numbers:"
msgstr ""
-#: Merge.rc:1373
+#: Merge.rc:1356
#, c-format
msgid "Operators:"
msgstr ""
-#: Merge.rc:1374
+#: Merge.rc:1357
#, c-format
msgid "Strings:"
msgstr ""
-#: Merge.rc:1375
+#: Merge.rc:1358
#, c-format
msgid "Preprocessor:"
msgstr ""
-#: Merge.rc:1376
+#: Merge.rc:1359
#, c-format
msgid "User 1:"
msgstr ""
-#: Merge.rc:1377
+#: Merge.rc:1360
#, c-format
msgid "User 2:"
msgstr ""
-#: Merge.rc:1382
-#: Merge.rc:1387
-#: Merge.rc:1392
-#: Merge.rc:1397
-#: Merge.rc:1402
-#: Merge.rc:1407
-#: Merge.rc:1412
-#: Merge.rc:1417
-#: Merge.rc:1422
+#: Merge.rc:1365
+#: Merge.rc:1370
+#: Merge.rc:1375
+#: Merge.rc:1380
+#: Merge.rc:1385
+#: Merge.rc:1390
+#: Merge.rc:1395
+#: Merge.rc:1400
+#: Merge.rc:1405
#, c-format
msgid "Bold"
msgstr ""
-#: Merge.rc:1430
+#: Merge.rc:1413
#, c-format
msgid "Folder Compare Report"
msgstr ""
-#: Merge.rc:1433
+#: Merge.rc:1416
#, c-format
msgid "Report &File:"
msgstr ""
-#: Merge.rc:1436
-#: Merge.rc:1610
-#: Merge.rc:1614
-#: Merge.rc:1641
+#: Merge.rc:1419
+#: Merge.rc:1593
+#: Merge.rc:1597
+#: Merge.rc:1624
#, c-format
msgid "Browse..."
msgstr ""
-#: Merge.rc:1437
+#: Merge.rc:1420
#, c-format
msgid "&Style:"
msgstr ""
-#: Merge.rc:1440
+#: Merge.rc:1423
#, c-format
msgid "&Copy to Clipboard"
msgstr ""
-#: Merge.rc:1448
+#: Merge.rc:1431
#, c-format
msgid "Shared or Private Filter"
msgstr ""
-#: Merge.rc:1451
+#: Merge.rc:1434
#, c-format
msgid "Which type of filter do you want to create?"
msgstr ""
-#: Merge.rc:1453
+#: Merge.rc:1436
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr ""
-#: Merge.rc:1455
+#: Merge.rc:1438
#, c-format
msgid "Private Filter (only for current user)"
msgstr ""
-#: Merge.rc:1463
-#: Merge.rc:1964
+#: Merge.rc:1446
+#: Merge.rc:1965
#, c-format
msgid "Archive Support"
msgstr ""
-#: Merge.rc:1466
+#: Merge.rc:1449
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr ""
-#: Merge.rc:1468
+#: Merge.rc:1451
#, c-format
msgid "Download 7-zip Plugin"
msgstr ""
-#: Merge.rc:1469
+#: Merge.rc:1452
#, c-format
msgid "&Enable archive file support"
msgstr ""
-#: Merge.rc:1471
+#: Merge.rc:1454
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr ""
-#: Merge.rc:1474
+#: Merge.rc:1457
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr ""
-#: Merge.rc:1476
+#: Merge.rc:1459
#, c-format
msgid "&Detect archive type from file signature"
msgstr ""
-#: Merge.rc:1484
+#: Merge.rc:1467
#, c-format
msgid "Compare Statistics"
msgstr ""
-#: Merge.rc:1487
+#: Merge.rc:1470
#, c-format
msgid "Folders:"
msgstr ""
-#: Merge.rc:1488
+#: Merge.rc:1471
#, c-format
msgid "Files:"
msgstr ""
-#: Merge.rc:1489
-#: Merge.rc:2356
+#: Merge.rc:1472
+#: Merge.rc:2359
#, c-format
msgid "Different"
msgstr ""
-#: Merge.rc:1490
+#: Merge.rc:1473
#, c-format
msgid "Text:"
msgstr ""
-#: Merge.rc:1493
-#: Merge.rc:1512
+#: Merge.rc:1476
+#: Merge.rc:1495
#, c-format
msgid "Binary:"
msgstr ""
-#: Merge.rc:1496
+#: Merge.rc:1479
#, c-format
msgid "Unique"
msgstr ""
-#: Merge.rc:1497
+#: Merge.rc:1480
#, c-format
msgid "Left:"
msgstr ""
-#: Merge.rc:1502
+#: Merge.rc:1485
#, c-format
msgid "Right:"
msgstr ""
-#: Merge.rc:1507
-#: Merge.rc:2350
+#: Merge.rc:1490
+#: Merge.rc:2353
#, c-format
msgid "Identical"
msgstr ""
-#: Merge.rc:1516
+#: Merge.rc:1499
#, c-format
msgid "Total:"
msgstr ""
-#: Merge.rc:1521
+#: Merge.rc:1504
#, c-format
msgid "Close"
msgstr ""
-#: Merge.rc:1530
+#: Merge.rc:1513
#, c-format
msgid "Affects"
msgstr ""
-#: Merge.rc:1533
-#: Merge.rc:1536
+#: Merge.rc:1516
+#: Merge.rc:1519
#, c-format
msgid "(Affects)"
msgstr ""
-#: Merge.rc:1537
+#: Merge.rc:1520
#, c-format
msgid "Select Codepage for"
msgstr ""
-#: Merge.rc:1538
+#: Merge.rc:1521
#, c-format
msgid "&File Loading:"
msgstr ""
-#: Merge.rc:1540
-#: Merge.rc:1543
+#: Merge.rc:1523
+#: Merge.rc:1526
#, c-format
msgid "..."
msgstr ""
-#: Merge.rc:1541
+#: Merge.rc:1524
#, c-format
msgid "File &Saving:"
msgstr ""
-#: Merge.rc:1544
+#: Merge.rc:1527
#, c-format
msgid "&Use same codepage for both"
msgstr ""
-#: Merge.rc:1547
+#: Merge.rc:1530
#, c-format
msgid "&Apply"
msgstr ""
-#: Merge.rc:1548
-#: Merge.rc:1930
+#: Merge.rc:1531
+#: Merge.rc:1931
#, c-format
msgid "&Cancel"
msgstr ""
-#: Merge.rc:1553
+#: Merge.rc:1536
#, c-format
msgid "Test Filter"
msgstr ""
-#: Merge.rc:1556
+#: Merge.rc:1539
#, c-format
msgid "Testing filter ..."
msgstr ""
-#: Merge.rc:1558
+#: Merge.rc:1541
#, c-format
msgid "&Enter text to test:"
msgstr ""
-#: Merge.rc:1560
+#: Merge.rc:1543
#, c-format
msgid "&Folder Name"
msgstr ""
-#: Merge.rc:1562
+#: Merge.rc:1545
#, c-format
msgid "Result:"
msgstr ""
-#: Merge.rc:1566
+#: Merge.rc:1549
#, c-format
msgid "&Test"
msgstr ""
-#: Merge.rc:1567
+#: Merge.rc:1550
#, c-format
msgid "&Close"
msgstr ""
-#: Merge.rc:1575
+#: Merge.rc:1558
#, c-format
msgid "&Use customized text colors"
msgstr ""
-#: Merge.rc:1578
+#: Merge.rc:1561
#, c-format
msgid "Custom text colors"
msgstr ""
-#: Merge.rc:1580
+#: Merge.rc:1563
#, c-format
msgid "Whitespace:"
msgstr ""
-#: Merge.rc:1581
+#: Merge.rc:1564
#, c-format
msgid "Regular text:"
msgstr ""
-#: Merge.rc:1582
+#: Merge.rc:1565
#, c-format
msgid "Selection:"
msgstr ""
-#: Merge.rc:1605
+#: Merge.rc:1588
#, c-format
msgid "Paths"
msgstr ""
-#: Merge.rc:1611
+#: Merge.rc:1594
#, c-format
msgid "R&ead-only"
msgstr ""
-#: Merge.rc:1615
+#: Merge.rc:1598
#, c-format
msgid "Re&ad-only"
msgstr ""
-#: Merge.rc:1621
+#: Merge.rc:1604
#, c-format
msgid "Open..."
msgstr ""
-#: Merge.rc:1622
+#: Merge.rc:1605
#, c-format
msgid "Save..."
msgstr ""
-#: Merge.rc:1627
-#: Merge.rc:1965
+#: Merge.rc:1610
+#: Merge.rc:1966
#, c-format
msgid "Backup Files"
msgstr ""
-#: Merge.rc:1630
+#: Merge.rc:1613
#, c-format
msgid "Create backup files in:"
msgstr ""
-#: Merge.rc:1635
+#: Merge.rc:1618
#, c-format
msgid "Create backup files into:"
msgstr ""
-#: Merge.rc:1636
+#: Merge.rc:1619
#, c-format
msgid "&Original file's folder"
msgstr ""
-#: Merge.rc:1638
+#: Merge.rc:1621
#, c-format
msgid "&Global backup folder:"
msgstr ""
-#: Merge.rc:1642
+#: Merge.rc:1625
#, c-format
msgid "Backup filename:"
msgstr ""
-#: Merge.rc:1643
+#: Merge.rc:1626
#, c-format
msgid "&Append .bak -extension"
msgstr ""
-#: Merge.rc:1645
+#: Merge.rc:1628
#, c-format
msgid "A&ppend timestamp"
msgstr ""
-#: Merge.rc:1652
-#: Merge.rc:2258
+#: Merge.rc:1635
+#: Merge.rc:2261
#, c-format
msgid "Confirm Copy"
msgstr ""
-#: Merge.rc:1656
+#: Merge.rc:1639
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr ""
-#: Merge.rc:1658
+#: Merge.rc:1641
#, c-format
msgid "From left"
msgstr ""
-#: Merge.rc:1661
+#: Merge.rc:1644
#, c-format
msgid "To right"
msgstr ""
-#: Merge.rc:1664
+#: Merge.rc:1647
#, c-format
msgid "Yes"
msgstr ""
-#: Merge.rc:1665
+#: Merge.rc:1648
#, c-format
msgid "No"
msgstr ""
-#: Merge.rc:1671
+#: Merge.rc:1654
#, c-format
msgid "Plugins"
msgstr ""
-#: Merge.rc:1674
+#: Merge.rc:1657
#, c-format
msgid "&Enable plugins"
msgstr ""
-#: Merge.rc:1685
-#: Merge.rc:1966
+#: Merge.rc:1668
+#: Merge.rc:1967
#, c-format
msgid "Shell Integration"
msgstr ""
-#: Merge.rc:1688
+#: Merge.rc:1671
#, c-format
msgid "Explorer"
msgstr ""
-#: Merge.rc:1689
+#: Merge.rc:1672
#, c-format
msgid "E&nable advanced menu"
msgstr ""
-#: Merge.rc:1691
+#: Merge.rc:1674
#, c-format
msgid "In&clude subfolders by default"
msgstr ""
-#: Merge.rc:1693
+#: Merge.rc:1676
#, c-format
msgid "&Add to context menu"
msgstr ""
-#: Merge.rc:1695
+#: Merge.rc:1678
#, c-format
msgid "Folder compare"
msgstr ""
-#: Merge.rc:1696
+#: Merge.rc:1679
#, c-format
msgid "Add &Shell menu to context menu"
msgstr ""
+#: Merge.rc:1686
+#: Merge.rc:1970
+#: Merge.rc:2307
+#, c-format
+msgid "Folder"
+msgstr ""
+
+#: Merge.rc:1689
+#, c-format
+msgid "&Compare method:"
+msgstr ""
+
+#: Merge.rc:1691
+#, c-format
+msgid "S&top after first difference"
+msgstr ""
+
+#: Merge.rc:1693
+#, c-format
+msgid "Ign&ore time differences less than 3 seconds"
+msgstr ""
+
+#: Merge.rc:1695
+#, c-format
+msgid "&Include unique subfolders contents"
+msgstr ""
+
+#: Merge.rc:1697
+#, c-format
+msgid "&Quick compare limit (MB):"
+msgstr ""
+
#. StringFileInfo.Block
-#: Merge.rc:1722
+#: Merge.rc:1723
#, c-format
msgid "040904e4"
msgstr ""
#. VarFileInfo.Translation
-#: Merge.rc:1738
+#: Merge.rc:1739
#, c-format
msgid "0x409, 1252"
msgstr ""
-#: Merge.rc:1753
+#: Merge.rc:1754
#, c-format
msgid "Ready"
msgstr ""
-#: Merge.rc:1759
+#: Merge.rc:1760
#, c-format
msgid "EXT"
msgstr ""
-#: Merge.rc:1760
+#: Merge.rc:1761
#, c-format
msgid "CAP"
msgstr ""
-#: Merge.rc:1761
+#: Merge.rc:1762
#, c-format
msgid "NUM"
msgstr ""
-#: Merge.rc:1762
+#: Merge.rc:1763
#, c-format
msgid "SCRL"
msgstr ""
-#: Merge.rc:1763
+#: Merge.rc:1764
#, c-format
msgid "OVR"
msgstr ""
-#: Merge.rc:1764
+#: Merge.rc:1765
#, c-format
msgid "REC"
msgstr ""
-#: Merge.rc:1770
+#: Merge.rc:1771
#, c-format
msgid "Create empty documents\nNew Documents (Ctrl+N)"
msgstr ""
-#: Merge.rc:1771
+#: Merge.rc:1772
#, c-format
msgid "Open an existing document\nOpen (Ctrl+O)"
msgstr ""
-#: Merge.rc:1772
+#: Merge.rc:1773
#, c-format
msgid "Close the active document\nClose"
msgstr ""
-#: Merge.rc:1773
+#: Merge.rc:1774
#, c-format
msgid "Save the active document\nSave (Ctrl+S)"
msgstr ""
-#: Merge.rc:1774
+#: Merge.rc:1775
#, c-format
msgid "Save the active document with a new name\nSave As"
msgstr ""
-#: Merge.rc:1775
+#: Merge.rc:1776
#, c-format
msgid "Change the printing options\nPage Setup"
msgstr ""
-#: Merge.rc:1776
+#: Merge.rc:1777
#, c-format
msgid "Change the printer and printing options\nPrint Setup"
msgstr ""
-#: Merge.rc:1777
+#: Merge.rc:1778
#, c-format
msgid "Print the active document\nPrint"
msgstr ""
-#: Merge.rc:1778
+#: Merge.rc:1779
#, c-format
msgid "Display full pages\nPrint Preview"
msgstr ""
-#: Merge.rc:1783
+#: Merge.rc:1784
#, c-format
msgid "Make all hidden items visible again"
msgstr ""
-#: Merge.rc:1784
+#: Merge.rc:1785
#, c-format
msgid "Toggle tree mode"
msgstr ""
-#: Merge.rc:1785
+#: Merge.rc:1786
#, c-format
msgid "Expand all subfolders"
msgstr ""
-#: Merge.rc:1786
+#: Merge.rc:1787
#, c-format
msgid "Collapse all subfolders"
msgstr ""
-#: Merge.rc:1792
+#: Merge.rc:1793
#, c-format
msgid "Open project file\nProject file (Ctrl+J)"
msgstr ""
-#: Merge.rc:1793
+#: Merge.rc:1794
#, c-format
msgid "Unknown error attempting to open project file"
msgstr ""
-#: Merge.rc:1794
+#: Merge.rc:1795
#, c-format
msgid "Unknown error attempting to save project file"
msgstr ""
-#: Merge.rc:1795
+#: Merge.rc:1796
#, c-format
msgid "Project File"
msgstr ""
-#: Merge.rc:1796
+#: Merge.rc:1797
#, c-format
msgid "Project file successfully loaded."
msgstr ""
-#: Merge.rc:1797
+#: Merge.rc:1798
#, c-format
msgid "Project file successfully saved."
msgstr ""
-#: Merge.rc:1798
+#: Merge.rc:1799
#, c-format
msgid "Save current paths and options to project file\nSave Project File"
msgstr ""
-#: Merge.rc:1803
+#: Merge.rc:1804
#, c-format
msgid "Display program information, version number and copyright\nAbout"
msgstr ""
-#: Merge.rc:1804
+#: Merge.rc:1805
#, c-format
msgid "Quit the application; prompts to save documents\nExit"
msgstr ""
-#: Merge.rc:1810
#: Merge.rc:1811
#: Merge.rc:1812
#: Merge.rc:1813
@@ -2799,2855 +2817,2851 @@
#: Merge.rc:1823
#: Merge.rc:1824
#: Merge.rc:1825
+#: Merge.rc:1826
#, c-format
msgid "Open this document"
msgstr ""
-#: Merge.rc:1830
+#: Merge.rc:1831
#, c-format
msgid "Switch to the next window pane\nNext Pane"
msgstr ""
-#: Merge.rc:1831
+#: Merge.rc:1832
#, c-format
msgid "Switch back to the previous window pane\nPrevious Pane"
msgstr ""
-#: Merge.rc:1837
+#: Merge.rc:1838
#, c-format
msgid "Arrange windows so they overlap\nCascade Windows"
msgstr ""
-#: Merge.rc:1838
+#: Merge.rc:1839
#, c-format
msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally"
msgstr ""
-#: Merge.rc:1839
+#: Merge.rc:1840
#, c-format
msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically"
msgstr ""
-#: Merge.rc:1845
+#: Merge.rc:1846
#, c-format
msgid "Copy the selection and put it on the Clipboard\nCopy"
msgstr ""
-#: Merge.rc:1846
+#: Merge.rc:1847
#, c-format
msgid "Cut the selection and put it on the Clipboard\nCut"
msgstr ""
-#: Merge.rc:1847
+#: Merge.rc:1848
#, c-format
msgid "Find the specified text\nFind"
msgstr ""
-#: Merge.rc:1848
+#: Merge.rc:1849
#, c-format
msgid "Insert Clipboard contents\nPaste"
msgstr ""
-#: Merge.rc:1849
+#: Merge.rc:1850
#, c-format
msgid "Repeat the last action\nRepeat"
msgstr ""
-#: Merge.rc:1850
+#: Merge.rc:1851
#, c-format
msgid "Replace specific text with different text\nReplace"
msgstr ""
-#: Merge.rc:1851
+#: Merge.rc:1852
#, c-format
msgid "Select the entire document\nSelect All"
msgstr ""
-#: Merge.rc:1852
+#: Merge.rc:1853
#, c-format
msgid "Undo the last action\nUndo (Ctrl+Z)"
msgstr ""
-#: Merge.rc:1853
+#: Merge.rc:1854
#, c-format
msgid "Redo the previously undone action\nRedo (Ctrl+Y)"
msgstr ""
-#: Merge.rc:1859
+#: Merge.rc:1860
#, c-format
msgid "Show or hide the toolbar\nToggle ToolBar"
msgstr ""
-#: Merge.rc:1860
+#: Merge.rc:1861
#, c-format
msgid "Show or hide the status bar\nToggle StatusBar"
msgstr ""
-#: Merge.rc:1861
+#: Merge.rc:1862
#, c-format
msgid "Show or hide the tab bar\nToggle TabBar"
msgstr ""
-#: Merge.rc:1862
+#: Merge.rc:1863
#, c-format
msgid "Automatically resize panes\nLock Panes"
msgstr ""
-#: Merge.rc:1868
+#: Merge.rc:1869
#, c-format
msgid "Change the window size"
msgstr ""
-#: Merge.rc:1869
+#: Merge.rc:1870
#, c-format
msgid "Change the window position"
msgstr ""
-#: Merge.rc:1870
+#: Merge.rc:1871
#, c-format
msgid "Reduce the window to an icon"
msgstr ""
-#: Merge.rc:1871
+#: Merge.rc:1872
#, c-format
msgid "Enlarge the window to full size"
msgstr ""
-#: Merge.rc:1872
+#: Merge.rc:1873
#, c-format
msgid "Switch to the next document window"
msgstr ""
-#: Merge.rc:1873
+#: Merge.rc:1874
#, c-format
msgid "Switch to the previous document window"
msgstr ""
-#: Merge.rc:1874
+#: Merge.rc:1875
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr ""
-#: Merge.rc:1879
+#: Merge.rc:1880
#, c-format
msgid "Restore the window to normal size"
msgstr ""
-#: Merge.rc:1880
+#: Merge.rc:1881
#, c-format
msgid "Activate Task List"
msgstr ""
-#: Merge.rc:1881
+#: Merge.rc:1882
#, c-format
msgid "Activate this window"
msgstr ""
-#: Merge.rc:1887
+#: Merge.rc:1888
#, c-format
msgid "Close print preview mode\nCancel Preview"
msgstr ""
-#: Merge.rc:1894
+#: Merge.rc:1895
#, c-format
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
msgstr ""
-#: Merge.rc:1895
+#: Merge.rc:1896
#, c-format
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr ""
-#: Merge.rc:1902
+#: Merge.rc:1903
#, c-format
msgid "Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1909
+#: Merge.rc:1910
#, c-format
msgid "Press any key"
msgstr ""
-#: Merge.rc:1915
#: Merge.rc:1916
+#: Merge.rc:1917
#, c-format
msgid "Right click on the path to copy"
msgstr ""
-#: Merge.rc:1922
+#: Merge.rc:1923
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
msgstr ""
-#: Merge.rc:1923
+#: Merge.rc:1924
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr ""
-#: Merge.rc:1929
+#: Merge.rc:1930
#, c-format
msgid "&Ok"
msgstr ""
-#: Merge.rc:1931
+#: Merge.rc:1932
#, c-format
msgid "&Abort"
msgstr ""
-#: Merge.rc:1932
+#: Merge.rc:1933
#, c-format
msgid "&Retry"
msgstr ""
-#: Merge.rc:1933
+#: Merge.rc:1934
#, c-format
msgid "&Ignore"
msgstr ""
-#: Merge.rc:1934
+#: Merge.rc:1935
#, c-format
msgid "Ignore &all"
msgstr ""
-#: Merge.rc:1935
+#: Merge.rc:1936
#, c-format
msgid "&Yes"
msgstr ""
-#: Merge.rc:1941
+#: Merge.rc:1942
#, c-format
msgid "Yes to &all"
msgstr ""
-#: Merge.rc:1942
+#: Merge.rc:1943
#, c-format
msgid "&No"
msgstr ""
-#: Merge.rc:1943
+#: Merge.rc:1944
#, c-format
msgid "No to a&ll"
msgstr ""
-#: Merge.rc:1944
+#: Merge.rc:1945
#, c-format
msgid "&Continue"
msgstr ""
-#: Merge.rc:1945
+#: Merge.rc:1946
#, c-format
msgid "&Skip"
msgstr ""
-#: Merge.rc:1946
+#: Merge.rc:1947
#, c-format
msgid "Skip &all"
msgstr ""
-#: Merge.rc:1948
+#: Merge.rc:1949
#, c-format
msgid "Don't display this &message again."
msgstr ""
-#: Merge.rc:1949
+#: Merge.rc:1950
#, c-format
msgid "Don't ask this &question again."
msgstr ""
-#: Merge.rc:1959
+#: Merge.rc:1961
#, c-format
msgid "Syntax"
msgstr ""
-#: Merge.rc:1962
+#: Merge.rc:1963
#, c-format
msgid "Version Control"
msgstr ""
-#: Merge.rc:1967
-#: Merge.rc:2118
+#: Merge.rc:1968
+#: Merge.rc:2121
#, c-format
msgid "Merge"
msgstr ""
-#: Merge.rc:1974
+#: Merge.rc:1977
#, c-format
msgid "To:"
msgstr ""
-#: Merge.rc:1975
+#: Merge.rc:1978
#, c-format
msgid "From left:"
msgstr ""
-#: Merge.rc:1976
+#: Merge.rc:1979
#, c-format
msgid "To left:"
msgstr ""
-#: Merge.rc:1977
+#: Merge.rc:1980
#, c-format
msgid "From right:"
msgstr ""
-#: Merge.rc:1978
+#: Merge.rc:1981
#, c-format
msgid "To right:"
msgstr ""
-#: Merge.rc:1984
+#: Merge.rc:1987
#, c-format
msgid "Version %1"
msgstr ""
-#: Merge.rc:1985
+#: Merge.rc:1988
#, c-format
msgid "Unicode"
msgstr ""
-#: Merge.rc:1986
+#: Merge.rc:1989
#, c-format
msgid "X64"
msgstr ""
-#: Merge.rc:1992
+#: Merge.rc:1995
#, c-format
msgid "Options (%1)"
msgstr ""
-#: Merge.rc:1993
+#: Merge.rc:1996
#, c-format
msgid "All message boxes are now displayed again."
msgstr ""
-#: Merge.rc:1994
+#: Merge.rc:1997
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
msgstr ""
-#: Merge.rc:1995
+#: Merge.rc:1998
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr ""
-#: Merge.rc:1997
+#: Merge.rc:2000
#, c-format
msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
msgstr ""
-#: Merge.rc:1999
+#: Merge.rc:2002
#, 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:2005
+#: Merge.rc:2008
#, c-format
msgid "Open"
msgstr ""
-#: Merge.rc:2006
+#: Merge.rc:2009
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:2007
+#: Merge.rc:2010
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:2008
+#: Merge.rc:2011
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr ""
-#: Merge.rc:2010
+#: Merge.rc:2013
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:2016
+#: Merge.rc:2019
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:2017
+#: Merge.rc:2020
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:2018
+#: Merge.rc:2021
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:2024
+#: Merge.rc:2027
#, c-format
msgid "UTF-8"
msgstr ""
-#: Merge.rc:2025
+#: Merge.rc:2028
#, c-format
msgid "UTF-8 (B)"
msgstr ""
-#: Merge.rc:2026
+#: Merge.rc:2029
#, c-format
msgid "UCS-2 LE"
msgstr ""
-#: Merge.rc:2027
+#: Merge.rc:2030
#, c-format
msgid "UCS-2 BE"
msgstr ""
-#: Merge.rc:2033
+#: Merge.rc:2036
#, c-format
msgid "Full Contents"
msgstr ""
-#: Merge.rc:2034
+#: Merge.rc:2037
#, c-format
msgid "Quick Contents"
msgstr ""
-#: Merge.rc:2035
+#: Merge.rc:2038
#, c-format
msgid "Modified Date"
msgstr ""
-#: Merge.rc:2036
+#: Merge.rc:2039
#, c-format
msgid "Modified Date and Size"
msgstr ""
-#: Merge.rc:2037
+#: Merge.rc:2040
#, c-format
msgid "Size"
msgstr ""
-#: Merge.rc:2043
-#: Merge.rc:2668
+#: Merge.rc:2046
+#: Merge.rc:2671
#, c-format
msgid "Name"
msgstr ""
-#: Merge.rc:2044
+#: Merge.rc:2047
#, c-format
msgid "Location"
msgstr ""
-#: Merge.rc:2045
+#: Merge.rc:2048
#, c-format
msgid "Filters"
msgstr ""
-#: Merge.rc:2046
+#: Merge.rc:2049
#, c-format
msgid "[F] "
msgstr ""
-#: Merge.rc:2047
-#: Merge.rc:2670
+#: Merge.rc:2050
+#: Merge.rc:2673
#, c-format
msgid "Description"
msgstr ""
-#: Merge.rc:2048
+#: Merge.rc:2051
#, c-format
msgid "Select filename for new filter"
msgstr ""
-#: Merge.rc:2049
+#: Merge.rc:2052
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:2051
+#: Merge.rc:2054
#, c-format
msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
msgstr ""
-#: Merge.rc:2053
+#: Merge.rc:2056
#, 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:2055
+#: Merge.rc:2058
#, c-format
msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System."
msgstr ""
-#: Merge.rc:2057
+#: Merge.rc:2060
#, c-format
msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
msgstr ""
-#: Merge.rc:2058
+#: Merge.rc:2061
#, c-format
msgid "Locate filter file to install"
msgstr ""
-#: Merge.rc:2060
+#: Merge.rc:2063
#, c-format
msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
msgstr ""
-#: Merge.rc:2062
+#: Merge.rc:2065
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr ""
-#: Merge.rc:2068
+#: Merge.rc:2071
#, c-format
msgid "Regular expression"
msgstr ""
-#: Merge.rc:2074
+#: Merge.rc:2077
#, 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:2081
+#: Merge.rc:2084
#, c-format
msgid "&Path to SS.EXE:"
msgstr ""
-#: Merge.rc:2087
+#: Merge.rc:2090
#, c-format
msgid "Folder Comparison Results"
msgstr ""
-#: Merge.rc:2088
+#: Merge.rc:2091
#, c-format
msgid "File Comparison"
msgstr ""
-#: Merge.rc:2089
+#: Merge.rc:2092
#, c-format
msgid "Untitled left"
msgstr ""
-#: Merge.rc:2090
+#: Merge.rc:2093
#, c-format
msgid "Untitled right"
msgstr ""
-#: Merge.rc:2091
+#: Merge.rc:2094
#, c-format
msgid "Theirs File"
msgstr ""
-#: Merge.rc:2092
+#: Merge.rc:2095
#, c-format
msgid "Mine File"
msgstr ""
-#: Merge.rc:2098
+#: Merge.rc:2101
#, c-format
msgid "Scanning files..."
msgstr ""
-#: Merge.rc:2099
+#: Merge.rc:2102
#, c-format
msgid "Opening selection"
msgstr ""
-#: Merge.rc:2100
+#: Merge.rc:2103
#, c-format
msgid "Copying Left to Right"
msgstr ""
-#: Merge.rc:2101
+#: Merge.rc:2104
#, c-format
msgid "Copying Right to Left"
msgstr ""
-#: Merge.rc:2102
+#: Merge.rc:2105
#, c-format
msgid "Copying All to Left"
msgstr ""
-#: Merge.rc:2103
+#: Merge.rc:2106
#, c-format
msgid "Copying All to Right"
msgstr ""
-#: Merge.rc:2104
+#: Merge.rc:2107
#, c-format
msgid "Copying files..."
msgstr ""
-#: Merge.rc:2105
+#: Merge.rc:2108
#, c-format
msgid "Deleting files..."
msgstr ""
-#: Merge.rc:2106
+#: Merge.rc:2109
#, c-format
msgid "Moving files..."
msgstr ""
-#: Merge.rc:2107
+#: Merge.rc:2110
#, c-format
msgid "Creating the report..."
msgstr ""
-#: Merge.rc:2108
+#: Merge.rc:2111
#, c-format
msgid "Undoing the last operation..."
msgstr ""
-#: Merge.rc:2109
+#: Merge.rc:2112
#, c-format
msgid "Redoing the previous operation..."
msgstr ""
-#: Merge.rc:2115
+#: Merge.rc:2118
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
-#: Merge.rc:2116
+#: Merge.rc:2119
#, c-format
msgid "Line: %s"
msgstr ""
-#: Merge.rc:2117
+#: Merge.rc:2120
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
-#: Merge.rc:2119
+#: Merge.rc:2122
#, c-format
msgid "Difference %1 of %2"
msgstr ""
-#: Merge.rc:2120
+#: Merge.rc:2123
#, c-format
msgid "%1 Differences Found"
msgstr ""
-#: Merge.rc:2121
+#: Merge.rc:2124
#, c-format
msgid "1 Difference Found"
msgstr ""
#. Abbreviation from "Read Only"
-#: Merge.rc:2122
+#: Merge.rc:2125
#, c-format
msgid "RO"
msgstr ""
-#: Merge.rc:2128
+#: Merge.rc:2131
#, c-format
msgid "Item %1 of %2"
msgstr ""
-#: Merge.rc:2129
+#: Merge.rc:2132
#, c-format
msgid "Items: %1"
msgstr ""
-#: Merge.rc:2135
+#: Merge.rc:2138
#, c-format
msgid "Select two existing folders or files to compare"
msgstr ""
-#: Merge.rc:2136
+#: Merge.rc:2139
#, c-format
msgid "Folder Selection"
msgstr ""
-#: Merge.rc:2137
+#: Merge.rc:2140
#, c-format
msgid "Select two folders or two files to compare."
msgstr ""
-#: Merge.rc:2138
+#: Merge.rc:2141
#, c-format
msgid "Left path is invalid!"
msgstr ""
-#: Merge.rc:2139
+#: Merge.rc:2142
#, c-format
msgid "Right path is invalid!"
msgstr ""
-#: Merge.rc:2140
+#: Merge.rc:2143
#, c-format
msgid "Both paths are invalid!"
msgstr ""
-#: Merge.rc:2141
+#: Merge.rc:2144
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr ""
-#: Merge.rc:2142
+#: Merge.rc:2145
#, c-format
msgid "Cannot compare file and folder!"
msgstr ""
-#: Merge.rc:2148
+#: Merge.rc:2151
#, c-format
msgid "File not found: %1"
msgstr ""
-#: Merge.rc:2149
+#: Merge.rc:2152
#, c-format
msgid "File not unpacked: %1"
msgstr ""
-#: Merge.rc:2150
+#: Merge.rc:2153
#, c-format
msgid "Cannot open file\n%1\n\n%2"
msgstr ""
-#: Merge.rc:2151
+#: Merge.rc:2154
#, c-format
msgid "Failed to parse conflict file."
msgstr ""
-#: Merge.rc:2152
+#: Merge.rc:2155
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
-#: Merge.rc:2158
+#: Merge.rc:2161
#, c-format
msgid "Save As"
msgstr ""
-#: Merge.rc:2159
+#: Merge.rc:2162
#, c-format
msgid "Save changes to %1?"
msgstr ""
-#: Merge.rc:2160
+#: Merge.rc:2163
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
msgstr ""
-#: Merge.rc:2161
+#: Merge.rc:2164
#, c-format
msgid "Error checking destination writeability"
msgstr ""
-#: Merge.rc:2162
+#: Merge.rc:2165
#, c-format
msgid "Error backing up file"
msgstr ""
-#: Merge.rc:2164
+#: Merge.rc:2167
#, c-format
msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
msgstr ""
-#: Merge.rc:2165
+#: Merge.rc:2168
#, 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:2166
+#: Merge.rc:2169
#, 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:2167
+#: Merge.rc:2170
#, 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:2168
+#: Merge.rc:2171
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
msgstr ""
-#: Merge.rc:2169
+#: Merge.rc:2172
#, c-format
msgid "%1\nis marked read-only. Would you like to override the read-only item?"
msgstr ""
-#: Merge.rc:2170
+#: Merge.rc:2173
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
msgstr ""
-#: Merge.rc:2171
+#: Merge.rc:2174
#, c-format
msgid "Save Left File As"
msgstr ""
-#: Merge.rc:2172
+#: Merge.rc:2175
#, c-format
msgid "Save Right File As"
msgstr ""
-#: Merge.rc:2173
+#: Merge.rc:2176
#, c-format
msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
msgstr ""
-#: Merge.rc:2179
+#: Merge.rc:2182
#, c-format
msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
msgstr ""
-#: Merge.rc:2185
+#: Merge.rc:2188
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr ""
-#: Merge.rc:2186
+#: Merge.rc:2189
#, c-format
msgid "Checkout files from VSS..."
msgstr ""
-#: Merge.rc:2187
+#: Merge.rc:2190
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr ""
-#: Merge.rc:2188
+#: Merge.rc:2191
#, c-format
msgid "Error executing versioning system command."
msgstr ""
-#: Merge.rc:2189
+#: Merge.rc:2192
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr ""
-#: Merge.rc:2190
+#: Merge.rc:2193
#, c-format
msgid "No VSS database(s) found!"
msgstr ""
-#: Merge.rc:2191
+#: Merge.rc:2194
#, c-format
msgid "Error from VSS:"
msgstr ""
-#: Merge.rc:2192
+#: Merge.rc:2195
#, 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:2193
+#: Merge.rc:2196
#, 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:2199
-#: Merge.rc:2652
+#: Merge.rc:2202
+#: Merge.rc:2655
#, c-format
msgid "None"
msgstr ""
-#: Merge.rc:2200
+#: Merge.rc:2203
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr ""
-#: Merge.rc:2201
+#: Merge.rc:2204
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr ""
-#: Merge.rc:2203
+#: Merge.rc:2206
#, c-format
msgid "Break at whitespace"
msgstr ""
-#: Merge.rc:2204
+#: Merge.rc:2207
#, c-format
msgid "Break at whitespace or punctuation"
msgstr ""
-#: Merge.rc:2210
-#: Merge.rc:2212
+#: Merge.rc:2213
+#: Merge.rc:2215
#, c-format
msgid "Copy selected item to named directory"
msgstr ""
-#: Merge.rc:2211
-#: Merge.rc:2213
+#: Merge.rc:2214
+#: Merge.rc:2216
#, c-format
msgid "Copy selected item to custom directory"
msgstr ""
-#: Merge.rc:2214
+#: Merge.rc:2217
#, c-format
msgid "Delete selected item on left"
msgstr ""
-#: Merge.rc:2215
+#: Merge.rc:2218
#, c-format
msgid "Delete selected item on right"
msgstr ""
-#: Merge.rc:2216
+#: Merge.rc:2219
#, c-format
msgid "Delete selected item(s) on both sides"
msgstr ""
-#: Merge.rc:2217
+#: Merge.rc:2220
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
msgstr ""
-#: Merge.rc:2218
+#: Merge.rc:2221
#, c-format
msgid "Rename selected item on both sides"
msgstr ""
-#: Merge.rc:2219
+#: Merge.rc:2222
#, c-format
msgid "Right to Left (%1)"
msgstr ""
-#: Merge.rc:2220
+#: Merge.rc:2223
#, c-format
msgid "Left to Right (%1)"
msgstr ""
-#: Merge.rc:2221
+#: Merge.rc:2224
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2222
+#: Merge.rc:2225
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2223
-#: Merge.rc:2239
+#: Merge.rc:2226
+#: Merge.rc:2242
#, c-format
msgid "Left to... (%1)"
msgstr ""
-#: Merge.rc:2224
-#: Merge.rc:2240
+#: Merge.rc:2227
+#: Merge.rc:2243
#, c-format
msgid "Right to... (%1)"
msgstr ""
-#: Merge.rc:2225
-#: Merge.rc:2241
+#: Merge.rc:2228
+#: Merge.rc:2244
#, c-format
msgid "Left to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2226
-#: Merge.rc:2242
+#: Merge.rc:2229
+#: Merge.rc:2245
#, c-format
msgid "Right to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2232
+#: Merge.rc:2235
#, c-format
msgid "Left (%1)"
msgstr ""
-#: Merge.rc:2233
+#: Merge.rc:2236
#, c-format
msgid "Right (%1)"
msgstr ""
-#: Merge.rc:2234
+#: Merge.rc:2237
#, c-format
msgid "Both (%1)"
msgstr ""
-#: Merge.rc:2235
+#: Merge.rc:2238
#, c-format
msgid "Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2236
+#: Merge.rc:2239
#, c-format
msgid "Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2237
+#: Merge.rc:2240
#, c-format
msgid "Both (%1 of %2)"
msgstr ""
-#: Merge.rc:2238
+#: Merge.rc:2241
#, c-format
msgid "Select destination folder"
msgstr ""
-#: Merge.rc:2243
+#: Merge.rc:2246
#, c-format
msgid "Left side - select destination folder:"
msgstr ""
-#: Merge.rc:2244
+#: Merge.rc:2247
#, c-format
msgid "Right side - select destination folder:"
msgstr ""
-#: Merge.rc:2245
+#: Merge.rc:2248
#, c-format
msgid "(%1 Files Affected)"
msgstr ""
-#: Merge.rc:2246
+#: Merge.rc:2249
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr ""
-#: Merge.rc:2252
+#: Merge.rc:2255
#, c-format
msgid "Are you sure you want to delete\n\n%1 ?"
msgstr ""
-#: Merge.rc:2253
+#: Merge.rc:2256
#, c-format
msgid "Are you sure you want to copy:"
msgstr ""
-#: Merge.rc:2254
+#: Merge.rc:2257
#, c-format
msgid "Are you sure you want to copy %d items:"
msgstr ""
-#: Merge.rc:2255
+#: Merge.rc:2258
#, 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:2256
+#: Merge.rc:2259
#, c-format
msgid "Are you sure you want to move:"
msgstr ""
-#: Merge.rc:2257
+#: Merge.rc:2260
#, c-format
msgid "Are you sure you want to move %d items:"
msgstr ""
-#: Merge.rc:2259
+#: Merge.rc:2262
#, c-format
msgid "Confirm Move"
msgstr ""
-#: Merge.rc:2265
+#: Merge.rc:2268
#, c-format
msgid "Open left file"
msgstr ""
-#: Merge.rc:2266
+#: Merge.rc:2269
#, c-format
msgid "Open the left file to external editor"
msgstr ""
-#: Merge.rc:2267
+#: Merge.rc:2270
#, c-format
msgid "Open left file with ..."
msgstr ""
-#: Merge.rc:2268
+#: Merge.rc:2271
#, c-format
msgid "Open right file"
msgstr ""
-#: Merge.rc:2269
+#: Merge.rc:2272
#, c-format
msgid "Open the right file to external editor"
msgstr ""
-#: Merge.rc:2270
+#: Merge.rc:2273
#, c-format
msgid "Open right file with..."
msgstr ""
-#: Merge.rc:2271
+#: Merge.rc:2274
#, c-format
msgid "Failed to execute external editor: %1"
msgstr ""
-#: Merge.rc:2272
+#: Merge.rc:2275
#, c-format
msgid "Unknown extension on external editor: %1"
msgstr ""
-#: Merge.rc:2273
+#: Merge.rc:2276
#, c-format
msgid "Copy filenames to clipboard"
msgstr ""
-#: Merge.rc:2274
+#: Merge.rc:2277
#, c-format
msgid "Copy left side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2275
+#: Merge.rc:2278
#, c-format
msgid "Copy right side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2276
+#: Merge.rc:2279
#, c-format
msgid "Copy both sides pathnames to clipboard"
msgstr ""
-#: Merge.rc:2282
+#: Merge.rc:2285
#, c-format
msgid "Left Shell menu"
msgstr ""
-#: Merge.rc:2283
+#: Merge.rc:2286
#, c-format
msgid "Right Shell menu"
msgstr ""
-#: Merge.rc:2289
+#: Merge.rc:2292
#, c-format
msgid "Unknown archive format"
msgstr ""
-#: Merge.rc:2290
+#: Merge.rc:2293
#, c-format
msgid "Add items from left side to archive"
msgstr ""
-#: Merge.rc:2291
+#: Merge.rc:2294
#, c-format
msgid "Add items from right side to archive"
msgstr ""
-#: Merge.rc:2292
+#: Merge.rc:2295
#, c-format
msgid "Add items from both sides to archive"
msgstr ""
-#: Merge.rc:2293
+#: Merge.rc:2296
#, c-format
msgid "Add different items to archive (both sides)"
msgstr ""
-#: Merge.rc:2295
+#: Merge.rc:2298
#, c-format
msgid "Move selected file on left to custom directory"
msgstr ""
-#: Merge.rc:2297
+#: Merge.rc:2300
#, c-format
msgid "Move selected file on right to custom directory"
msgstr ""
-#: Merge.rc:2303
+#: Merge.rc:2306
#, c-format
msgid "Filename"
msgstr ""
-#: Merge.rc:2304
+#: Merge.rc:2308
#, c-format
-msgid "Folder"
-msgstr ""
-
-#: Merge.rc:2305
-#, c-format
msgid "Comparison result"
msgstr ""
-#: Merge.rc:2306
+#: Merge.rc:2309
#, c-format
msgid "Left Date"
msgstr ""
-#: Merge.rc:2307
+#: Merge.rc:2310
#, c-format
msgid "Right Date"
msgstr ""
-#: Merge.rc:2308
+#: Merge.rc:2311
#, c-format
msgid "Extension"
msgstr ""
-#: Merge.rc:2309
+#: Merge.rc:2312
#, c-format
msgid "Left Size"
msgstr ""
-#: Merge.rc:2310
+#: Merge.rc:2313
#, c-format
msgid "Right Size"
msgstr ""
-#: Merge.rc:2311
+#: Merge.rc:2314
#, c-format
msgid "Right Size (Short)"
msgstr ""
-#: Merge.rc:2312
+#: Merge.rc:2315
#, c-format
msgid "Left Size (Short)"
msgstr ""
-#: Merge.rc:2318
+#: Merge.rc:2321
#, c-format
msgid "Left Creation Time"
msgstr ""
-#: Merge.rc:2319
+#: Merge.rc:2322
#, c-format
msgid "Right Creation Time"
msgstr ""
-#: Merge.rc:2320
+#: Merge.rc:2323
#, c-format
msgid "Newer File"
msgstr ""
-#: Merge.rc:2321
+#: Merge.rc:2324
#, c-format
msgid "Left File Version"
msgstr ""
-#: Merge.rc:2322
+#: Merge.rc:2325
#, c-format
msgid "Right File Version"
msgstr ""
-#: Merge.rc:2323
+#: Merge.rc:2326
#, c-format
msgid "Short Result"
msgstr ""
-#: Merge.rc:2324
+#: Merge.rc:2327
#, c-format
msgid "Left Attributes"
msgstr ""
-#: Merge.rc:2325
+#: Merge.rc:2328
#, c-format
msgid "Right Attributes"
msgstr ""
-#: Merge.rc:2326
+#: Merge.rc:2329
#, c-format
msgid "Left EOL"
msgstr ""
-#: Merge.rc:2327
+#: Merge.rc:2330
#, c-format
msgid "Right EOL"
msgstr ""
-#: Merge.rc:2333
+#: Merge.rc:2336
#, c-format
msgid "Left Encoding"
msgstr ""
-#: Merge.rc:2334
+#: Merge.rc:2337
#, c-format
msgid "Right Encoding"
msgstr ""
-#: Merge.rc:2335
+#: Merge.rc:2338
#, c-format
msgid "Ignored Diff."
msgstr ""
-#: Merge.rc:2336
+#: Merge.rc:2339
#, c-format
msgid "Differences"
msgstr ""
-#: Merge.rc:2337
-#: Merge.rc:2648
+#: Merge.rc:2340
+#: Merge.rc:2651
#, c-format
msgid "Binary"
msgstr ""
-#: Merge.rc:2343
+#: Merge.rc:2346
#, c-format
msgid "Unable to compare files"
msgstr ""
-#: Merge.rc:2344
+#: Merge.rc:2347
#, c-format
msgid "Item aborted"
msgstr ""
-#: Merge.rc:2345
+#: Merge.rc:2348
#, c-format
msgid "File skipped"
msgstr ""
-#: Merge.rc:2346
+#: Merge.rc:2349
#, c-format
msgid "Folder skipped"
msgstr ""
-#: Merge.rc:2347
+#: Merge.rc:2350
#, c-format
msgid "Left only: %1"
msgstr ""
-#: Merge.rc:2348
+#: Merge.rc:2351
#, c-format
msgid "Right only: %1"
msgstr ""
-#: Merge.rc:2349
+#: Merge.rc:2352
#, c-format
msgid "Binary files are identical"
msgstr ""
-#: Merge.rc:2351
+#: Merge.rc:2354
#, c-format
msgid "Binary files are different"
msgstr ""
-#: Merge.rc:2352
+#: Merge.rc:2355
#, c-format
msgid "Files are different"
msgstr ""
-#: Merge.rc:2353
+#: Merge.rc:2356
#, c-format
msgid "Folders are different"
msgstr ""
-#: Merge.rc:2354
+#: Merge.rc:2357
#, c-format
msgid "Left Only"
msgstr ""
-#: Merge.rc:2355
+#: Merge.rc:2358
#, c-format
msgid "Right Only"
msgstr ""
-#: Merge.rc:2357
+#: Merge.rc:2360
#, c-format
msgid "Error"
msgstr ""
-#: Merge.rc:2358
+#: Merge.rc:2361
#, c-format
msgid "Text files are identical"
msgstr ""
-#: Merge.rc:2363
+#: Merge.rc:2366
#, c-format
msgid "Text files are different"
msgstr ""
-#: Merge.rc:2369
+#: Merge.rc:2372
#, c-format
msgid "Elapsed time: %ld ms"
msgstr ""
-#: Merge.rc:2370
+#: Merge.rc:2373
#, c-format
msgid "1 item selected"
msgstr ""
-#: Merge.rc:2371
+#: Merge.rc:2374
#, c-format
msgid "%1 items selected"
msgstr ""
-#: Merge.rc:2377
+#: Merge.rc:2380
#, c-format
msgid "Filename or folder name."
msgstr ""
-#: Merge.rc:2378
+#: Merge.rc:2381
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr ""
-#: Merge.rc:2379
+#: Merge.rc:2382
#, c-format
msgid "Comparison result, long form."
msgstr ""
-#: Merge.rc:2380
+#: Merge.rc:2383
#, c-format
msgid "Left side modification date."
msgstr ""
-#: Merge.rc:2381
+#: Merge.rc:2384
#, c-format
msgid "Right side modification date."
msgstr ""
-#: Merge.rc:2382
+#: Merge.rc:2385
#, c-format
msgid "File's extension."
msgstr ""
-#: Merge.rc:2383
+#: Merge.rc:2386
#, c-format
msgid "Left file size in bytes."
msgstr ""
-#: Merge.rc:2384
+#: Merge.rc:2387
#, c-format
msgid "Right file size in bytes."
msgstr ""
-#: Merge.rc:2385
+#: Merge.rc:2388
#, c-format
msgid "Left file size abbreviated."
msgstr ""
-#: Merge.rc:2386
+#: Merge.rc:2389
#, c-format
msgid "Right file size abbreviated."
msgstr ""
-#: Merge.rc:2392
+#: Merge.rc:2395
#, c-format
msgid "Left side creation time."
msgstr ""
-#: Merge.rc:2393
+#: Merge.rc:2396
#, c-format
msgid "Right side creation time."
msgstr ""
-#: Merge.rc:2394
+#: Merge.rc:2397
#, c-format
msgid "Tells which side has newer modification date."
msgstr ""
-#: Merge.rc:2395
+#: Merge.rc:2398
#, c-format
msgid "Left side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2396
+#: Merge.rc:2399
#, c-format
msgid "Right side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2397
+#: Merge.rc:2400
#, c-format
msgid "Short comparison result."
msgstr ""
-#: Merge.rc:2398
+#: Merge.rc:2401
#, c-format
msgid "Left side attributes."
msgstr ""
-#: Merge.rc:2399
+#: Merge.rc:2402
#, c-format
msgid "Right side attributes."
msgstr ""
-#: Merge.rc:2400
+#: Merge.rc:2403
#, c-format
msgid "Left side file EOL type"
msgstr ""
-#: Merge.rc:2401
+#: Merge.rc:2404
#, c-format
msgid "Right side file EOL type"
msgstr ""
-#: Merge.rc:2407
+#: Merge.rc:2410
#, c-format
msgid "Left side encoding."
msgstr ""
-#: Merge.rc:2408
+#: Merge.rc:2411
#, c-format
msgid "Right side encoding."
msgstr ""
-#: Merge.rc:2409
+#: Merge.rc:2412
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
msgstr ""
-#: Merge.rc:2410
+#: Merge.rc:2413
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
msgstr ""
-#: Merge.rc:2411
+#: Merge.rc:2414
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr ""
-#: Merge.rc:2417
+#: Merge.rc:2420
#, c-format
msgid "Compare %1 with %2"
msgstr ""
-#: Merge.rc:2418
+#: Merge.rc:2421
#, c-format
msgid "Comma-separated list"
msgstr ""
-#: Merge.rc:2419
+#: Merge.rc:2422
#, c-format
msgid "Tab-separated list"
msgstr ""
-#: Merge.rc:2420
+#: Merge.rc:2423
#, c-format
msgid "Simple HTML"
msgstr ""
-#: Merge.rc:2421
+#: Merge.rc:2424
#, c-format
msgid "Simple XML"
msgstr ""
-#: Merge.rc:2423
+#: Merge.rc:2426
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
msgstr ""
-#: Merge.rc:2424
+#: Merge.rc:2427
#, c-format
msgid "Error creating the report:\n%1"
msgstr ""
-#: Merge.rc:2425
+#: Merge.rc:2428
#, c-format
msgid "The report has been created successfully."
msgstr ""
-#: Merge.rc:2431
+#: Merge.rc:2434
#, c-format
msgid "The same file is opened in both panels."
msgstr ""
-#: Merge.rc:2432
+#: Merge.rc:2435
#, c-format
msgid "The selected files are identical."
msgstr ""
-#: Merge.rc:2433
+#: Merge.rc:2436
#, c-format
msgid "An error occurred while comparing the files."
msgstr ""
-#: Merge.rc:2434...
[truncated message content] |
|
From: <ki...@us...> - 2009-07-23 15:11:47
|
Revision: 6920
http://winmerge.svn.sourceforge.net/winmerge/?rev=6920&view=rev
Author: kimmov
Date: 2009-07-23 15:11:41 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
PATCH: [ 2824173 ] Stringdiffs
Optimize loops
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Src/stringdiffs.cpp
Modified: trunk/Src/stringdiffs.cpp
===================================================================
--- trunk/Src/stringdiffs.cpp 2009-07-22 11:15:45 UTC (rev 6919)
+++ trunk/Src/stringdiffs.cpp 2009-07-23 15:11:41 UTC (rev 6920)
@@ -566,7 +566,9 @@
// Be aware, do not create more wdiffs as shortest line has chars!
int imaxcount = min(m_str1.length(), m_str2.length());
i = 0;
- while ((i < (int)m_words1.size()) && (i < (int)m_words2.size()) && ((int)m_wdiffs.size() <= imaxcount))
+ const int iSize1 = (int)m_words1.size();
+ const int iSize2 = (int)m_words2.size();
+ while ((i < iSize1) && (i < iSize2) && ((int)m_wdiffs.size() <= imaxcount))
{
if (!AreWordsSame(*m_words1[i], *m_words2[i]))
{
@@ -579,7 +581,7 @@
int len1 = e1 - s1 + 1;
int len2 = e2 - s2 + 1;
- if (IsInsert(*m_words1[i]))
+ if (IsInsert(*m_words1[i]))
str1.clear();
else
{
@@ -622,7 +624,8 @@
int
stringdiffs::FindNextMatchInWords1(const word & needword2, int bw1) const
{
- while (bw1 < (int) m_words1.size())
+ const int iSize = (int) m_words1.size();
+ while (bw1 < iSize)
{
if (AreWordsSame(*m_words1[bw1], needword2))
return bw1;
@@ -637,7 +640,8 @@
int
stringdiffs::FindNextMatchInWords2(const word & needword1, int bw2) const
{
- while (bw2 < (int)m_words2.size())
+ const int iSize = (int) m_words2.size();
+ while (bw2 < iSize)
{
if (AreWordsSame(needword1, *m_words2[bw2]))
return bw2;
@@ -652,7 +656,8 @@
int
stringdiffs::FindNextSpaceInWords1(int bw1) const
{
- while (bw1 < (int) m_words1.size())
+ const int iSize = (int) m_words1.size();
+ while (bw1 < iSize)
{
if (IsSpace(*m_words1[bw1]))
return bw1;
@@ -666,7 +671,8 @@
int
stringdiffs::FindNextSpaceInWords2(int bw2) const
{
- while (bw2 < (int) m_words2.size())
+ const int iSize = (int) m_words2.size();
+ while (bw2 < iSize)
{
if (IsSpace(*m_words2[bw2]))
return bw2;
@@ -1084,17 +1090,17 @@
pen2 = CharPrev(py2, pen2);
}
}
- //check for excaption of empty string on one side
- //In that case display all as a diff
- if (!equal && ((py1 == pen1) && isSafeWhitespace(*pen1) )
- || ((py2 == pen2) && isSafeWhitespace(*pen2) ))
- {
- begin1 = 0;
- begin2 = 0;
- end1 =len1 - 1;
- end2 =len2 - 1;
- return;
- }
+ //check for excaption of empty string on one side
+ //In that case display all as a diff
+ if (!equal && (((py1 == pen1) && isSafeWhitespace(*pen1)) ||
+ ((py2 == pen2) && isSafeWhitespace(*pen2))))
+ {
+ begin1 = 0;
+ begin2 = 0;
+ end1 =len1 - 1;
+ end2 =len2 - 1;
+ return;
+ }
bool alldone = false;
bool found = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-22 11:15:50
|
Revision: 6919
http://winmerge.svn.sourceforge.net/winmerge/?rev=6919&view=rev
Author: kimmov
Date: 2009-07-22 11:15:45 +0000 (Wed, 22 Jul 2009)
Log Message:
-----------
PATCH: [ 2824173 ] Stringdiffs
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/stringdiffs.cpp
trunk/Src/stringdiffsi.h
trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test_adds.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-07-18 11:17:59 UTC (rev 6918)
+++ trunk/Docs/Users/ChangeLog.txt 2009-07-22 11:15:45 UTC (rev 6919)
@@ -13,9 +13,10 @@
Bugfix: Don't highlight identical words if whitespaces are ignored (#2798360)
Bugfix: Did not reset folder compare method back to original (#2803152)
Bugfix: Added EOL chars between copied file/path names (#2817546)
+ Bugfix: In-line difference highlight fixes (#2824173)
Translation updates:
- Dutch (#2801690, #2804979)
- - Swedish (#2805726)\xB4
+ - Swedish (#2805726)
- Ukrainian (#2817835)
WinMerge 2.13.8 - 2009-05-26 (r6791)
Modified: trunk/Src/stringdiffs.cpp
===================================================================
--- trunk/Src/stringdiffs.cpp 2009-07-18 11:17:59 UTC (rev 6918)
+++ trunk/Src/stringdiffs.cpp 2009-07-22 11:15:45 UTC (rev 6919)
@@ -141,14 +141,14 @@
int i = 0; // Number of fixed records of word2
int start = 0;
int end = 0;
+#ifdef STRINGDIFF_LOGGING
String str1;
String str2;
-#ifdef STRINGDIFF_LOGGING
TCHAR buf[256];
#endif
// If we have to ignore all whitespace change,
// just remove leading and ending if one is there
- if (m_whitespace == 2 && m_matchblock)
+ if (m_whitespace == WHITESPACE_IGNORE_ALL && m_matchblock)
{
// Remove a leading whitespace
if (((int) m_words1.size() > 0) && (IsSpace(*m_words1[0])))
@@ -191,7 +191,7 @@
lbreak = false;
if (bw1 >= (int)m_words1.size())
break;
- if (m_whitespace == 2)
+ if (m_whitespace == WHITESPACE_IGNORE_ALL)
{
if (IsSpace(*m_words1[bw1]))
{
@@ -221,68 +221,74 @@
w2 = w1;
// Not found, not same, check whitch distance is shorter
if (w1 == -1 || (w1 - bw1) > 0)
- {
- w2 = FindNextMatchInWords2(*m_words1[bw2], bw1);
- // Execption both are not found in other string
- // so all between keep as a differ
- if (w1 == -1 && w2 == -1)
- {
- // check if it would be same if we remove the spaceblock
- // we must only ckeck on the side with the shortes word
- if ((m_words1[bw1]->end - m_words1[bw1]->start) > (m_words2[bw2]->end - m_words2[bw2]->start))
- {
- // first we check for size word2 and next word as space
- if ((bw2 < (int)m_words2.size() - 2) && IsSpace(*m_words2[bw2 + 1]))
- {
- // Are the contents same
- if (m_words1[bw1]->hash ==
- Hash(m_str2, m_words2[bw2 + 2]->start, m_words2[bw2 + 2]->end, m_words2[bw2]->hash))
- {
- m_words2[bw2]->end = m_words2[bw2 + 2]->end;
- m_words2[bw1]->hash = m_words1[bw1]->hash;
- // Now remove the detected blocks on side2.
- RemoveItem2(bw2 + 1);
- RemoveItem2(bw2 + 1);
- bw1++;
- bw2++;
- continue;
- }
- }
- }
- else if ((m_words1[bw1]->end - m_words1[bw1]->start) < (m_words2[bw2]->end - m_words2[bw2]->start))
-
- {
- // first we check for size word1 and next word as space
- if ((bw1 < (int)m_words1.size() - 2) && IsSpace(*m_words1[bw1 + 1]))
- {
- // Are the contents same
- if (m_words2[bw2]->hash ==
- Hash(m_str1, m_words1[bw1 + 2]->start, m_words1[bw1 + 2]->end, m_words1[bw1]->hash))
- {
- m_words1[bw1]->end = m_words1[bw1 + 2]->end;
- m_words1[bw1]->hash = m_words2[bw1]->hash;
- // Now remove the detected blocks on side2.
- RemoveItem1(bw1 + 1);
- RemoveItem1(bw1 + 1);
- bw1++;
- bw2++;
- continue;
- }
- }
- }
- // Otherwise keep as diff
- bw1++;
- bw2++;
- continue;
- }
- // Check if in distance 2 and 3 is equal again
+ {
+ // Are we looking for a spacebreak, so just look for word->bBreak
+ if (IsSpace(*m_words1[bw1]))
+ w2 = FindNextSpaceInWords2(bw2);
+ else
+ w2 = FindNextMatchInWords2(*m_words1[bw1], bw2);
+ // Execption both are not found in other string
+ // so all between keep as a differ
+ if (w1 == -1 && w2 == -1)
+ {
+ // check if it would be same if we remove the spaceblock
+ // we must only ckeck on the side with the shortes word
+ if ((m_words1[bw1]->end - m_words1[bw1]->start) > (m_words2[bw2]->end - m_words2[bw2]->start))
+ {
+ // first we check for size word2 and next word as space
+ if ((bw2 < (int)m_words2.size() - 2) && IsSpace(*m_words2[bw2 + 1]))
+ {
+ // Are the contents same
+ if (m_words1[bw1]->hash ==
+ Hash(m_str2, m_words2[bw2 + 2]->start, m_words2[bw2 + 2]->end, m_words2[bw2]->hash))
+ {
+ m_words2[bw2]->end = m_words2[bw2 + 2]->end;
+ m_words2[bw1]->hash = m_words1[bw1]->hash;
+ // Now remove the detected blocks on side2.
+ RemoveItem2(bw2 + 1);
+ RemoveItem2(bw2 + 1);
+ bw1++;
+ bw2++;
+ continue;
+ }
+ }
+ }
+ else if ((m_words1[bw1]->end - m_words1[bw1]->start) < (m_words2[bw2]->end - m_words2[bw2]->start))
+ {
+ // first we check for size word1 and next word as space
+ if ((bw1 < (int)m_words1.size() - 2) && IsSpace(*m_words1[bw1 + 1]))
+ {
+ // Are the contents same
+ if (m_words2[bw2]->hash ==
+ Hash(m_str1, m_words1[bw1 + 2]->start, m_words1[bw1 + 2]->end, m_words1[bw1]->hash))
+ {
+ m_words1[bw1]->end = m_words1[bw1 + 2]->end;
+ m_words1[bw1]->hash = m_words2[bw1]->hash;
+ // Now remove the detected blocks on side2.
+ RemoveItem1(bw1 + 1);
+ RemoveItem1(bw1 + 1);
+ bw1++;
+ bw2++;
+ continue;
+ }
+ }
+ }
+ // Otherwise keep as diff
+ bw1++;
+ bw2++;
+ continue;
+ }
+ // Not found on one side, so check if we are synchron again on
+ // next words (try not to check breaks)
if ((w1 == -1) || (w2 == -1))
{
- if (bw2 + 2 < (int)m_words1.size() && (bw2 + 2 < (int)m_words2.size()))
+ // In relation to words.size()
+ // Check if in distance 2 and (3 or 4) is equal again
+ if (bw1 + 4 < (int)m_words1.size() && (bw2 + 4 < (int)m_words2.size()))
{
- if (AreWordsSame(*m_words1[bw2 + 1], *m_words2[bw2 + 1]))
+ if (AreWordsSame(*m_words1[bw1 + 2], *m_words2[bw2 + 2]))
{
- if (AreWordsSame(*m_words1[bw2 + 2], *m_words2[bw2 + 2]))
+ if (AreWordsSame(*m_words1[bw1 + 3], *m_words2[bw2 + 3]) || AreWordsSame(*m_words1[bw1 + 4], *m_words2[bw2 + 4]))
{
// Ok than keep it as a differ
bw1 = bw1 + 2;
@@ -291,57 +297,33 @@
}
}
}
- }
- }
-
- // Not found in word1, or distance from word1 to word2 is shorter
- // or too far away from both
- if (((w1 == -1) && (w2 == 0)) || ((w1 < w2)&& (w1 >= 0)) || (w2 - bw1 > 4))
- {
- // Not found in word1 or to far away
- // so insert an empty record in word1
- // at actual position
- // remember last start end
- if (bw1)
- {
- // Last word is a insert? So use same positions
- if (IsInsert(*m_words1[bw1 - 1]))
+ // Check if in distance 2 is equal again
+ else if (bw1 + 2 < (int)m_words1.size() && (bw2 + 2 < (int)m_words2.size()))
{
- end = m_words1[bw1 - 1]->end;
- start = m_words1[bw1 - 1]->start;
+ if (AreWordsSame(*m_words1[bw1 + 1], *m_words2[bw2 + 1]))
+ {
+ // Ok than keep it as a differ
+ bw1 = bw1 + 2;
+ bw2 = bw2 + 2;
+ continue;
+ }
}
- else
- {
- // First insert, use endpos as start
- start = m_words1[bw1 - 1]->end + 1;
- end = start - 1;
- }
}
- else
- {
- // At first position allways start at 0
- end = -1;
- start = 0;
- }
- vector<word*>::iterator iter = m_words1.begin() + bw1;
- word *wd = new word(start, end, dlinsert, 0);
- m_words1.insert(iter, wd);
- // check if a space is following
- if ((bw2 + 1) < (int)m_words2.size() && IsSpace(*m_words2[bw2 + 1]))
- {
- // Add a second insert
- iter = m_words1.begin() + bw1;
- word *wd = new word(start, end, dlinsert, 0);
- m_words1.insert(iter, wd);
- bw1 = bw1 + 1;
- bw2 = bw2 + 1; // Next record
- }
- bw1 = bw1 + 1;
- bw2 = bw2 + 1; // Next record
- continue;
}
- else if (w2 > bw2)
+ // distance from word1 to word2 is too far away on both side
+ // or too far away and not found on the other side
+ if (((w1 - bw1 > 4) && (w2 - bw2 > 4))
+ || ((w1 - bw1 > 4) && (w2 == -1))
+ || ((w2 - bw2 > 4) && (w1 == -1)))
+ {
+ // keep as diff
+ bw1++;
+ bw2++;
+ continue;
+ }
+ else if ((w2 > bw2) && ((w1 == -1 || (w2 - bw2) < (w1 - bw1))))
{
+ // Numbers of inserts in word1
int k = w2 - bw2;
for (int l = 0; l < k; l++)
{
@@ -359,14 +341,14 @@
word *wd = new word(start, end, dlinsert, 0);
m_words1.insert(iter, wd);
}
- bw1 = bw1 + k + 1;
- bw2 = bw2 + k + 1; // Next record
- continue;
+ bw1 = bw1 + k + 2;
+ bw2 = bw2 + k + 2; // Next record
+ continue;
}
else if (w1 > bw2)
{
- int k = w1 - bw2;
-
+ // Numbers of inserts in word2
+ int k = w1 - bw2;
for (int l = 0; l < k; l++)
{
// Remember last start end
@@ -383,8 +365,8 @@
word *wd = new word(start, end, dlinsert, 0);
m_words2.insert(iter, wd);
}
- bw1 = w1 + 1;
- bw2 = bw2 + k + 1; // Next record
+ bw1 = bw1 + k + 2;
+ bw2 = bw2 + k + 2; // Next record
continue;
}
else if (w1 == bw2)
@@ -427,7 +409,7 @@
word *wd = new word(start, end, dlinsert, 0);
m_words1.push_back(wd);
length1++;
- // connect inserted char to on diff
+ // connect inserted char to one diff
m_words2[length1]->end = m_words2[length2]->end;
}
while ((length1 + 2) < (int)m_words2.size())
@@ -524,7 +506,7 @@
// inore all diff in whitespace
// so remove same records
- if (m_whitespace != 0)
+ if (m_whitespace != WHITESPACE_COMPARE_ALL)
{
i = 0;
while ((i < (int)m_words1.size()) && (i < (int)m_words2.size()))
@@ -590,13 +572,14 @@
{
int s1 = m_words1[i]->start;
int e1 = m_words1[i]->end;
- int len1 = e1 - s1 + 1;
int s2 = m_words2[i]->start;
int e2 = m_words2[i]->end ;
+
+#ifdef STRINGDIFF_LOGGING
+ int len1 = e1 - s1 + 1;
int len2 = e2 - s2 + 1;
-#ifdef STRINGDIFF_LOGGING
- if (IsInsert(*m_words1[i]))
+ if (IsInsert(*m_words1[i]))
str1.clear();
else
{
@@ -678,6 +661,20 @@
return -1;
}
/**
+ * @brief Find next space in m_words2 (starting at bw2)
+ */
+int
+stringdiffs::FindNextSpaceInWords2(int bw2) const
+{
+ while (bw2 < (int) m_words2.size())
+ {
+ if (IsSpace(*m_words2[bw2]))
+ return bw2;
+ ++bw2;
+ }
+ return -1;
+}
+/**
* @brief erase an item in m_words1
*/
bool
@@ -852,7 +849,7 @@
bool
stringdiffs::AreWordsSame(const word & word1, const word & word2) const
{
- if (m_whitespace == 2)
+ if (m_whitespace == WHITESPACE_IGNORE_ALL)
if (word1.hash == word2.hash)
return true;
if (word1.hash != word2.hash)
@@ -1087,7 +1084,17 @@
pen2 = CharPrev(py2, pen2);
}
}
-
+ //check for excaption of empty string on one side
+ //In that case display all as a diff
+ if (!equal && ((py1 == pen1) && isSafeWhitespace(*pen1) )
+ || ((py2 == pen2) && isSafeWhitespace(*pen2) ))
+ {
+ begin1 = 0;
+ begin2 = 0;
+ end1 =len1 - 1;
+ end2 =len2 - 1;
+ return;
+ }
bool alldone = false;
bool found = false;
@@ -1220,7 +1227,7 @@
{
end1 = pen1 - pbeg1;
end2 = pen2 - pbeg2;
- }
+ }
else
{
pz1 = pen1;
Modified: trunk/Src/stringdiffsi.h
===================================================================
--- trunk/Src/stringdiffsi.h 2009-07-18 11:17:59 UTC (rev 6918)
+++ trunk/Src/stringdiffsi.h 2009-07-22 11:15:45 UTC (rev 6919)
@@ -67,6 +67,7 @@
int FindNextMatchInWords1(const word & needword2, int bw1) const;
int FindNextMatchInWords2(const word & needword1, int bw2) const;
int FindNextSpaceInWords1(int bw1) const;
+ int FindNextSpaceInWords2(int bw2) const;
UINT Hash(const String & str, int begin, int end, UINT h ) const;
bool AreWordsSame(const word & word1, const word & word2) const;
bool IsWord(const word & word1) const;
Modified: trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test_adds.cpp
===================================================================
--- trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test_adds.cpp 2009-07-18 11:17:59 UTC (rev 6918)
+++ trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test_adds.cpp 2009-07-22 11:15:45 UTC (rev 6919)
@@ -191,5 +191,118 @@
EXPECT_EQ(-1, pDiff->end[1]);
}
}
+ // exchange string left right side only
+ TEST_F(StringDiffsAddsTest, ExchangeString1a)
+ {
+ std::vector<wdiff*> diffs;
+ sd_SetBreakChars(".,;:()[]{}!@#\"$%^&*~+-=<>\'/\\|");
+ sd_ComputeWordDiffs("N2130 _RobOk=_INT B_AND 512 ;Roboter bereit",
+ "N2040 _RobOk=_INT B_AND 'B1000000000' ;Roboter bereit",
+ false, 1, 0, true, &diffs);
+ EXPECT_EQ(2, diffs.size());
+ if (diffs.size() > 1)
+ {
+ wdiff *pDiff = diffs[0];
+ EXPECT_EQ(2, pDiff->start[0]);
+ EXPECT_EQ(2, pDiff->start[1]);
+ EXPECT_EQ(3, pDiff->end[0]);
+ EXPECT_EQ(3, pDiff->end[1]);
+ pDiff = diffs[1];
+ EXPECT_EQ(26, pDiff->start[0]);
+ EXPECT_EQ(26, pDiff->start[1]);
+ EXPECT_EQ(28, pDiff->end[0]);
+ EXPECT_EQ(38, pDiff->end[1]);
+ }
+ }
+ // exchange string left right side only
+ TEST_F(StringDiffsAddsTest, ExchangeString1b)
+ {
+ std::vector<wdiff*> diffs;
+ sd_SetBreakChars(".,;:()[]{}!@#\"$%^&*~+-=<>\'/\\|");
+ sd_ComputeWordDiffs("N2040 _RobOk=_INT B_AND 'B1000000000' ;Roboter bereit",
+ "N2130 _RobOk=_INT B_AND 512 ;Roboter bereit",
+ false, 1, 0, true, &diffs);
+ EXPECT_EQ(2, diffs.size());
+ if (diffs.size() > 1)
+ {
+ wdiff *pDiff = diffs[0];
+ EXPECT_EQ(2, pDiff->start[0]);
+ EXPECT_EQ(2, pDiff->start[1]);
+ EXPECT_EQ(3, pDiff->end[0]);
+ EXPECT_EQ(3, pDiff->end[1]);
+ pDiff = diffs[1];
+ EXPECT_EQ(26, pDiff->start[0]);
+ EXPECT_EQ(26, pDiff->start[1]);
+ EXPECT_EQ(38, pDiff->end[0]);
+ EXPECT_EQ(28, pDiff->end[1]);
+ }
+ }
+ // exchange string left right side only
+ TEST_F(StringDiffsAddsTest, ExchangeString2a)
+ {
+ std::vector<wdiff*> diffs;
+ sd_SetBreakChars(".,;:()[]{}!@#\"$%^&*~+-=<>\'/\\|");
+ sd_ComputeWordDiffs("N1960 IF(R2941==2) OR (R2941==203))",
+ "N1830 IF((R2941==2) OR (R2941==3) ",
+ false, 1, 1, true, &diffs);
+ EXPECT_EQ(4, diffs.size());
+ if (diffs.size() > 3)
+ {
+ wdiff *pDiff = diffs[0];
+ EXPECT_EQ(2, pDiff->start[0]);
+ EXPECT_EQ(2, pDiff->start[1]);
+ EXPECT_EQ(3, pDiff->end[0]);
+ EXPECT_EQ(3, pDiff->end[1]);
+ pDiff = diffs[1];
+ EXPECT_EQ(9, pDiff->start[0]);
+ EXPECT_EQ(9, pDiff->start[1]);
+ EXPECT_EQ(8, pDiff->end[0]);
+ EXPECT_EQ(9, pDiff->end[1]);
+ pDiff = diffs[2];
+ EXPECT_EQ(30, pDiff->start[0]);
+ EXPECT_EQ(33, pDiff->start[1]);
+ EXPECT_EQ(31, pDiff->end[0]);
+ EXPECT_EQ(32, pDiff->end[1]);
+ pDiff = diffs[3];
+ EXPECT_EQ(34, pDiff->start[0]);
+ EXPECT_EQ(35, pDiff->start[1]);
+ EXPECT_EQ(34, pDiff->end[0]);
+ EXPECT_EQ(38, pDiff->end[1]);
+ }
+ }
+ // exchange string left right side only
+ TEST_F(StringDiffsAddsTest, ExchangeString2b)
+ {
+ std::vector<wdiff*> diffs;
+ sd_SetBreakChars(".,;:()[]{}!@#\"$%^&*~+-=<>\'/\\|");
+ sd_ComputeWordDiffs("N1830 IF((R2941==2) OR (R2941==3) ",
+ "N1960 IF(R2941==2) OR (R2941==203))",
+ false, 1, 1, true, &diffs);
+ EXPECT_EQ(4, diffs.size());
+ if (diffs.size() > 3)
+ {
+ wdiff *pDiff = diffs[0];
+ EXPECT_EQ(2, pDiff->start[0]);
+ EXPECT_EQ(2, pDiff->start[1]);
+ EXPECT_EQ(3, pDiff->end[0]);
+ EXPECT_EQ(3, pDiff->end[1]);
+ pDiff = diffs[1];
+ EXPECT_EQ(9, pDiff->start[0]);
+ EXPECT_EQ(9, pDiff->start[1]);
+ EXPECT_EQ(9, pDiff->end[0]);
+ EXPECT_EQ(8, pDiff->end[1]);
+ pDiff = diffs[2];
+ EXPECT_EQ(33, pDiff->start[0]);
+ EXPECT_EQ(30, pDiff->start[1]);
+ EXPECT_EQ(32, pDiff->end[0]);
+ EXPECT_EQ(31, pDiff->end[1]);
+ pDiff = diffs[3];
+ EXPECT_EQ(35, pDiff->start[0]);
+ EXPECT_EQ(34, pDiff->start[1]);
+ EXPECT_EQ(38, pDiff->end[0]);
+ EXPECT_EQ(34, pDiff->end[1]);
+ }
+ }
+
} // namespace
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-18 11:18:04
|
Revision: 6918
http://winmerge.svn.sourceforge.net/winmerge/?rev=6918&view=rev
Author: kimmov
Date: 2009-07-18 11:17:59 +0000 (Sat, 18 Jul 2009)
Log Message:
-----------
BUG: [ 2817546 ] Copy pathname appends CRLF to path
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/DirView.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-07-18 11:15:04 UTC (rev 6917)
+++ trunk/Docs/Users/ChangeLog.txt 2009-07-18 11:17:59 UTC (rev 6918)
@@ -12,6 +12,7 @@
Bugfix: Did not export changed options values (#2799149)
Bugfix: Don't highlight identical words if whitespaces are ignored (#2798360)
Bugfix: Did not reset folder compare method back to original (#2803152)
+ Bugfix: Added EOL chars between copied file/path names (#2817546)
Translation updates:
- Dutch (#2801690, #2804979)
- Swedish (#2805726)\xB4
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2009-07-18 11:15:04 UTC (rev 6917)
+++ trunk/Src/DirView.cpp 2009-07-18 11:17:59 UTC (rev 6918)
@@ -3103,9 +3103,12 @@
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
strPaths = paths_ConcatPath(strPaths, di.left.filename);
- strPaths += _T("\r\n");
+ // Append space between (and end) of paths. Space is better than
+ // EOL since it allows copying to console/command line.
+ strPaths += _T(" ");
}
}
+ strPaths = string_trim_ws_end(strPaths);
PutToClipboard(strPaths, AfxGetMainWnd()->GetSafeHwnd());
}
@@ -3127,9 +3130,12 @@
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
strPaths = paths_ConcatPath(strPaths, di.right.filename);
- strPaths += _T("\r\n");
+ // Append space between (and end) of paths. Space is better than
+ // EOL since it allows copying to console/command line.
+ strPaths += _T(" ");
}
}
+ strPaths = string_trim_ws_end(strPaths);
PutToClipboard(strPaths, AfxGetMainWnd()->GetSafeHwnd());
}
@@ -3151,7 +3157,9 @@
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
strPaths = paths_ConcatPath(strPaths, di.left.filename);
- strPaths += _T("\r\n");
+ // Append space between (and end) of paths. Space is better than
+ // EOL since it allows copying to console/command line.
+ strPaths += _T(" ");
}
if (!di.diffcode.isSideLeftOnly())
@@ -3160,9 +3168,12 @@
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
strPaths = paths_ConcatPath(strPaths, di.right.filename);
- strPaths += _T("\r\n");
+ // Append space between (and end) of paths. Space is better than
+ // EOL since it allows copying to console/command line.
+ strPaths += _T(" ");
}
}
+ strPaths = string_trim_ws_end(strPaths);
PutToClipboard(strPaths, AfxGetMainWnd()->GetSafeHwnd());
}
@@ -3180,9 +3191,12 @@
if (!di.diffcode.isDirectory())
{
strPaths += di.left.filename;
- strPaths += _T("\r\n");
+ // Append space between (and end) of paths. Space is better than
+ // EOL since it allows copying to console/command line.
+ strPaths += _T(" ");
}
}
+ strPaths = string_trim_ws_end(strPaths);
PutToClipboard(strPaths, AfxGetMainWnd()->GetSafeHwnd());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
