msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-01-23 00:47+0000\n"
+"POT-Creation-Date: 2008-01-22 23:48+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
#: Merge.rc:81
#: Merge.rc:103
-#: Merge.rc:495
+#: Merge.rc:498
#, c-format
msgid "&Copy"
msgstr ""
msgstr ""
#: Merge.rc:84
-#: Merge.rc:576
+#: Merge.rc:579
#, c-format
msgid "&Goto..."
msgstr ""
msgstr ""
#: Merge.rc:88
-#: Merge.rc:518
-#: Merge.rc:524
+#: Merge.rc:521
+#: Merge.rc:527
#, c-format
msgid "with &Registered Application"
msgstr ""
#: Merge.rc:89
-#: Merge.rc:519
-#: Merge.rc:525
+#: Merge.rc:522
+#: Merge.rc:528
#, c-format
msgid "with &External Editor"
msgstr ""
#: Merge.rc:90
-#: Merge.rc:520
-#: Merge.rc:526
+#: Merge.rc:523
+#: Merge.rc:529
#, c-format
msgid "&with..."
msgstr ""
#: Merge.rc:110
-#: Merge.rc:190
-#: Merge.rc:305
+#: Merge.rc:191
+#: Merge.rc:307
#, c-format
msgid "&File"
msgstr ""
#: Merge.rc:112
-#: Merge.rc:192
-#: Merge.rc:307
+#: Merge.rc:193
+#: Merge.rc:309
#, c-format
msgid "&New\tCtrl+N"
msgstr ""
#: Merge.rc:113
-#: Merge.rc:193
-#: Merge.rc:308
+#: Merge.rc:194
+#: Merge.rc:310
#, c-format
msgid "&Open...\tCtrl+O"
msgstr ""
msgstr ""
#: Merge.rc:117
-#: Merge.rc:196
-#: Merge.rc:311
+#: Merge.rc:197
+#: Merge.rc:313
#, c-format
msgid "Sa&ve Project..."
msgstr ""
msgstr ""
#: Merge.rc:121
-#: Merge.rc:203
-#: Merge.rc:343
+#: Merge.rc:204
+#: Merge.rc:345
#, c-format
msgid "E&xit"
msgstr ""
#: Merge.rc:123
-#: Merge.rc:205
-#: Merge.rc:345
+#: Merge.rc:206
+#: Merge.rc:347
#, c-format
msgid "&Edit"
msgstr ""
#: Merge.rc:125
-#: Merge.rc:209
-#: Merge.rc:379
+#: Merge.rc:210
+#: Merge.rc:381
#, c-format
msgid "&Options..."
msgstr ""
#: Merge.rc:127
-#: Merge.rc:211
-#: Merge.rc:381
+#: Merge.rc:212
+#: Merge.rc:383
#, c-format
msgid "&View"
msgstr ""
#: Merge.rc:129
-#: Merge.rc:222
-#: Merge.rc:383
+#: Merge.rc:223
+#: Merge.rc:385
#, c-format
msgid "Select &Font..."
msgstr ""
#: Merge.rc:130
-#: Merge.rc:223
-#: Merge.rc:384
+#: Merge.rc:224
+#: Merge.rc:386
#, c-format
msgid "Use Default F&ont"
msgstr ""
#: Merge.rc:132
-#: Merge.rc:225
-#: Merge.rc:401
+#: Merge.rc:226
+#: Merge.rc:403
#, c-format
msgid "&Toolbar"
msgstr ""
#: Merge.rc:134
-#: Merge.rc:227
-#: Merge.rc:403
+#: Merge.rc:228
+#: Merge.rc:405
#, c-format
msgid "&None"
msgstr ""
#: Merge.rc:135
-#: Merge.rc:228
-#: Merge.rc:404
+#: Merge.rc:229
+#: Merge.rc:406
#, c-format
msgid "&Small"
msgstr ""
#: Merge.rc:136
-#: Merge.rc:229
-#: Merge.rc:405
+#: Merge.rc:230
+#: Merge.rc:407
#, c-format
msgid "&Big"
msgstr ""
#: Merge.rc:138
-#: Merge.rc:231
-#: Merge.rc:407
+#: Merge.rc:232
+#: Merge.rc:409
#, c-format
msgid "&Status Bar"
msgstr ""
#: Merge.rc:139
-#: Merge.rc:232
-#: Merge.rc:408
+#: Merge.rc:233
+#: Merge.rc:410
#, c-format
msgid "Ta&b Bar"
msgstr ""
#: Merge.rc:141
-#: Merge.rc:235
-#: Merge.rc:412
+#: Merge.rc:236
+#: Merge.rc:414
#, c-format
msgid "&Language..."
msgstr ""
#: Merge.rc:143
-#: Merge.rc:256
-#: Merge.rc:434
+#: Merge.rc:257
+#: Merge.rc:436
#, c-format
msgid "&Tools"
msgstr ""
#: Merge.rc:145
-#: Merge.rc:259
-#: Merge.rc:436
+#: Merge.rc:260
+#: Merge.rc:438
#, c-format
msgid "&Filters..."
msgstr ""
#: Merge.rc:146
-#: Merge.rc:260
-#: Merge.rc:437
+#: Merge.rc:261
+#: Merge.rc:439
#, c-format
msgid "&Generate Patch..."
msgstr ""
#: Merge.rc:148
-#: Merge.rc:263
-#: Merge.rc:440
+#: Merge.rc:264
+#: Merge.rc:442
#, c-format
msgid "&Plugins"
msgstr ""
#: Merge.rc:150
-#: Merge.rc:265
-#: Merge.rc:442
+#: Merge.rc:266
+#: Merge.rc:444
#, c-format
msgid "&Manual Unpacking"
msgstr ""
#: Merge.rc:151
-#: Merge.rc:266
-#: Merge.rc:443
+#: Merge.rc:267
+#: Merge.rc:445
#, c-format
msgid "&Automatic Unpacking"
msgstr ""
#: Merge.rc:153
-#: Merge.rc:268
-#: Merge.rc:445
+#: Merge.rc:269
+#: Merge.rc:447
#, c-format
msgid "&Edit with Unpacker"
msgstr ""
#: Merge.rc:155
-#: Merge.rc:270
-#: Merge.rc:452
+#: Merge.rc:271
+#: Merge.rc:454
#, c-format
msgid "&Reload plugins"
msgstr ""
#: Merge.rc:157
-#: Merge.rc:272
-#: Merge.rc:454
+#: Merge.rc:273
+#: Merge.rc:456
#, c-format
msgid "&Debug"
msgstr ""
#: Merge.rc:159
-#: Merge.rc:274
-#: Merge.rc:456
+#: Merge.rc:275
+#: Merge.rc:458
#, c-format
msgid "&Load Config..."
msgstr ""
#: Merge.rc:160
-#: Merge.rc:275
-#: Merge.rc:457
+#: Merge.rc:276
+#: Merge.rc:459
#, c-format
msgid "&Reset Options"
msgstr ""
#: Merge.rc:162
-#: Merge.rc:277
-#: Merge.rc:459
+#: Merge.rc:278
+#: Merge.rc:461
#, c-format
msgid "&Window"
msgstr ""
#: Merge.rc:164
-#: Merge.rc:279
-#: Merge.rc:461
+#: Merge.rc:280
+#: Merge.rc:463
#, c-format
msgid "Cl&ose"
msgstr ""
#: Merge.rc:165
-#: Merge.rc:280
-#: Merge.rc:462
+#: Merge.rc:281
+#: Merge.rc:464
#, c-format
msgid "Clo&se All"
msgstr ""
#: Merge.rc:167
-#: Merge.rc:282
-#: Merge.rc:464
+#: Merge.rc:283
+#: Merge.rc:466
#, c-format
msgid "Change &Pane\tF6"
msgstr ""
#: Merge.rc:169
-#: Merge.rc:284
-#: Merge.rc:466
+#: Merge.rc:285
+#: Merge.rc:468
#, c-format
msgid "Tile &Horizontally"
msgstr ""
#: Merge.rc:170
-#: Merge.rc:285
-#: Merge.rc:467
+#: Merge.rc:286
+#: Merge.rc:469
#, c-format
msgid "Tile &Vertically"
msgstr ""
#: Merge.rc:171
-#: Merge.rc:286
-#: Merge.rc:468
+#: Merge.rc:287
+#: Merge.rc:470
#, c-format
msgid "&Cascade"
msgstr ""
#: Merge.rc:173
-#: Merge.rc:288
-#: Merge.rc:470
-#: Merge.rc:1884
+#: Merge.rc:289
+#: Merge.rc:472
+#: Merge.rc:1887
#, c-format
msgid "&Help"
msgstr ""
#: Merge.rc:175
-#: Merge.rc:290
-#: Merge.rc:472
+#: Merge.rc:291
+#: Merge.rc:474
#, c-format
msgid "&Contents...\tF1"
msgstr ""
#: Merge.rc:176
-#: Merge.rc:291
-#: Merge.rc:473
+#: Merge.rc:292
+#: Merge.rc:475
#, c-format
msgid "&Index..."
msgstr ""
#: Merge.rc:177
-#: Merge.rc:292
-#: Merge.rc:474
+#: Merge.rc:293
+#: Merge.rc:476
#, c-format
msgid "&Search..."
msgstr ""
#: Merge.rc:179
-#: Merge.rc:294
-#: Merge.rc:476
+#: Merge.rc:295
+#: Merge.rc:478
#, c-format
msgid "R&elease Notes"
msgstr ""
#: Merge.rc:180
-#: Merge.rc:295
-#: Merge.rc:477
+#: Merge.rc:296
+#: Merge.rc:479
#, c-format
-msgid "C&onfiguration..."
+msgid "&Translations"
msgstr ""
#: Merge.rc:181
-#: Merge.rc:296
-#: Merge.rc:478
+#: Merge.rc:297
+#: Merge.rc:480
#, c-format
-msgid "A&rchive Support disabled..."
+msgid "C&onfiguration..."
msgstr ""
-#: Merge.rc:183
+#: Merge.rc:182
#: Merge.rc:298
-#: Merge.rc:480
+#: Merge.rc:481
#, c-format
-msgid "&GNU Public License..."
+msgid "A&rchive Support disabled..."
msgstr ""
#: Merge.rc:184
-#: Merge.rc:299
-#: Merge.rc:481
+#: Merge.rc:300
+#: Merge.rc:483
+#, c-format
+msgid "&GNU Public License..."
+msgstr ""
+
+#: Merge.rc:185
+#: Merge.rc:301
+#: Merge.rc:484
#, c-format
msgid "&About WinMerge..."
msgstr ""
-#: Merge.rc:195
-#: Merge.rc:310
+#: Merge.rc:196
+#: Merge.rc:312
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr ""
-#: Merge.rc:198
-#: Merge.rc:329
+#: Merge.rc:199
+#: Merge.rc:331
#, c-format
msgid "L&eft Read-only"
msgstr ""
-#: Merge.rc:199
-#: Merge.rc:330
+#: Merge.rc:200
+#: Merge.rc:332
#, c-format
msgid "Ri&ght Read-only"
msgstr ""
-#: Merge.rc:201
+#: Merge.rc:202
#, c-format
msgid "File En&coding"
msgstr ""
-#: Merge.rc:207
-#: Merge.rc:355
+#: Merge.rc:208
+#: Merge.rc:357
#, c-format
msgid "Select &All\tCtrl+A"
msgstr ""
-#: Merge.rc:213
+#: Merge.rc:214
#, c-format
msgid "Show &Identical Items"
msgstr ""
-#: Merge.rc:214
+#: Merge.rc:215
#, c-format
msgid "Show &Different Items"
msgstr ""
-#: Merge.rc:215
+#: Merge.rc:216
#, c-format
msgid "Show L&eft Unique Items"
msgstr ""
-#: Merge.rc:216
+#: Merge.rc:217
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr ""
-#: Merge.rc:217
+#: Merge.rc:218
#, c-format
msgid "Show S&kipped Items"
msgstr ""
-#: Merge.rc:218
+#: Merge.rc:219
#, c-format
msgid "S&how Binary Files"
msgstr ""
-#: Merge.rc:220
+#: Merge.rc:221
#, c-format
msgid "Show Hidd&en Items"
msgstr ""
-#: Merge.rc:233
+#: Merge.rc:234
#, c-format
msgid "Compa&re Statistics"
msgstr ""
-#: Merge.rc:237
-#: Merge.rc:414
+#: Merge.rc:238
+#: Merge.rc:416
#, c-format
msgid "Refre&sh\tF5"
msgstr ""
-#: Merge.rc:238
+#: Merge.rc:239
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr ""
-#: Merge.rc:240
-#: Merge.rc:416
+#: Merge.rc:241
+#: Merge.rc:418
#, c-format
msgid "&Merge"
msgstr ""
-#: Merge.rc:242
+#: Merge.rc:243
#, c-format
msgid "Co&mpare\tEnter"
msgstr ""
-#: Merge.rc:244
-#: Merge.rc:418
+#: Merge.rc:245
+#: Merge.rc:420
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr ""
-#: Merge.rc:245
-#: Merge.rc:419
+#: Merge.rc:246
+#: Merge.rc:421
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr ""
-#: Merge.rc:247
-#: Merge.rc:421
+#: Merge.rc:248
+#: Merge.rc:423
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr ""
-#: Merge.rc:248
-#: Merge.rc:422
+#: Merge.rc:249
+#: Merge.rc:424
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr ""
-#: Merge.rc:249
-#: Merge.rc:423
+#: Merge.rc:250
+#: Merge.rc:425
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr ""
-#: Merge.rc:251
-#: Merge.rc:425
+#: Merge.rc:252
+#: Merge.rc:427
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr ""
-#: Merge.rc:252
-#: Merge.rc:426
+#: Merge.rc:253
+#: Merge.rc:428
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr ""
-#: Merge.rc:254
+#: Merge.rc:255
#, c-format
msgid "&Delete\tDel"
msgstr ""
-#: Merge.rc:258
-#: Merge.rc:549
+#: Merge.rc:259
+#: Merge.rc:552
#, c-format
msgid "&Customize Columns..."
msgstr ""
-#: Merge.rc:261
-#: Merge.rc:438
+#: Merge.rc:262
+#: Merge.rc:440
#, c-format
msgid "Generate &Report..."
msgstr ""
-#: Merge.rc:313
+#: Merge.rc:315
#, c-format
msgid "&Save\tCtrl+S"
msgstr ""
-#: Merge.rc:314
+#: Merge.rc:316
#, c-format
msgid "Save &Left"
msgstr ""
-#: Merge.rc:316
-#: Merge.rc:321
+#: Merge.rc:318
+#: Merge.rc:323
#, c-format
msgid "&Save"
msgstr ""
-#: Merge.rc:317
-#: Merge.rc:322
+#: Merge.rc:319
+#: Merge.rc:324
#, c-format
msgid "Save &As..."
msgstr ""
-#: Merge.rc:319
+#: Merge.rc:321
#, c-format
msgid "Save &Right"
msgstr ""
-#: Merge.rc:325
+#: Merge.rc:327
#, c-format
msgid "&Print..."
msgstr ""
-#: Merge.rc:326
+#: Merge.rc:328
#, c-format
msgid "Page Se&tup"
msgstr ""
-#: Merge.rc:327
+#: Merge.rc:329
#, c-format
msgid "Print Previe&w"
msgstr ""
-#: Merge.rc:332
+#: Merge.rc:334
#, c-format
msgid "&Convert Line Endings to"
msgstr ""
-#: Merge.rc:334
+#: Merge.rc:336
#, c-format
msgid "&DOS (CRLF)"
msgstr ""
-#: Merge.rc:335
+#: Merge.rc:337
#, c-format
msgid "&UNIX (LF)"
msgstr ""
-#: Merge.rc:336
+#: Merge.rc:338
#, c-format
msgid "&MAC (CR)"
msgstr ""
-#: Merge.rc:339
+#: Merge.rc:341
#, c-format
msgid "&Merge Mode\tF9"
msgstr ""
-#: Merge.rc:341
+#: Merge.rc:343
#, c-format
msgid "&File Encoding..."
msgstr ""
-#: Merge.rc:347
+#: Merge.rc:349
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr ""
-#: Merge.rc:348
+#: Merge.rc:350
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr ""
-#: Merge.rc:350
+#: Merge.rc:352
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr ""
-#: Merge.rc:351
+#: Merge.rc:353
#, c-format
msgid "&Copy\tCtrl+C"
msgstr ""
-#: Merge.rc:352
+#: Merge.rc:354
#, c-format
msgid "&Paste\tCtrl+V"
msgstr ""
-#: Merge.rc:354
+#: Merge.rc:356
#, c-format
msgid "Select Line &Difference\tF4"
msgstr ""
-#: Merge.rc:357
+#: Merge.rc:359
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr ""
-#: Merge.rc:358
+#: Merge.rc:360
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr ""
-#: Merge.rc:360
+#: Merge.rc:362
#, c-format
msgid "&Scripts"
msgstr ""
-#: Merge.rc:362
-#: Merge.rc:2870
+#: Merge.rc:364
+#: Merge.rc:2874
#, c-format
msgid "< Empty >"
msgstr ""
-#: Merge.rc:365
+#: Merge.rc:367
#, c-format
msgid "Advanced"
msgstr ""
-#: Merge.rc:367
+#: Merge.rc:369
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr ""
-#: Merge.rc:370
+#: Merge.rc:372
#, c-format
msgid "&Bookmarks"
msgstr ""
-#: Merge.rc:372
+#: Merge.rc:374
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr ""
-#: Merge.rc:373
+#: Merge.rc:375
#, c-format
msgid "&Next Bookmark\tF2"
msgstr ""
-#: Merge.rc:374
+#: Merge.rc:376
#, c-format
msgid "&Previous bookmark\tShift+F2"
msgstr ""
-#: Merge.rc:375
+#: Merge.rc:377
#, c-format
msgid "&Clear All Bookmarks"
msgstr ""
-#: Merge.rc:377
+#: Merge.rc:379
#, c-format
msgid "&Go To...\tCtrl+G"
msgstr ""
-#: Merge.rc:385
+#: Merge.rc:387
#, c-format
msgid "Zoom In\tCtrl++"
msgstr ""
-#: Merge.rc:386
+#: Merge.rc:388
#, c-format
msgid "Zoom Out\tCtrl+-"
msgstr ""
-#: Merge.rc:387
+#: Merge.rc:389
#, c-format
msgid "Syntax Highlight"
msgstr ""
-#: Merge.rc:392
+#: Merge.rc:394
#, c-format
msgid "&Lock Panes"
msgstr ""
-#: Merge.rc:393
+#: Merge.rc:395
#, c-format
msgid "&View Whitespace"
msgstr ""
-#: Merge.rc:394
+#: Merge.rc:396
#, c-format
msgid "Vie&w Line Differences"
msgstr ""
-#: Merge.rc:395
+#: Merge.rc:397
#, c-format
msgid "View Line &Numbers"
msgstr ""
-#: Merge.rc:396
+#: Merge.rc:398
#, c-format
msgid "View &Margins"
msgstr ""
-#: Merge.rc:397
+#: Merge.rc:399
#, c-format
msgid "W&rap Lines"
msgstr ""
-#: Merge.rc:399
+#: Merge.rc:401
#, c-format
msgid "Sw&ap Panes"
msgstr ""
-#: Merge.rc:409
+#: Merge.rc:411
#, c-format
msgid "Diff &Pane"
msgstr ""
-#: Merge.rc:410
+#: Merge.rc:412
#, c-format
msgid "Lo&cation Pane"
msgstr ""
-#: Merge.rc:428
+#: Merge.rc:430
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr ""
-#: Merge.rc:429
+#: Merge.rc:431
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr ""
-#: Merge.rc:431
+#: Merge.rc:433
#, c-format
msgid "Copy &All to Right"
msgstr ""
-#: Merge.rc:432
+#: Merge.rc:434
#, c-format
msgid "Cop&y All to Left"
msgstr ""
-#: Merge.rc:447
+#: Merge.rc:449
#, c-format
msgid "&Prediffer"
msgstr ""
-#: Merge.rc:489
+#: Merge.rc:492
#, c-format
msgid "Comp&are"
msgstr ""
-#: Merge.rc:490
+#: Merge.rc:493
#, c-format
msgid "Co&mpare Special"
msgstr ""
-#: Merge.rc:492
+#: Merge.rc:495
#, c-format
msgid "&XML"
msgstr ""
-#: Merge.rc:497
+#: Merge.rc:500
#, c-format
msgid "&Left to Right"
msgstr ""
-#: Merge.rc:498
+#: Merge.rc:501
#, c-format
msgid "L&eft to..."
msgstr ""
-#: Merge.rc:499
+#: Merge.rc:502
#, c-format
msgid "&Right to Left"
msgstr ""
-#: Merge.rc:500
+#: Merge.rc:503
#, c-format
msgid "R&ight to..."
msgstr ""
-#: Merge.rc:502
+#: Merge.rc:505
#, c-format
msgid "&Move"
msgstr ""
-#: Merge.rc:504
+#: Merge.rc:507
#, c-format
msgid "&Left to..."
msgstr ""
-#: Merge.rc:505
+#: Merge.rc:508
#, c-format
msgid "&Right to..."
msgstr ""
-#: Merge.rc:507
+#: Merge.rc:510
#, c-format
msgid "&Delete"
msgstr ""
-#: Merge.rc:509
-#: Merge.rc:1121
-#: Merge.rc:1500
+#: Merge.rc:512
+#: Merge.rc:1124
+#: Merge.rc:1503
#, c-format
msgid "&Left"
msgstr ""
-#: Merge.rc:510
-#: Merge.rc:1123
-#: Merge.rc:1503
+#: Merge.rc:513
+#: Merge.rc:1126
+#: Merge.rc:1506
#, c-format
msgid "&Right"
msgstr ""
-#: Merge.rc:511
+#: Merge.rc:514
#, c-format
msgid "&Both"
msgstr ""
-#: Merge.rc:513
+#: Merge.rc:516
#, c-format
msgid "Re&name"
msgstr ""
-#: Merge.rc:514
+#: Merge.rc:517
#, c-format
msgid "&Hide Items"
msgstr ""
-#: Merge.rc:516
+#: Merge.rc:519
#, c-format
msgid "&Open Left"
msgstr ""
-#: Merge.rc:522
+#: Merge.rc:525
#, c-format
msgid "O&pen Right"
msgstr ""
-#: Merge.rc:529
+#: Merge.rc:532
#, c-format
msgid "Cop&y Pathnames"
msgstr ""
-#: Merge.rc:531
+#: Merge.rc:534
#, c-format
msgid "&Left (%1 of %2)"
msgstr ""
-#: Merge.rc:532
+#: Merge.rc:535
#, c-format
msgid "&Right (%1 of %2)"
msgstr ""
-#: Merge.rc:533
+#: Merge.rc:536
#, c-format
msgid "&Both (%1 of %2)"
msgstr ""
-#: Merge.rc:535
+#: Merge.rc:538
#, c-format
msgid "Copy &Filenames"
msgstr ""
-#: Merge.rc:537
+#: Merge.rc:540
#, c-format
msgid "&Zip"
msgstr ""
-#: Merge.rc:539
+#: Merge.rc:542
#, c-format
msgid "&Left... (%1 of %2)"
msgstr ""
-#: Merge.rc:540
+#: Merge.rc:543
#, c-format
msgid "&Right... (%1 of %2)"
msgstr ""
-#: Merge.rc:541
+#: Merge.rc:544
#, c-format
msgid "&Both... (%1 of %2)"
msgstr ""
-#: Merge.rc:542
+#: Merge.rc:545
#, c-format
msgid "&Differences... (%1 of %2)"
msgstr ""
-#: Merge.rc:545
+#: Merge.rc:548
#, c-format
msgid "&Refresh"
msgstr ""
-#: Merge.rc:557
+#: Merge.rc:560
#, c-format
msgid "&Copy Full Path"
msgstr ""
-#: Merge.rc:558
+#: Merge.rc:561
#, c-format
msgid "Copy &Filename"
msgstr ""
-#: Merge.rc:564
+#: Merge.rc:567
#, c-format
msgid "Prediffer Settings"
msgstr ""
-#: Merge.rc:566
+#: Merge.rc:569
#, c-format
msgid "&No prediffer"
msgstr ""
-#: Merge.rc:567
+#: Merge.rc:570
#, c-format
msgid "Auto prediffer"
msgstr ""
-#: Merge.rc:575
+#: Merge.rc:578
#, c-format
msgid "G&oto Diff"
msgstr ""
-#: Merge.rc:578
+#: Merge.rc:581
#, c-format
msgid "&No Moved Blocks"
msgstr ""
-#: Merge.rc:579
+#: Merge.rc:582
#, c-format
msgid "&All Moved Blocks"
msgstr ""
-#: Merge.rc:580
+#: Merge.rc:583
#, c-format
msgid "Moved Block for &Current Diff"
msgstr ""
-#: Merge.rc:648
+#: Merge.rc:651
#, c-format
msgid "About WinMerge"
msgstr ""
-#: Merge.rc:654
+#: Merge.rc:657
#, c-format
msgid "(Private Build)"
msgstr ""
-#: Merge.rc:655
+#: Merge.rc:658
#, c-format
msgid "All rights reserved."
msgstr ""
-#: Merge.rc:656
+#: Merge.rc:659
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr ""
-#: Merge.rc:659
-#: Merge.rc:690
-#: Merge.rc:780
-#: Merge.rc:966
-#: Merge.rc:1040
-#: Merge.rc:1069
-#: Merge.rc:1079
-#: Merge.rc:1242
-#: Merge.rc:1306
-#: Merge.rc:1319
-#: Merge.rc:1411
-#: Merge.rc:1426
+#: Merge.rc:662
+#: Merge.rc:693
+#: Merge.rc:783
+#: Merge.rc:969
+#: Merge.rc:1043
+#: Merge.rc:1072
+#: Merge.rc:1082
+#: Merge.rc:1245
+#: Merge.rc:1309
+#: Merge.rc:1322
+#: Merge.rc:1414
+#: Merge.rc:1429
#, c-format
msgid "OK"
msgstr ""
-#: Merge.rc:660
+#: Merge.rc:663
#, c-format
msgid "Contributors"
msgstr ""
-#: Merge.rc:666
+#: Merge.rc:669
#, c-format
msgid "Select Files or Folders"
msgstr ""
-#: Merge.rc:669
-#: Merge.rc:1577
+#: Merge.rc:672
+#: Merge.rc:1580
#, c-format
msgid "&Left:"
msgstr ""
-#: Merge.rc:673
-#: Merge.rc:734
-#: Merge.rc:990
-#: Merge.rc:1005
+#: Merge.rc:676
+#: Merge.rc:737
+#: Merge.rc:993
+#: Merge.rc:1008
#, c-format
msgid "&Browse..."
msgstr ""
-#: Merge.rc:674
-#: Merge.rc:1581
+#: Merge.rc:677
+#: Merge.rc:1584
#, c-format
msgid "&Right:"
msgstr ""
-#: Merge.rc:678
-#: Merge.rc:1016
+#: Merge.rc:681
+#: Merge.rc:1019
#, c-format
msgid "Bro&wse..."
msgstr ""
-#: Merge.rc:679
-#: Merge.rc:1585
+#: Merge.rc:682
+#: Merge.rc:1588
#, c-format
msgid "&Filter:"
msgstr ""
-#: Merge.rc:682
-#: Merge.rc:1587
+#: Merge.rc:685
+#: Merge.rc:1590
#, c-format
msgid "Select..."
msgstr ""
-#: Merge.rc:683
+#: Merge.rc:686
#, c-format
msgid "&Unpacker:"
msgstr ""
-#: Merge.rc:686
+#: Merge.rc:689
#, c-format
msgid "&Select..."
msgstr ""
-#: Merge.rc:687
-#: Merge.rc:1588
+#: Merge.rc:690
+#: Merge.rc:1591
#, c-format
msgid "&Include Subfolders"
msgstr ""
-#: Merge.rc:689
+#: Merge.rc:692
#, c-format
msgid "Status:"
msgstr ""
-#: Merge.rc:691
-#: Merge.rc:721
-#: Merge.rc:781
-#: Merge.rc:811
-#: Merge.rc:843
-#: Merge.rc:853
-#: Merge.rc:1041
-#: Merge.rc:1070
-#: Merge.rc:1080
-#: Merge.rc:1131
-#: Merge.rc:1243
-#: Merge.rc:1320
-#: Merge.rc:1412
-#: Merge.rc:1427
+#: Merge.rc:694
+#: Merge.rc:724
+#: Merge.rc:784
+#: Merge.rc:814
+#: Merge.rc:846
+#: Merge.rc:856
+#: Merge.rc:1044
+#: Merge.rc:1073
+#: Merge.rc:1083
+#: Merge.rc:1134
+#: Merge.rc:1246
+#: Merge.rc:1323
+#: Merge.rc:1415
+#: Merge.rc:1430
#, c-format
msgid "Cancel"
msgstr ""
-#: Merge.rc:692
-#: Merge.rc:1321
+#: Merge.rc:695
+#: Merge.rc:1324
#, c-format
msgid "Help"
msgstr ""
-#: Merge.rc:693
+#: Merge.rc:696
#, c-format
msgid "Files or Folders to Compare"
msgstr ""
-#: Merge.rc:700
+#: Merge.rc:703
#, c-format
msgid "Visual SourceSafe"
msgstr ""
-#: Merge.rc:705
+#: Merge.rc:708
#, c-format
msgid "Database:"
msgstr ""
-#: Merge.rc:708
+#: Merge.rc:711
#, c-format
msgid "Project:"
msgstr ""
-#: Merge.rc:711
+#: Merge.rc:714
#, c-format
msgid "User:"
msgstr ""
-#: Merge.rc:713
+#: Merge.rc:716
#, c-format
msgid "Password:"
msgstr ""
-#: Merge.rc:715
+#: Merge.rc:718
#, c-format
msgid "Link to Destination VSS project"
msgstr ""
-#: Merge.rc:717
-#: Merge.rc:858
+#: Merge.rc:720
+#: Merge.rc:861
#, c-format
msgid "Apply to all items"
msgstr ""
-#: Merge.rc:719
+#: Merge.rc:722
#, c-format
msgid "Check Out"
msgstr ""
-#: Merge.rc:720
-#: Merge.rc:854
+#: Merge.rc:723
+#: Merge.rc:857
#, c-format
msgid "Save As..."
msgstr ""
-#: Merge.rc:726
+#: Merge.rc:729
#, c-format
msgid "Versioning System"
msgstr ""
-#: Merge.rc:729
+#: Merge.rc:732
#, c-format
msgid "&Versioning System:"
msgstr ""
-#: Merge.rc:732
+#: Merge.rc:735
#, c-format
msgid "&Path to cleartool.exe:"
msgstr ""
-#: Merge.rc:739
-#: Merge.rc:1892
+#: Merge.rc:742
+#: Merge.rc:1895
#, c-format
msgid "General"
msgstr ""
-#: Merge.rc:742
+#: Merge.rc:745
#, c-format
msgid "Automatically &scroll to first difference"
msgstr ""
-#: Merge.rc:745
+#: Merge.rc:748
#, c-format
msgid "&Disable Splash Screen"
msgstr ""
-#: Merge.rc:747
+#: Merge.rc:750
#, c-format
msgid "Cl&ose windows with ESC"
msgstr ""
-#: Merge.rc:749
+#: Merge.rc:752
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr ""
-#: Merge.rc:752
+#: Merge.rc:755
#, c-format
msgid "All&ow only one instance to run"
msgstr ""
-#: Merge.rc:754
+#: Merge.rc:757
#, c-format
msgid "As&k when closing multiple windows"
msgstr ""
-#: Merge.rc:756
+#: Merge.rc:759
#, c-format
msgid "&Preserve file time in file compare"
msgstr ""
-#: Merge.rc:759
+#: Merge.rc:762
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr ""
-#: Merge.rc:762
+#: Merge.rc:765
#, c-format
msgid "Enable multiple compare windows for"
msgstr ""
-#: Merge.rc:764
-#: Merge.rc:1600
+#: Merge.rc:767
+#: Merge.rc:1603
#, c-format
msgid "&Folder compare"
msgstr ""
-#: Merge.rc:766
-#: Merge.rc:1602
+#: Merge.rc:769
+#: Merge.rc:1605
#, c-format
msgid "Fil&e compare"
msgstr ""
-#: Merge.rc:768
+#: Merge.rc:771
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
-#: Merge.rc:770
+#: Merge.rc:773
#, c-format
msgid "Reset"
msgstr ""
-#: Merge.rc:777
+#: Merge.rc:780
#, c-format
msgid "Language"
msgstr ""
-#: Merge.rc:784
+#: Merge.rc:787
#, c-format
msgid "Available languages:"
msgstr ""
-#: Merge.rc:790
+#: Merge.rc:793
#, c-format
msgid "Find"
msgstr ""
-#: Merge.rc:793
-#: Merge.rc:820
+#: Merge.rc:796
+#: Merge.rc:823
#, c-format
msgid "Fi&nd what:"
msgstr ""
-#: Merge.rc:796
-#: Merge.rc:826
+#: Merge.rc:799
+#: Merge.rc:829
#, c-format
msgid "Match &whole word only"
msgstr ""
-#: Merge.rc:798
-#: Merge.rc:828
+#: Merge.rc:801
+#: Merge.rc:831
#, c-format
msgid "Match &case"
msgstr ""
-#: Merge.rc:800
-#: Merge.rc:830
+#: Merge.rc:803
+#: Merge.rc:833
#, c-format
msgid "Regular &expression"
msgstr ""
-#: Merge.rc:802
+#: Merge.rc:805
#, c-format
msgid "D&on't wrap end of file"
msgstr ""
-#: Merge.rc:805
+#: Merge.rc:808
#, c-format
msgid "Direction"
msgstr ""
-#: Merge.rc:806
+#: Merge.rc:809
#, c-format
msgid "&Up"
msgstr ""
-#: Merge.rc:808
+#: Merge.rc:811
#, c-format
msgid "&Down"
msgstr ""
-#: Merge.rc:810
-#: Merge.rc:840
+#: Merge.rc:813
+#: Merge.rc:843
#, c-format
msgid "&Find Next"
msgstr ""
-#: Merge.rc:817
+#: Merge.rc:820
#, c-format
msgid "Replace"
msgstr ""
-#: Merge.rc:823
+#: Merge.rc:826
#, c-format
msgid "Re&place with:"
msgstr ""
-#: Merge.rc:832
+#: Merge.rc:835
#, c-format
msgid "&Don't wrap end of file"
msgstr ""
-#: Merge.rc:835
+#: Merge.rc:838
#, c-format
msgid "Replace in"
msgstr ""
-#: Merge.rc:836
+#: Merge.rc:839
#, c-format
msgid "&Selection"
msgstr ""
-#: Merge.rc:838
+#: Merge.rc:841
#, c-format
msgid "Wh&ole file"
msgstr ""
-#: Merge.rc:841
+#: Merge.rc:844
#, c-format
msgid "&Replace"
msgstr ""
-#: Merge.rc:842
+#: Merge.rc:845
#, c-format
msgid "Replace &All"
msgstr ""
-#: Merge.rc:849
-#: Merge.rc:2120
+#: Merge.rc:852
+#: Merge.rc:2123
#, c-format
msgid "Rational ClearCase"
msgstr ""
-#: Merge.rc:852
+#: Merge.rc:855
#, c-format
msgid "CheckOut"
msgstr ""
-#: Merge.rc:857
-#: Merge.rc:1162
+#: Merge.rc:860
+#: Merge.rc:1165
#, c-format
msgid "Comments"
msgstr ""
-#: Merge.rc:860
+#: Merge.rc:863
#, c-format
msgid "CheckIn after checkout"
msgstr ""
-#: Merge.rc:866
+#: Merge.rc:869
#, c-format
msgid "Linefilters"
msgstr ""
-#: Merge.rc:869
+#: Merge.rc:872
#, c-format
msgid "Enable Line Filters"
msgstr ""
-#: Merge.rc:872
+#: Merge.rc:875
#, c-format
msgid "Regular Expressions (one per line):"
msgstr ""
-#: Merge.rc:879
+#: Merge.rc:882
#, c-format
msgid "Save"
msgstr ""
-#: Merge.rc:880
+#: Merge.rc:883
#, c-format
msgid "New"
msgstr ""
-#: Merge.rc:881
+#: Merge.rc:884
#, c-format
msgid "Edit"
msgstr ""
-#: Merge.rc:882
+#: Merge.rc:885
#, c-format
msgid "Remove"
msgstr ""
-#: Merge.rc:887
-#: Merge.rc:1895
+#: Merge.rc:890
+#: Merge.rc:1898
#, c-format
msgid "Colors"
msgstr ""
-#: Merge.rc:890
+#: Merge.rc:893
#, c-format
msgid "Difference:"
msgstr ""
-#: Merge.rc:894
+#: Merge.rc:897
#, c-format
msgid "Selected Difference:"
msgstr ""
-#: Merge.rc:898
-#: Merge.rc:1552
+#: Merge.rc:901
+#: Merge.rc:1555
#, c-format
msgid "Background"
msgstr ""
-#: Merge.rc:899
+#: Merge.rc:902
#, c-format
msgid "Deleted"
msgstr ""
-#: Merge.rc:912
-#: Merge.rc:1347
-#: Merge.rc:1553
+#: Merge.rc:915
+#: Merge.rc:1350
+#: Merge.rc:1556
#, c-format
msgid "Text"
msgstr ""
-#: Merge.rc:916
+#: Merge.rc:919
#, c-format
msgid "Ignored Difference:"
msgstr ""
-#: Merge.rc:926
+#: Merge.rc:929
#, c-format
msgid "Moved:"
msgstr ""
-#: Merge.rc:936
+#: Merge.rc:939
#, c-format
msgid "Selected Moved:"
msgstr ""
-#: Merge.rc:943
+#: Merge.rc:946
#, c-format
msgid "Word Difference:"
msgstr ""
-#: Merge.rc:950
+#: Merge.rc:953
#, c-format
msgid "Selected Word Diff:"
msgstr ""
-#: Merge.rc:957
-#: Merge.rc:1039
-#: Merge.rc:1068
-#: Merge.rc:1165
-#: Merge.rc:1393
+#: Merge.rc:960
+#: Merge.rc:1042
+#: Merge.rc:1071
+#: Merge.rc:1168
+#: Merge.rc:1396
#, c-format
msgid "Defaults"
msgstr ""
-#: Merge.rc:963
-#: Merge.rc:1335
-#: Merge.rc:1541
+#: Merge.rc:966
+#: Merge.rc:1338
+#: Merge.rc:1544
#, c-format
msgid "Dialog"
msgstr ""
-#: Merge.rc:973
-#: Merge.rc:1898
+#: Merge.rc:976
+#: Merge.rc:1901
#, c-format
msgid "System"
msgstr ""
-#: Merge.rc:976
+#: Merge.rc:979
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr ""
-#: Merge.rc:978
+#: Merge.rc:981
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr ""
-#: Merge.rc:981
+#: Merge.rc:984
#, c-format
msgid "Integration"
msgstr ""
-#: Merge.rc:982
+#: Merge.rc:985
#, c-format
msgid "&Add to explorer context menu"
msgstr ""
-#: Merge.rc:984
+#: Merge.rc:987
#, c-format
msgid "E&nable advanced menu"
msgstr ""
-#: Merge.rc:986
+#: Merge.rc:989
#, c-format
msgid "In&clude subfolders by default"
msgstr ""
-#: Merge.rc:988
+#: Merge.rc:991
#, c-format
msgid "&External editor:"
msgstr ""
-#: Merge.rc:991
+#: Merge.rc:994
#, c-format
msgid "&Filter folder:"
msgstr ""
-#: Merge.rc:993
-#: Merge.rc:1405
-#: Merge.rc:1579
-#: Merge.rc:1583
-#: Merge.rc:1610
+#: Merge.rc:996
+#: Merge.rc:1408
+#: Merge.rc:1582
+#: Merge.rc:1586
+#: Merge.rc:1613
#, c-format
msgid "Browse..."
msgstr ""
-#: Merge.rc:999
+#: Merge.rc:1002
#, c-format
msgid "Patch Generator"
msgstr ""
-#: Merge.rc:1002
+#: Merge.rc:1005
#, c-format
msgid "File&1:"
msgstr ""
-#: Merge.rc:1006
+#: Merge.rc:1009
#, c-format
msgid "File&2:"
msgstr ""
-#: Merge.rc:1009
+#: Merge.rc:1012
#, c-format
msgid "Br&owse..."
msgstr ""
-#: Merge.rc:1010
+#: Merge.rc:1013
#, c-format
msgid "&Swap"
msgstr ""
-#: Merge.rc:1011
+#: Merge.rc:1014
#, c-format
msgid "&Append to existing file"
msgstr ""
-#: Merge.rc:1013
+#: Merge.rc:1016
#, c-format
msgid "&Result:"
msgstr ""
-#: Merge.rc:1017
+#: Merge.rc:1020
#, c-format
msgid "&Format"
msgstr ""
-#: Merge.rc:1018
+#: Merge.rc:1021
#, c-format
msgid "St&yle:"
msgstr ""
-#: Merge.rc:1021
+#: Merge.rc:1024
#, c-format
msgid "&Context:"
msgstr ""
-#: Merge.rc:1024
+#: Merge.rc:1027
#, c-format
msgid "W&hitespaces"
msgstr ""
-#: Merge.rc:1025
+#: Merge.rc:1028
#, c-format
msgid "Com&pare"
msgstr ""
-#: Merge.rc:1027
+#: Merge.rc:1030
#, c-format
msgid "I&gnore changes"
msgstr ""
-#: Merge.rc:1029
+#: Merge.rc:1032
#, c-format
msgid "Ig&nore all"
msgstr ""
-#: Merge.rc:1031
+#: Merge.rc:1034
#, c-format
msgid "Ignor&e blank lines"
msgstr ""
-#: Merge.rc:1033
+#: Merge.rc:1036
#, c-format
msgid "Case sensi&tive"
msgstr ""
-#: Merge.rc:1035
+#: Merge.rc:1038
#, c-format
msgid "Inclu&de command line"
msgstr ""
-#: Merge.rc:1037
+#: Merge.rc:1040
#, c-format
msgid "Open to e&xternal editor"
msgstr ""
-#: Merge.rc:1059
+#: Merge.rc:1062
#, c-format
msgid "Display Columns"
msgstr ""
-#: Merge.rc:1065
+#: Merge.rc:1068
#, c-format
msgid "Move &Up"
msgstr ""
-#: Merge.rc:1066
+#: Merge.rc:1069
#, c-format
msgid "Move &Down"
msgstr ""
-#: Merge.rc:1076
+#: Merge.rc:1079
#, c-format
msgid "Select Unpacker"
msgstr ""
-#: Merge.rc:1081
+#: Merge.rc:1084
#, c-format
msgid "File unpacker:"
msgstr ""
-#: Merge.rc:1084
+#: Merge.rc:1087
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr ""
-#: Merge.rc:1087
+#: Merge.rc:1090
#, c-format
msgid "Extensions list:"
msgstr ""
-#: Merge.rc:1088
+#: Merge.rc:1091
#, c-format
msgid "Description:"
msgstr ""
-#: Merge.rc:1099
+#: Merge.rc:1102
#, c-format
msgid " Folder Compare Progress"
msgstr ""
-#: Merge.rc:1102
-#: Merge.rc:1845
+#: Merge.rc:1105
+#: Merge.rc:1848
#, c-format
msgid "Stop"
msgstr ""
-#: Merge.rc:1107
+#: Merge.rc:1110
#, c-format
msgid "Comparing items..."
msgstr ""
-#: Merge.rc:1108
+#: Merge.rc:1111
#, c-format
msgid "Items compared:"
msgstr ""
-#: Merge.rc:1109
+#: Merge.rc:1112
#, c-format
msgid "Items total:"
msgstr ""
-#: Merge.rc:1115
+#: Merge.rc:1118
#, c-format
msgid "Go To"
msgstr ""
-#: Merge.rc:1118
+#: Merge.rc:1121
#, c-format
msgid "G&oto:"
msgstr ""
-#: Merge.rc:1120
+#: Merge.rc:1123
#, c-format
msgid "File"
msgstr ""
-#: Merge.rc:1125
+#: Merge.rc:1128
#, c-format
msgid "Goto what"
msgstr ""
-#: Merge.rc:1126
+#: Merge.rc:1129
#, c-format
msgid "Li&ne"
msgstr ""
-#: Merge.rc:1128
+#: Merge.rc:1131
#, c-format
msgid "&Difference"
msgstr ""
-#: Merge.rc:1130
+#: Merge.rc:1133
#, c-format
msgid "&Go To"
msgstr ""
-#: Merge.rc:1136
-#: Merge.rc:1893
+#: Merge.rc:1139
+#: Merge.rc:1896
#, c-format
msgid "Compare"
msgstr ""
-#: Merge.rc:1139
+#: Merge.rc:1142
#, c-format
msgid "Whitespace"
msgstr ""
-#: Merge.rc:1140
+#: Merge.rc:1143
#, c-format
msgid "&Compare"
msgstr ""
-#: Merge.rc:1142
+#: Merge.rc:1145
#, c-format
msgid "&Ignore change"
msgstr ""
-#: Merge.rc:1144
+#: Merge.rc:1147
#, c-format
msgid "I&gnore all"
msgstr ""
-#: Merge.rc:1146
+#: Merge.rc:1149
#, c-format
msgid "Ignore blan&k lines"
msgstr ""
-#: Merge.rc:1148
+#: Merge.rc:1151
#, c-format
msgid "Ignore &case"
msgstr ""
-#: Merge.rc:1150
+#: Merge.rc:1153
#, c-format
msgid "Igno&re carriage return differences (DOS/UNIX/MAC)"
msgstr ""
-#: Merge.rc:1153
+#: Merge.rc:1156
#, c-format
msgid "E&nable moved block detection"
msgstr ""
-#: Merge.rc:1155
+#: Merge.rc:1158
#, c-format
msgid "&Match similar lines"
msgstr ""
-#: Merge.rc:1157
+#: Merge.rc:1160
#, c-format
msgid "&File Compare method:"
msgstr ""
-#: Merge.rc:1160
+#: Merge.rc:1163
#, c-format
msgid "S&top after first difference"
msgstr ""
-#: Merge.rc:1163
+#: Merge.rc:1166
#, c-format
msgid "Filter Comments"
msgstr ""
-#: Merge.rc:1170
-#: Merge.rc:1894
+#: Merge.rc:1173
+#: Merge.rc:1897
#, c-format
msgid "Editor"
msgstr ""
-#: Merge.rc:1173
+#: Merge.rc:1176
#, c-format
msgid "&Highlight syntax"
msgstr ""
-#: Merge.rc:1175
+#: Merge.rc:1178
#, c-format
msgid "&Automatic rescan"
msgstr ""
-#: Merge.rc:1177
+#: Merge.rc:1180
#, c-format
msgid "&Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1179
+#: Merge.rc:1182
#, c-format
msgid "Tabs"
msgstr ""
-#: Merge.rc:1180
+#: Merge.rc:1183
#, c-format
msgid "&Tab size:"
msgstr ""
-#: Merge.rc:1183
+#: Merge.rc:1186
#, c-format
msgid "&Insert Tabs"
msgstr ""
-#: Merge.rc:1185
+#: Merge.rc:1188
#, c-format
msgid "Insert &Spaces"
msgstr ""
-#: Merge.rc:1187
+#: Merge.rc:1190
#, c-format
msgid "Line Difference Coloring"
msgstr ""
-#: Merge.rc:1189
+#: Merge.rc:1192
#, c-format
msgid "View line differences"
msgstr ""
-#: Merge.rc:1191
+#: Merge.rc:1194
#, c-format
msgid "&Character level"
msgstr ""
-#: Merge.rc:1193
+#: Merge.rc:1196
#, c-format
msgid "&Word-level:"
msgstr ""
-#: Merge.rc:1208
+#: Merge.rc:1211
#, c-format
msgid "Filefilters"
msgstr ""
-#: Merge.rc:1214
+#: Merge.rc:1217
#, c-format
msgid "Test"
msgstr ""
-#: Merge.rc:1215
+#: Merge.rc:1218
#, c-format
msgid "Install..."
msgstr ""
-#: Merge.rc:1216
+#: Merge.rc:1219
#, c-format
msgid "New..."
msgstr ""
-#: Merge.rc:1217
+#: Merge.rc:1220
#, c-format
msgid "Edit..."
msgstr ""
-#: Merge.rc:1218
+#: Merge.rc:1221
#, c-format
msgid "Delete..."
msgstr ""
-#: Merge.rc:1224
+#: Merge.rc:1227
#, c-format
msgid "Save modified files?"
msgstr ""
-#: Merge.rc:1227
+#: Merge.rc:1230
#, c-format
msgid "Left side file"
msgstr ""
-#: Merge.rc:1230
+#: Merge.rc:1233
#, c-format
msgid "&Save changes"
msgstr ""
-#: Merge.rc:1232
+#: Merge.rc:1235
#, c-format
msgid "&Discard changes"
msgstr ""
-#: Merge.rc:1234
+#: Merge.rc:1237
#, c-format
msgid "Right side file"
msgstr ""
-#: Merge.rc:1237
+#: Merge.rc:1240
#, c-format
msgid "S&ave changes"
msgstr ""
-#: Merge.rc:1239
+#: Merge.rc:1242
#, c-format
msgid "Dis&card changes"
msgstr ""
-#: Merge.rc:1241
+#: Merge.rc:1244
#, c-format
msgid "Discard All"
msgstr ""
-#: Merge.rc:1248
-#: Merge.rc:1496
-#: Merge.rc:1900
+#: Merge.rc:1251
+#: Merge.rc:1499
+#: Merge.rc:1903
#, c-format
msgid "Codepage"
msgstr ""
-#: Merge.rc:1251
+#: Merge.rc:1254
#, c-format
msgid "Default Codepage"
msgstr ""
-#: Merge.rc:1252
+#: Merge.rc:1255
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr ""
-#: Merge.rc:1254
+#: Merge.rc:1257
#, c-format
msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session"
msgstr ""
-#: Merge.rc:1257
+#: Merge.rc:1260
#, c-format
msgid "System codepage"
msgstr ""
-#: Merge.rc:1259
+#: Merge.rc:1262
#, c-format
msgid "According to WinMerge User Interface"
msgstr ""
-#: Merge.rc:1261
+#: Merge.rc:1264
#, c-format
msgid "Custom codepage :"
msgstr ""
-#: Merge.rc:1269
+#: Merge.rc:1272
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr ""
-#: Merge.rc:1272
+#: Merge.rc:1275
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr ""
-#: Merge.rc:1275
+#: Merge.rc:1278
#, 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:1277
+#: Merge.rc:1280
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr ""
-#: Merge.rc:1279
+#: Merge.rc:1282
#, c-format
msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available."
msgstr ""
-#: Merge.rc:1281
+#: Merge.rc:1284
#, c-format
msgid "Version"
msgstr ""
-#: Merge.rc:1283
+#: Merge.rc:1286
#, c-format
msgid "Plugin required\n(dllbuild %04u)"
msgstr ""
-#: Merge.rc:1285
+#: Merge.rc:1288
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr ""
-#: Merge.rc:1288
#: Merge.rc:1291
+#: Merge.rc:1294
#, c-format
msgid "present"
msgstr ""
-#: Merge.rc:1289
+#: Merge.rc:1292
#, c-format
msgid "Merge7z000U.dll"
msgstr ""
-#: Merge.rc:1292
+#: Merge.rc:1295
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr ""
-#: Merge.rc:1294
-#: Merge.rc:1299
+#: Merge.rc:1297
+#: Merge.rc:1302
#, c-format
msgid "none"
msgstr ""
-#: Merge.rc:1296
+#: Merge.rc:1299
#, c-format
msgid "missing"
msgstr ""
-#: Merge.rc:1297
+#: Merge.rc:1300
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr ""
-#: Merge.rc:1301
+#: Merge.rc:1304
#, c-format
msgid "outdated"
msgstr ""
-#: Merge.rc:1302
+#: Merge.rc:1305
#, c-format
msgid "Plugins on path:"
msgstr ""
-#: Merge.rc:1303
+#: Merge.rc:1306
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from help menu.)"
msgstr ""
-#: Merge.rc:1307
+#: Merge.rc:1310
#, c-format
msgid "Plugin Download"
msgstr ""
-#: Merge.rc:1316
+#: Merge.rc:1319
#, c-format
msgid "Options"
msgstr ""
-#: Merge.rc:1327
+#: Merge.rc:1330
#, c-format
msgid " Categories"
msgstr ""
-#: Merge.rc:1329
+#: Merge.rc:1332
#, c-format
msgid "Import..."
msgstr ""
-#: Merge.rc:1330
+#: Merge.rc:1333
#, c-format
msgid "Export..."
msgstr ""
-#: Merge.rc:1338
+#: Merge.rc:1341
#, c-format
msgid "Keywords:"
msgstr ""
-#: Merge.rc:1339
+#: Merge.rc:1342
#, c-format
msgid "Function names:"
msgstr ""
-#: Merge.rc:1340
+#: Merge.rc:1343
#, c-format
msgid "Comments:"
msgstr ""
-#: Merge.rc:1341
+#: Merge.rc:1344
#, c-format
msgid "Numbers:"
msgstr ""
-#: Merge.rc:1342
+#: Merge.rc:1345
#, c-format
msgid "Operators:"
msgstr ""
-#: Merge.rc:1343
+#: Merge.rc:1346
#, c-format
msgid "Strings:"
msgstr ""
-#: Merge.rc:1344
+#: Merge.rc:1347
#, c-format
msgid "Preprocessor:"
msgstr ""
-#: Merge.rc:1345
+#: Merge.rc:1348
#, c-format
msgid "User 1:"
msgstr ""
-#: Merge.rc:1346
+#: Merge.rc:1349
#, c-format
msgid "User 2:"
msgstr ""
-#: Merge.rc:1351
-#: Merge.rc:1356
-#: Merge.rc:1361
-#: Merge.rc:1366
-#: Merge.rc:1371
-#: Merge.rc:1376
-#: Merge.rc:1381
-#: Merge.rc:1386
-#: Merge.rc:1391
+#: Merge.rc:1354
+#: Merge.rc:1359
+#: Merge.rc:1364
+#: Merge.rc:1369
+#: Merge.rc:1374
+#: Merge.rc:1379
+#: Merge.rc:1384
+#: Merge.rc:1389
+#: Merge.rc:1394
#, c-format
msgid "Bold"
msgstr ""
-#: Merge.rc:1399
+#: Merge.rc:1402
#, c-format
msgid "Folder Compare Report"
msgstr ""
-#: Merge.rc:1402
+#: Merge.rc:1405
#, c-format
msgid "Report &File:"
msgstr ""
-#: Merge.rc:1406
+#: Merge.rc:1409
#, c-format
msgid "&Style:"
msgstr ""
-#: Merge.rc:1409
+#: Merge.rc:1412
#, c-format
msgid "&Copy to Clipboard"
msgstr ""
-#: Merge.rc:1417
+#: Merge.rc:1420
#, c-format
msgid "Shared or Private Filter"
msgstr ""
-#: Merge.rc:1420
+#: Merge.rc:1423
#, c-format
msgid "Which type of filter do you want to create?"
msgstr ""
-#: Merge.rc:1422
+#: Merge.rc:1425
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr ""
-#: Merge.rc:1424
+#: Merge.rc:1427
#, c-format
msgid "Private Filter (only for current user)"
msgstr ""
-#: Merge.rc:1432
-#: Merge.rc:1901
+#: Merge.rc:1435
+#: Merge.rc:1904
#, c-format
msgid "Archive Support"
msgstr ""
-#: Merge.rc:1435
+#: Merge.rc:1438
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr ""
-#: Merge.rc:1437
+#: Merge.rc:1440
#, c-format
msgid "Download 7-zip Plugin"
msgstr ""
-#: Merge.rc:1438
+#: Merge.rc:1441
#, c-format
msgid "&Enable archive file support"
msgstr ""
-#: Merge.rc:1440
+#: Merge.rc:1443
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr ""
-#: Merge.rc:1443
+#: Merge.rc:1446
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr ""
-#: Merge.rc:1445
+#: Merge.rc:1448
#, c-format
msgid "&Detect archive type from file signature"
msgstr ""
-#: Merge.rc:1453
+#: Merge.rc:1456
#, c-format
msgid "Compare Statistics"
msgstr ""
-#: Merge.rc:1456
+#: Merge.rc:1459
#, c-format
msgid "Folders:"
msgstr ""
-#: Merge.rc:1457
+#: Merge.rc:1460
#, c-format
msgid "Files:"
msgstr ""
-#: Merge.rc:1458
-#: Merge.rc:2268
+#: Merge.rc:1461
+#: Merge.rc:2271
#, c-format
msgid "Different"
msgstr ""
-#: Merge.rc:1459
+#: Merge.rc:1462
#, c-format
msgid "Text:"
msgstr ""
-#: Merge.rc:1462
-#: Merge.rc:1481
+#: Merge.rc:1465
+#: Merge.rc:1484
#, c-format
msgid "Binary:"
msgstr ""
-#: Merge.rc:1465
+#: Merge.rc:1468
#, c-format
msgid "Unique"
msgstr ""
-#: Merge.rc:1466
+#: Merge.rc:1469
#, c-format
msgid "Left:"
msgstr ""
-#: Merge.rc:1471
+#: Merge.rc:1474
#, c-format
msgid "Right:"
msgstr ""
-#: Merge.rc:1476
-#: Merge.rc:2263
+#: Merge.rc:1479
+#: Merge.rc:2266
#, c-format
msgid "Identical"
msgstr ""
-#: Merge.rc:1485
+#: Merge.rc:1488
#, c-format
msgid "Total:"
msgstr ""
-#: Merge.rc:1490
+#: Merge.rc:1493
#, c-format
msgid "Close"
msgstr ""
-#: Merge.rc:1499
+#: Merge.rc:1502
#, c-format
msgid "Affects"
msgstr ""
-#: Merge.rc:1502
#: Merge.rc:1505
+#: Merge.rc:1508
#, c-format
msgid "(Affects)"
msgstr ""
-#: Merge.rc:1506
+#: Merge.rc:1509
#, c-format
msgid "Select Codepage for"
msgstr ""
-#: Merge.rc:1507
+#: Merge.rc:1510
#, c-format
msgid "&File Loading:"
msgstr ""
-#: Merge.rc:1509
#: Merge.rc:1512
+#: Merge.rc:1515
#, c-format
msgid "..."
msgstr ""
-#: Merge.rc:1510
+#: Merge.rc:1513
#, c-format
msgid "File &Saving:"
msgstr ""
-#: Merge.rc:1513
+#: Merge.rc:1516
#, c-format
msgid "&Use same codepage for both"
msgstr ""
-#: Merge.rc:1516
+#: Merge.rc:1519
#, c-format
msgid "&Apply"
msgstr ""
-#: Merge.rc:1517
-#: Merge.rc:1867
+#: Merge.rc:1520
+#: Merge.rc:1870
#, c-format
msgid "&Cancel"
msgstr ""
-#: Merge.rc:1522
+#: Merge.rc:1525
#, c-format
msgid "Test Filter"
msgstr ""
-#: Merge.rc:1525
+#: Merge.rc:1528
#, c-format
msgid "Testing filter ..."
msgstr ""
-#: Merge.rc:1527
+#: Merge.rc:1530
#, c-format
msgid "&Enter text to test:"
msgstr ""
-#: Merge.rc:1529
+#: Merge.rc:1532
#, c-format
msgid "&Folder Name"
msgstr ""
-#: Merge.rc:1531
+#: Merge.rc:1534
#, c-format
msgid "Result:"
msgstr ""
-#: Merge.rc:1535
+#: Merge.rc:1538
#, c-format
msgid "&Test"
msgstr ""
-#: Merge.rc:1536
+#: Merge.rc:1539
#, c-format
msgid "&Close"
msgstr ""
-#: Merge.rc:1544
+#: Merge.rc:1547
#, c-format
msgid "&Use customized text colors"
msgstr ""
-#: Merge.rc:1547
+#: Merge.rc:1550
#, c-format
msgid "Custom text colors"
msgstr ""
-#: Merge.rc:1549
+#: Merge.rc:1552
#, c-format
msgid "Whitespace:"
msgstr ""
-#: Merge.rc:1550
+#: Merge.rc:1553
#, c-format
msgid "Regular text:"
msgstr ""
-#: Merge.rc:1551
+#: Merge.rc:1554
#, c-format
msgid "Selection:"
msgstr ""
-#: Merge.rc:1574
+#: Merge.rc:1577
#, c-format
msgid "Paths"
msgstr ""
-#: Merge.rc:1580
+#: Merge.rc:1583
#, c-format
msgid "R&ead-only"
msgstr ""
-#: Merge.rc:1584
+#: Merge.rc:1587
#, c-format
msgid "Re&ad-only"
msgstr ""
-#: Merge.rc:1590
+#: Merge.rc:1593
#, c-format
msgid "Open..."
msgstr ""
-#: Merge.rc:1591
+#: Merge.rc:1594
#, c-format
msgid "Save..."
msgstr ""
-#: Merge.rc:1596
-#: Merge.rc:1902
+#: Merge.rc:1599
+#: Merge.rc:1905
#, c-format
msgid "Backup Files"
msgstr ""
-#: Merge.rc:1599
+#: Merge.rc:1602
#, c-format
msgid "Create backup files in:"
msgstr ""
-#: Merge.rc:1604
+#: Merge.rc:1607
#, c-format
msgid "Create backup files into:"
msgstr ""
-#: Merge.rc:1605
+#: Merge.rc:1608
#, c-format
msgid "&Original file's folder"
msgstr ""
-#: Merge.rc:1607
+#: Merge.rc:1610
#, c-format
msgid "&Global backup folder:"
msgstr ""
-#: Merge.rc:1611
+#: Merge.rc:1614
#, c-format
msgid "Backup filename:"
msgstr ""
-#: Merge.rc:1612
+#: Merge.rc:1615
#, c-format
msgid "&Append .bak -extension"
msgstr ""
-#: Merge.rc:1614
+#: Merge.rc:1617
#, c-format
msgid "A&ppend timestamp"
msgstr ""
-#: Merge.rc:1621
+#: Merge.rc:1624
#, c-format
msgid "Confirm Copy"
msgstr ""
-#: Merge.rc:1625
+#: Merge.rc:1628
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr ""
-#: Merge.rc:1627
+#: Merge.rc:1630
#, c-format
msgid "From left"
msgstr ""
-#: Merge.rc:1630
+#: Merge.rc:1633
#, c-format
msgid "To right"
msgstr ""
-#: Merge.rc:1633
+#: Merge.rc:1636
#, c-format
msgid "Yes"
msgstr ""
-#: Merge.rc:1634
+#: Merge.rc:1637
#, c-format
msgid "No"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1659
+#: Merge.rc:1662
#, c-format
msgid "040904e4"
msgstr ""
#. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file!
-#: Merge.rc:1661
+#: Merge.rc:1664
#, c-format
msgid "English translation by developers"
msgstr ""
#. VarFileInfo.Translation
-#: Merge.rc:1674
+#: Merge.rc:1677
#, c-format
msgid "0x409, 1252"
msgstr ""
-#: Merge.rc:1689
+#: Merge.rc:1692
#, c-format
msgid "Ready"
msgstr ""
-#: Merge.rc:1695
+#: Merge.rc:1698
#, c-format
msgid "EXT"
msgstr ""
-#: Merge.rc:1696
+#: Merge.rc:1699
#, c-format
msgid "CAP"
msgstr ""
-#: Merge.rc:1697
+#: Merge.rc:1700
#, c-format
msgid "NUM"
msgstr ""
-#: Merge.rc:1698
+#: Merge.rc:1701
#, c-format
msgid "SCRL"
msgstr ""
-#: Merge.rc:1699
+#: Merge.rc:1702
#, c-format
msgid "OVR"
msgstr ""
-#: Merge.rc:1700
+#: Merge.rc:1703
#, c-format
msgid "REC"
msgstr ""
-#: Merge.rc:1706
+#: Merge.rc:1709
#, c-format
msgid "Create empty documents\nNew Documents (Ctrl+N)"
msgstr ""
-#: Merge.rc:1707
+#: Merge.rc:1710
#, c-format
msgid "Open an existing document\nOpen (Ctrl+O)"
msgstr ""
-#: Merge.rc:1708
+#: Merge.rc:1711
#, c-format
msgid "Close the active document\nClose"
msgstr ""
-#: Merge.rc:1709
+#: Merge.rc:1712
#, c-format
msgid "Save the active document\nSave (Ctrl+S)"
msgstr ""
-#: Merge.rc:1710
+#: Merge.rc:1713
#, c-format
msgid "Save the active document with a new name\nSave As"
msgstr ""
-#: Merge.rc:1711
+#: Merge.rc:1714
#, c-format
msgid "Change the printing options\nPage Setup"
msgstr ""
-#: Merge.rc:1712
+#: Merge.rc:1715
#, c-format
msgid "Change the printer and printing options\nPrint Setup"
msgstr ""
-#: Merge.rc:1713
+#: Merge.rc:1716
#, c-format
msgid "Print the active document\nPrint"
msgstr ""
-#: Merge.rc:1714
+#: Merge.rc:1717
#, c-format
msgid "Display full pages\nPrint Preview"
msgstr ""
-#: Merge.rc:1719
+#: Merge.rc:1722
#, c-format
msgid "Make all hidden items visible again"
msgstr ""
-#: Merge.rc:1725
+#: Merge.rc:1728
#, c-format
msgid "Open project file\nProject file (Ctrl+J)"
msgstr ""
-#: Merge.rc:1726
+#: Merge.rc:1729
#, c-format
msgid "Unknown error attempting to open project file"
msgstr ""
-#: Merge.rc:1727
+#: Merge.rc:1730
#, c-format
msgid "Unknown error attempting to save project file"
msgstr ""
-#: Merge.rc:1728
+#: Merge.rc:1731
#, c-format
msgid "Project File"
msgstr ""
-#: Merge.rc:1729
+#: Merge.rc:1732
#, c-format
msgid "Project file successfully loaded."
msgstr ""
-#: Merge.rc:1730
+#: Merge.rc:1733
#, c-format
msgid "Project file successfully saved."
msgstr ""
-#: Merge.rc:1731
+#: Merge.rc:1734
#, c-format
msgid "Save current paths and options to project file\nSave Project File"
msgstr ""
-#: Merge.rc:1736
+#: Merge.rc:1739
#, c-format
msgid "Display program information, version number and copyright\nAbout"
msgstr ""
-#: Merge.rc:1737
+#: Merge.rc:1740
#, c-format
msgid "Quit the application; prompts to save documents\nExit"
msgstr ""
-#: Merge.rc:1743
-#: Merge.rc:1744
-#: Merge.rc:1745
#: Merge.rc:1746
#: Merge.rc:1747
#: Merge.rc:1748
#: Merge.rc:1756
#: Merge.rc:1757
#: Merge.rc:1758
+#: Merge.rc:1759
+#: Merge.rc:1760
+#: Merge.rc:1761
#, c-format
msgid "Open this document"
msgstr ""
-#: Merge.rc:1763
+#: Merge.rc:1766
#, c-format
msgid "Switch to the next window pane\nNext Pane"
msgstr ""
-#: Merge.rc:1764
+#: Merge.rc:1767
#, c-format
msgid "Switch back to the previous window pane\nPrevious Pane"
msgstr ""
-#: Merge.rc:1770
+#: Merge.rc:1773
#, c-format
msgid "Open another window for the active document\nNew Window"
msgstr ""
-#: Merge.rc:1771
+#: Merge.rc:1774
#, c-format
msgid "Arrange icons at the bottom of the window\nArrange Icons"
msgstr ""
-#: Merge.rc:1772
+#: Merge.rc:1775
#, c-format
msgid "Arrange windows so they overlap\nCascade Windows"
msgstr ""
-#: Merge.rc:1773
+#: Merge.rc:1776
#, c-format
msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally"
msgstr ""
-#: Merge.rc:1774
+#: Merge.rc:1777
#, c-format
msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically"
msgstr ""
-#: Merge.rc:1775
+#: Merge.rc:1778
#, c-format
msgid "Split the active window into panes\nSplit"
msgstr ""
-#: Merge.rc:1781
+#: Merge.rc:1784
#, c-format
msgid "Erase the selection\nErase"
msgstr ""
-#: Merge.rc:1782
+#: Merge.rc:1785
#, c-format
msgid "Erase everything\nErase All"
msgstr ""
-#: Merge.rc:1783
+#: Merge.rc:1786
#, c-format
msgid "Copy the selection and put it on the Clipboard\nCopy"
msgstr ""
-#: Merge.rc:1784
+#: Merge.rc:1787
#, c-format
msgid "Cut the selection and put it on the Clipboard\nCut"
msgstr ""
-#: Merge.rc:1785
+#: Merge.rc:1788
#, c-format
msgid "Find the specified text\nFind"
msgstr ""
-#: Merge.rc:1786
+#: Merge.rc:1789
#, c-format
msgid "Insert Clipboard contents\nPaste"
msgstr ""
-#: Merge.rc:1787
+#: Merge.rc:1790
#, c-format
msgid "Repeat the last action\nRepeat"
msgstr ""
-#: Merge.rc:1788
+#: Merge.rc:1791
#, c-format
msgid "Replace specific text with different text\nReplace"
msgstr ""
-#: Merge.rc:1789
+#: Merge.rc:1792
#, c-format
msgid "Select the entire document\nSelect All"
msgstr ""
-#: Merge.rc:1790
+#: Merge.rc:1793
#, c-format
msgid "Undo the last action\nUndo (Ctrl+Z)"
msgstr ""
-#: Merge.rc:1791
+#: Merge.rc:1794
#, c-format
msgid "Redo the previously undone action\nRedo (Ctrl+Y)"
msgstr ""
-#: Merge.rc:1797
+#: Merge.rc:1800
#, c-format
msgid "Show or hide the toolbar\nToggle ToolBar"
msgstr ""
-#: Merge.rc:1798
+#: Merge.rc:1801
#, c-format
msgid "Show or hide the status bar\nToggle StatusBar"
msgstr ""
-#: Merge.rc:1799
+#: Merge.rc:1802
#, c-format
msgid "Show or hide the tab bar\nToggle TabBar"
msgstr ""
-#: Merge.rc:1800
+#: Merge.rc:1803
#, c-format
msgid "Automatically resize panes\nLock Panes"
msgstr ""
-#: Merge.rc:1806
+#: Merge.rc:1809
#, c-format
msgid "Change the window size"
msgstr ""
-#: Merge.rc:1807
+#: Merge.rc:1810
#, c-format
msgid "Change the window position"
msgstr ""
-#: Merge.rc:1808
+#: Merge.rc:1811
#, c-format
msgid "Reduce the window to an icon"
msgstr ""
-#: Merge.rc:1809
+#: Merge.rc:1812
#, c-format
msgid "Enlarge the window to full size"
msgstr ""
-#: Merge.rc:1810
+#: Merge.rc:1813
#, c-format
msgid "Switch to the next document window"
msgstr ""
-#: Merge.rc:1811
+#: Merge.rc:1814
#, c-format
msgid "Switch to the previous document window"
msgstr ""
-#: Merge.rc:1812
+#: Merge.rc:1815
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr ""
-#: Merge.rc:1817
+#: Merge.rc:1820
#, c-format
msgid "Restore the window to normal size"
msgstr ""
-#: Merge.rc:1818
+#: Merge.rc:1821
#, c-format
msgid "Activate Task List"
msgstr ""
-#: Merge.rc:1819
+#: Merge.rc:1822
#, c-format
msgid "Activate this window"
msgstr ""
-#: Merge.rc:1825
+#: Merge.rc:1828
#, c-format
msgid "Close print preview mode\nCancel Preview"
msgstr ""
-#: Merge.rc:1832
+#: Merge.rc:1835
#, c-format
msgid "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
msgstr ""
-#: Merge.rc:1839
+#: Merge.rc:1842
#, c-format
msgid "Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1846
+#: Merge.rc:1849
#, c-format
msgid "Press any key"
msgstr ""
-#: Merge.rc:1852
-#: Merge.rc:1853
+#: Merge.rc:1855
+#: Merge.rc:1856
#, c-format
msgid "Right click on the path to copy"
msgstr ""
-#: Merge.rc:1859
+#: Merge.rc:1862
#, 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:1860
+#: Merge.rc:1863
#, 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:1866
+#: Merge.rc:1869
#, c-format
msgid "&Ok"
msgstr ""
-#: Merge.rc:1868
+#: Merge.rc:1871
#, c-format
msgid "&Abort"
msgstr ""
-#: Merge.rc:1869
+#: Merge.rc:1872
#, c-format
msgid "&Retry"
msgstr ""
-#: Merge.rc:1870
+#: Merge.rc:1873
#, c-format
msgid "&Ignore"
msgstr ""
-#: Merge.rc:1871
+#: Merge.rc:1874
#, c-format
msgid "Ignore &all"
msgstr ""
-#: Merge.rc:1872
+#: Merge.rc:1875
#, c-format
msgid "&Yes"
msgstr ""
-#: Merge.rc:1878
+#: Merge.rc:1881
#, c-format
msgid "Yes to &all"
msgstr ""
-#: Merge.rc:1879
+#: Merge.rc:1882
#, c-format
msgid "&No"
msgstr ""
-#: Merge.rc:1880
+#: Merge.rc:1883
#, c-format
msgid "No to a&ll"
msgstr ""
-#: Merge.rc:1881
+#: Merge.rc:1884
#, c-format
msgid "&Continue"
msgstr ""
-#: Merge.rc:1882
+#: Merge.rc:1885
#, c-format
msgid "&Skip"
msgstr ""
-#: Merge.rc:1883
+#: Merge.rc:1886
#, c-format
msgid "Skip &all"
msgstr ""
-#: Merge.rc:1885
+#: Merge.rc:1888
#, c-format
msgid "Don't display this &message again."
msgstr ""
-#: Merge.rc:1886
+#: Merge.rc:1889
#, c-format
msgid "Don't ask this &question again."
msgstr ""
-#: Merge.rc:1896
+#: Merge.rc:1899
#, c-format
msgid "Syntax colors"
msgstr ""
-#: Merge.rc:1897
+#: Merge.rc:1900
#, c-format
msgid "Text Colors"
msgstr ""
-#: Merge.rc:1899
+#: Merge.rc:1902
#, c-format
msgid "Version Control"
msgstr ""
-#: Merge.rc:1909
+#: Merge.rc:1912
#, c-format
msgid "To:"
msgstr ""
-#: Merge.rc:1910
+#: Merge.rc:1913
#, c-format
msgid "From left:"
msgstr ""
-#: Merge.rc:1911
+#: Merge.rc:1914
#, c-format
msgid "To left:"
msgstr ""
-#: Merge.rc:1912
+#: Merge.rc:1915
#, c-format
msgid "From right:"
msgstr ""
-#: Merge.rc:1913
+#: Merge.rc:1916
#, c-format
msgid "To right:"
msgstr ""
-#: Merge.rc:1919
+#: Merge.rc:1922
#, c-format
msgid "Version %1"
msgstr ""
-#: Merge.rc:1920
+#: Merge.rc:1923
#, c-format
msgid "Unicode"
msgstr ""
-#: Merge.rc:1926
+#: Merge.rc:1929
#, c-format
msgid "Options (%1)"
msgstr ""
-#: Merge.rc:1927
+#: Merge.rc:1930
#, c-format
msgid "All message boxes are now displayed again."
msgstr ""
-#: Merge.rc:1928
+#: Merge.rc:1931
#, 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:1929
+#: Merge.rc:1932
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr ""
-#: Merge.rc:1931
+#: Merge.rc:1934
#, c-format
msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
msgstr ""
-#: Merge.rc:1933
+#: Merge.rc:1936
#, 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:1939
+#: Merge.rc:1942
#, c-format
msgid "Open"
msgstr ""
-#: Merge.rc:1940
+#: Merge.rc:1943
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1941
+#: Merge.rc:1944
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1942
+#: Merge.rc:1945
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr ""
-#: Merge.rc:1944
+#: Merge.rc:1947
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1950
+#: Merge.rc:1953
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1951
+#: Merge.rc:1954
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1952
+#: Merge.rc:1955
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1958
+#: Merge.rc:1961
#, c-format
msgid "Full Contents"
msgstr ""
-#: Merge.rc:1959
+#: Merge.rc:1962
#, c-format
msgid "Quick Contents"
msgstr ""
-#: Merge.rc:1960
+#: Merge.rc:1963
#, c-format
msgid "Modified Date"
msgstr ""
-#: Merge.rc:1961
+#: Merge.rc:1964
#, c-format
msgid "Modified Date and Size"
msgstr ""
-#: Merge.rc:1962
+#: Merge.rc:1965
#, c-format
msgid "Size"
msgstr ""
-#: Merge.rc:1968
+#: Merge.rc:1971
#, c-format
msgid "Name"
msgstr ""
-#: Merge.rc:1969
+#: Merge.rc:1972
#, c-format
msgid "Location"
msgstr ""
-#: Merge.rc:1970
+#: Merge.rc:1973
#, c-format
msgid "Filters"
msgstr ""
-#: Merge.rc:1971
+#: Merge.rc:1974
#, c-format
msgid "[F] "
msgstr ""
-#: Merge.rc:1972
+#: Merge.rc:1975
#, c-format
msgid "Description"
msgstr ""
-#: Merge.rc:1973
+#: Merge.rc:1976
#, c-format
msgid "Select filename for new filter"
msgstr ""
-#: Merge.rc:1974
+#: Merge.rc:1977
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1976
+#: Merge.rc:1979
#, c-format
msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
msgstr ""
-#: Merge.rc:1978
+#: Merge.rc:1981
#, 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:1980
+#: Merge.rc:1983
#, c-format
msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System."
msgstr ""
-#: Merge.rc:1982
+#: Merge.rc:1985
#, c-format
msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
msgstr ""
-#: Merge.rc:1983
+#: Merge.rc:1986
#, c-format
msgid "Locate filter file to install"
msgstr ""
-#: Merge.rc:1985
+#: Merge.rc:1988
#, c-format
msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
msgstr ""
-#: Merge.rc:1987
+#: Merge.rc:1990
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr ""
-#: Merge.rc:1993
+#: Merge.rc:1996
#, c-format
msgid "Regular expression"
msgstr ""
-#: Merge.rc:1999
+#: Merge.rc:2002
#, c-format
msgid "&Path to cleartool.exe :"
msgstr ""
-#: Merge.rc:2000
+#: Merge.rc:2003
#, c-format
msgid "&Path to SS.EXE :"
msgstr ""
-#: Merge.rc:2006
+#: Merge.rc:2009
#, c-format
msgid "Folder Comparison Results"
msgstr ""
-#: Merge.rc:2007
+#: Merge.rc:2010
#, c-format
msgid "File Comparison"
msgstr ""
-#: Merge.rc:2008
+#: Merge.rc:2011
#, c-format
msgid "Untitled left"
msgstr ""
-#: Merge.rc:2009
+#: Merge.rc:2012
#, c-format
msgid "Untitled right"
msgstr ""
-#: Merge.rc:2010
+#: Merge.rc:2013
#, c-format
msgid "Theirs File"
msgstr ""
-#: Merge.rc:2011
+#: Merge.rc:2014
#, c-format
msgid "Mine File"
msgstr ""
-#: Merge.rc:2017
+#: Merge.rc:2020
#, c-format
msgid "Scanning files..."
msgstr ""
-#: Merge.rc:2018
+#: Merge.rc:2021
#, c-format
msgid "Opening selection"
msgstr ""
-#: Merge.rc:2019
+#: Merge.rc:2022
#, c-format
msgid "Copying Left to Right"
msgstr ""
-#: Merge.rc:2020
+#: Merge.rc:2023
#, c-format
msgid "Copying Right to Left"
msgstr ""
-#: Merge.rc:2021
+#: Merge.rc:2024
#, c-format
msgid "Copying All to Left"
msgstr ""
-#: Merge.rc:2022
+#: Merge.rc:2025
#, c-format
msgid "Copying All to Right"
msgstr ""
-#: Merge.rc:2023
+#: Merge.rc:2026
#, c-format
msgid "Copying files..."
msgstr ""
-#: Merge.rc:2024
+#: Merge.rc:2027
#, c-format
msgid "Deleting files..."
msgstr ""
-#: Merge.rc:2025
+#: Merge.rc:2028
#, c-format
msgid "Moving files..."
msgstr ""
-#: Merge.rc:2026
+#: Merge.rc:2029
#, c-format
msgid "Creating the report..."
msgstr ""
-#: Merge.rc:2032
+#: Merge.rc:2035
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
-#: Merge.rc:2033
+#: Merge.rc:2036
#, c-format
msgid "Line: %s"
msgstr ""
-#: Merge.rc:2034
+#: Merge.rc:2037
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
-#: Merge.rc:2035
+#: Merge.rc:2038
#, c-format
msgid "Merge"
msgstr ""
-#: Merge.rc:2036
+#: Merge.rc:2039
#, c-format
msgid "Difference %1 of %2"
msgstr ""
-#: Merge.rc:2037
+#: Merge.rc:2040
#, c-format
msgid "%1 Differences Found"
msgstr ""
-#: Merge.rc:2038
+#: Merge.rc:2041
#, c-format
msgid "1 Difference Found"
msgstr ""
#. Abbreviation from "Read Only"
-#: Merge.rc:2039
+#: Merge.rc:2042
#, c-format
msgid "RO"
msgstr ""
-#: Merge.rc:2045
+#: Merge.rc:2048
#, c-format
msgid "Item %1 of %2"
msgstr ""
-#: Merge.rc:2046
+#: Merge.rc:2049
#, c-format
msgid "Items: %1"
msgstr ""
-#: Merge.rc:2052
+#: Merge.rc:2055
#, c-format
msgid "Select two existing folders or files to compare"
msgstr ""
-#: Merge.rc:2053
+#: Merge.rc:2056
#, c-format
msgid "Folder Selection"
msgstr ""
-#: Merge.rc:2054
+#: Merge.rc:2057
#, c-format
msgid "Select two folders or two files to compare."
msgstr ""
-#: Merge.rc:2055
+#: Merge.rc:2058
#, c-format
msgid "Left path is invalid!"
msgstr ""
-#: Merge.rc:2056
+#: Merge.rc:2059
#, c-format
msgid "Right path is invalid!"
msgstr ""
-#: Merge.rc:2057
+#: Merge.rc:2060
#, c-format
msgid "Both paths are invalid!"
msgstr ""
-#: Merge.rc:2058
+#: Merge.rc:2061
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr ""
-#: Merge.rc:2059
+#: Merge.rc:2062
#, c-format
msgid "Cannot compare file and folder!"
msgstr ""
-#: Merge.rc:2065
+#: Merge.rc:2068
#, c-format
msgid "File not found: %1"
msgstr ""
-#: Merge.rc:2066
+#: Merge.rc:2069
#, c-format
msgid "File not unpacked: %1"
msgstr ""
-#: Merge.rc:2067
+#: Merge.rc:2070
#, c-format
msgid "%1\n%2\n\nare identical binary files."
msgstr ""
-#: Merge.rc:2068
+#: Merge.rc:2071
#, c-format
msgid "%1\n%2\n\nare different binary files."
msgstr ""
-#: Merge.rc:2069
+#: Merge.rc:2072
#, c-format
msgid "%1\n\nis binary file. Cannot compare binary and text files."
msgstr ""
-#: Merge.rc:2070
+#: Merge.rc:2073
#, c-format
msgid "Cannot open file\n%1\n\n%2"
msgstr ""
-#: Merge.rc:2071
+#: Merge.rc:2074
#, c-format
msgid "Failed to parse conflict file."
msgstr ""
-#: Merge.rc:2077
+#: Merge.rc:2080
#, c-format
msgid "Save As"
msgstr ""
-#: Merge.rc:2078
+#: Merge.rc:2081
#, c-format
msgid "Save changes to %1?"
msgstr ""
-#: Merge.rc:2079
+#: Merge.rc:2082
#, 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:2080
+#: Merge.rc:2083
#, c-format
msgid "Error checking destination writeability"
msgstr ""
-#: Merge.rc:2081
+#: Merge.rc:2084
#, c-format
msgid "Error backing up file"
msgstr ""
-#: Merge.rc:2083
+#: Merge.rc:2086
#, c-format
msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
msgstr ""
-#: Merge.rc:2084
+#: Merge.rc:2087
#, 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:2085
+#: Merge.rc:2088
#, 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:2086
+#: Merge.rc:2089
#, 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:2087
+#: Merge.rc:2090
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
msgstr ""
-#: Merge.rc:2088
+#: Merge.rc:2091
#, c-format
msgid "%1\nis marked read-only. Would you like to override the read-only item?"
msgstr ""
-#: Merge.rc:2089
+#: Merge.rc:2092
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nIf you want to refresh files close current file compare and load files again."
msgstr ""
-#: Merge.rc:2090
+#: Merge.rc:2093
#, c-format
msgid "Save Left File As"
msgstr ""
-#: Merge.rc:2091
+#: Merge.rc:2094
#, c-format
msgid "Save Right File As"
msgstr ""
-#: Merge.rc:2097
+#: Merge.rc:2100
#, c-format
msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
msgstr ""
-#: Merge.rc:2103
+#: Merge.rc:2106
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr ""
-#: Merge.rc:2104
+#: Merge.rc:2107
#, c-format
msgid "Checkout files from VSS..."
msgstr ""
-#: Merge.rc:2105
+#: Merge.rc:2108
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr ""
-#: Merge.rc:2106
+#: Merge.rc:2109
#, c-format
msgid "Error executing versioning system command."
msgstr ""
-#: Merge.rc:2107
+#: Merge.rc:2110
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr ""
-#: Merge.rc:2108
+#: Merge.rc:2111
#, c-format
msgid "No VSS database(s) found!"
msgstr ""
-#: Merge.rc:2109
+#: Merge.rc:2112
#, c-format
msgid "Error from VSS:"
msgstr ""
-#: Merge.rc:2110
+#: Merge.rc:2113
#, 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:2111
+#: Merge.rc:2114
#, 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:2117
-#: Merge.rc:2906
+#: Merge.rc:2120
+#: Merge.rc:2910
#, c-format
msgid "None"
msgstr ""
-#: Merge.rc:2118
+#: Merge.rc:2121
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr ""
-#: Merge.rc:2119
+#: Merge.rc:2122
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr ""
-#: Merge.rc:2121
+#: Merge.rc:2124
#, c-format
msgid "Break at whitespace"
msgstr ""
-#: Merge.rc:2122
+#: Merge.rc:2125
#, c-format
msgid "Break at whitespace or punctuation"
msgstr ""
-#: Merge.rc:2128
-#: Merge.rc:2130
+#: Merge.rc:2131
+#: Merge.rc:2133
#, c-format
msgid "Copy selected item to named directory"
msgstr ""
-#: Merge.rc:2129
-#: Merge.rc:2131
+#: Merge.rc:2132
+#: Merge.rc:2134
#, c-format
msgid "Copy selected item to custom directory"
msgstr ""
-#: Merge.rc:2132
+#: Merge.rc:2135
#, c-format
msgid "Delete selected item on left"
msgstr ""
-#: Merge.rc:2133
+#: Merge.rc:2136
#, c-format
msgid "Delete selected item on right"
msgstr ""
-#: Merge.rc:2134
+#: Merge.rc:2137
#, c-format
msgid "Delete selected item(s) on both sides"
msgstr ""
-#: Merge.rc:2135
+#: Merge.rc:2138
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
msgstr ""
-#: Merge.rc:2136
+#: Merge.rc:2139
#, c-format
msgid "Rename selected item on both sides"
msgstr ""
-#: Merge.rc:2137
+#: Merge.rc:2140
#, c-format
msgid "Right to Left (%1)"
msgstr ""
-#: Merge.rc:2138
+#: Merge.rc:2141
#, c-format
msgid "Left to Right (%1)"
msgstr ""
-#: Merge.rc:2139
+#: Merge.rc:2142
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2140
+#: Merge.rc:2143
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2141
-#: Merge.rc:2157
+#: Merge.rc:2144
+#: Merge.rc:2160
#, c-format
msgid "Left to... (%1)"
msgstr ""
-#: Merge.rc:2142
-#: Merge.rc:2158
+#: Merge.rc:2145
+#: Merge.rc:2161
#, c-format
msgid "Right to... (%1)"
msgstr ""
-#: Merge.rc:2143
-#: Merge.rc:2159
+#: Merge.rc:2146
+#: Merge.rc:2162
#, c-format
msgid "Left to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2144
-#: Merge.rc:2160
+#: Merge.rc:2147
+#: Merge.rc:2163
#, c-format
msgid "Right to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2150
+#: Merge.rc:2153
#, c-format
msgid "Left (%1)"
msgstr ""
-#: Merge.rc:2151
+#: Merge.rc:2154
#, c-format
msgid "Right (%1)"
msgstr ""
-#: Merge.rc:2152
+#: Merge.rc:2155
#, c-format
msgid "Both (%1)"
msgstr ""
-#: Merge.rc:2153
+#: Merge.rc:2156
#, c-format
msgid "Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2154
+#: Merge.rc:2157
#, c-format
msgid "Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2155
+#: Merge.rc:2158
#, c-format
msgid "Both (%1 of %2)"
msgstr ""
-#: Merge.rc:2156
+#: Merge.rc:2159
#, c-format
msgid "Select destination folder"
msgstr ""
-#: Merge.rc:2161
+#: Merge.rc:2164
#, c-format
msgid "Left side - select destination folder:"
msgstr ""
-#: Merge.rc:2162
+#: Merge.rc:2165
#, c-format
msgid "Right side - select destination folder:"
msgstr ""
-#: Merge.rc:2163
+#: Merge.rc:2166
#, c-format
msgid "(%1 Files Affected)"
msgstr ""
-#: Merge.rc:2164
+#: Merge.rc:2167
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr ""
-#: Merge.rc:2170
+#: Merge.rc:2173
#, c-format
msgid "Are you sure you want to copy all differences to the left file?"
msgstr ""
-#: Merge.rc:2171
+#: Merge.rc:2174
#, c-format
msgid "Are you sure you want to copy all differences to the right file?"
msgstr ""
-#: Merge.rc:2172
+#: Merge.rc:2175
#, c-format
msgid "Are you sure you want to copy\n\n%1\nto\n%2 ?"
msgstr ""
-#: Merge.rc:2173
+#: Merge.rc:2176
#, c-format
msgid "Are you sure you want to copy %1 of %2 selected item(s)?"
msgstr ""
-#: Merge.rc:2174
+#: Merge.rc:2177
#, c-format
msgid "Are you sure you want to delete %1 of %2 selected item(s)?"
msgstr ""
-#: Merge.rc:2175
+#: Merge.rc:2178
#, c-format
msgid "Delete directory\n\n%1 ?"
msgstr ""
-#: Merge.rc:2176
+#: Merge.rc:2179
#, c-format
msgid "Are you sure you want to delete\n\n%1 ?"
msgstr ""
-#: Merge.rc:2177
+#: Merge.rc:2180
#, c-format
msgid "Are you sure you want to copy:"
msgstr ""
-#: Merge.rc:2178
+#: Merge.rc:2181
#, c-format
msgid "Are you sure you want to copy %d items:"
msgstr ""
-#: Merge.rc:2179
+#: Merge.rc:2182
#, 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:2185
+#: Merge.rc:2188
#, c-format
msgid "Open left file"
msgstr ""
-#: Merge.rc:2186
+#: Merge.rc:2189
#, c-format
msgid "Open the left file to external editor"
msgstr ""
-#: Merge.rc:2187
+#: Merge.rc:2190
#, c-format
msgid "Open left file with ..."
msgstr ""
-#: Merge.rc:2188
+#: Merge.rc:2191
#, c-format
msgid "Open right file"
msgstr ""
-#: Merge.rc:2189
+#: Merge.rc:2192
#, c-format
msgid "Open the right file to external editor"
msgstr ""
-#: Merge.rc:2190
+#: Merge.rc:2193
#, c-format
msgid "Open right file with..."
msgstr ""
-#: Merge.rc:2191
+#: Merge.rc:2194
#, c-format
msgid "Failed to execute external editor: %1"
msgstr ""
-#: Merge.rc:2192
+#: Merge.rc:2195
#, c-format
msgid "Unknown extension on external editor: %1"
msgstr ""
-#: Merge.rc:2193
+#: Merge.rc:2196
#, c-format
msgid "Copy filenames to clipboard"
msgstr ""
-#: Merge.rc:2194
+#: Merge.rc:2197
#, c-format
msgid "Copy left side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2195
+#: Merge.rc:2198
#, c-format
msgid "Copy right side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2196
+#: Merge.rc:2199
#, c-format
msgid "Copy both sides pathnames to clipboard"
msgstr ""
-#: Merge.rc:2202
+#: Merge.rc:2205
#, c-format
msgid "Unknown archive format"
msgstr ""
-#: Merge.rc:2203
+#: Merge.rc:2206
#, c-format
msgid "Add items from left side to archive"
msgstr ""
-#: Merge.rc:2204
+#: Merge.rc:2207
#, c-format
msgid "Add items from right side to archive"
msgstr ""
-#: Merge.rc:2205
+#: Merge.rc:2208
#, c-format
msgid "Add items from both sides to archive"
msgstr ""
-#: Merge.rc:2206
+#: Merge.rc:2209
#, c-format
msgid "Add different items to archive (both sides)"
msgstr ""
-#: Merge.rc:2208
+#: Merge.rc:2211
#, c-format
msgid "Move selected file on left to custom directory"
msgstr ""
-#: Merge.rc:2210
+#: Merge.rc:2213
#, c-format
msgid "Move selected file on right to custom directory"
msgstr ""
-#: Merge.rc:2216
+#: Merge.rc:2219
#, c-format
msgid "Filename"
msgstr ""
-#: Merge.rc:2217
+#: Merge.rc:2220
#, c-format
msgid "Folder"
msgstr ""
-#: Merge.rc:2218
+#: Merge.rc:2221
#, c-format
msgid "Comparison result"
msgstr ""
-#: Merge.rc:2219
+#: Merge.rc:2222
#, c-format
msgid "Left Date"
msgstr ""
-#: Merge.rc:2220
+#: Merge.rc:2223
#, c-format
msgid "Right Date"
msgstr ""
-#: Merge.rc:2221
+#: Merge.rc:2224
#, c-format
msgid "Extension"
msgstr ""
-#: Merge.rc:2222
+#: Merge.rc:2225
#, c-format
msgid "Left Size"
msgstr ""
-#: Merge.rc:2223
+#: Merge.rc:2226
#, c-format
msgid "Right Size"
msgstr ""
-#: Merge.rc:2224
+#: Merge.rc:2227
#, c-format
msgid "Right Size (Short)"
msgstr ""
-#: Merge.rc:2225
+#: Merge.rc:2228
#, c-format
msgid "Left Size (Short)"
msgstr ""
-#: Merge.rc:2231
+#: Merge.rc:2234
#, c-format
msgid "Left Creation Time"
msgstr ""
-#: Merge.rc:2232
+#: Merge.rc:2235
#, c-format
msgid "Right Creation Time"
msgstr ""
-#: Merge.rc:2233
+#: Merge.rc:2236
#, c-format
msgid "Newer File"
msgstr ""
-#: Merge.rc:2234
+#: Merge.rc:2237
#, c-format
msgid "Left File Version"
msgstr ""
-#: Merge.rc:2235
+#: Merge.rc:2238
#, c-format
msgid "Right File Version"
msgstr ""
-#: Merge.rc:2236
+#: Merge.rc:2239
#, c-format
msgid "Short Result"
msgstr ""
-#: Merge.rc:2237
+#: Merge.rc:2240
#, c-format
msgid "Left Attributes"
msgstr ""
-#: Merge.rc:2238
+#: Merge.rc:2241
#, c-format
msgid "Right Attributes"
msgstr ""
-#: Merge.rc:2239
+#: Merge.rc:2242
#, c-format
msgid "Left EOL"
msgstr ""
-#: Merge.rc:2240
+#: Merge.rc:2243
#, c-format
msgid "Right EOL"
msgstr ""
-#: Merge.rc:2246
+#: Merge.rc:2249
#, c-format
msgid "Left Encoding"
msgstr ""
-#: Merge.rc:2247
+#: Merge.rc:2250
#, c-format
msgid "Right Encoding"
msgstr ""
-#: Merge.rc:2248
+#: Merge.rc:2251
#, c-format
msgid "Ignored Diff."
msgstr ""
-#: Merge.rc:2249
+#: Merge.rc:2252
#, c-format
msgid "Differences"
msgstr ""
-#: Merge.rc:2250
-#: Merge.rc:2729
+#: Merge.rc:2253
+#: Merge.rc:2732
#, c-format
msgid "Binary"
msgstr ""
-#: Merge.rc:2256
+#: Merge.rc:2259
#, c-format
msgid "Unable to compare files"
msgstr ""
-#: Merge.rc:2257
+#: Merge.rc:2260
#, c-format
msgid "Item aborted"
msgstr ""
-#: Merge.rc:2258
+#: Merge.rc:2261
#, c-format
msgid "File skipped"
msgstr ""
-#: Merge.rc:2259
+#: Merge.rc:2262
#, c-format
msgid "Folder skipped"
msgstr ""
-#: Merge.rc:2260
+#: Merge.rc:2263
#, c-format
msgid "Left only: %1"
msgstr ""
-#: Merge.rc:2261
+#: Merge.rc:2264
#, c-format
msgid "Right only: %1"
msgstr ""
-#: Merge.rc:2262
+#: Merge.rc:2265
#, c-format
msgid "Binary files are identical"
msgstr ""
-#: Merge.rc:2264
+#: Merge.rc:2267
#, c-format
msgid "Binary files are different"
msgstr ""
-#: Merge.rc:2265
+#: Merge.rc:2268
#, c-format
msgid "Files are different"
msgstr ""
-#: Merge.rc:2266
+#: Merge.rc:2269
#, c-format
msgid "Left Only"
msgstr ""
-#: Merge.rc:2267
+#: Merge.rc:2270
#, c-format
msgid "Right Only"
msgstr ""
-#: Merge.rc:2269
+#: Merge.rc:2272
#, c-format
msgid "Error"
msgstr ""
-#: Merge.rc:2275
+#: Merge.rc:2278
#, c-format
msgid "Elapsed time: %ld ms"
msgstr ""
-#: Merge.rc:2276
+#: Merge.rc:2279
#, c-format
msgid "1 item selected"
msgstr ""
-#: Merge.rc:2277
+#: Merge.rc:2280
#, c-format
msgid "%1 items selected"
msgstr ""
-#: Merge.rc:2283
+#: Merge.rc:2286
#, c-format
msgid "Filename or folder name."
msgstr ""
-#: Merge.rc:2284
+#: Merge.rc:2287
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr ""
-#: Merge.rc:2285
+#: Merge.rc:2288
#, c-format
msgid "Comparison result, long form."
msgstr ""
-#: Merge.rc:2286
+#: Merge.rc:2289
#, c-format
msgid "Left side modification date."
msgstr ""
-#: Merge.rc:2287
+#: Merge.rc:2290
#, c-format
msgid "Right side modification date."
msgstr ""
-#: Merge.rc:2288
+#: Merge.rc:2291
#, c-format
msgid "File's extension."
msgstr ""
-#: Merge.rc:2289
+#: Merge.rc:2292
#, c-format
msgid "Left file size in bytes."
msgstr ""
-#: Merge.rc:2290
+#: Merge.rc:2293
#, c-format
msgid "Right file size in bytes."
msgstr ""
-#: Merge.rc:2291
+#: Merge.rc:2294
#, c-format
msgid "Left file size abbreviated."
msgstr ""
-#: Merge.rc:2292
+#: Merge.rc:2295
#, c-format
msgid "Right file size abbreviated."
msgstr ""
-#: Merge.rc:2298
+#: Merge.rc:2301
#, c-format
msgid "Left side creation time."
msgstr ""
-#: Merge.rc:2299
+#: Merge.rc:2302
#, c-format
msgid "Right side creation time."
msgstr ""
-#: Merge.rc:2300
+#: Merge.rc:2303
#, c-format
msgid "Tells which side has newer modification date."
msgstr ""
-#: Merge.rc:2301
+#: Merge.rc:2304
#, c-format
msgid "Left side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2302
+#: Merge.rc:2305
#, c-format
msgid "Right side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2303
+#: Merge.rc:2306
#, c-format
msgid "Short comparison result."
msgstr ""
-#: Merge.rc:2304
+#: Merge.rc:2307
#, c-format
msgid "Left side attributes."
msgstr ""
-#: Merge.rc:2305
+#: Merge.rc:2308
#, c-format
msgid "Right side attributes."
msgstr ""
-#: Merge.rc:2306
+#: Merge.rc:2309
#, c-format
msgid "Left side file EOL type"
msgstr ""
-#: Merge.rc:2307
+#: Merge.rc:2310
#, c-format
msgid "Right side file EOL type"
msgstr ""
-#: Merge.rc:2313
+#: Merge.rc:2316
#, c-format
msgid "Left side encoding."
msgstr ""
-#: Merge.rc:2314
+#: Merge.rc:2317
#, c-format
msgid "Right side encoding."
msgstr ""
-#: Merge.rc:2315
+#: Merge.rc:2318
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
msgstr ""
-#: Merge.rc:2316
+#: Merge.rc:2319
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
msgstr ""
-#: Merge.rc:2317
+#: Merge.rc:2320
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr ""
-#: Merge.rc:2323
+#: Merge.rc:2326
#, c-format
msgid "Compare %1 with %2"
msgstr ""
-#: Merge.rc:2324
+#: Merge.rc:2327
#, c-format
msgid "Comma-separated list"
msgstr ""
-#: Merge.rc:2325
+#: Merge.rc:2328
#, c-format
msgid "Tab-separated list"
msgstr ""
-#: Merge.rc:2326
+#: Merge.rc:2329
#, c-format
msgid "Simple HTML"
msgstr ""
-#: Merge.rc:2327
+#: Merge.rc:2330
#, c-format
msgid "Simple XML"
msgstr ""
-#: Merge.rc:2329
+#: Merge.rc:2332
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
msgstr ""
-#: Merge.rc:2330
+#: Merge.rc:2333
#, c-format
msgid "Error creating the report:\n%1"
msgstr ""
-#: Merge.rc:2331
+#: Merge.rc:2334
#, c-format
msgid "The report has been created successfully."
msgstr ""
-#: Merge.rc:2337
+#: Merge.rc:2340
#, c-format
msgid "The same file is opened in both panels."
msgstr ""
-#: Merge.rc:2338
+#: Merge.rc:2341
#, c-format
msgid "The selected files are identical."
msgstr ""
-#: Merge.rc:2339
+#: Merge.rc:2342
#, c-format
msgid "The selected folder exists only in other side and therefore cannot be opened."
msgstr ""
-#: Merge.rc:2340
+#: Merge.rc:2343
#, c-format
msgid "An error occurred while comparing the files."
msgstr ""
-#: Merge.rc:2341
+#: Merge.rc:2344
#, c-format
msgid "Binary files cannot be visually compared."
msgstr ""
-#: Merge.rc:2342
+#: Merge.rc:2345
#, c-format
msgid "Temporary files could not be created. Check your temporary path settings."
msgstr ""
-#: Merge.rc:2343
+#: Merge.rc:2346
#, c-format
msgid "Directory files cannot be visually compared."
msgstr ""
-#: Merge.rc:2344
+#: Merge.rc:2347
#, c-format
msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
msgstr ""
-#: Merge.rc:2345
+#: Merge.rc:2348
#, c-format
msgid "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
msgstr ""
-#: Merge.rc:2346
+#: Merge.rc:2349
#, c-format
msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
msgstr ""
-#: Merge.rc:2347
+#: Merge.rc:2350
#, c-format
msgid "The selected folder is invalid."
msgstr ""
-#: Merge.rc:2348
+#: Merge.rc:2351
#, c-format
msgid "Cannot open a binary file to editor."
msgstr ""
-#: Merge.rc:2354
+#: Merge.rc:2357
#, c-format
msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?"
msgstr ""
-#: Merge.rc:2355
+#: Merge.rc:2358
#, c-format
msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
msgstr ""
-#: Merge.rc:2356
+#: Merge.rc:2359
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr ""
-#: Merge.rc:2357
+#: Merge.rc:2360
#, c-format
msgid "Information lost due to encoding errors: right file"
msgstr ""
-#: Merge.rc:2358
+#: Merge.rc:2361
#, c-format
msgid "Information lost due to encoding errors: left file"
msgstr ""
-#: Merge.rc:2364
+#: Merge.rc:2367
#, c-format
msgid "No difference"
msgstr ""
-#: Merge.rc:2365
+#: Merge.rc:2368
#, c-format
msgid "Line difference"
msgstr ""
-#: Merge.rc:2371
+#: Merge.rc:2374
#, c-format
msgid "Replaced %1 string(s)."
msgstr ""
-#: Merge.rc:2372
+#: Merge.rc:2375
#, c-format
msgid "Cannot find string \"%s\""
msgstr ""
-#: Merge.rc:2378
+#: Merge.rc:2381
#, c-format
msgid "Copy Full Path"
msgstr ""
-#: Merge.rc:2379
+#: Merge.rc:2382
#, c-format
msgid "Copy Filename"
msgstr ""
-#: Merge.rc:2385
+#: Merge.rc:2388
#, c-format
msgid "Location Pane"
msgstr ""
-#: Merge.rc:2386
+#: Merge.rc:2389
#, c-format
msgid "Diff Pane"
msgstr ""
-#: Merge.rc:2392
+#: Merge.rc:2395
#, c-format
msgid "Patch file successfully written."
msgstr ""
-#: Merge.rc:2393
+#: Merge.rc:2396
#, c-format
msgid "1. item is not found or is directory!"
msgstr ""
-#: Merge.rc:2394
+#: Merge.rc:2397
#, c-format
msgid "2. item is not found or is directory!"
msgstr ""
-#: Merge.rc:2395
+#: Merge.rc:2398
#, c-format
msgid "The patch file already exists. Do you want to overwrite it?"
msgstr ""
-#: Merge.rc:2396
+#: Merge.rc:2399
#, c-format
msgid "[%1 files selected]"
msgstr ""
-#: Merge.rc:2397
+#: Merge.rc:2400
#, c-format
msgid "Normal"
msgstr ""
-#: Merge.rc:2398
+#: Merge.rc:2401
#, c-format
msgid "Context"
msgstr ""
-#: Merge.rc:2399
+#: Merge.rc:2402
#, c-format
msgid "Unified"
msgstr ""
-#: Merge.rc:2400
+#: Merge.rc:2403
#, c-format
msgid "Could not write to file %1."
msgstr ""
-#: Merge.rc:2401
+#: Merge.rc:2404
#, c-format
msgid "The specified output path is not an absolute path: %1"
msgstr ""
-#: Merge.rc:2402
+#: Merge.rc:2405
#, c-format
msgid "Specify an output file"
msgstr ""
-#: Merge.rc:2403
+#: Merge.rc:2406
#, c-format
msgid "Cannot create a patch file from binary files."
msgstr ""
-#: Merge.rc:2404
+#: Merge.rc:2407
#, c-format
msgid "Cannot create a patch file from directories."
msgstr ""
-#: Merge.rc:2405
+#: Merge.rc:2408
#, c-format
msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
msgstr ""
-#: Merge.rc:2406
+#: Merge.rc:2409
#, c-format
msgid "Folder does not exist."
msgstr ""
-#: Merge.rc:2411
+#: Merge.rc:2414
#, c-format
msgid "Current directory comparison results will be cleared."
msgstr ""
-#: Merge.rc:2412
+#: Merge.rc:2415
#, c-format
msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it."
msgstr ""
-#: Merge.rc:2413
+#: Merge.rc:2416
#, c-format
msgid "\nNote: 7-Zip integration is disabled in WinMerge settings."
msgstr ""
-#: Merge.rc:2414
+#: Merge.rc:2417
#, c-format
msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings."
msgstr ""
-#: Merge.rc:2415
+#: Merge.rc:2418
#, c-format
msgid "Select file for export"
msgstr ""
-#: Merge.rc:2416
+#: Merge.rc:2419
#, c-format
msgid "Select file for import"
msgstr ""
-#: Merge.rc:2417
+#: Merge.rc:2420
#, c-format
msgid "Options imported from the file."
msgstr ""
-#: Merge.rc:2418
+#: Merge.rc:2421
#, c-format
msgid "Options exported to the file."
msgstr ""
-#: Merge.rc:2419
+#: Merge.rc:2422
#, c-format
msgid "Failed to import options from the file."
msgstr ""
-#: Merge.rc:2420
+#: Merge.rc:2423
#, c-format
msgid "Failed to write options to the file."
msgstr ""
-#: Merge.rc:2421
+#: Merge.rc:2424
#, c-format
msgid "You are about to close several compare windows.\n\nDo you want to continue?"
msgstr ""
-#: Merge.rc:2427
+#: Merge.rc:2430
#, c-format
msgid "Regular expression error"
msgstr ""
-#: Merge.rc:2428
+#: Merge.rc:2431
#, c-format
msgid "No match"
msgstr ""
-#: Merge.rc:2429
+#: Merge.rc:2432
#, c-format
msgid "Invalid regular expression"
msgstr ""
-#: Merge.rc:2430
+#: Merge.rc:2433
#, c-format
msgid "Invalid collation character"
msgstr ""
-#: Merge.rc:2431
+#: Merge.rc:2434
#, c-format
msgid "Invalid character class name"
msgstr ""
-#: Merge.rc:2432
+#: Merge.rc:2435
#, c-format
msgid "Trailing backslash"
msgstr ""
-#: Merge.rc:2433
+#: Merge.rc:2436
#, c-format
msgid "Invalid back reference"
msgstr ""
-#: Merge.rc:2434
+#: Merge.rc:2437
#, c-format
msgid "Unmatched [ or [^"
msgstr ""
-#: Merge.rc:2435
+#: Merge.rc:2438
#, c-format
msgid "Unmatched ( or \\("
msgstr ""
-#: Merge.rc:2436
+#: Merge.rc:2439
#, c-format
msgid "Unmatched \\{"
msgstr ""
-#: Merge.rc:2437
+#: Merge.rc:2440
#, c-format
msgid "Invalid content of \\{\\}"
msgstr ""
-#: Merge.rc:2438
+#: Merge.rc:2441
#, c-format
msgid "Invalid range end"
msgstr ""
-#: Merge.rc:2439
+#: Merge.rc:2442
#, c-format
msgid "Out of memory"
msgstr ""
-#: Merge.rc:2440
+#: Merge.rc:2443
#, c-format
msgid "Invalid preceding regular expression"
msgstr ""
-#: Merge.rc:2441
+#: Merge.rc:2444
#, c-format
msgid "Premature end of regular expression"
msgstr ""
-#: Merge.rc:2442
+#: Merge.rc:2445
#, c-format
msgid "Regular expression too big"
msgstr ""
-#: Merge.rc:2447
+#: Merge.rc:2450
#, c-format
msgid "Unmatched ) or \\)"
msgstr ""
-#: Merge.rc:2453
+#: Merge.rc:2456
#, c-format
msgid "Afrikaans"
msgstr ""
-#: Merge.rc:2454
+#: Merge.rc:2457
#, c-format
msgid "Albanian"
msgstr ""
-#: Merge.rc:2455
+#: Merge.rc:2458
#, c-format
msgid "Arabic (Saudi Arabian)"
msgstr ""
-#: Merge.rc:2456
+#: Merge.rc:2459
#, c-format
msgid "Arabic (Iraq)"
msgstr ""
-#: Merge.rc:2457
+#: Merge.rc:2460
#, c-format
msgid "Arabic (Egyptian)"
msgstr ""
-#: Merge.rc:2458
+#: Merge.rc:2461
#, c-format
msgid "Arabic (Libyan)"
msgstr ""
-#: Merge.rc:2459
+#: Merge.rc:2462
#, c-format
msgid "Arabic (Algerian)"
msgstr ""
-#: Merge.rc:2460
+#: Merge.rc:2463
#, c-format
msgid "Arabic (Moroccan)"
msgstr ""
-#: Merge.rc:2461
+#: Merge.rc:2464
#, c-format
msgid "Arabic (Tunisian)"
msgstr ""
-#: Merge.rc:2462
+#: Merge.rc:2465
#, c-format
msgid "Arabic (Oman)"
msgstr ""
-#: Merge.rc:2463
+#: Merge.rc:2466
#, c-format
msgid "Arabic (Yemen)"
msgstr ""
-#: Merge.rc:2464
+#: Merge.rc:2467
#, c-format
msgid "Arabic (Syrian)"
msgstr ""
-#: Merge.rc:2465
+#: Merge.rc:2468
#, c-format
msgid "Arabic (Jordan)"
msgstr ""
-#: Merge.rc:2471
+#: Merge.rc:2474
#, c-format
msgid "Arabic (Lebanon)"
msgstr ""
-#: Merge.rc:2472
+#: Merge.rc:2475
#, c-format
msgid "Arabic (Kuwait)"
msgstr ""
-#: Merge.rc:2473
+#: Merge.rc:2476
#, c-format
msgid "Arabic (UAE)"
msgstr ""
-#: Merge.rc:2474
+#: Merge.rc:2477
#, c-format
msgid "Arabic (Bahrain)"
msgstr ""
-#: Merge.rc:2475
+#: Merge.rc:2478
#, c-format
msgid "Arabic (Qatar)"
msgstr ""
-#: Merge.rc:2476
+#: Merge.rc:2479
#, c-format
msgid "Armenian"
msgstr ""
-#: Merge.rc:2477
+#: Merge.rc:2480
#, c-format
msgid "Azeri (Latin)"
msgstr ""
-#: Merge.rc:2478
+#: Merge.rc:2481
#, c-format
msgid "Azeri (Cyrillic)"
msgstr ""
-#: Merge.rc:2479
+#: Merge.rc:2482
#, c-format
msgid "Basque"
msgstr ""
-#: Merge.rc:2480
+#: Merge.rc:2483
#, c-format
msgid "Belarusian"
msgstr ""
-#: Merge.rc:2481
+#: Merge.rc:2484
#, c-format
msgid "Bulgarian"
msgstr ""
-#: Merge.rc:2482
+#: Merge.rc:2485
#, c-format
msgid "Catalan"
msgstr ""
-#: Merge.rc:2483
+#: Merge.rc:2486
#, c-format
msgid "Chinese (Traditional)"
msgstr ""
-#: Merge.rc:2484
+#: Merge.rc:2487
#, c-format
msgid "Chinese (Simplified)"
msgstr ""
-#: Merge.rc:2485
+#: Merge.rc:2488
#, c-format
msgid "Chinese (Hong Kong)"
msgstr ""
-#: Merge.rc:2486
+#: Merge.rc:2489
#, c-format
msgid "Chinese (Singapore)"
msgstr ""
-#: Merge.rc:2492
+#: Merge.rc:2495
#, c-format
msgid "Chinese (Macau SAR)"
msgstr ""
-#: Merge.rc:2493
+#: Merge.rc:2496
#, c-format
msgid "Croatian"
msgstr ""
-#: Merge.rc:2494
+#: Merge.rc:2497
#, c-format
msgid "Czech"
msgstr ""
-#: Merge.rc:2495
+#: Merge.rc:2498
#, c-format
msgid "Dansk"
msgstr ""
-#: Merge.rc:2496
+#: Merge.rc:2499
#, c-format
msgid "Dutch"
msgstr ""
-#: Merge.rc:2497
+#: Merge.rc:2500
#, c-format
msgid "Dutch (Belgium)"
msgstr ""
-#: Merge.rc:2498
+#: Merge.rc:2501
#, c-format
msgid "English (US)"
msgstr ""
-#: Merge.rc:2499
+#: Merge.rc:2502
#, c-format
msgid "English (UK)"
msgstr ""
-#: Merge.rc:2500
+#: Merge.rc:2503
#, c-format
msgid "English (Australian)"
msgstr ""
-#: Merge.rc:2501
+#: Merge.rc:2504
#, c-format
msgid "English (Canadian)"
msgstr ""
-#: Merge.rc:2502
+#: Merge.rc:2505
#, c-format
msgid "English (New Zealand)"
msgstr ""
-#: Merge.rc:2503
+#: Merge.rc:2506
#, c-format
msgid "English (Irish)"
msgstr ""
-#: Merge.rc:2504
+#: Merge.rc:2507
#, c-format
msgid "English (So. African)"
msgstr ""
-#: Merge.rc:2505
+#: Merge.rc:2508
#, c-format
msgid "English (Jamaican)"
msgstr ""
-#: Merge.rc:2506
+#: Merge.rc:2509
#, c-format
msgid "English (Caribbean)"
msgstr ""
-#: Merge.rc:2507
+#: Merge.rc:2510
#, c-format
msgid "English (Belize)"
msgstr ""
-#: Merge.rc:2513
+#: Merge.rc:2516
#, c-format
msgid "English (Trinidad)"
msgstr ""
-#: Merge.rc:2514
+#: Merge.rc:2517
#, c-format
msgid "English (Zimbabwe)"
msgstr ""
-#: Merge.rc:2515
+#: Merge.rc:2518
#, c-format
msgid "English (Philippines)"
msgstr ""
-#: Merge.rc:2516
+#: Merge.rc:2519
#, c-format
msgid "Eesti"
msgstr ""
-#: Merge.rc:2517
+#: Merge.rc:2520
#, c-format
msgid "Faeroese"
msgstr ""
-#: Merge.rc:2518
+#: Merge.rc:2521
#, c-format
msgid "Farsi"
msgstr ""
-#: Merge.rc:2519
+#: Merge.rc:2522
#, c-format
msgid "Suomi"
msgstr ""
-#: Merge.rc:2520
+#: Merge.rc:2523
#, c-format
msgid "French"
msgstr ""
-#: Merge.rc:2521
+#: Merge.rc:2524
#, c-format
msgid "French (Belgique)"
msgstr ""
-#: Merge.rc:2522
+#: Merge.rc:2525
#, c-format
msgid "French (Canada)"
msgstr ""
-#: Merge.rc:2523
+#: Merge.rc:2526
#, c-format
msgid "French (Switzerland)"
msgstr ""
-#: Merge.rc:2524
+#: Merge.rc:2527
#, c-format
msgid "French (Luxembourg)"
msgstr ""
-#: Merge.rc:2525
+#: Merge.rc:2528
#, c-format
msgid "French (Monaco)"
msgstr ""
-#: Merge.rc:2526
+#: Merge.rc:2529
#, c-format
msgid "Georgian"
msgstr ""
-#: Merge.rc:2527
+#: Merge.rc:2530
#, c-format
msgid "German (Germany)"
msgstr ""
-#: Merge.rc:2528
+#: Merge.rc:2531
#, c-format
msgid "German (Switzerland)"
msgstr ""
-#: Merge.rc:2534
+#: Merge.rc:2537
#, c-format
msgid "German (Austria)"
msgstr ""
-#: Merge.rc:2535
+#: Merge.rc:2538
#, c-format
msgid "German (Luxembourg)"
msgstr ""
-#: Merge.rc:2536
+#: Merge.rc:2539
#, c-format
msgid "German (Liechtenstein)"
msgstr ""
-#: Merge.rc:2537
+#: Merge.rc:2540
#, c-format
msgid "Greek"
msgstr ""
-#: Merge.rc:2538
+#: Merge.rc:2541
#, c-format
msgid "Hebrew"
msgstr ""
-#: Merge.rc:2539
+#: Merge.rc:2542
#, c-format
msgid "Hindi"
msgstr ""
-#: Merge.rc:2540
+#: Merge.rc:2543
#, c-format
msgid "Hungarian"
msgstr ""
-#: Merge.rc:2541
+#: Merge.rc:2544
#, c-format
msgid "Icelandic"
msgstr ""
-#: Merge.rc:2542
+#: Merge.rc:2545
#, c-format
msgid "Indonesian"
msgstr ""
-#: Merge.rc:2543
+#: Merge.rc:2546
#, c-format
msgid "Italian"
msgstr ""
-#: Merge.rc:2544
+#: Merge.rc:2547
#, c-format
msgid "Italian (Swiss)"
msgstr ""
-#: Merge.rc:2545
+#: Merge.rc:2548
#, c-format
msgid "Japanese"
msgstr ""
-#: Merge.rc:2546
+#: Merge.rc:2549
#, c-format
msgid "Kashmiri (India)"
msgstr ""
-#: Merge.rc:2547
+#: Merge.rc:2550
#, c-format
msgid "Kazakh"
msgstr ""
-#: Merge.rc:2548
+#: Merge.rc:2551
#, c-format
msgid "Korean"
msgstr ""
-#: Merge.rc:2549
+#: Merge.rc:2552
#, c-format
msgid "Korean (Johab)"
msgstr ""
-#: Merge.rc:2555
+#: Merge.rc:2558
#, c-format
msgid "Latvian"
msgstr ""
-#: Merge.rc:2556
+#: Merge.rc:2559
#, c-format
msgid "Lithuanian"
msgstr ""
-#: Merge.rc:2557
+#: Merge.rc:2560
#, c-format
msgid "Malay (Malaysian)"
msgstr ""
-#: Merge.rc:2558
+#: Merge.rc:2561
#, c-format
msgid "Malay (Brunei Darussalam)"
msgstr ""
-#: Merge.rc:2559
+#: Merge.rc:2562
#, c-format
msgid "Manipuri"
msgstr ""
-#: Merge.rc:2560
+#: Merge.rc:2563
#, c-format
msgid "Norwegian (Bokml)"
msgstr ""
-#: Merge.rc:2561
+#: Merge.rc:2564
#, c-format
msgid "Norwegian (Nynorsk)"
msgstr ""
-#: Merge.rc:2562
+#: Merge.rc:2565
#, c-format
msgid "Polski"
msgstr ""
-#: Merge.rc:2563
+#: Merge.rc:2566
#, c-format
msgid "Portugese"
msgstr ""
-#: Merge.rc:2564
+#: Merge.rc:2567
#, c-format
msgid "Portugese (Brazil)"
msgstr ""
-#: Merge.rc:2565
+#: Merge.rc:2568
#, c-format
msgid "Romanian"
msgstr ""
-#: Merge.rc:2566
+#: Merge.rc:2569
#, c-format
msgid "Russian"
msgstr ""
-#: Merge.rc:2567
+#: Merge.rc:2570
#, c-format
msgid "Sanskrit"
msgstr ""
-#: Merge.rc:2568
+#: Merge.rc:2571
#, c-format
msgid "Serbian (Latin)"
msgstr ""
-#: Merge.rc:2569
+#: Merge.rc:2572
#, c-format
msgid "Serbian (Cyrillic)"
msgstr ""
-#: Merge.rc:2570
+#: Merge.rc:2573
#, c-format
msgid "Sindhi"
msgstr ""
-#: Merge.rc:2576
+#: Merge.rc:2579
#, c-format
msgid "Slovak"
msgstr ""
-#: Merge.rc:2577
+#: Merge.rc:2580
#, c-format
msgid "Slovenian"
msgstr ""
-#: Merge.rc:2578
+#: Merge.rc:2581
#, c-format
msgid "Spanish"
msgstr ""
-#: Merge.rc:2579
+#: Merge.rc:2582
#, c-format
msgid "Spanish (Mexican)"
msgstr ""
-#: Merge.rc:2580
+#: Merge.rc:2583
#, c-format
msgid "Spanish (Modern)"
msgstr ""
-#: Merge.rc:2581
+#: Merge.rc:2584
#, c-format
msgid "Spanish (Guatemala)"
msgstr ""
-#: Merge.rc:2582
+#: Merge.rc:2585
#, c-format
msgid "Spanish (Costa Rica)"
msgstr ""
-#: Merge.rc:2583
+#: Merge.rc:2586
#, c-format
msgid "Spanish (Panama)"
msgstr ""
-#: Merge.rc:2584
+#: Merge.rc:2587
#, c-format
msgid "Spanish (Dominican)"
msgstr ""
-#: Merge.rc:2585
+#: Merge.rc:2588
#, c-format
msgid "Spanish (Venezuela)"
msgstr ""
-#: Merge.rc:2586
+#: Merge.rc:2589
#, c-format
msgid "Spanish (Colombia)"
msgstr ""
-#: Merge.rc:2587
+#: Merge.rc:2590
#, c-format
msgid "Spanish (Peru)"
msgstr ""
-#: Merge.rc:2588
+#: Merge.rc:2591
#, c-format
msgid "Spanish (Argentina)"
msgstr ""
-#: Merge.rc:2589
+#: Merge.rc:2592
#, c-format
msgid "Spanish (Ecuador)"
msgstr ""
-#: Merge.rc:2590
+#: Merge.rc:2593
#, c-format
msgid "Spanish (Chile)"
msgstr ""
-#: Merge.rc:2591
+#: Merge.rc:2594
#, c-format
msgid "Spanish (Uruguay)"
msgstr ""
-#: Merge.rc:2597
+#: Merge.rc:2600
#, c-format
msgid "Spanish (Paraguay)"
msgstr ""
-#: Merge.rc:2598
+#: Merge.rc:2601
#, c-format
msgid "Spanish (Bolivia)"
msgstr ""
-#: Merge.rc:2599
+#: Merge.rc:2602
#, c-format
msgid "Spanish (El Salvador)"
msgstr ""
-#: Merge.rc:2600
+#: Merge.rc:2603
#, c-format
msgid "Spanish (Honduras)"
msgstr ""
-#: Merge.rc:2601
+#: Merge.rc:2604
#, c-format
msgid "Spanish (Nicaragua)"
msgstr ""
-#: Merge.rc:2602
+#: Merge.rc:2605
#, c-format
msgid "Spanish (Puerto Rico)"
msgstr ""
-#: Merge.rc:2603
+#: Merge.rc:2606
#, c-format
msgid "Swahili (Kenya)"
msgstr ""
-#: Merge.rc:2604
+#: Merge.rc:2607
#, c-format
msgid "Swedish"
msgstr ""
-#: Merge.rc:2605
+#: Merge.rc:2608
#, c-format
msgid "Swedish (Finland)"
msgstr ""
-#: Merge.rc:2606
+#: Merge.rc:2609
#, c-format
msgid "Tamil"
msgstr ""
-#: Merge.rc:2607
+#: Merge.rc:2610
#, c-format
msgid "Tatar (Tatarstan)"
msgstr ""
-#: Merge.rc:2608
+#: Merge.rc:2611
#, c-format
msgid "Thai"
msgstr ""
-#: Merge.rc:2609
+#: Merge.rc:2612
#, c-format
msgid "Turkish"
msgstr ""
-#: Merge.rc:2610
+#: Merge.rc:2613
#, c-format
msgid "Ukranian"
msgstr ""
-#: Merge.rc:2611
+#: Merge.rc:2614
#, c-format
msgid "Urdu (Pakistan)"
msgstr ""
-#: Merge.rc:2612
+#: Merge.rc:2615
#, c-format
msgid "Urdu (India)"
msgstr ""
-#: Merge.rc:2618
+#: Merge.rc:2621
#, c-format
msgid "Uzbek (Latin)"
msgstr ""
-#: Merge.rc:2619
+#: Merge.rc:2622
#, c-format
msgid "Uzbek (Cyrillic)"
msgstr ""
-#: Merge.rc:2620
+#: Merge.rc:2623
#, c-format
msgid "Vietnamese"
msgstr ""
-#: Merge.rc:2626
+#: Merge.rc:2629
#, c-format
msgid "Western European"
msgstr ""
-#: Merge.rc:2627
+#: Merge.rc:2630
#, c-format
msgid "Eastern European"
msgstr ""
-#: Merge.rc:2628
+#: Merge.rc:2631
#, c-format
msgid "East Asian"
msgstr ""
-#: Merge.rc:2629
+#: Merge.rc:2632
#, c-format
msgid "SE & SW Asian"
msgstr ""
-#: Merge.rc:2630
+#: Merge.rc:2633
#, c-format
msgid "Middle Eastern"
msgstr ""
-#: Merge.rc:2631
-#: Merge.rc:2641
+#: Merge.rc:2634
+#: Merge.rc:2644
#, c-format
msgid "Not applicable"
msgstr ""
-#: Merge.rc:2637
+#: Merge.rc:2640
#, c-format
msgid "MS-Windows"
msgstr ""
-#: Merge.rc:2638
+#: Merge.rc:2641
#, c-format
msgid "MS-DOS"
msgstr ""
-#: Merge.rc:2639
+#: Merge.rc:2642
#, c-format
msgid "Macintosh"
msgstr ""
-#: Merge.rc:2640
+#: Merge.rc:2643
#, c-format
msgid "IBM"
msgstr ""
-#: Merge.rc:2647
+#: Merge.rc:2650
#, c-format
msgid "EBCDIC"
msgstr ""
-#: Merge.rc:2648
+#: Merge.rc:2651
#, c-format
msgid "IBM EBCDIC Cyrillic"
msgstr ""
-#: Merge.rc:2654
+#: Merge.rc:2657
#, c-format
msgid "MS-DOS Latin US"
msgstr ""
-#: Merge.rc:2655
+#: Merge.rc:2658
#, c-format
msgid "MS-DOS Arabic"
msgstr ""
-#: Merge.rc:2656
+#: Merge.rc:2659
#, c-format
msgid "MS-DOS Greek"
msgstr ""
-#: Merge.rc:2657
+#: Merge.rc:2660
#, c-format
msgid "MS-DOS Baltic Rim"
msgstr ""
-#: Merge.rc:2658
+#: Merge.rc:2661
#, c-format
msgid "MS-DOS Latin 1"
msgstr ""
-#: Merge.rc:2659
+#: Merge.rc:2662
#, c-format
msgid "MS-DOS Greek 1"
msgstr ""
-#: Merge.rc:2660
+#: Merge.rc:2663
#, c-format
msgid "MS-DOS Latin 2"
msgstr ""
-#: Merge.rc:2661
+#: Merge.rc:2664
#, c-format
msgid "MS-DOS Cyrillic"
msgstr ""
-#: Merge.rc:2662
+#: Merge.rc:2665
#, c-format
msgid "MS-DOS Turkish"
msgstr ""
-#: Merge.rc:2663
+#: Merge.rc:2666
#, c-format
msgid "MS-DOS Portuguese"
msgstr ""
-#: Merge.rc:2669
+#: Merge.rc:2672
#, c-format
msgid "MS-DOS Icelandic"
msgstr ""
-#: Merge.rc:2670
+#: Merge.rc:2673
#, c-format
msgid "MS-DOS Hebrew"
msgstr ""
-#: Merge.rc:2671
+#: Merge.rc:2674
#, c-format
msgid "MS-DOS French Canada"
msgstr ""
-#: Merge.rc:2672
+#: Merge.rc:2675
#, c-format
msgid "MS-DOS Nordic"
msgstr ""
-#: Merge.rc:2673
+#: Merge.rc:2676
#, c-format
msgid "MS-DOS Cyrillic CIS 1"
msgstr ""
-#: Merge.rc:2674
+#: Merge.rc:2677
#, c-format
msgid "MS-DOS Greek 2"
msgstr ""
-#: Merge.rc:2680
+#: Merge.rc:2683
#, c-format
msgid "Windows Thai"
msgstr ""
-#: Merge.rc:2681
+#: Merge.rc:2684
#, c-format
msgid "Windows Japanese"
msgstr ""
-#: Merge.rc:2682
+#: Merge.rc:2685
#, c-format
msgid "Windows Simplified Chinese"
msgstr ""
-#: Merge.rc:2683
+#: Merge.rc:2686
#, c-format
msgid "Windows Korean"
msgstr ""
-#: Merge.rc:2684
+#: Merge.rc:2687
#, c-format
msgid "Windows Traditional Chinese"
msgstr ""
-#: Merge.rc:2685
+#: Merge.rc:2688
#, c-format
msgid "Windows Latin 2"
msgstr ""
-#: Merge.rc:2686
+#: Merge.rc:2689
#, c-format
msgid "Windows Cyrillic (Slavic)"
msgstr ""
-#: Merge.rc:2687
+#: Merge.rc:2690
#, c-format
msgid "Windows Latin 1"
msgstr ""
-#: Merge.rc:2688
+#: Merge.rc:2691
#, c-format
msgid "Windows Greek"
msgstr ""
-#: Merge.rc:2689
+#: Merge.rc:2692
#, c-format
msgid "Windows Latin 5 (Turkish)"
msgstr ""
-#: Merge.rc:2690
+#: Merge.rc:2693
#, c-format
msgid "Windows Hebrew"
msgstr ""
-#: Merge.rc:2691
+#: Merge.rc:2694
#, c-format
msgid "Windows Arabic"
msgstr ""
-#: Merge.rc:2692
+#: Merge.rc:2695
#, c-format
msgid "Windows Baltic Rim"
msgstr ""
-#: Merge.rc:2693
+#: Merge.rc:2696
#, c-format
msgid "Windows Vietnamese"
msgstr ""
-#: Merge.rc:2699
+#: Merge.rc:2702
#, c-format
msgid "Macintosh Roman"
msgstr ""
-#: Merge.rc:2700
+#: Merge.rc:2703
#, c-format
msgid "Macintosh Greek"
msgstr ""
-#: Merge.rc:2701
+#: Merge.rc:2704
#, c-format
msgid "Macintosh Cyrillic"
msgstr ""
-#: Merge.rc:2702
+#: Merge.rc:2705
#, c-format
msgid "Macintosh "
msgstr ""
-#: Merge.rc:2703
+#: Merge.rc:2706
#, c-format
msgid "Macintosh Central Europe"
msgstr ""
-#: Merge.rc:2704
+#: Merge.rc:2707
#, c-format
msgid "Macintosh Turkish"
msgstr ""
-#: Merge.rc:2713
+#: Merge.rc:2716
#, c-format
msgid "Approximates ISO-8859-2"
msgstr ""
-#: Merge.rc:2716
+#: Merge.rc:2719
#, c-format
msgid "Approximates ISO-8859-1"
msgstr ""
-#: Merge.rc:2717
+#: Merge.rc:2720
#, c-format
msgid "Approximates ISO-8859-7"
msgstr ""
-#: Merge.rc:2718
+#: Merge.rc:2721
#, c-format
msgid "Approximates ISO-8859-9"
msgstr ""
-#: Merge.rc:2719
+#: Merge.rc:2722
#, c-format
msgid "Approximates ISO-8859-8"
msgstr ""
-#: Merge.rc:2725
+#: Merge.rc:2728
#, c-format
msgid "Win"
msgstr ""
-#: Merge.rc:2726
+#: Merge.rc:2729
#, c-format
msgid "Mac"
msgstr ""
-#: Merge.rc:2727
+#: Merge.rc:2730
#, c-format
msgid "Unix"
msgstr ""
-#: Merge.rc:2728
+#: Merge.rc:2731
#, c-format
msgid "Mixed"
msgstr ""
-#: Merge.rc:2735
+#: Merge.rc:2738
#, c-format
msgid " B"
msgstr ""
-#: Merge.rc:2736
+#: Merge.rc:2739
#, c-format
msgid " KB"
msgstr ""
-#: Merge.rc:2737
+#: Merge.rc:2740
#, c-format
msgid " MB"
msgstr ""
-#: Merge.rc:2738
+#: Merge.rc:2741
#, c-format
msgid " GB"
msgstr ""
-#: Merge.rc:2739
+#: Merge.rc:2742
#, c-format
msgid " TB"
msgstr ""
-#: Merge.rc:2740
+#: Merge.rc:2743
#, c-format
msgid " PB"
msgstr ""
-#: Merge.rc:2747
+#: Merge.rc:2750
#, c-format
msgid "Save the left file"
msgstr ""
-#: Merge.rc:2748
+#: Merge.rc:2751
#, c-format
msgid "Save the right file"
msgstr ""
-#: Merge.rc:2749
+#: Merge.rc:2752
#, c-format
msgid "Save the left file with name..."
msgstr ""
-#: Merge.rc:2750
+#: Merge.rc:2753
#, c-format
msgid "Save the right file with name..."
msgstr ""
-#: Merge.rc:2751
+#: Merge.rc:2754
#, c-format
msgid "Change left file/dir read-only status"
msgstr ""
-#: Merge.rc:2752
+#: Merge.rc:2755
#, c-format
msgid "Change right file/dir read-only status"
msgstr ""
-#: Merge.rc:2753
+#: Merge.rc:2756
#, c-format
msgid "Convert EOL to DOS mode"
msgstr ""
-#: Merge.rc:2754
+#: Merge.rc:2757
#, c-format
msgid "Convert EOL to UNIX mode"
msgstr ""
-#: Merge.rc:2755
+#: Merge.rc:2758
#, c-format
msgid "Convert EOL to MAC mode"
msgstr ""
-#: Merge.rc:2756
+#: Merge.rc:2759
#, c-format
msgid "Switch between editing and merging modes"
msgstr ""
-#: Merge.rc:2757
+#: Merge.rc:2760
#, c-format
msgid "View and adjust file encoding properties\nFile encoding properties"
msgstr ""
-#: Merge.rc:2758
+#: Merge.rc:2761
#, c-format
msgid "Open and resolve conflict file"
msgstr ""
-#: Merge.rc:2764
+#: Merge.rc:2767
#, c-format
msgid "Select difference area in the current line\nDifference in the Current Line"
msgstr ""
-#: Merge.rc:2765
+#: Merge.rc:2768
#, c-format
msgid "Go to line or difference\nGo to (Ctrl+G)"
msgstr ""
-#: Merge.rc:2766
+#: Merge.rc:2769
#, c-format
msgid "Set program options\nOptions"
msgstr ""
-#: Merge.rc:2767
+#: Merge.rc:2770
#, c-format
msgid "Refresh display\nRefresh (F5)"
msgstr ""
-#: Merge.rc:2768
+#: Merge.rc:2771
#, c-format
msgid "Copy selected lines to clipboard adding linenumbers to line begin"
msgstr ""
-#: Merge.rc:2769
+#: Merge.rc:2772
#, c-format
msgid "Refresh selected items"
msgstr ""
-#: Merge.rc:2770
+#: Merge.rc:2773
#, c-format
msgid "Toggle bookmark"
msgstr ""
-#: Merge.rc:2771
+#: Merge.rc:2774
#, c-format
msgid "Go to next bookmark"
msgstr ""
-#: Merge.rc:2772
+#: Merge.rc:2775
#, c-format
msgid "Go to previous bookmark"
msgstr ""
-#: Merge.rc:2773
+#: Merge.rc:2776
#, c-format
msgid "Clear all bookmarks"
msgstr ""
-#: Merge.rc:2779
+#: Merge.rc:2782
#, c-format
msgid "Displays items that are exactly the same\nShow Identical Items"
msgstr ""
-#: Merge.rc:2780
+#: Merge.rc:2783
#, c-format
msgid "Displays items that have differences\nShow Different Items"
msgstr ""
-#: Merge.rc:2781
+#: Merge.rc:2784
#, c-format
msgid "Displays items that exist in only on the left side\nShow Left Unique Items"
msgstr ""
-#: Merge.rc:2782
+#: Merge.rc:2785
#, c-format
msgid "Displays items that exist in only on the right side\nShow Right Unique Items"
msgstr ""
-#: Merge.rc:2783
+#: Merge.rc:2786
#, c-format
msgid "Displays binary files\nShow Binary Files"
msgstr ""
-#: Merge.rc:2784
+#: Merge.rc:2787
#, c-format
msgid "Displays skipped items\nShow Skipped Items"
msgstr ""
-#: Merge.rc:2790
+#: Merge.rc:2793
#, c-format
msgid "Select the font for the view\nSelect View Font"
msgstr ""
-#: Merge.rc:2791
+#: Merge.rc:2794
#, c-format
msgid "Revert to using the default system font for view\nDefault Font"
msgstr ""
-#: Merge.rc:2792
+#: Merge.rc:2795
#, c-format
msgid "Shows whitespace characters"
msgstr ""
-#: Merge.rc:2793
+#: Merge.rc:2796
#, c-format
msgid "Toggle Diff Pane"
msgstr ""
-#: Merge.rc:2794
+#: Merge.rc:2797
#, c-format
msgid "Location pane shows overall picture from files"
msgstr ""
-#: Merge.rc:2795
+#: Merge.rc:2798
#, c-format
msgid "Show folder compare statistics dialog"
msgstr ""
-#: Merge.rc:2796
+#: Merge.rc:2799
#, c-format
msgid "Select the current user interfacce language\nLanguage"
msgstr ""
-#: Merge.rc:2797
+#: Merge.rc:2800
#, c-format
msgid "Shows differences inside lines with different color\nShow Line Diff"
msgstr ""
-#: Merge.rc:2798
+#: Merge.rc:2801
#, c-format
msgid "Swap the positions of the two panes"
msgstr ""
-#: Merge.rc:2799
+#: Merge.rc:2802
#, c-format
msgid "Shows line numbers\nShow Line Numbers"
msgstr ""
-#: Merge.rc:2800
+#: Merge.rc:2803
#, c-format
msgid "Enable word wrap\nWrap Lines"
msgstr ""
-#: Merge.rc:2801
+#: Merge.rc:2804
#, c-format
msgid "Shows selection margins for both panes\nShow Selection Margins"
msgstr ""
-#: Merge.rc:2802
+#: Merge.rc:2805
#, c-format
msgid "Increase text size"
msgstr ""
-#: Merge.rc:2803
+#: Merge.rc:2806
#, c-format
msgid "Decrease text size"
msgstr ""
-#: Merge.rc:2809
+#: Merge.rc:2812
#, c-format
msgid "Scroll to the previous difference\nPrev Diff (Alt+Up)"
msgstr ""
-#: Merge.rc:2810
+#: Merge.rc:2813
#, c-format
msgid "Scroll to the next difference\nNext Diff (Alt+Down)"
msgstr ""
-#: Merge.rc:2811
+#: Merge.rc:2814
#, c-format
msgid "Scroll to the first difference\nFirst Diff (Alt+Home)"
msgstr ""
-#: Merge.rc:2812
+#: Merge.rc:2815
#, c-format
msgid "Scroll to the current difference\nCurrent Diff (Alt+Enter)"
msgstr ""
-#: Merge.rc:2813
+#: Merge.rc:2816
#, c-format
msgid "Scroll to the last difference\nLast Diff (Alt+End)"
msgstr ""
-#: Merge.rc:2814
+#: Merge.rc:2817
#, c-format
msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)"
msgstr ""
-#: Merge.rc:2815
+#: Merge.rc:2818
#, c-format
msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)"
msgstr ""
-#: Merge.rc:2816
+#: Merge.rc:2819
#, c-format
msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)"
msgstr ""
-#: Merge.rc:2817
+#: Merge.rc:2820
#, c-format
msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
msgstr ""
-#: Merge.rc:2818
+#: Merge.rc:2821
#, c-format
msgid "Copy all differences to the right file\nAll Right"
msgstr ""
-#: Merge.rc:2819
+#: Merge.rc:2822
#, c-format
msgid "Copy all differences to the left file\nAll Left"
msgstr ""
-#: Merge.rc:2820
+#: Merge.rc:2823
#, c-format
msgid "Delete selected items from both directories"
msgstr ""
-#: Merge.rc:2821
+#: Merge.rc:2824
#, c-format
msgid "Compare selected item (compare first item if multiple items selected)"
msgstr ""
-#: Merge.rc:2827
+#: Merge.rc:2830
#, c-format
msgid "Select and reorder directory compare columns"
msgstr ""
-#: Merge.rc:2828
+#: Merge.rc:2831
#, c-format
msgid "Generate a patch-file"
msgstr ""
-#: Merge.rc:2829
+#: Merge.rc:2832
#, c-format
msgid "Select and modify filters"
msgstr ""
-#: Merge.rc:2830
+#: Merge.rc:2833
#, c-format
msgid "Generates a report from compare results"
msgstr ""
-#: Merge.rc:2836
+#: Merge.rc:2839
#, c-format
msgid "The user selects the unpacker (no unpacking when comparing dir)"
msgstr ""
-#: Merge.rc:2837
+#: Merge.rc:2840
#, c-format
msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
msgstr ""
-#: Merge.rc:2838
+#: Merge.rc:2841
#, c-format
msgid "Select an unpacker to edit this file"
msgstr ""
-#: Merge.rc:2839
+#: Merge.rc:2842
#, c-format
msgid "No prediffer (normal)"
msgstr ""
-#: Merge.rc:2840
+#: Merge.rc:2843
#, c-format
msgid "Suggested plugins"
msgstr ""
-#: Merge.rc:2841
+#: Merge.rc:2844
#, c-format
msgid "Other plugins"
msgstr ""
-#: Merge.rc:2842
+#: Merge.rc:2845
#, c-format
msgid "Unload all plugins and reload them (for developers)"
msgstr ""
-#: Merge.rc:2848
+#: Merge.rc:2851
#, c-format
msgid "Activates next file visible\nActive next File"
msgstr ""
-#: Merge.rc:2849
+#: Merge.rc:2852
#, c-format
msgid "Closes all open windows"
msgstr ""
-#: Merge.rc:2855
+#: Merge.rc:2858
#, c-format
msgid "Displays the WinMerge User's Guide\nHelp"
msgstr ""
-#: Merge.rc:2856
+#: Merge.rc:2859
#, c-format
msgid "Outputs current WinMerge version info and configuration to text file"
msgstr ""
-#: Merge.rc:2857
+#: Merge.rc:2860
#, c-format
msgid "Display the GNU public license"
msgstr ""
-#: Merge.rc:2858
+#: Merge.rc:2861
#, c-format
msgid "Private Build: %1"
msgstr ""
-#: Merge.rc:2859
+#: Merge.rc:2862
#, c-format
msgid "Opens WinMerge Help Index\nHelp Index"
msgstr ""
-#: Merge.rc:2860
+#: Merge.rc:2863
#, c-format
msgid "Opens WinMerge Help Search\nHelp Search"
msgstr ""
-#: Merge.rc:2861
+#: Merge.rc:2864
#, c-format
msgid "Opens the release notes document\nRelease Notes"
msgstr ""
-#: Merge.rc:2867
+#: Merge.rc:2865
+#, c-format
+msgid "Opens the translations website\nTranslations"
+msgstr ""
+
+#: Merge.rc:2871
#, c-format
msgid "Plugin Settings"
msgstr ""
-#: Merge.rc:2868
+#: Merge.rc:2872
#, c-format
msgid "No prediffer"
msgstr ""
-#: Merge.rc:2869
+#: Merge.rc:2873
#, c-format
msgid "Prediff if possible"
msgstr ""
-#: Merge.rc:2871
+#: Merge.rc:2875
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr ""
-#: Merge.rc:2872
+#: Merge.rc:2876
#, c-format
msgid "<None>"
msgstr ""
-#: Merge.rc:2873
+#: Merge.rc:2877
#, c-format
msgid "<Automatic>"
msgstr ""
-#: Merge.rc:2879
+#: Merge.rc:2883
#, c-format
msgid "Open the file with registered application"
msgstr ""
-#: Merge.rc:2880
+#: Merge.rc:2884
#, c-format
msgid "Open the file with external editor"
msgstr ""
-#: Merge.rc:2881
+#: Merge.rc:2885
#, c-format
msgid "Open the file with a particular program"
msgstr ""
-#: Merge.rc:2887
+#: Merge.rc:2891
#, c-format
msgid "Do not display moved blocks"
msgstr ""
-#: Merge.rc:2888
+#: Merge.rc:2892
#, c-format
msgid "Display all moved blacks"
msgstr ""
-#: Merge.rc:2889
+#: Merge.rc:2893
#, c-format
msgid "Display moved blocks only from current diff"
msgstr ""
-#: Merge.rc:2890
+#: Merge.rc:2894
#, c-format
msgid "Go to diff under cursor"
msgstr ""
-#: Merge.rc:2891
+#: Merge.rc:2895
#, c-format
msgid "G&oto Diff %1 of %2"
msgstr ""
-#: Merge.rc:2892
+#: Merge.rc:2896
#, c-format
msgid "G&oto Line %1"
msgstr ""
-#: Merge.rc:2898
+#: Merge.rc:2902
#, c-format
msgid "Disabled"
msgstr ""
-#: Merge.rc:2899
+#: Merge.rc:2903
#, c-format
msgid "From file system"
msgstr ""
-#: Merge.rc:2900
+#: Merge.rc:2904
#, c-format
msgid "From MRU list"
msgstr ""
-#: Merge.rc:2907
+#: Merge.rc:2911
#, c-format
msgid "ASP"
msgstr ""
-#: Merge.rc:2908
+#: Merge.rc:2912
#, c-format
msgid "Basic"
msgstr ""
-#: Merge.rc:2909
+#: Merge.rc:2913
#, c-format
msgid "Batch"
msgstr ""
-#: Merge.rc:2910
+#: Merge.rc:2914
#, c-format
msgid "C/C++"
msgstr ""
-#: Merge.rc:2911
+#: Merge.rc:2915
#, c-format
msgid "C#"
msgstr ""
-#: Merge.rc:2912
+#: Merge.rc:2916
#, c-format
msgid "CSS"
msgstr ""
-#: Merge.rc:2913
+#: Merge.rc:2917
#, c-format
msgid "DCL"
msgstr ""
-#: Merge.rc:2914
+#: Merge.rc:2918
#, c-format
msgid "Fortran"
msgstr ""
-#: Merge.rc:2915
+#: Merge.rc:2919
#, c-format
msgid "HTML"
msgstr ""
-#: Merge.rc:2916
+#: Merge.rc:2920
#, c-format
msgid "INI"
msgstr ""
-#: Merge.rc:2917
+#: Merge.rc:2921
#, c-format
msgid "InnoSetup"
msgstr ""
-#: Merge.rc:2918
+#: Merge.rc:2922
#, c-format
msgid "InstallShield"
msgstr ""
-#: Merge.rc:2919
+#: Merge.rc:2923
#, c-format
msgid "Java"
msgstr ""
-#: Merge.rc:2920
+#: Merge.rc:2924
#, c-format
msgid "AutoLISP"
msgstr ""
-#: Merge.rc:2921
+#: Merge.rc:2925
#, c-format
msgid "NSIS"
msgstr ""
-#: Merge.rc:2922
+#: Merge.rc:2926
#, c-format
msgid "Pascal"
msgstr ""
-#: Merge.rc:2923
+#: Merge.rc:2927
#, c-format
msgid "Perl"
msgstr ""
-#: Merge.rc:2924
+#: Merge.rc:2928
#, c-format
msgid "PHP"
msgstr ""
-#: Merge.rc:2925
+#: Merge.rc:2929
#, c-format
msgid "Portable Object"
msgstr ""
-#: Merge.rc:2926
+#: Merge.rc:2930
#, c-format
msgid "PowerShell"
msgstr ""
-#: Merge.rc:2927
+#: Merge.rc:2931
#, c-format
msgid "Python"
msgstr ""
-#: Merge.rc:2928
+#: Merge.rc:2932
#, c-format
msgid "REXX"
msgstr ""
-#: Merge.rc:2929
+#: Merge.rc:2933
#, c-format
msgid "Resources"
msgstr ""
-#: Merge.rc:2930
+#: Merge.rc:2934
#, c-format
msgid "Ruby"
msgstr ""
-#: Merge.rc:2931
+#: Merge.rc:2935
#, c-format
msgid "SGML"
msgstr ""
-#: Merge.rc:2932
+#: Merge.rc:2936
#, c-format
msgid "Shell"
msgstr ""
-#: Merge.rc:2933
+#: Merge.rc:2937
#, c-format
msgid "SIOD"
msgstr ""
-#: Merge.rc:2934
+#: Merge.rc:2938
#, c-format
msgid "SQL"
msgstr ""
-#: Merge.rc:2935
+#: Merge.rc:2939
#, c-format
msgid "TCL"
msgstr ""
-#: Merge.rc:2936
+#: Merge.rc:2940
#, c-format
msgid "TEX"
msgstr ""
-#: Merge.rc:2937
+#: Merge.rc:2941
#, c-format
msgid "XML"
msgstr ""
-#: Merge.rc:2942
+#: Merge.rc:2946
#, c-format
msgid "Hide the toolbar"
msgstr ""
-#: Merge.rc:2943
+#: Merge.rc:2947
#, c-format
msgid "Show small toolbar"
msgstr ""
-#: Merge.rc:2944
+#: Merge.rc:2948
#, c-format
msgid "Show big toolbar"
msgstr ""
OSDN Git Service
