[Winmerge-svn] SF.net SVN: winmerge: [4556] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
[Winmerge-svn] SF.net SVN: winmerge: [4556] trunk
|
From: <ki...@us...> - 2007-09-24 19:47:24
|
Revision: 4556
http://winmerge.svn.sourceforge.net/winmerge/?rev=4556&view=rev
Author: kimmov
Date: 2007-09-24 12:47:17 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
PATCH: [ 1800064 ] "Display Columns" dialog with "Move Up" and "Move Down"
Submitted by Jean-F Jolin
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/English.pot
trunk/Src/Languages/French/French.po
trunk/Src/Merge.rc
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2007-09-23 06:38:45 UTC (rev 4555)
+++ trunk/Docs/Users/ChangeLog.txt 2007-09-24 19:47:17 UTC (rev 4556)
@@ -5,12 +5,14 @@
WinMerge 2.7.5.3
Use PO files for translations (generate RC-files from PO-files)
Add Portuguese translation (#1756364)
+ Change Up/Down button names in folder compare columns dialog(#1800064)
BugFix: Fix MakeResDll crash (#1795421)
BugFix: Full screen mode didn't work with multiple monitors (#1788168)
BugFix: PgUp key didn't do anything in beginning of the file (#1795680)
BugFix: The option 'Automatically scroll to first difference' didn't work
- properly when word-wrap mode was on (#1795814)
+ properly when word-wrap mode was on (#1795814)
Translation updates:
+ - French (#1800064)
- Japanese (r4546)
WinMerge 2.7.5.2 (r4528)
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2007-09-23 06:38:45 UTC (rev 4555)
+++ trunk/Src/Languages/English.pot 2007-09-24 19:47:17 UTC (rev 4556)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2007-09-04 22:28+0000\n"
+"POT-Creation-Date: 2007-09-23 20:14+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -22,7 +22,7 @@
#. LANGUAGE, SUBLANGUAGE
#: Merge.rc:22
#: Merge.rc:51
-#: Merge.rc:2951
+#: Merge.rc:2941
#, c-format
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr ""
@@ -30,2125 +30,2135 @@
#. Codepage
#: Merge.rc:23
#: Merge.rc:52
-#: Merge.rc:2952
+#: Merge.rc:2942
#, c-format
msgid "1252"
msgstr ""
-#: Merge.rc:82
-#: Merge.rc:109
+#: Merge.rc:72
+#: Merge.rc:99
#, c-format
msgid "C&opy to Right"
msgstr ""
-#: Merge.rc:83
-#: Merge.rc:110
+#: Merge.rc:73
+#: Merge.rc:100
#, c-format
msgid "Cop&y to Left"
msgstr ""
-#: Merge.rc:85
+#: Merge.rc:75
#, c-format
msgid "&Select Line Difference"
msgstr ""
-#: Merge.rc:87
+#: Merge.rc:77
#, c-format
msgid "&Undo"
msgstr ""
-#: Merge.rc:88
+#: Merge.rc:78
#, c-format
msgid "&Redo"
msgstr ""
-#: Merge.rc:90
-#: Merge.rc:112
+#: Merge.rc:80
+#: Merge.rc:102
#, c-format
msgid "Cu&t"
msgstr ""
-#: Merge.rc:91
-#: Merge.rc:113
-#: Merge.rc:492
+#: Merge.rc:81
+#: Merge.rc:103
+#: Merge.rc:482
#, c-format
msgid "&Copy"
msgstr ""
-#: Merge.rc:92
-#: Merge.rc:114
+#: Merge.rc:82
+#: Merge.rc:104
#, c-format
msgid "&Paste"
msgstr ""
-#: Merge.rc:94
-#: Merge.rc:573
+#: Merge.rc:84
+#: Merge.rc:563
#, c-format
msgid "&Goto..."
msgstr ""
-#: Merge.rc:96
+#: Merge.rc:86
#, c-format
msgid "Op&en"
msgstr ""
-#: Merge.rc:98
-#: Merge.rc:515
-#: Merge.rc:521
+#: Merge.rc:88
+#: Merge.rc:505
+#: Merge.rc:511
#, c-format
msgid "with &Registered Application"
msgstr ""
-#: Merge.rc:99
-#: Merge.rc:516
-#: Merge.rc:522
+#: Merge.rc:89
+#: Merge.rc:506
+#: Merge.rc:512
#, c-format
msgid "with &External Editor"
msgstr ""
-#: Merge.rc:100
-#: Merge.rc:517
-#: Merge.rc:523
+#: Merge.rc:90
+#: Merge.rc:507
+#: Merge.rc:513
#, c-format
msgid "&with..."
msgstr ""
-#: Merge.rc:120
-#: Merge.rc:198
-#: Merge.rc:312
+#: Merge.rc:110
+#: Merge.rc:188
+#: Merge.rc:302
#, c-format
msgid "&File"
msgstr ""
-#: Merge.rc:122
-#: Merge.rc:200
-#: Merge.rc:314
+#: Merge.rc:112
+#: Merge.rc:190
+#: Merge.rc:304
#, c-format
msgid "&New\tCtrl+N"
msgstr ""
-#: Merge.rc:123
-#: Merge.rc:201
-#: Merge.rc:315
+#: Merge.rc:113
+#: Merge.rc:191
+#: Merge.rc:305
#, c-format
msgid "&Open...\tCtrl+O"
msgstr ""
-#: Merge.rc:125
+#: Merge.rc:115
#, c-format
msgid "Open Project...\tCtrl+J"
msgstr ""
-#: Merge.rc:126
-#: Merge.rc:204
-#: Merge.rc:318
+#: Merge.rc:116
+#: Merge.rc:194
+#: Merge.rc:308
#, c-format
msgid "Sa&ve Project..."
msgstr ""
-#: Merge.rc:128
+#: Merge.rc:118
#, c-format
msgid "Recent Projects"
msgstr ""
-#: Merge.rc:130
-#: Merge.rc:211
-#: Merge.rc:348
+#: Merge.rc:120
+#: Merge.rc:201
+#: Merge.rc:338
#, c-format
msgid "E&xit"
msgstr ""
-#: Merge.rc:132
-#: Merge.rc:213
-#: Merge.rc:350
+#: Merge.rc:122
+#: Merge.rc:203
+#: Merge.rc:340
#, c-format
msgid "&Edit"
msgstr ""
-#: Merge.rc:134
-#: Merge.rc:217
-#: Merge.rc:384
+#: Merge.rc:124
+#: Merge.rc:207
+#: Merge.rc:374
#, c-format
msgid "&Options..."
msgstr ""
-#: Merge.rc:136
-#: Merge.rc:219
-#: Merge.rc:386
+#: Merge.rc:126
+#: Merge.rc:209
+#: Merge.rc:376
#, c-format
msgid "&View"
msgstr ""
-#: Merge.rc:138
-#: Merge.rc:230
-#: Merge.rc:388
+#: Merge.rc:128
+#: Merge.rc:220
+#: Merge.rc:378
#, c-format
msgid "Select &Font..."
msgstr ""
-#: Merge.rc:139
-#: Merge.rc:231
-#: Merge.rc:389
+#: Merge.rc:129
+#: Merge.rc:221
+#: Merge.rc:379
#, c-format
msgid "Use Default F&ont"
msgstr ""
-#: Merge.rc:141
-#: Merge.rc:233
-#: Merge.rc:403
+#: Merge.rc:131
+#: Merge.rc:223
+#: Merge.rc:393
#, c-format
msgid "&Toolbar"
msgstr ""
-#: Merge.rc:143
-#: Merge.rc:235
-#: Merge.rc:405
+#: Merge.rc:133
+#: Merge.rc:225
+#: Merge.rc:395
#, c-format
msgid "&None"
msgstr ""
-#: Merge.rc:144
-#: Merge.rc:236
-#: Merge.rc:406
+#: Merge.rc:134
+#: Merge.rc:226
+#: Merge.rc:396
#, c-format
msgid "&Small"
msgstr ""
-#: Merge.rc:145
-#: Merge.rc:237
-#: Merge.rc:407
+#: Merge.rc:135
+#: Merge.rc:227
+#: Merge.rc:397
#, c-format
msgid "&Big"
msgstr ""
-#: Merge.rc:147
-#: Merge.rc:239
-#: Merge.rc:409
+#: Merge.rc:137
+#: Merge.rc:229
+#: Merge.rc:399
#, c-format
msgid "&Status Bar"
msgstr ""
-#: Merge.rc:148
-#: Merge.rc:240
-#: Merge.rc:410
+#: Merge.rc:138
+#: Merge.rc:230
+#: Merge.rc:400
#, c-format
msgid "Ta&b Bar"
msgstr ""
-#: Merge.rc:150
-#: Merge.rc:243
-#: Merge.rc:414
+#: Merge.rc:140
+#: Merge.rc:233
+#: Merge.rc:404
#, c-format
msgid "&Language..."
msgstr ""
-#: Merge.rc:152
-#: Merge.rc:264
-#: Merge.rc:436
+#: Merge.rc:142
+#: Merge.rc:254
+#: Merge.rc:426
#, c-format
msgid "&Tools"
msgstr ""
-#: Merge.rc:154
-#: Merge.rc:267
-#: Merge.rc:438
+#: Merge.rc:144
+#: Merge.rc:257
+#: Merge.rc:428
#, c-format
msgid "&Filters..."
msgstr ""
-#: Merge.rc:155
-#: Merge.rc:268
-#: Merge.rc:439
+#: Merge.rc:145
+#: Merge.rc:258
+#: Merge.rc:429
#, c-format
msgid "&Generate Patch..."
msgstr ""
-#: Merge.rc:157
-#: Merge.rc:271
-#: Merge.rc:442
+#: Merge.rc:147
+#: Merge.rc:261
+#: Merge.rc:432
#, c-format
msgid "&Plugins"
msgstr ""
-#: Merge.rc:159
-#: Merge.rc:273
-#: Merge.rc:444
+#: Merge.rc:149
+#: Merge.rc:263
+#: Merge.rc:434
#, c-format
msgid "&Manual Unpacking"
msgstr ""
-#: Merge.rc:160
-#: Merge.rc:274
-#: Merge.rc:445
+#: Merge.rc:150
+#: Merge.rc:264
+#: Merge.rc:435
#, c-format
msgid "&Automatic Unpacking"
msgstr ""
-#: Merge.rc:162
-#: Merge.rc:276
-#: Merge.rc:447
+#: Merge.rc:152
+#: Merge.rc:266
+#: Merge.rc:437
#, c-format
msgid "&Edit with Unpacker"
msgstr ""
-#: Merge.rc:164
-#: Merge.rc:278
-#: Merge.rc:454
+#: Merge.rc:154
+#: Merge.rc:268
+#: Merge.rc:444
#, c-format
msgid "&Reload plugins"
msgstr ""
-#: Merge.rc:166
-#: Merge.rc:280
-#: Merge.rc:456
+#: Merge.rc:156
+#: Merge.rc:270
+#: Merge.rc:446
#, c-format
msgid "&Debug"
msgstr ""
-#: Merge.rc:168
-#: Merge.rc:282
-#: Merge.rc:458
+#: Merge.rc:158
+#: Merge.rc:272
+#: Merge.rc:448
#, c-format
msgid "&Load Config..."
msgstr ""
-#: Merge.rc:169
-#: Merge.rc:283
-#: Merge.rc:459
+#: Merge.rc:159
+#: Merge.rc:273
+#: Merge.rc:449
#, c-format
msgid "&Reset Options"
msgstr ""
-#: Merge.rc:171
-#: Merge.rc:285
-#: Merge.rc:461
+#: Merge.rc:161
+#: Merge.rc:275
+#: Merge.rc:451
#, c-format
msgid "&Window"
msgstr ""
-#: Merge.rc:173
-#: Merge.rc:287
-#: Merge.rc:463
+#: Merge.rc:163
+#: Merge.rc:277
+#: Merge.rc:453
#, c-format
msgid "Cl&ose"
msgstr ""
-#: Merge.rc:174
-#: Merge.rc:288
-#: Merge.rc:464
+#: Merge.rc:164
+#: Merge.rc:278
+#: Merge.rc:454
#, c-format
msgid "Clo&se All"
msgstr ""
-#: Merge.rc:176
-#: Merge.rc:290
-#: Merge.rc:466
+#: Merge.rc:166
+#: Merge.rc:280
+#: Merge.rc:456
#, c-format
msgid "Change &Pane\tF6"
msgstr ""
-#: Merge.rc:178
-#: Merge.rc:292
-#: Merge.rc:468
+#: Merge.rc:168
+#: Merge.rc:282
+#: Merge.rc:458
#, c-format
msgid "Tile &Horizontally"
msgstr ""
-#: Merge.rc:179
-#: Merge.rc:293
-#: Merge.rc:469
+#: Merge.rc:169
+#: Merge.rc:283
+#: Merge.rc:459
#, c-format
msgid "Tile &Vertically"
msgstr ""
-#: Merge.rc:180
-#: Merge.rc:294
-#: Merge.rc:470
+#: Merge.rc:170
+#: Merge.rc:284
+#: Merge.rc:460
#, c-format
msgid "&Cascade"
msgstr ""
-#: Merge.rc:182
-#: Merge.rc:296
-#: Merge.rc:472
-#: Merge.rc:1880
+#: Merge.rc:172
+#: Merge.rc:286
+#: Merge.rc:462
+#: Merge.rc:1870
#, c-format
msgid "&Help"
msgstr ""
-#: Merge.rc:184
-#: Merge.rc:298
-#: Merge.rc:474
+#: Merge.rc:174
+#: Merge.rc:288
+#: Merge.rc:464
#, c-format
msgid "&Contents...\tF1"
msgstr ""
-#: Merge.rc:185
-#: Merge.rc:299
-#: Merge.rc:475
+#: Merge.rc:175
+#: Merge.rc:289
+#: Merge.rc:465
#, c-format
msgid "&Index..."
msgstr ""
-#: Merge.rc:186
-#: Merge.rc:300
-#: Merge.rc:476
+#: Merge.rc:176
+#: Merge.rc:290
+#: Merge.rc:466
#, c-format
msgid "&Search..."
msgstr ""
-#: Merge.rc:188
-#: Merge.rc:302
-#: Merge.rc:478
+#: Merge.rc:178
+#: Merge.rc:292
+#: Merge.rc:468
#, c-format
msgid "C&onfiguration..."
msgstr ""
-#: Merge.rc:189
-#: Merge.rc:303
-#: Merge.rc:479
+#: Merge.rc:179
+#: Merge.rc:293
+#: Merge.rc:469
#, c-format
msgid "A&rchive Support disabled..."
msgstr ""
-#: Merge.rc:191
-#: Merge.rc:305
-#: Merge.rc:481
+#: Merge.rc:181
+#: Merge.rc:295
+#: Merge.rc:471
#, c-format
msgid "&GNU Public License..."
msgstr ""
-#: Merge.rc:192
-#: Merge.rc:306
-#: Merge.rc:482
+#: Merge.rc:182
+#: Merge.rc:296
+#: Merge.rc:472
#, c-format
msgid "&About WinMerge..."
msgstr ""
-#: Merge.rc:203
-#: Merge.rc:317
+#: Merge.rc:193
+#: Merge.rc:307
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr ""
-#: Merge.rc:206
-#: Merge.rc:336
+#: Merge.rc:196
+#: Merge.rc:326
#, c-format
msgid "L&eft Read-only"
msgstr ""
-#: Merge.rc:207
-#: Merge.rc:337
+#: Merge.rc:197
+#: Merge.rc:327
#, c-format
msgid "Ri&ght Read-only"
msgstr ""
-#: Merge.rc:209
+#: Merge.rc:199
#, c-format
msgid "File En&coding"
msgstr ""
-#: Merge.rc:215
-#: Merge.rc:360
+#: Merge.rc:205
+#: Merge.rc:350
#, c-format
msgid "Select &All\tCtrl+A"
msgstr ""
-#: Merge.rc:221
+#: Merge.rc:211
#, c-format
msgid "Show &Identical Items"
msgstr ""
-#: Merge.rc:222
+#: Merge.rc:212
#, c-format
msgid "Show &Different Items"
msgstr ""
-#: Merge.rc:223
+#: Merge.rc:213
#, c-format
msgid "Show L&eft Unique Items"
msgstr ""
-#: Merge.rc:224
+#: Merge.rc:214
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr ""
-#: Merge.rc:225
+#: Merge.rc:215
#, c-format
msgid "Show S&kipped Items"
msgstr ""
-#: Merge.rc:226
+#: Merge.rc:216
#, c-format
msgid "S&how Binary Files"
msgstr ""
-#: Merge.rc:228
+#: Merge.rc:218
#, c-format
msgid "Show Hidd&en Items"
msgstr ""
-#: Merge.rc:241
+#: Merge.rc:231
#, c-format
msgid "Compa&re Statistics"
msgstr ""
-#: Merge.rc:245
-#: Merge.rc:416
+#: Merge.rc:235
+#: Merge.rc:406
#, c-format
msgid "Refre&sh\tF5"
msgstr ""
-#: Merge.rc:246
+#: Merge.rc:236
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr ""
-#: Merge.rc:248
-#: Merge.rc:418
+#: Merge.rc:238
+#: Merge.rc:408
#, c-format
msgid "&Merge"
msgstr ""
-#: Merge.rc:250
+#: Merge.rc:240
#, c-format
msgid "Co&mpare\tEnter"
msgstr ""
-#: Merge.rc:252
-#: Merge.rc:420
+#: Merge.rc:242
+#: Merge.rc:410
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr ""
-#: Merge.rc:253
-#: Merge.rc:421
+#: Merge.rc:243
+#: Merge.rc:411
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr ""
-#: Merge.rc:255
-#: Merge.rc:423
+#: Merge.rc:245
+#: Merge.rc:413
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr ""
-#: Merge.rc:256
-#: Merge.rc:424
+#: Merge.rc:246
+#: Merge.rc:414
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr ""
-#: Merge.rc:257
-#: Merge.rc:425
+#: Merge.rc:247
+#: Merge.rc:415
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr ""
-#: Merge.rc:259
-#: Merge.rc:427
+#: Merge.rc:249
+#: Merge.rc:417
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr ""
-#: Merge.rc:260
-#: Merge.rc:428
+#: Merge.rc:250
+#: Merge.rc:418
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr ""
-#: Merge.rc:262
+#: Merge.rc:252
#, c-format
msgid "&Delete\tDel"
msgstr ""
-#: Merge.rc:266
-#: Merge.rc:546
+#: Merge.rc:256
+#: Merge.rc:536
#, c-format
msgid "&Customize Columns..."
msgstr ""
-#: Merge.rc:269
-#: Merge.rc:440
+#: Merge.rc:259
+#: Merge.rc:430
#, c-format
msgid "Generate &Report..."
msgstr ""
-#: Merge.rc:320
+#: Merge.rc:310
#, c-format
msgid "&Save\tCtrl+S"
msgstr ""
-#: Merge.rc:321
+#: Merge.rc:311
#, c-format
msgid "Save &Left"
msgstr ""
-#: Merge.rc:323
-#: Merge.rc:328
+#: Merge.rc:313
+#: Merge.rc:318
#, c-format
msgid "&Save"
msgstr ""
-#: Merge.rc:324
-#: Merge.rc:329
+#: Merge.rc:314
+#: Merge.rc:319
#, c-format
msgid "Save &As..."
msgstr ""
-#: Merge.rc:326
+#: Merge.rc:316
#, c-format
msgid "Save &Right"
msgstr ""
-#: Merge.rc:332
+#: Merge.rc:322
#, c-format
msgid "&Print..."
msgstr ""
-#: Merge.rc:333
+#: Merge.rc:323
#, c-format
msgid "Page Se&tup"
msgstr ""
-#: Merge.rc:334
+#: Merge.rc:324
#, c-format
msgid "Print Previe&w"
msgstr ""
-#: Merge.rc:339
+#: Merge.rc:329
#, c-format
msgid "&Convert Line Endings to"
msgstr ""
-#: Merge.rc:341
+#: Merge.rc:331
#, c-format
msgid "&DOS (CRLF)"
msgstr ""
-#: Merge.rc:342
+#: Merge.rc:332
#, c-format
msgid "&UNIX (LF)"
msgstr ""
-#: Merge.rc:343
+#: Merge.rc:333
#, c-format
msgid "&MAC (CR)"
msgstr ""
-#: Merge.rc:346
+#: Merge.rc:336
#, c-format
msgid "&Merge Mode\tF9"
msgstr ""
-#: Merge.rc:352
+#: Merge.rc:342
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr ""
-#: Merge.rc:353
+#: Merge.rc:343
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr ""
-#: Merge.rc:355
+#: Merge.rc:345
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr ""
-#: Merge.rc:356
+#: Merge.rc:346
#, c-format
msgid "&Copy\tCtrl+C"
msgstr ""
-#: Merge.rc:357
+#: Merge.rc:347
#, c-format
msgid "&Paste\tCtrl+V"
msgstr ""
-#: Merge.rc:359
+#: Merge.rc:349
#, c-format
msgid "Select Line &Difference\tF4"
msgstr ""
-#: Merge.rc:362
+#: Merge.rc:352
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr ""
-#: Merge.rc:363
+#: Merge.rc:353
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr ""
-#: Merge.rc:365
+#: Merge.rc:355
#, c-format
msgid "&Scripts"
msgstr ""
-#: Merge.rc:367
-#: Merge.rc:2859
+#: Merge.rc:357
+#: Merge.rc:2849
#, c-format
msgid "< Empty >"
msgstr ""
-#: Merge.rc:370
+#: Merge.rc:360
#, c-format
msgid "Advanced"
msgstr ""
-#: Merge.rc:372
+#: Merge.rc:362
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr ""
-#: Merge.rc:375
+#: Merge.rc:365
#, c-format
msgid "&Bookmarks"
msgstr ""
-#: Merge.rc:377
+#: Merge.rc:367
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr ""
-#: Merge.rc:378
+#: Merge.rc:368
#, c-format
msgid "&Next Bookmark\tF2"
msgstr ""
-#: Merge.rc:379
+#: Merge.rc:369
#, c-format
msgid "&Previous bookmark\tShift+F2"
msgstr ""
-#: Merge.rc:380
+#: Merge.rc:370
#, c-format
msgid "&Clear All Bookmarks"
msgstr ""
-#: Merge.rc:382
+#: Merge.rc:372
#, c-format
msgid "&Go To...\tCtrl+G"
msgstr ""
-#: Merge.rc:390
+#: Merge.rc:380
#, c-format
msgid "Syntax Highlight"
msgstr ""
-#: Merge.rc:395
+#: Merge.rc:385
#, c-format
msgid "&View Whitespace"
msgstr ""
-#: Merge.rc:396
+#: Merge.rc:386
#, c-format
msgid "Vie&w Line Differences"
msgstr ""
-#: Merge.rc:397
+#: Merge.rc:387
#, c-format
msgid "View Line &Numbers"
msgstr ""
-#: Merge.rc:398
+#: Merge.rc:388
#, c-format
msgid "View &Margins"
msgstr ""
-#: Merge.rc:399
+#: Merge.rc:389
#, c-format
msgid "W&rap Lines"
msgstr ""
-#: Merge.rc:401
+#: Merge.rc:391
#, c-format
msgid "Sw&ap Panes"
msgstr ""
-#: Merge.rc:411
+#: Merge.rc:401
#, c-format
msgid "Diff &Pane"
msgstr ""
-#: Merge.rc:412
+#: Merge.rc:402
#, c-format
msgid "Lo&cation Pane"
msgstr ""
-#: Merge.rc:430
+#: Merge.rc:420
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr ""
-#: Merge.rc:431
+#: Merge.rc:421
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr ""
-#: Merge.rc:433
+#: Merge.rc:423
#, c-format
msgid "Copy &All to Right"
msgstr ""
-#: Merge.rc:434
+#: Merge.rc:424
#, c-format
msgid "Cop&y All to Left"
msgstr ""
-#: Merge.rc:449
+#: Merge.rc:439
#, c-format
msgid "&Prediffer"
msgstr ""
-#: Merge.rc:490
+#: Merge.rc:480
#, c-format
msgid "Comp&are"
msgstr ""
-#: Merge.rc:494
+#: Merge.rc:484
#, c-format
msgid "&Left to Right"
msgstr ""
-#: Merge.rc:495
+#: Merge.rc:485
#, c-format
msgid "L&eft to..."
msgstr ""
-#: Merge.rc:496
+#: Merge.rc:486
#, c-format
msgid "&Right to Left"
msgstr ""
-#: Merge.rc:497
+#: Merge.rc:487
#, c-format
msgid "R&ight to..."
msgstr ""
-#: Merge.rc:499
+#: Merge.rc:489
#, c-format
msgid "&Move"
msgstr ""
-#: Merge.rc:501
+#: Merge.rc:491
#, c-format
msgid "&Left to..."
msgstr ""
-#: Merge.rc:502
+#: Merge.rc:492
#, c-format
msgid "&Right to..."
msgstr ""
-#: Merge.rc:504
+#: Merge.rc:494
#, c-format
msgid "&Delete"
msgstr ""
-#: Merge.rc:506
-#: Merge.rc:1118
-#: Merge.rc:1497
+#: Merge.rc:496
+#: Merge.rc:1108
+#: Merge.rc:1487
#, c-format
msgid "&Left"
msgstr ""
-#: Merge.rc:507
-#: Merge.rc:1120
-#: Merge.rc:1500
+#: Merge.rc:497
+#: Merge.rc:1110
+#: Merge.rc:1490
#, c-format
msgid "&Right"
msgstr ""
-#: Merge.rc:508
+#: Merge.rc:498
#, c-format
msgid "&Both"
msgstr ""
-#: Merge.rc:510
+#: Merge.rc:500
#, c-format
msgid "Re&name"
msgstr ""
-#: Merge.rc:511
+#: Merge.rc:501
#, c-format
msgid "&Hide Items"
msgstr ""
-#: Merge.rc:513
+#: Merge.rc:503
#, c-format
msgid "&Open Left"
msgstr ""
-#: Merge.rc:519
+#: Merge.rc:509
#, c-format
msgid "O&pen Right"
msgstr ""
-#: Merge.rc:526
+#: Merge.rc:516
#, c-format
msgid "Cop&y Pathnames"
msgstr ""
-#: Merge.rc:528
+#: Merge.rc:518
#, c-format
msgid "&Left (%1 of %2)"
msgstr ""
-#: Merge.rc:529
+#: Merge.rc:519
#, c-format
msgid "&Right (%1 of %2)"
msgstr ""
-#: Merge.rc:530
+#: Merge.rc:520
#, c-format
msgid "&Both (%1 of %2)"
msgstr ""
-#: Merge.rc:532
+#: Merge.rc:522
#, c-format
msgid "Copy &Filenames"
msgstr ""
-#: Merge.rc:534
+#: Merge.rc:524
#, c-format
msgid "&Zip"
msgstr ""
-#: Merge.rc:536
+#: Merge.rc:526
#, c-format
msgid "&Left... (%1 of %2)"
msgstr ""
-#: Merge.rc:537
+#: Merge.rc:527
#, c-format
msgid "&Right... (%1 of %2)"
msgstr ""
-#: Merge.rc:538
+#: Merge.rc:528
#, c-format
msgid "&Both... (%1 of %2)"
msgstr ""
-#: Merge.rc:539
+#: Merge.rc:529
#, c-format
msgid "&Differences... (%1 of %2)"
msgstr ""
-#: Merge.rc:542
+#: Merge.rc:532
#, c-format
msgid "&Refresh"
msgstr ""
-#: Merge.rc:554
+#: Merge.rc:544
#, c-format
msgid "&Copy Full Path"
msgstr ""
-#: Merge.rc:555
+#: Merge.rc:545
#, c-format
msgid "Copy &Filename"
msgstr ""
-#: Merge.rc:561
+#: Merge.rc:551
#, c-format
msgid "Prediffer Settings"
msgstr ""
-#: Merge.rc:563
+#: Merge.rc:553
#, c-format
msgid "&No prediffer"
msgstr ""
-#: Merge.rc:564
+#: Merge.rc:554
#, c-format
msgid "Auto prediffer"
msgstr ""
-#: Merge.rc:572
+#: Merge.rc:562
#, c-format
msgid "G&oto Diff"
msgstr ""
-#: Merge.rc:575
+#: Merge.rc:565
#, c-format
msgid "&No Moved Blocks"
msgstr ""
-#: Merge.rc:576
+#: Merge.rc:566
#, c-format
msgid "&All Moved Blocks"
msgstr ""
-#: Merge.rc:577
+#: Merge.rc:567
#, c-format
msgid "Moved Block for &Current Diff"
msgstr ""
-#: Merge.rc:643
+#: Merge.rc:633
#, c-format
msgid "About WinMerge"
msgstr ""
#. StringFileInfo.InternalName
#. StringFileInfo.ProductName
-#: Merge.rc:647
-#: Merge.rc:1661
-#: Merge.rc:1665
-#: Merge.rc:1685
-#: Merge.rc:1827
-#: Merge.rc:1939
+#: Merge.rc:637
+#: Merge.rc:1651
+#: Merge.rc:1655
+#: Merge.rc:1675
+#: Merge.rc:1817
+#: Merge.rc:1929
#, c-format
msgid "WinMerge"
msgstr ""
-#: Merge.rc:649
+#: Merge.rc:639
#, c-format
msgid "(Private Build)"
msgstr ""
-#: Merge.rc:650
+#: Merge.rc:640
#, c-format
msgid "All rights reserved."
msgstr ""
-#: Merge.rc:651
+#: Merge.rc:641
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr ""
-#: Merge.rc:654
-#: Merge.rc:685
-#: Merge.rc:772
-#: Merge.rc:958
-#: Merge.rc:1032
+#: Merge.rc:644
+#: Merge.rc:675
+#: Merge.rc:762
+#: Merge.rc:948
+#: Merge.rc:1022
+#: Merge.rc:1056
#: Merge.rc:1066
-#: Merge.rc:1076
-#: Merge.rc:1239
-#: Merge.rc:1303
-#: Merge.rc:1316
-#: Merge.rc:1408
-#: Merge.rc:1423
+#: Merge.rc:1229
+#: Merge.rc:1293
+#: Merge.rc:1306
+#: Merge.rc:1398
+#: Merge.rc:1413
#, c-format
msgid "OK"
msgstr ""
-#: Merge.rc:655
+#: Merge.rc:645
#, c-format
msgid "Contributors"
msgstr ""
-#: Merge.rc:661
+#: Merge.rc:651
#, c-format
msgid "Select Files or Folders"
msgstr ""
-#: Merge.rc:664
-#: Merge.rc:1574
+#: Merge.rc:654
+#: Merge.rc:1564
#, c-format
msgid "&Left:"
msgstr ""
-#: Merge.rc:668
-#: Merge.rc:729
-#: Merge.rc:982
-#: Merge.rc:997
+#: Merge.rc:658
+#: Merge.rc:719
+#: Merge.rc:972
+#: Merge.rc:987
#, c-format
msgid "&Browse..."
msgstr ""
-#: Merge.rc:669
-#: Merge.rc:1578
+#: Merge.rc:659
+#: Merge.rc:1568
#, c-format
msgid "&Right:"
msgstr ""
-#: Merge.rc:673
-#: Merge.rc:1008
+#: Merge.rc:663
+#: Merge.rc:998
#, c-format
msgid "Bro&wse..."
msgstr ""
-#: Merge.rc:674
-#: Merge.rc:1582
+#: Merge.rc:664
+#: Merge.rc:1572
#, c-format
msgid "&Filter:"
msgstr ""
-#: Merge.rc:677
-#: Merge.rc:1584
+#: Merge.rc:667
+#: Merge.rc:1574
#, c-format
msgid "Select..."
msgstr ""
-#: Merge.rc:678
+#: Merge.rc:668
#, c-format
msgid "&Unpacker:"
msgstr ""
-#: Merge.rc:681
+#: Merge.rc:671
#, c-format
msgid "&Select..."
msgstr ""
-#: Merge.rc:682
-#: Merge.rc:1585
+#: Merge.rc:672
+#: Merge.rc:1575
#, c-format
msgid "&Include Subfolders"
msgstr ""
-#: Merge.rc:684
+#: Merge.rc:674
#, c-format
msgid "Status:"
msgstr ""
-#: Merge.rc:686
-#: Merge.rc:716
-#: Merge.rc:773
-#: Merge.rc:803
+#: Merge.rc:676
+#: Merge.rc:706
+#: Merge.rc:763
+#: Merge.rc:793
+#: Merge.rc:825
#: Merge.rc:835
-#: Merge.rc:845
-#: Merge.rc:1033
+#: Merge.rc:1023
+#: Merge.rc:1057
#: Merge.rc:1067
-#: Merge.rc:1077
-#: Merge.rc:1128
-#: Merge.rc:1240
-#: Merge.rc:1317
-#: Merge.rc:1409
-#: Merge.rc:1424
+#: Merge.rc:1118
+#: Merge.rc:1230
+#: Merge.rc:1307
+#: Merge.rc:1399
+#: Merge.rc:1414
#, c-format
msgid "Cancel"
msgstr ""
-#: Merge.rc:687
-#: Merge.rc:1318
+#: Merge.rc:677
+#: Merge.rc:1308
#, c-format
msgid "Help"
msgstr ""
-#: Merge.rc:688
+#: Merge.rc:678
#, c-format
msgid "Files or Folders to Compare"
msgstr ""
-#: Merge.rc:695
+#: Merge.rc:685
#, c-format
msgid "Visual SourceSafe"
msgstr ""
-#: Merge.rc:700
+#: Merge.rc:690
#, c-format
msgid "Database:"
msgstr ""
-#: Merge.rc:703
+#: Merge.rc:693
#, c-format
msgid "Project:"
msgstr ""
-#: Merge.rc:706
+#: Merge.rc:696
#, c-format
msgid "User:"
msgstr ""
-#: Merge.rc:708
+#: Merge.rc:698
#, c-format
msgid "Password:"
msgstr ""
-#: Merge.rc:710
+#: Merge.rc:700
#, c-format
msgid "Link to Destination VSS project"
msgstr ""
-#: Merge.rc:712
-#: Merge.rc:850
+#: Merge.rc:702
+#: Merge.rc:840
#, c-format
msgid "Apply to all items"
msgstr ""
-#: Merge.rc:714
+#: Merge.rc:704
#, c-format
msgid "Check Out"
msgstr ""
-#: Merge.rc:715
-#: Merge.rc:846
+#: Merge.rc:705
+#: Merge.rc:836
#, c-format
msgid "Save As..."
msgstr ""
-#: Merge.rc:721
+#: Merge.rc:711
#, c-format
msgid "Versioning System"
msgstr ""
-#: Merge.rc:724
+#: Merge.rc:714
#, c-format
msgid "&Versioning System:"
msgstr ""
-#: Merge.rc:727
+#: Merge.rc:717
#, c-format
msgid "&Path to cleartool.exe:"
msgstr ""
-#: Merge.rc:734
-#: Merge.rc:1888
+#: Merge.rc:724
+#: Merge.rc:1878
#, c-format
msgid "General"
msgstr ""
-#: Merge.rc:737
+#: Merge.rc:727
#, c-format
msgid "Automatically &scroll to first difference"
msgstr ""
-#: Merge.rc:740
+#: Merge.rc:730
#, c-format
msgid "&Disable Splash Screen"
msgstr ""
-#: Merge.rc:742
+#: Merge.rc:732
#, c-format
msgid "Cl&ose windows with ESC"
msgstr ""
-#: Merge.rc:744
+#: Merge.rc:734
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr ""
-#: Merge.rc:747
+#: Merge.rc:737
#, c-format
msgid "All&ow only one instance to run"
msgstr ""
-#: Merge.rc:749
+#: Merge.rc:739
#, c-format
msgid "As&k when closing multiple windows"
msgstr ""
-#: Merge.rc:751
+#: Merge.rc:741
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr ""
-#: Merge.rc:754
+#: Merge.rc:744
#, c-format
msgid "Enable multiple compare windows for"
msgstr ""
-#: Merge.rc:756
-#: Merge.rc:1597
+#: Merge.rc:746
+#: Merge.rc:1587
#, c-format
msgid "&Folder compare"
msgstr ""
-#: Merge.rc:758
-#: Merge.rc:1599
+#: Merge.rc:748
+#: Merge.rc:1589
#, c-format
msgid "Fil&e compare"
msgstr ""
-#: Merge.rc:760
+#: Merge.rc:750
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
-#: Merge.rc:762
+#: Merge.rc:752
#, c-format
msgid "Reset"
msgstr ""
-#: Merge.rc:769
+#: Merge.rc:759
#, c-format
msgid "Language"
msgstr ""
-#: Merge.rc:776
+#: Merge.rc:766
#, c-format
msgid "Available languages:"
msgstr ""
-#: Merge.rc:782
+#: Merge.rc:772
#, c-format
msgid "Find"
msgstr ""
-#: Merge.rc:785
-#: Merge.rc:812
+#: Merge.rc:775
+#: Merge.rc:802
#, c-format
msgid "Fi&nd what:"
msgstr ""
-#: Merge.rc:788
-#: Merge.rc:818
+#: Merge.rc:778
+#: Merge.rc:808
#, c-format
msgid "Match &whole word only"
msgstr ""
-#: Merge.rc:790
-#: Merge.rc:820
+#: Merge.rc:780
+#: Merge.rc:810
#, c-format
msgid "Match &case"
msgstr ""
-#: Merge.rc:792
-#: Merge.rc:822
+#: Merge.rc:782
+#: Merge.rc:812
#, c-format
msgid "Regular &expression"
msgstr ""
-#: Merge.rc:794
+#: Merge.rc:784
#, c-format
msgid "D&on't wrap end of file"
msgstr ""
-#: Merge.rc:797
+#: Merge.rc:787
#, c-format
msgid "Direction"
msgstr ""
-#: Merge.rc:798
-#: Merge.rc:1057
+#: Merge.rc:788
#, c-format
msgid "&Up"
msgstr ""
-#: Merge.rc:800
-#: Merge.rc:1058
+#: Merge.rc:790
#, c-format
msgid "&Down"
msgstr ""
-#: Merge.rc:802
-#: Merge.rc:832
+#: Merge.rc:792
+#: Merge.rc:822
#, c-format
msgid "&Find Next"
msgstr ""
-#: Merge.rc:809
+#: Merge.rc:799
#, c-format
msgid "Replace"
msgstr ""
-#: Merge.rc:815
+#: Merge.rc:805
#, c-format
msgid "Re&place with:"
msgstr ""
-#: Merge.rc:824
+#: Merge.rc:814
#, c-format
msgid "&Don't wrap end of file"
msgstr ""
-#: Merge.rc:827
+#: Merge.rc:817
#, c-format
msgid "Replace in"
msgstr ""
-#: Merge.rc:828
+#: Merge.rc:818
#, c-format
msgid "&Selection"
msgstr ""
-#: Merge.rc:830
+#: Merge.rc:820
#, c-format
msgid "Wh&ole file"
msgstr ""
-#: Merge.rc:833
+#: Merge.rc:823
#, c-format
msgid "&Replace"
msgstr ""
-#: Merge.rc:834
+#: Merge.rc:824
#, c-format
msgid "Replace &All"
msgstr ""
-#: Merge.rc:841
-#: Merge.rc:2113
+#: Merge.rc:831
+#: Merge.rc:2103
#, c-format
msgid "Rational ClearCase"
msgstr ""
-#: Merge.rc:844
+#: Merge.rc:834
#, c-format
msgid "CheckOut"
msgstr ""
-#: Merge.rc:849
-#: Merge.rc:1159
+#: Merge.rc:839
+#: Merge.rc:1149
#, c-format
msgid "Comments"
msgstr ""
-#: Merge.rc:852
+#: Merge.rc:842
#, c-format
msgid "CheckIn after checkout"
msgstr ""
-#: Merge.rc:858
+#: Merge.rc:848
#, c-format
msgid "Linefilters"
msgstr ""
-#: Merge.rc:861
+#: Merge.rc:851
#, c-format
msgid "Enable Line Filters"
msgstr ""
-#: Merge.rc:864
+#: Merge.rc:854
#, c-format
msgid "Regular Expressions (one per line):"
msgstr ""
-#: Merge.rc:871
+#: Merge.rc:861
#, c-format
msgid "Save"
msgstr ""
-#: Merge.rc:872
+#: Merge.rc:862
#, c-format
msgid "New"
msgstr ""
-#: Merge.rc:873
+#: Merge.rc:863
#, c-format
msgid "Edit"
msgstr ""
-#: Merge.rc:874
+#: Merge.rc:864
#, c-format
msgid "Remove"
msgstr ""
-#: Merge.rc:879
-#: Merge.rc:1891
+#: Merge.rc:869
+#: Merge.rc:1881
#, c-format
msgid "Colors"
msgstr ""
-#: Merge.rc:882
+#: Merge.rc:872
#, c-format
msgid "Difference:"
msgstr ""
-#: Merge.rc:886
+#: Merge.rc:876
#, c-format
msgid "Selected Difference:"
msgstr ""
-#: Merge.rc:890
-#: Merge.rc:1549
+#: Merge.rc:880
+#: Merge.rc:1539
#, c-format
msgid "Background"
msgstr ""
-#: Merge.rc:891
+#: Merge.rc:881
#, c-format
msgid "Deleted"
msgstr ""
-#: Merge.rc:904
-#: Merge.rc:1344
-#: Merge.rc:1550
+#: Merge.rc:894
+#: Merge.rc:1334
+#: Merge.rc:1540
#, c-format
msgid "Text"
msgstr ""
-#: Merge.rc:908
+#: Merge.rc:898
#, c-format
msgid "Ignored Difference:"
msgstr ""
-#: Merge.rc:918
+#: Merge.rc:908
#, c-format
msgid "Moved:"
msgstr ""
-#: Merge.rc:928
+#: Merge.rc:918
#, c-format
msgid "Selected Moved:"
msgstr ""
-#: Merge.rc:935
+#: Merge.rc:925
#, c-format
msgid "Word Difference:"
msgstr ""
-#: Merge.rc:942
+#: Merge.rc:932
#, c-format
msgid "Selected Word Diff:"
msgstr ""
-#: Merge.rc:949
-#: Merge.rc:1031
-#: Merge.rc:1065
-#: Merge.rc:1162
-#: Merge.rc:1390
+#: Merge.rc:939
+#: Merge.rc:1021
+#: Merge.rc:1055
+#: Merge.rc:1152
+#: Merge.rc:1380
#, c-format
msgid "Defaults"
msgstr ""
-#: Merge.rc:955
-#: Merge.rc:1332
-#: Merge.rc:1538
+#: Merge.rc:945
+#: Merge.rc:1322
+#: Merge.rc:1528
#, c-format
msgid "Dialog"
msgstr ""
-#: Merge.rc:965
-#: Merge.rc:1894
+#: Merge.rc:955
+#: Merge.rc:1884
#, c-format
msgid "System"
msgstr ""
-#: Merge.rc:968
+#: Merge.rc:958
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr ""
-#: Merge.rc:970
+#: Merge.rc:960
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr ""
-#: Merge.rc:973
+#: Merge.rc:963
#, c-format
msgid "Integration"
msgstr ""
-#: Merge.rc:974
+#: Merge.rc:964
#, c-format
msgid "&Add to explorer context menu"
msgstr ""
-#: Merge.rc:976
+#: Merge.rc:966
#, c-format
msgid "E&nable advanced menu"
msgstr ""
-#: Merge.rc:978
+#: Merge.rc:968
#, c-format
msgid "In&clude subfolders by default"
msgstr ""
-#: Merge.rc:980
+#: Merge.rc:970
#, c-format
msgid "&External editor:"
msgstr ""
-#: Merge.rc:983
+#: Merge.rc:973
#, c-format
msgid "&Filter folder:"
msgstr ""
-#: Merge.rc:985
-#: Merge.rc:1402
-#: Merge.rc:1576
-#: Merge.rc:1580
-#: Merge.rc:1607
+#: Merge.rc:975
+#: Merge.rc:1392
+#: Merge.rc:1566
+#: Merge.rc:1570
+#: Merge.rc:1597
#, c-format
msgid "Browse..."
msgstr ""
-#: Merge.rc:991
+#: Merge.rc:981
#, c-format
msgid "Patch Generator"
msgstr ""
-#: Merge.rc:994
+#: Merge.rc:984
#, c-format
msgid "File&1:"
msgstr ""
-#: Merge.rc:998
+#: Merge.rc:988
#, c-format
msgid "File&2:"
msgstr ""
-#: Merge.rc:1001
+#: Merge.rc:991
#, c-format
msgid "Br&owse..."
msgstr ""
-#: Merge.rc:1002
+#: Merge.rc:992
#, c-format
msgid "&Swap"
msgstr ""
-#: Merge.rc:1003
+#: Merge.rc:993
#, c-format
msgid "&Append to existing file"
msgstr ""
-#: Merge.rc:1005
+#: Merge.rc:995
#, c-format
msgid "&Result:"
msgstr ""
-#: Merge.rc:1009
+#: Merge.rc:999
#, c-format
msgid "&Format"
msgstr ""
-#: Merge.rc:1010
+#: Merge.rc:1000
#, c-format
msgid "St&yle:"
msgstr ""
-#: Merge.rc:1013
+#: Merge.rc:1003
#, c-format
msgid "&Context:"
msgstr ""
-#: Merge.rc:1016
+#: Merge.rc:1006
#, c-format
msgid "W&hitespaces"
msgstr ""
-#: Merge.rc:1017
+#: Merge.rc:1007
#, c-format
msgid "Com&pare"
msgstr ""
-#: Merge.rc:1019
+#: Merge.rc:1009
#, c-format
msgid "I&gnore changes"
msgstr ""
-#: Merge.rc:1021
+#: Merge.rc:1011
#, c-format
msgid "Ig&nore all"
msgstr ""
-#: Merge.rc:1023
+#: Merge.rc:1013
#, c-format
msgid "Ignor&e blank lines"
msgstr ""
-#: Merge.rc:1025
+#: Merge.rc:1015
#, c-format
msgid "Case sensi&tive"
msgstr ""
-#: Merge.rc:1027
+#: Merge.rc:1017
#, c-format
msgid "Inclu&de command line"
msgstr ""
-#: Merge.rc:1029
+#: Merge.rc:1019
#, c-format
msgid "Open to e&xternal editor"
msgstr ""
-#: Merge.rc:1051
+#: Merge.rc:1041
#, c-format
msgid "Display Columns"
msgstr ""
-#: Merge.rc:1054
+#: Merge.rc:1044
#, c-format
msgid "Show columns"
msgstr ""
-#: Merge.rc:1059
+#: Merge.rc:1047
#, c-format
+msgid "Move &Up"
+msgstr ""
+
+#: Merge.rc:1048
+#, c-format
+msgid "Move &Down"
+msgstr ""
+
+#: Merge.rc:1049
+#, c-format
msgid "Hide columns"
msgstr ""
-#: Merge.rc:1062
+#: Merge.rc:1052
#, c-format
msgid "<<"
msgstr ""
-#: Merge.rc:1063
+#: Merge.rc:1053
#, c-format
msgid ">>"
msgstr ""
-#: Merge.rc:1073
+#: Merge.rc:1063
#, c-format
msgid "Select Unpacker"
msgstr ""
-#: Merge.rc:1078
+#: Merge.rc:1068
#, c-format
msgid "File unpacker:"
msgstr ""
-#: Merge.rc:1081
+#: Merge.rc:1071
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr ""
-#: Merge.rc:1084
+#: Merge.rc:1074
#, c-format
msgid "Extensions list:"
msgstr ""
-#: Merge.rc:1085
+#: Merge.rc:1075
#, c-format
msgid "Description:"
msgstr ""
-#: Merge.rc:1096
+#: Merge.rc:1086
#, c-format
msgid " Folder Compare Progress"
msgstr ""
-#: Merge.rc:1099
-#: Merge.rc:1841
+#: Merge.rc:1089
+#: Merge.rc:1831
#, c-format
msgid "Stop"
msgstr ""
-#: Merge.rc:1104
+#: Merge.rc:1094
#, c-format
msgid "Comparing items..."
msgstr ""
-#: Merge.rc:1105
+#: Merge.rc:1095
#, c-format
msgid "Items compared:"
msgstr ""
-#: Merge.rc:1106
+#: Merge.rc:1096
#, c-format
msgid "Items total:"
msgstr ""
-#: Merge.rc:1112
+#: Merge.rc:1102
#, c-format
msgid "Go To"
msgstr ""
-#: Merge.rc:1115
+#: Merge.rc:1105
#, c-format
msgid "G&oto:"
msgstr ""
-#: Merge.rc:1117
+#: Merge.rc:1107
#, c-format
msgid "File"
msgstr ""
-#: Merge.rc:1122
+#: Merge.rc:1112
#, c-format
msgid "Goto what"
msgstr ""
-#: Merge.rc:1123
+#: Merge.rc:1113
#, c-format
msgid "Li&ne"
msgstr ""
-#: Merge.rc:1125
+#: Merge.rc:1115
#, c-format
msgid "&Difference"
msgstr ""
-#: Merge.rc:1127
+#: Merge.rc:1117
#, c-format
msgid "&Go To"
msgstr ""
-#: Merge.rc:1133
-#: Merge.rc:1889
+#: Merge.rc:1123
+#: Merge.rc:1879
#, c-format
msgid "Compare"
msgstr ""
-#: Merge.rc:1136
+#: Merge.rc:1126
#, c-format
msgid "Whitespace"
msgstr ""
-#: Merge.rc:1137
+#: Merge.rc:1127
#, c-format
msgid "&Compare"
msgstr ""
-#: Merge.rc:1139
+#: Merge.rc:1129
#, c-format
msgid "&Ignore change"
msgstr ""
-#: Merge.rc:1141
+#: Merge.rc:1131
#, c-format
msgid "I&gnore all"
msgstr ""
-#: Merge.rc:1143
+#: Merge.rc:1133
#, c-format
msgid "Ignore blan&k lines"
msgstr ""
-#: Merge.rc:1145
+#: Merge.rc:1135
#, c-format
msgid "Ignore &case"
msgstr ""
-#: Merge.rc:1147
+#: Merge.rc:1137
#, c-format
msgid "Igno&re carriage return differences (DOS/UNIX/MAC)"
msgstr ""
-#: Merge.rc:1150
+#: Merge.rc:1140
#, c-format
msgid "E&nable moved block detection"
msgstr ""
-#: Merge.rc:1152
+#: Merge.rc:1142
#, c-format
msgid "&Match similar lines"
msgstr ""
-#: Merge.rc:1154
+#: Merge.rc:1144
#, c-format
msgid "&File Compare method:"
msgstr ""
-#: Merge.rc:1157
+#: Merge.rc:1147
#, c-format
msgid "S&top after first difference"
msgstr ""
-#: Merge.rc:1160
+#: Merge.rc:1150
#, c-format
msgid "Filter Comments"
msgstr ""
-#: Merge.rc:1167
-#: Merge.rc:1890
+#: Merge.rc:1157
+#: Merge.rc:1880
#, c-format
msgid "Editor"
msgstr ""
-#: Merge.rc:1170
+#: Merge.rc:1160
#, c-format
msgid "&Highlight syntax"
msgstr ""
-#: Merge.rc:1172
+#: Merge.rc:1162
#, c-format
msgid "&Automatic rescan"
msgstr ""
-#: Merge.rc:1174
+#: Merge.rc:1164
#, c-format
msgid "&Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1176
+#: Merge.rc:1166
#, c-format
msgid "Tabs"
msgstr ""
-#: Merge.rc:1177
+#: Merge.rc:1167
#, c-format
msgid "&Tab size:"
msgstr ""
-#: Merge.rc:1180
+#: Merge.rc:1170
#, c-format
msgid "&Insert Tabs"
msgstr ""
-#: Merge.rc:1182
+#: Merge.rc:1172
#, c-format
msgid "Insert &Spaces"
msgstr ""
-#: Merge.rc:1184
+#: Merge.rc:1174
#, c-format
msgid "Line Difference Coloring"
msgstr ""
-#: Merge.rc:1186
+#: Merge.rc:1176
#, c-format
msgid "View line differences"
msgstr ""
-#: Merge.rc:1188
+#: Merge.rc:1178
#, c-format
msgid "&Character level"
msgstr ""
-#: Merge.rc:1190
+#: Merge.rc:1180
#, c-format
msgid "&Word-level:"
msgstr ""
-#: Merge.rc:1205
+#: Merge.rc:1195
#, c-format
msgid "Filefilters"
msgstr ""
-#: Merge.rc:1211
+#: Merge.rc:1201
#, c-format
msgid "Test"
msgstr ""
-#: Merge.rc:1212
+#: Merge.rc:1202
#, c-format
msgid "Install..."
msgstr ""
-#: Merge.rc:1213
+#: Merge.rc:1203
#, c-format
msgid "New..."
msgstr ""
-#: Merge.rc:1214
+#: Merge.rc:1204
#, c-format
msgid "Edit..."
msgstr ""
-#: Merge.rc:1215
+#: Merge.rc:1205
#, c-format
msgid "Delete..."
msgstr ""
-#: Merge.rc:1221
+#: Merge.rc:1211
#, c-format
msgid "Save modified files?"
msgstr ""
-#: Merge.rc:1224
+#: Merge.rc:1214
#, c-format
msgid "Left side file"
msgstr ""
-#: Merge.rc:1227
+#: Merge.rc:1217
#, c-format
msgid "&Save changes"
msgstr ""
-#: Merge.rc:1229
+#: Merge.rc:1219
#, c-format
msgid "&Discard changes"
msgstr ""
-#: Merge.rc:1231
+#: Merge.rc:1221
#, c-format
msgid "Right side file"
msgstr ""
-#: Merge.rc:1234
+#: Merge.rc:1224
#, c-format
msgid "S&ave changes"
msgstr ""
-#: Merge.rc:1236
+#: Merge.rc:1226
#, c-format
msgid "Dis&card changes"
msgstr ""
-#: Merge.rc:1238
+#: Merge.rc:1228
#, c-format
msgid "Discard All"
msgstr ""
-#: Merge.rc:1245
-#: Merge.rc:1493
-#: Merge.rc:1896
+#: Merge.rc:1235
+#: Merge.rc:1483
+#: Merge.rc:1886
#, c-format
msgid "Codepage"
msgstr ""
-#: Merge.rc:1248
+#: Merge.rc:1238
#, c-format
msgid "Default Codepage"
msgstr ""
-#: Merge.rc:1249
+#: Merge.rc:1239
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr ""
-#: Merge.rc:1251
+#: Merge.rc:1241
#, c-format
msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session"
msgstr ""
-#: Merge.rc:1254
+#: Merge.rc:1244
#, c-format
msgid "System codepage"
msgstr ""
-#: Merge.rc:1256
+#: Merge.rc:1246
#, c-format
msgid "According to WinMerge User Interface"
msgstr ""
-#: Merge.rc:1258
+#: Merge.rc:1248
#, c-format
msgid "Custom codepage :"
msgstr ""
-#: Merge.rc:1266
+#: Merge.rc:1256
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr ""
-#: Merge.rc:1269
+#: Merge.rc:1259
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr ""
-#: Merge.rc:1272
+#: Merge.rc:1262
#, 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:1274
+#: Merge.rc:1264
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr ""
-#: Merge.rc:1276
+#: Merge.rc:1266
#, c-format
msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available."
msgstr ""
-#: Merge.rc:1278
+#: Merge.rc:1268
#, c-format
msgid "Version"
msgstr ""
-#: Merge.rc:1280
+#: Merge.rc:1270
#, c-format
msgid "Plugin required\n(dllbuild %04u)"
msgstr ""
-#: Merge.rc:1282
+#: Merge.rc:1272
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr ""
-#: Merge.rc:1285
-#: Merge.rc:1288
+#: Merge.rc:1275
+#: Merge.rc:1278
#, c-format
msgid "present"
msgstr ""
-#: Merge.rc:1286
+#: Merge.rc:1276
#, c-format
msgid "Merge7z000U.dll"
msgstr ""
-#: Merge.rc:1289
+#: Merge.rc:1279
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr ""
-#: Merge.rc:1291
-#: Merge.rc:1296
+#: Merge.rc:1281
+#: Merge.rc:1286
#, c-format
msgid "none"
msgstr ""
-#: Merge.rc:1293
+#: Merge.rc:1283
#, c-format
msgid "missing"
msgstr ""
-#: Merge.rc:1294
+#: Merge.rc:1284
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr ""
-#: Merge.rc:1298
+#: Merge.rc:1288
#, c-format
msgid "outdated"
msgstr ""
-#: Merge.rc:1299
+#: Merge.rc:1289
#, c-format
msgid "Plugins on path:"
msgstr ""
-#: Merge.rc:1300
+#: Merge.rc:1290
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from help menu.)"
msgstr ""
-#: Merge.rc:1304
+#: Merge.rc:1294
#, c-format
msgid "Plugin Download"
msgstr ""
-#: Merge.rc:1313
+#: Merge.rc:1303
#, c-format
msgid "Options"
msgstr ""
-#: Merge.rc:1324
+#: Merge.rc:1314
#, c-format
msgid " Categories"
msgstr ""
-#: Merge.rc:1326
+#: Merge.rc:1316
#, c-format
msgid "Import..."
msgstr ""
-#: Merge.rc:1327
+#: Merge.rc:1317
#, c-format
msgid "Export..."
msgstr ""
-#: Merge.rc:1335
+#: Merge.rc:1325
#, c-format
msgid "Keywords:"
msgstr ""
-#: Merge.rc:1336
+#: Merge.rc:1326
#, c-format
msgid "Function names:"
msgstr ""
-#: Merge.rc:1337
+#: Merge.rc:1327
#, c-format
msgid "Comments:"
msgstr ""
-#: Merge.rc:1338
+#: Merge.rc:1328
#, c-format
msgid "Numbers:"
msgstr ""
-#: Merge.rc:1339
+#: Merge.rc:1329
#, c-format
msgid "Operators:"
msgstr ""
-#: Merge.rc:1340
+#: Merge.rc:1330
#, c-format
msgid "Strings:"
msgstr ""
-#: Merge.rc:1341
+#: Merge.rc:1331
#, c-format
msgid "Preprocessor:"
msgstr ""
-#: Merge.rc:1342
+#: Merge.rc:1332
#, c-format
msgid "User 1:"
msgstr ""
-#: Merge.rc:1343
+#: Merge.rc:1333
#, c-format
msgid "User 2:"
msgstr ""
+#: Merge.rc:1338
+#: Merge.rc:1343
#: Merge.rc:1348
#: Merge.rc:1353
#: Merge.rc:1358
@@ -2156,3917 +2166,3915 @@
#: Merge.rc:1368
#: Merge.rc:1373
#: Merge.rc:1378
-#: Merge.rc:1383
-#: Merge.rc:1388
#, c-format
msgid "Bold"
msgstr ""
-#: Merge.rc:1396
+#: Merge.rc:1386
#, c-format
msgid "Folder Compare Report"
msgstr ""
-#: Merge.rc:1399
+#: Merge.rc:1389
#, c-format
msgid "Report &File:"
msgstr ""
-#: Merge.rc:1403
+#: Merge.rc:1393
#, c-format
msgid "&Style:"
msgstr ""
-#: Merge.rc:1406
+#: Merge.rc:1396
#, c-format
msgid "&Copy to Clipboard"
msgstr ""
-#: Merge.rc:1414
+#: Merge.rc:1404
#, c-format
msgid "Shared or Private Filter"
msgstr ""
-#: Merge.rc:1417
+#: Merge.rc:1407
#, c-format
msgid "Which type of filter do you want to create?"
msgstr ""
-#: Merge.rc:1419
+#: Merge.rc:1409
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr ""
-#: Merge.rc:1421
+#: Merge.rc:1411
#, c-format
msgid "Private Filter (only for current user)"
msgstr ""
-#: Merge.rc:1429
-#: Merge.rc:1897
+#: Merge.rc:1419
+#: Merge.rc:1887
#, c-format
msgid "Archive Support"
msgstr ""
-#: Merge.rc:1432
+#: Merge.rc:1422
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr ""
-#: Merge.rc:1434
+#: Merge.rc:1424
#, c-format
msgid "Download 7-zip Plugin"
msgstr ""
-#: Merge.rc:1435
+#: Merge.rc:1425
#, c-format
msgid "&Enable archive file support"
msgstr ""
-#: Merge.rc:1437
+#: Merge.rc:1427
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr ""
-#: Merge.rc:1440
+#: Merge.rc:1430
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr ""
-#: Merge.rc:1442
+#: Merge.rc:1432
#, c-format
msgid "&Detect archive type from file signature"
msgstr ""
-#: Merge.rc:1450
+#: Merge.rc:1440
#, c-format
msgid "Compare Statistics"
msgstr ""
-#: Merge.rc:1453
+#: Merge.rc:1443
#, c-format
msgid "Folders:"
msgstr ""
-#: Merge.rc:1454
+#: Merge.rc:1444
#, c-format
msgid "Files:"
msgstr ""
-#: Merge.rc:1455
-#: Merge.rc:2261
+#: Merge.rc:1445
+#: Merge.rc:2251
#, c-format
msgid "Different"
msgstr ""
-#: Merge.rc:1456
+#: Merge.rc:1446
#, c-format
msgid "Text:"
msgstr ""
-#: Merge.rc:1459
-#: Merge.rc:1478
+#: Merge.rc:1449
+#: Merge.rc:1468
#, c-format
msgid "Binary:"
msgstr ""
-#: Merge.rc:1462
+#: Merge.rc:1452
#, c-format
msgid "Unique"
msgstr ""
-#: Merge.rc:1463
+#: Merge.rc:1453
#, c-format
msgid "Left:"
msgstr ""
-#: Merge.rc:1468
+#: Merge.rc:1458
#, c-format
msgid "Right:"
msgstr ""
-#: Merge.rc:1473
-#: Merge.rc:2256
+#: Merge.rc:1463
+#: Merge.rc:2246
#, c-format
msgid "Identical"
msgstr ""
-#: Merge.rc:1482
+#: Merge.rc:1472
#, c-format
msgid "Total:"
msgstr ""
-#: Merge.rc:1487
+#: Merge.rc:1477
#, c-format
msgid "Close"
msgstr ""
-#: Merge.rc:1496
+#: Merge.rc:1486
#, c-format
msgid "Affects"
msgstr ""
-#: Merge.rc:1499
-#: Merge.rc:1502
+#: Merge.rc:1489
+#: Merge.rc:1492
#, c-format
msgid "(Affects)"
msgstr ""
-#: Merge.rc:1503
+#: Merge.rc:1493
#, c-format
msgid "Select Codepage for"
msgstr ""
-#: Merge.rc:1504
+#: Merge.rc:1494
#, c-format
msgid "&File Loading:"
msgstr ""
-#: Merge.rc:1506
-#: Merge.rc:1509
+#: Merge.rc:1496
+#: Merge.rc:1499
#, c-format
msgid "..."
msgstr ""
-#: Merge.rc:1507
+#: Merge.rc:1497
#, c-format
msgid "File &Saving:"
msgstr ""
-#: Merge.rc:1510
+#: Merge.rc:1500
#, c-format
msgid "&Use same codepage for both"
msgstr ""
-#: Merge.rc:1513
+#: Merge.rc:1503
#, c-format
msgid "&Apply"
msgstr ""
-#: Merge.rc:1514
-#: Merge.rc:1863
+#: Merge.rc:1504
+#: Merge.rc:1853
#, c-format
msgid "&Cancel"
msgstr ""
-#: Merge.rc:1519
+#: Merge.rc:1509
#, c-format
msgid "Test Filter"
msgstr ""
-#: Merge.rc:1522
+#: Merge.rc:1512
#, c-format
msgid "Testing filter ..."
msgstr ""
-#: Merge.rc:1524
+#: Merge.rc:1514
#, c-format
msgid "&Enter text to test:"
msgstr ""
-#: Merge.rc:1526
+#: Merge.rc:1516
#, c-format
msgid "&Folder Name"
msgstr ""
-#: Merge.rc:1528
+#: Merge.rc:1518
#, c-format
msgid "Result:"
msgstr ""
-#: Merge.rc:1532
+#: Merge.rc:1522
#, c-format
msgid "&Test"
msgstr ""
-#: Merge.rc:1533
+#: Merge.rc:1523
#, c-format
msgid "&Close"
msgstr ""
-#: Merge.rc:1541
+#: Merge.rc:1531
#, c-format
msgid "&Use customized text colors"
msgstr ""
-#: Merge.rc:1544
+#: Merge.rc:1534
#, c-format
msgid "Custom text colors"
msgstr ""
-#: Merge.rc:1546
+#: Merge.rc:1536
#, c-format
msgid "Whitespace:"
msgstr ""
-#: Merge.rc:1547
+#: Merge.rc:1537
#, c-format
msgid "Regular text:"
msgstr ""
-#: Merge.rc:1548
+#: Merge.rc:1538
#, c-format
msgid "Selection:"
msgstr ""
-#: Merge.rc:1571
+#: Merge.rc:1561
#, c-format
msgid "Paths"
msgstr ""
-#: Merge.rc:1577
+#: Merge.rc:1567
#, c-format
msgid "R&ead-only"
msgstr ""
-#: Merge.rc:1581
+#: Merge.rc:1571
#, c-format
msgid "Re&ad-only"
msgstr ""
-#: Merge.rc:1587
+#: Merge.rc:1577
#, c-format
msgid "Open..."
msgstr ""
-#: Merge.rc:1588
+#: Merge.rc:1578
#, c-format
msgid "Save..."
msgstr ""
-#: Merge.rc:1593
-#: Merge.rc:1898
+#: Merge.rc:1583
+#: Merge.rc:1888
#, c-format
msgid "Backup Files"
msgstr ""
-#: Merge.rc:1596
+#: Merge.rc:1586
#, c-format
msgid "Create backup files in:"
msgstr ""
-#: Merge.rc:1601
+#: Merge.rc:1591
#, c-format
msgid "Create backup files into:"
msgstr ""
-#: Merge.rc:1602
+#: Merge.rc:1592
#, c-format
msgid "&Original file's folder"
msgstr ""
-#: Merge.rc:1604
+#: Merge.rc:1594
#, c-format
msgid "&Global backup folder:"
msgstr ""
-#: Merge.rc:1608
+#: Merge.rc:1598
#, c-format
msgid "Backup filename:"
msgstr ""
-#: Merge.rc:1609
+#: Merge.rc:1599
#, c-format
msgid "&Append .bak -extension"
msgstr ""
-#: Merge.rc:1611
+#: Merge.rc:1601
#, c-format
msgid "A&ppend timestamp"
msgstr ""
-#: Merge.rc:1618
+#: Merge.rc:1608
#, c-format
msgid "Confirm Copy"
msgstr ""
-#: Merge.rc:1622
+#: Merge.rc:1612
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr ""
-#: Merge.rc:1624
+#: Merge.rc:1614
#, c-format
msgid "From left"
msgstr ""
-#: Merge.rc:1627
+#: Merge.rc:1617
#, c-format
msgid "To right"
msgstr ""
-#: Merge.rc:1630
+#: Merge.rc:1620
#, c-format
msgid "Yes"
msgstr ""
-#: Merge.rc:1631
+#: Merge.rc:1621
#, c-format
msgid "No"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1656
+#: Merge.rc:1646
#, c-format
msgid "040904e4"
msgstr ""
#. StringFileInfo.Comments
-#: Merge.rc:1658
+#: Merge.rc:1648
#, c-format
msgid "English translation by developers"
msgstr ""
#. StringFileInfo.FileDescription
-#: Merge.rc:1659
+#: Merge.rc:1649
#, c-format
msgid "WinMerge Application"
msgstr ""
#. StringFileInfo.LegalCopyright
-#: Merge.rc:1662
+#: Merge.rc:1652
#, c-format
msgid "(c) 1996-2007 Dean P. Grimm / Thingamahoochie Software"
msgstr ""
#. StringFileInfo.OriginalFilename
-#: Merge.rc:1663
+#: Merge.rc:1653
#, c-format
msgid "WinMerge.EXE"
msgstr ""
#. VarFileInfo.Translation
-#: Merge.rc:1671
+#: Merge.rc:1661
#, c-format
msgid "0x409, 1252"
msgstr ""
-#: Merge.rc:1686
+#: Merge.rc:1676
#, c-format
msgid "Ready"
msgstr ""
-#: Merge.rc:1692
+#: Merge.rc:1682
#, c-format
msgid "EXT"
msgstr ""
-#: Merge.rc:1693
+#: Merge.rc:1683
#, c-format
msgid "CAP"
msgstr ""
-#: Merge.rc:1694
+#: Merge.rc:1684
#, c-format
msgid "NUM"
msgstr ""
-#: Merge.rc:1695
+#: Merge.rc:1685
#, c-format
msgid "SCRL"
msgstr ""
-#: Merge.rc:1696
+#: Merge.rc:1686
#, c-format
msgid "OVR"
msgstr ""
-#: Merge.rc:1697
+#: Merge.rc:1687
#, c-format
msgid "REC"
msgstr ""
-#: Merge.rc:1703
+#: Merge.rc:1693
#, c-format
msgid "Create empty documents\nNew Documents (Ctrl+N)"
msgstr ""
-#: Merge.rc:1704
+#: Merge.rc:1694
#, c-format
msgid "Open an existing document\nOpen (Ctrl+O)"
msgstr ""
-#: Merge.rc:1705
+#: Merge.rc:1695
#, c-format
msgid "Close the active document\nClose"
msgstr ""
-#: Merge.rc:1706
+#: Merge.rc:1696
#, c-format
msgid "Save the active document\nSave (Ctrl+S)"
msgstr ""
-#: Merge.rc:1707
+#: Merge.rc:1697
#, c-format
msgid "Save the active document with a new name\nSave As"
msgstr ""
-#: Merge.rc:1708
+#: Merge.rc:1698
#, c-format
msgid "Change the printing options\nPage Setup"
msgstr ""
-#: Merge.rc:1709
+#: Merge.rc:1699
#, c-format
msgid "Change the printer and printing options\nPrint Setup"
msgstr ""
-#: Merge.rc:1710
+#: Merge.rc:1700
#, c-format
msgid "Print the active document\nPrint"
msgstr ""
-#: Merge.rc:1711
+#: Merge.rc:1701
#, c-format
msgid "Display full pages\nPrint Preview"
msgstr ""
-#: Merge.rc:1716
+#: Merge.rc:1706
#, c-format
msgid "Make all hidden items visible again"
msgstr ""
-#: Merge.rc:1722
+#: Merge.rc:1712
#, c-format
msgid "Open project file\nProject file (Ctrl+J)"
msgstr ""
-#: Merge.rc:1723
+#: Merge.rc:1713
#, c-format
msgid "Unknown error attempting to open project file"
msgstr ""
-#: Merge.rc:1724
+#: Merge.rc:1714
#, c-format
msgid "Unknown error attempting to save project file"
msgstr ""
-#: Merge.rc:1725
+#: Merge.rc:1715
#, c-format
msgid "Project File"
msgstr ""
-#: Merge.rc:1726
+#: Merge.rc:1716
#, c-format
msgid "Project file successfully loaded."
msgstr ""
-#: Merge.rc:1727
+#: Merge.rc:1717
#, c-format
msgid "Project file successfully saved."
msgstr ""
-#: Merge.rc:1728
+#: Merge.rc:1718
#, c-format
msgid "Save current paths and options to project file\nSave Project File"
msgstr ""
-#: Merge.rc:1733
+#: Merge.rc:1723
#, c-format
msgid "Display program information, version number and copyright\nAbout"
msgstr ""
-#: Merge.rc:1734
+#: Merge.rc:1724
#, c-format
msgid "Quit the application; prompts to save documents\nExit"
msgstr ""
+#: Merge.rc:1730
+#: Merge.rc:1731
+#: Merge.rc:1732
+#: Merge.rc:1733
+#: Merge.rc:1734
+#: Merge.rc:1735
+#: Merge.rc:1736
+#: Merge.rc:1737
+#: Merge.rc:1738
+#: Merge.rc:1739
#: Merge.rc:1740
#: Merge.rc:1741
#: Merge.rc:1742
#: Merge.rc:1743
#: Merge.rc:1744
#: Merge.rc:1745
-#: Merge.rc:1746
-#: Merge.rc:1747
-#: Merge.rc:1748
-#: Merge.rc:1749
-#: Merge.rc:1750
-#: Merge.rc:1751
-#: Merge.rc:1752
-#: Merge.rc:1753
-#: Merge.rc:1754
-#: Merge.rc:1755
#, c-format
msgid "Open this document"
msgstr ""
-#: Merge.rc:1760
+#: Merge.rc:1750
#, c-format
msgid "Switch to the next window pane\nNext Pane"
msgstr ""
-#: Merge.rc:1761
+#: Merge.rc:1751
#, c-format
msgid "Switch back to the previous window pane\nPrevious Pane"
msgstr ""
-#: Merge.rc:1767
+#: Merge.rc:1757
#, c-format
msgid "Open another window for the active document\nNew Window"
msgstr ""
-#: Merge.rc:1768
+#: Merge.rc:1758
#, c-format
msgid "Arrange icons at the bottom of the window\nArrange Icons"
msgstr ""
-#: Merge.rc:1769
+#: Merge.rc:1759
#, c-format
msgid "Arrange windows so they overlap\nCascade Windows"
msgstr ""
-#: Merge.rc:1770
+#: Merge.rc:1760
#, c-format
msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally"
msgstr ""
-#: Merge.rc:1771
+#: Merge.rc:1761
#, c-format
msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically"
msgstr ""
-#: Merge.rc:1772
+#: Merge.rc:1762
#, c-format
msgid "Split the active window into panes\nSplit"
msgstr ""
-#: Merge.rc:1778
+#: Merge.rc:1768
#, c-format
msgid "Erase the selection\nErase"
msgstr ""
-#: Merge.rc:1779
+#: Merge.rc:1769
#, c-format
msgid "Erase everything\nErase All"
msgstr ""
-#: Merge.rc:1780
+#: Merge.rc:1770
#, c-format
msgid "Copy the selection and put it on the Clipboard\nCopy"
msgstr ""
-#: Merge.rc:1781
+#: Merge.rc:1771
#, c-format
msgid "Cut the selection and put it on the Clipboard\nCut"
msgstr ""
-#: Merge.rc:1782
+#: Merge.rc:1772
#, c-format
msgid "Find the specified text\nFind"
msgstr ""
-#: Merge.rc:1783
+#: Merge.rc:1773
#, c-format
msgid "Insert Clipboard contents\nPaste"
msgstr ""
-#: Merge.rc:1784
+#: Merge.rc:1774
#, c-format
msgid "Repeat the last action\nRepeat"
msgstr ""
-#: Merge.rc:1785
+#: Merge.rc:1775
#, c-format
msgid "Replace specific text with different text\nReplace"
msgstr ""
-#: Merge.rc:1786
+#: Merge.rc:1776
#, c-format
msgid "Select the entire document\nSelect All"
msgstr ""
-#: Merge.rc:1787
+#: Merge.rc:1777
#, c-format
msgid "Undo the last action\nUndo (Ctrl+Z)"
msgstr ""
-#: Merge.rc:1788
+#: Merge.rc:1778
#, c-format
msgid "Redo the previously undone action\nRedo (Ctrl+Y)"
msgstr ""
-#: Merge.rc:1794
+#: Merge.rc:1784
#, c-format
msgid "Show or hide the toolbar\nToggle ToolBar"
msgstr ""
-#: Merge.rc:1795
+#: Merge.rc:1785
#, c-format
msgid "Show or hide the status bar\nToggle StatusBar"
msgstr ""
-#: Merge.rc:1796
+#: Merge.rc:1786
#, c-format
msgid "Show or hide the tab bar\nToggle TabBar"
msgstr ""
-#: Merge.rc:1802
+#: Merge.rc:1792
#, c-format
msgid "Change the window size"
msgstr ""
-#: Merge.rc:1803
+#: Merge.rc:1793
#, c-format
msgid "Change the window position"
msgstr ""
-#: Merge.rc:1804
+#: Merge.rc:1794
#, c-format
msgid "Reduce the window to an icon"
msgstr ""
-#: Merge.rc:1805
+#: Merge.rc:1795
#, c-format
msgid "Enlarge the window to full size"
msgstr ""
-#: Merge.rc:1806
+#: Merge.rc:1796
#, c-format
msgid "Switch to the next document window"
msgstr ""
-#: Merge.rc:1807
+#: Merge.rc:1797
#, c-format
msgid "Switch to the previous document window"
msgstr ""
-#: Merge.rc:1808
+#: Merge.rc:1798
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr ""
-#: Merge.rc:1813
+#: Merge.rc:1803
#, c-format
msgid "Restore the window to normal size"
msgstr ""
-#: Merge.rc:1814
+#: Merge.rc:1804
#, c-format
msgid "Activate Task List"
msgstr ""
-#: Merge.rc:1815
+#: Merge.rc:1805
#, c-format
msgid "Activate this window"
msgstr ""
-#: Merge.rc:1821
+#: Merge.rc:1811
#, c-format
msgid "Close print preview mode\nCancel Preview"
msgstr ""
-#: Merge.rc:1828
+#: Merge.rc:1818
#, c-format
msgid "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
msgstr ""
-#: Merge.rc:1835
+#: Merge.rc:1825
#, c-format
msgid "Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1842
+#: Merge.rc:1832
#, c-format
msgid "Press any key"
msgstr ""
-#: Merge.rc:1848
-#: Merge.rc:1849
+#: Merge.rc:1838
+#: Merge.rc:1839
#, c-format
msgid "Right click on the path to copy"
msgstr ""
-#: Merge.rc:1855
+#: Merge.rc:1845
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
msgstr ""
-#: Merge.rc:1856
+#: Merge.rc:1846
#, 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 Public License in the Help menu for details."
msgstr ""
-#: Merge.rc:1862
+#: Merge.rc:1852
#, c-format
msgid "&Ok"
msgstr ""
-#: Merge.rc:1864
+#: Merge.rc:1854
#, c-format
msgid "&Abort"
msgstr ""
-#: Merge.rc:1865
+#: Merge.rc:1855
#, c-format
msgid "&Retry"
msgstr ""
-#: Merge.rc:1866
+#: Merge.rc:1856
#, c-format
msgid "&Ignore"
msgstr ""
-#: Merge.rc:1867
+#: Merge.rc:1857
#, c-format
msgid "Ignore &all"
msgstr ""
-#: Merge.rc:1868
+#: Merge.rc:1858
#, c-format
msgid "&Yes"
msgstr ""
-#: Merge.rc:1874
+#: Merge.rc:1864
#, c-format
msgid "Yes to &all"
msgstr ""
-#: Merge.rc:1875
+#: Merge.rc:1865
#, c-format
msgid "&No"
msgstr ""
-#: Merge.rc:1876
+#: Merge.rc:1866
#, c-format
msgid "No to a&ll"
msgstr ""
-#: Merge.rc:1877
+#: Merge.rc:1867
#, c-format
msgid "&Continue"
msgstr ""
-#: Merge.rc:1878
+#: Merge.rc:1868
#, c-format
msgid "&Skip"
msgstr ""
-#: Merge.rc:1879
+#: Merge.rc:1869
#, c-format
msgid "Skip &all"
msgstr ""
-#: Merge.rc:1881
+#: Merge.rc:1871
#, c-format
msgid "Don't display this &message again."
msgstr ""
-#: Merge.rc:1882
+#: Merge.rc:1872
#, c-format
msgid "Don't ask this &question again."
msgstr ""
-#: Merge.rc:1892
+#: Merge.rc:1882
#, c-format
msgid "Syntax colors"
msgstr ""
-#: Merge.rc:1893
+#: Merge.rc:1883
#, c-format
msgid "Text Colors"
msgstr ""
-#: Merge.rc:1895
+#: Merge.rc:1885
#, c-format
msgid "Version Control"
msgstr ""
-#: Merge.rc:1905
+#: Merge.rc:1895
#, c-format
msgid "To:"
msgstr ""
-#: Merge.rc:1906
+#: Merge.rc:1896
#, c-format
msgid "From left:"
msgstr ""
-#: Merge.rc:1907
+#: Merge.rc:1897
#, c-format
msgid "To left:"
msgstr ""
-#: Merge.rc:1908
+#: Merge.rc:1898
#, c-format
msgid "From right:"
msgstr ""
-#: Merge.rc:1909
+#: Merge.rc:1899
#, c-format
msgid "To right:"
msgstr ""
-#: Merge.rc:1915
+#: Merge.rc:1905
#, c-format
msgid "Version %1"
msgstr ""
-#: Merge.rc:1916
+#: Merge.rc:1906
#, c-format
msgid "Unicode"
msgstr ""
-#: Merge.rc:1922
+#: Merge.rc:1912
#, c-format
msgid "Options (%1)"
msgstr ""
-#: Merge.rc:1923
+#: Merge.rc:1913
#, c-format
msgid "All message boxes are now displayed again."
msgstr ""
-#: Merge.rc:1924
+#: Merge.rc:1914
#, 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:1925
+#: Merge.rc:1915
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr ""
-#: Merge.rc:1927
+#: Merge.rc:1917
#, c-format
msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
msgstr ""
-#: Merge.rc:1929
+#: Merge.rc:1919
#, 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:1935
+#: Merge.rc:1925
#, c-format
msgid "Open"
msgstr ""
-#: Merge.rc:1936
+#: Merge.rc:1926
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1937
+#: Merge.rc:1927
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1938
+#: Merge....
[truncated message content] |