Revision: 7526
http://winmerge.svn.sourceforge.net/winmerge/?rev=7526&view=rev
Author: sdottaka
Date: 2011-05-22 15:10:48 +0000 (Sun, 22 May 2011)
Log Message:
-----------
Japanese translation - update
Modified Paths:
--------------
branches/R2_14/Src/Languages/Japanese.po
Modified: branches/R2_14/Src/Languages/Japanese.po
===================================================================
--- branches/R2_14/Src/Languages/Japanese.po 2011-05-22 15:09:36 UTC (rev 7525)
+++ branches/R2_14/Src/Languages/Japanese.po 2011-05-22 15:10:48 UTC (rev 7526)
@@ -12,7 +12,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-02-16 23:03+0900\n"
+"PO-Revision-Date: 2011-05-23 00:06+0900\n"
"Last-Translator: Takashi Sawanaka <sawanaka at d1.dion.ne.jp>\n"
"Language-Team: Japanese <winmerge-translate@..."
"MIME-Version: 1.0\n"
@@ -71,7 +71,7 @@
#: Merge.rc:81
#: Merge.rc:103
-#: Merge.rc:508
+#: Merge.rc:512
#, c-format
msgid "&Copy"
msgstr "\x83R\x83s\x81[(&C)"
@@ -83,7 +83,7 @@
msgstr "\x93\\x82\xE8\x95t\x82\xAF(&P)"
#: Merge.rc:84
-#: Merge.rc:589
+#: Merge.rc:593
#, c-format
msgid "&Goto..."
msgstr "\x88ړ\xAE(&G)..."
@@ -94,64 +94,64 @@
msgstr "\x8AJ\x82\xAD(&E)"
#: Merge.rc:88
-#: Merge.rc:531
-#: Merge.rc:537
+#: Merge.rc:535
+#: Merge.rc:541
#, c-format
msgid "with &Registered Application"
msgstr "\x93o\x98^\x82\xB3\x82ꂽ\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82\xC5(&R)"
#: Merge.rc:89
-#: Merge.rc:532
-#: Merge.rc:538
+#: Merge.rc:536
+#: Merge.rc:542
#, c-format
msgid "with &External Editor"
msgstr "\x8AO\x95\x94\x83G\x83f\x83B\x83^\x82\xC5(&E)"
#: Merge.rc:90
-#: Merge.rc:533
-#: Merge.rc:539
+#: Merge.rc:537
+#: Merge.rc:543
#, c-format
msgid "&with..."
msgstr "\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82̑I\x91\xF0(&W)..."
#: Merge.rc:110
-#: Merge.rc:191
-#: Merge.rc:312
+#: Merge.rc:194
+#: Merge.rc:315
#, c-format
msgid "&File"
msgstr "\x83t\x83@...)"
#: Merge.rc:112
-#: Merge.rc:193
-#: Merge.rc:314
+#: Merge.rc:196
+#: Merge.rc:317
#, c-format
msgid "&New\tCtrl+N"
msgstr "\x90V\x8BK\x8D쐬(&N)\tCtrl+N"
#: Merge.rc:113
-#: Merge.rc:194
-#: Merge.rc:315
+#: Merge.rc:197
+#: Merge.rc:318
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "\x8AJ\x82\xAD(&O)...\tCtrl+O"
#: Merge.rc:114
-#: Merge.rc:195
-#: Merge.rc:316
+#: Merge.rc:198
+#: Merge.rc:319
#, c-format
msgid "Op&en Conflict File..."
msgstr "\x83R\x83\x93\x83t\x83\x8A\x83N\x83g\x83t\x83@...)..."
#: Merge.rc:116
-#: Merge.rc:197
-#: Merge.rc:318
+#: Merge.rc:200
+#: Merge.rc:321
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "\x83v\x83\x8D\x83W\x83F\x83N\x83g\x82\xF0\x8AJ\x82\xAD(&J)...\tCtrl+J"
#: Merge.rc:117
-#: Merge.rc:198
-#: Merge.rc:319
+#: Merge.rc:201
+#: Merge.rc:322
#, c-format
msgid "Sa&ve Project..."
msgstr "\x83v\x83\x8D\x83W\x83F\x83N\x83g\x82\xF0\x95ۑ\xB6(&V)..."
@@ -162,1667 +162,1680 @@
msgstr "\x8Dŋߎg\x97p\x82\xB5\x82\xBD\x83v\x83\x8D\x83W\x83F\x83N\x83g"
#: Merge.rc:121
-#: Merge.rc:205
-#: Merge.rc:351
+#: Merge.rc:208
+#: Merge.rc:354
#, c-format
msgid "E&xit"
msgstr "\x8FI\x97\xB9(&X)"
#: Merge.rc:123
-#: Merge.rc:207
-#: Merge.rc:353
+#: Merge.rc:210
+#: Merge.rc:356
#, c-format
msgid "&Edit"
msgstr "\x95ҏW(&E)"
#: Merge.rc:125
-#: Merge.rc:211
-#: Merge.rc:387
+#: Merge.rc:214
+#: Merge.rc:390
#, c-format
msgid "&Options..."
msgstr "\x90ݒ\xE8(&O)..."
#: Merge.rc:127
-#: Merge.rc:213
-#: Merge.rc:389
+#: Merge.rc:216
+#: Merge.rc:392
#, c-format
msgid "&View"
msgstr "\x95\\x8E\xA6(&V)"
#: Merge.rc:129
-#: Merge.rc:228
-#: Merge.rc:391
+#: Merge.rc:231
+#: Merge.rc:394
#, c-format
msgid "Select &Font..."
msgstr "\x83t\x83H\x83\x93\x83g\x91I\x91\xF0(&F)..."
#: Merge.rc:130
-#: Merge.rc:229
-#: Merge.rc:392
+#: Merge.rc:232
+#: Merge.rc:395
#, c-format
msgid "Use Default F&ont"
msgstr "\x83f\x83t\x83H\x83\x8B\x83g\x83t\x83H\x83\x93\x83g\x82\xF0\x8Eg\x97p(&O)"
#: Merge.rc:132
-#: Merge.rc:231
-#: Merge.rc:413
+#: Merge.rc:234
+#: Merge.rc:416
#, c-format
msgid "&Toolbar"
msgstr "\x83c\x81[\x83\x8B\x83o\x81[(&T)"
#: Merge.rc:134
-#: Merge.rc:233
-#: Merge.rc:415
+#: Merge.rc:236
+#: Merge.rc:418
#, c-format
msgid "&None"
msgstr "\x82Ȃ\xB5(&N)"
#: Merge.rc:135
-#: Merge.rc:234
-#: Merge.rc:416
+#: Merge.rc:237
+#: Merge.rc:419
#, c-format
msgid "&Small"
msgstr "\x8F\xAC(&S)"
#: Merge.rc:136
-#: Merge.rc:235
-#: Merge.rc:417
+#: Merge.rc:238
+#: Merge.rc:420
#, c-format
msgid "&Big"
msgstr "\x91\xE5(&B)"
#: Merge.rc:138
-#: Merge.rc:237
-#: Merge.rc:419
+#: Merge.rc:240
+#: Merge.rc:422
#, c-format
msgid "&Status Bar"
msgstr "\x83X\x83e\x81[\x83^\x83X\x83o\x81[(&S)"
#: Merge.rc:139
-#: Merge.rc:238
-#: Merge.rc:420
+#: Merge.rc:241
+#: Merge.rc:423
#, c-format
msgid "Ta&b Bar"
msgstr "\x83^\x83u\x83o\x81[(&B)"
#: Merge.rc:141
-#: Merge.rc:241
-#: Merge.rc:424
+#: Merge.rc:244
+#: Merge.rc:427
#, c-format
msgid "&Language..."
msgstr "\x8C\xBE\x8C\xEA(&L)..."
#: Merge.rc:143
-#: Merge.rc:262
-#: Merge.rc:446
+#: Merge.rc:265
+#: Merge.rc:449
#, c-format
msgid "&Tools"
msgstr "\x83c\x81[\x83\x8B(&T)"
#: Merge.rc:145
-#: Merge.rc:265
-#: Merge.rc:448
+#: Merge.rc:268
+#: Merge.rc:451
#, c-format
msgid "&Filters..."
msgstr "\x83t\x83B\x83\x8B\x83^(&F)..."
#: Merge.rc:146
-#: Merge.rc:266
-#: Merge.rc:449
+#: Merge.rc:269
+#: Merge.rc:452
#, c-format
msgid "&Generate Patch..."
msgstr "\x83p\x83b\x83`\x82̐\xB6\x90\xAC(&G)..."
#: Merge.rc:148
-#: Merge.rc:269
-#: Merge.rc:452
+#: Merge.rc:272
+#: Merge.rc:455
#, c-format
msgid "&Plugins"
msgstr "\x83v\x83\x89\x83O\x83C\x83\x93(&P)"
#: Merge.rc:150
-#: Merge.rc:271
-#: Merge.rc:454
+#: Merge.rc:274
+#: Merge.rc:457
#, c-format
msgid "&List..."
msgstr "\x83\x8A\x83X\x83g(&L)..."
#: Merge.rc:152
-#: Merge.rc:273
-#: Merge.rc:456
#, c-format
-msgid "&Manual Unpacking"
-msgstr "\x8E蓮\x93W\x8AJ"
+msgid "Ma&nual Prediffer"
+msgstr "\x8E蓮\x94\xE4\x8Ar\x91O\x8F\x88\x97\x9D(&N)"
#: Merge.rc:153
-#: Merge.rc:274
-#: Merge.rc:457
#, c-format
-msgid "&Automatic Unpacking"
-msgstr "\x8E\xA9\x93\xAE\x93W\x8AJ"
+msgid "A&utomatic Prediffer"
+msgstr "\x8E\xA9\x93\xAE\x94\xE4\x8Ar\x91O\x8F\x88\x97\x9D(&U)"
#: Merge.rc:155
#: Merge.rc:276
#: Merge.rc:459
#, c-format
+msgid "&Manual Unpacking"
+msgstr "\x8E蓮\x93W\x8AJ"
+
+#: Merge.rc:156
+#: Merge.rc:277
+#: Merge.rc:460
+#, c-format
+msgid "&Automatic Unpacking"
+msgstr "\x8E\xA9\x93\xAE\x93W\x8AJ"
+
+#: Merge.rc:158
+#: Merge.rc:279
+#: Merge.rc:462
+#, c-format
msgid "&Edit with Unpacker"
msgstr "\x93W\x8AJ\x83v\x83\x89\x83O\x83C\x83\x93\x82ŊJ\x82\xAD"
-#: Merge.rc:157
-#: Merge.rc:278
-#: Merge.rc:466
+#: Merge.rc:160
+#: Merge.rc:281
+#: Merge.rc:469
#, c-format
msgid "&Reload plugins"
msgstr "\x83v\x83\x89\x83O\x83C\x83\x93\x82̍ēǍ\x9E\x82\xDD(&R)"
-#: Merge.rc:159
-#: Merge.rc:280
-#: Merge.rc:468
+#: Merge.rc:162
+#: Merge.rc:283
+#: Merge.rc:471
#, c-format
msgid "&Debug"
msgstr "\x83f\x83o\x83b\x83O(&D)"
-#: Merge.rc:161
-#: Merge.rc:282
-#: Merge.rc:470
+#: Merge.rc:164
+#: Merge.rc:285
+#: Merge.rc:473
#, c-format
msgid "&Load Config..."
msgstr "\x83R\x83\x93\x83t\x83B\x83O\x83t\x83@...)..."
-#: Merge.rc:162
-#: Merge.rc:283
-#: Merge.rc:471
+#: Merge.rc:165
+#: Merge.rc:286
+#: Merge.rc:474
#, c-format
msgid "&Reset Options"
msgstr "\x90ݒ\xE8\x82̃\x8A\x83Z\x83b\x83g(&R)"
-#: Merge.rc:164
-#: Merge.rc:285
-#: Merge.rc:473
+#: Merge.rc:167
+#: Merge.rc:288
+#: Merge.rc:476
#, c-format
msgid "&Window"
msgstr "\x83E\x83B\x83\x93\x83h\x83E(&W)"
-#: Merge.rc:166
-#: Merge.rc:287
-#: Merge.rc:475
+#: Merge.rc:169
+#: Merge.rc:290
+#: Merge.rc:478
#, c-format
msgid "Cl&ose"
msgstr "\x95\xB6\x82\xE9(&O)\tCtrl+W"
-#: Merge.rc:167
-#: Merge.rc:288
-#: Merge.rc:476
+#: Merge.rc:170
+#: Merge.rc:291
+#: Merge.rc:479
#, c-format
msgid "Clo&se All"
msgstr "\x91S\x82ĕ\xB6\x82\xE9(&S)"
-#: Merge.rc:169
-#: Merge.rc:290
-#: Merge.rc:478
+#: Merge.rc:172
+#: Merge.rc:293
+#: Merge.rc:481
#, c-format
msgid "Change &Pane\tF6"
msgstr "\x83y\x83C\x83\x93\x82\xF0\x95ύX\x82\xB7\x82\xE9(&P)\tF6"
-#: Merge.rc:171
-#: Merge.rc:292
-#: Merge.rc:480
+#: Merge.rc:174
+#: Merge.rc:295
+#: Merge.rc:483
#, c-format
msgid "Tile &Horizontally"
msgstr "\x8F㉺\x82ɕ\xC0\x82ׂĕ\\x8E\xA6(&H)"
-#: Merge.rc:172
-#: Merge.rc:293
-#: Merge.rc:481
+#: Merge.rc:175
+#: Merge.rc:296
+#: Merge.rc:484
#, c-format
msgid "Tile &Vertically"
msgstr "\x8D\xB6\x89E\x82ɕ\xC0\x82ׂĕ\\x8E\xA6(&V)"
-#: Merge.rc:173
-#: Merge.rc:294
-#: Merge.rc:482
+#: Merge.rc:176
+#: Merge.rc:297
+#: Merge.rc:485
#, c-format
msgid "&Cascade"
msgstr "\x8Fd\x82˂ĕ\\x8E\xA6(&C)"
-#: Merge.rc:175
-#: Merge.rc:296
-#: Merge.rc:484
-#: Merge.rc:1933
+#: Merge.rc:178
+#: Merge.rc:299
+#: Merge.rc:487
+#: Merge.rc:1935
#, c-format
msgid "&Help"
msgstr "\x83w\x83\x8B\x83v(&H)"
-#: Merge.rc:177
-#: Merge.rc:298
-#: Merge.rc:486
+#: Merge.rc:180
+#: Merge.rc:301
+#: Merge.rc:489
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "&WinMerge \x83w\x83\x8B\x83v\tF1"
-#: Merge.rc:179
-#: Merge.rc:300
-#: Merge.rc:488
+#: Merge.rc:182
+#: Merge.rc:303
+#: Merge.rc:491
#, c-format
msgid "R&elease Notes"
msgstr "\x83\x8A\x83\x8A\x81[\x83X\x83m\x81[\x83g(&E)"
-#: Merge.rc:180
-#: Merge.rc:301
-#: Merge.rc:489
+#: Merge.rc:183
+#: Merge.rc:304
+#: Merge.rc:492
#, c-format
msgid "&Translations"
msgstr "\x96|\x96\xF3(&T)"
-#: Merge.rc:181
-#: Merge.rc:302
-#: Merge.rc:490
+#: Merge.rc:184
+#: Merge.rc:305
+#: Merge.rc:493
#, c-format
msgid "C&onfiguration"
msgstr "\x90ݒ\xE8(&O)"
-#: Merge.rc:182
-#: Merge.rc:303
-#: Merge.rc:491
+#: Merge.rc:185
+#: Merge.rc:306
+#: Merge.rc:494
#, c-format
msgid "A&rchive Support disabled..."
msgstr "\x83A\x81[\x83J\x83C\x83u\x83T\x83|\x81[\x83g\x82\xAA\x96\xB3\x8C\xF8\x82ł\xB7(&R)..."
-#: Merge.rc:184
-#: Merge.rc:305
-#: Merge.rc:493
+#: Merge.rc:187
+#: Merge.rc:308
+#: Merge.rc:496
#, c-format
msgid "&GNU General Public License"
msgstr "&GNU General Public License"
-#: Merge.rc:185
-#: Merge.rc:306
-#: Merge.rc:494
+#: Merge.rc:188
+#: Merge.rc:309
+#: Merge.rc:497
#, c-format
msgid "&About WinMerge..."
msgstr "WinMerge\x82ɂ\xA2\x82\xC4(&A)..."
-#: Merge.rc:200
-#: Merge.rc:337
+#: Merge.rc:203
+#: Merge.rc:340
#, c-format
msgid "L&eft Read-only"
msgstr "\x8D\xB6\x91\xA4\x82\xF0\x93ǂݎ\xE6\x82\xE8\x90\xEA\x97p(&E)"
-#: Merge.rc:201
-#: Merge.rc:338
+#: Merge.rc:204
+#: Merge.rc:341
#, c-format
msgid "Ri&ght Read-only"
msgstr "\x89E\x91\xA4\x82\xF0\x93ǂݎ\xE6\x82\xE8\x90\xEA\x97p(&I)"
-#: Merge.rc:203
+#: Merge.rc:206
#, c-format
msgid "File En&coding"
msgstr "\x83t\x83@...)"
-#: Merge.rc:209
-#: Merge.rc:363
+#: Merge.rc:212
+#: Merge.rc:366
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "\x82\xB7\x82ׂđI\x91\xF0(&A)\tCtrl+A"
-#: Merge.rc:215
+#: Merge.rc:218
#, c-format
msgid "Show &Identical Items"
msgstr "\x93\xAF\x88ꍀ\x96ڂ̕\\x8E\xA6(&I)"
-#: Merge.rc:216
+#: Merge.rc:219
#, c-format
msgid "Show &Different Items"
msgstr "\x8D\xB7\x88ٍ\x80\x96ڂ̕\\x8E\xA6(&D)"
-#: Merge.rc:217
+#: Merge.rc:220
#, c-format
msgid "Show L&eft Unique Items"
msgstr "\x8D\xB6\x82݂̂ɑ\xB6\x8D݂\xB7\x82鍀\x96ڂ̕\\x8E\xA6(&E)"
-#: Merge.rc:218
+#: Merge.rc:221
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr "\x89E\x82݂̂ɑ\xB6\x8D݂\xB7\x82鍀\x96ڂ̕\\x8E\xA6(&G)"
-#: Merge.rc:219
+#: Merge.rc:222
#, c-format
msgid "Show S&kipped Items"
msgstr "\x83X\x83L\x83b\x83v\x82\xB3\x82ꂽ\x8D\x80\x96ڂ̕\\x8E\xA6(&K)"
-#: Merge.rc:220
+#: Merge.rc:223
#, c-format
msgid "S&how Binary Files"
msgstr "\x83o\x83C\x83i\x83\x8A\x83t\x83@...)"
-#: Merge.rc:222
+#: Merge.rc:225
#, c-format
msgid "Show Hidd&en Items"
msgstr "\x94\xF1\x95\\x8E\xA6\x82̍\x80\x96ڂ\xF0\x95\\x8E\xA6(&E)"
-#: Merge.rc:224
+#: Merge.rc:227
#, c-format
msgid "Tree &Mode"
msgstr "\x83c\x83\x8A\x81[\x95\\x8E\xA6(&M)"
-#: Merge.rc:225
+#: Merge.rc:228
#, c-format
msgid "E&xpand All Subfolders"
msgstr "\x82\xB7\x82ׂẴT\x83u\x83t\x83H\x83\x8B\x83_\x82\xF0\x93W\x8AJ\x82\xB7\x82\xE9(&X)"
-#: Merge.rc:226
+#: Merge.rc:229
#, c-format
msgid "&Collapse All Subfolders"
msgstr "\x82\xB7\x82ׂẴT\x83u\x83t\x83H\x83\x8B\x83_\x82\xF0\x90܂肽\x82\xBD\x82\xDE(&C)"
-#: Merge.rc:239
+#: Merge.rc:242
#, c-format
msgid "Compa&re Statistics"
msgstr "\x94\xE4\x8Ar\x93\x9D\x8Cv(&R)"
-#: Merge.rc:243
-#: Merge.rc:426
+#: Merge.rc:246
+#: Merge.rc:429
#, c-format
msgid "Refre&sh\tF5"
msgstr "\x8DŐV\x82̏\xEE\x95\xF1\x82ɍX\x90V(S)\tF5"
-#: Merge.rc:244
+#: Merge.rc:247
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "\x91I\x91\xF0\x8D\x80\x96ڂ\xF0\x8DŐV\x82ɍX\x90V(&R)\tCtrl+F5"
-#: Merge.rc:246
-#: Merge.rc:428
+#: Merge.rc:249
+#: Merge.rc:431
#, c-format
msgid "&Merge"
msgstr "\x83}\x81[\x83W(&M)"
-#: Merge.rc:248
+#: Merge.rc:251
#, c-format
msgid "Co&mpare\tEnter"
msgstr "\x94\xE4\x8Ar(&M)\tEnter"
-#: Merge.rc:250
-#: Merge.rc:430
+#: Merge.rc:253
+#: Merge.rc:433
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "\x8E\x9F\x82̍\xB7\x88\xD9(&N)\tAlt+Down"
-#: Merge.rc:251
-#: Merge.rc:431
+#: Merge.rc:254
+#: Merge.rc:434
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "\x91O\x82̍\xB7\x88\xD9(&P)\tAlt+Up"
-#: Merge.rc:253
-#: Merge.rc:433
+#: Merge.rc:256
+#: Merge.rc:436
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "\x8Dŏ\x89\x82̍\xB7\x88\xD9(&F)\tAlt+Home"
-#: Merge.rc:254
-#: Merge.rc:434
+#: Merge.rc:257
+#: Merge.rc:437
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "\x8C\xBB\x8D݂̍\xB7\x88\xD9(&C)\tAlt+Enter"
-#: Merge.rc:255
-#: Merge.rc:435
+#: Merge.rc:258
+#: Merge.rc:438
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "\x8DŌ\xE3\x82̍\xB7\x88\xD9(&L)\tAlt+End"
-#: Merge.rc:257
-#: Merge.rc:437
+#: Merge.rc:260
+#: Merge.rc:440
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "\x89E\x82ɃR\x83s\x81[(&R)\tAlt+Right"
-#: Merge.rc:258
-#: Merge.rc:438
+#: Merge.rc:261
+#: Merge.rc:441
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "\x8D\xB6\x82ɃR\x83s\x81[(&E)\tAlt+Left"
-#: Merge.rc:260
+#: Merge.rc:263
#, c-format
msgid "&Delete\tDel"
msgstr "\x8D폜(&D)\tDel"
-#: Merge.rc:264
-#: Merge.rc:562
+#: Merge.rc:267
+#: Merge.rc:566
#, c-format
msgid "&Customize Columns..."
msgstr "\x97\xF1\x82̐ݒ\xE8(&C)..."
-#: Merge.rc:267
-#: Merge.rc:450
+#: Merge.rc:270
+#: Merge.rc:453
#, c-format
msgid "Generate &Report..."
msgstr "\x83\x8C\x83|\x81[\x83g\x82̐\xB6\x90\xAC(&R)..."
-#: Merge.rc:321
+#: Merge.rc:324
#, c-format
msgid "&Save\tCtrl+S"
msgstr "\x95ۑ\xB6(&S)\tCtrl+S"
-#: Merge.rc:322
+#: Merge.rc:325
#, c-format
msgid "Save &Left"
msgstr "\x8D\xB6\x91\xA4\x82̃t\x83@...)"
-#: Merge.rc:324
-#: Merge.rc:329
+#: Merge.rc:327
+#: Merge.rc:332
#, c-format
msgid "&Save"
msgstr "\x95ۑ\xB6(&S)"
-#: Merge.rc:325
-#: Merge.rc:330
+#: Merge.rc:328
+#: Merge.rc:333
#, c-format
msgid "Save &As..."
msgstr "\x96\xBC\x91O\x82\xF0\x95t\x82\xAF\x82ĕۑ\xB6(&A)..."
-#: Merge.rc:327
+#: Merge.rc:330
#, c-format
msgid "Save &Right"
msgstr "\x89E\x91\xA4\x82̃t\x83@...)"
-#: Merge.rc:333
+#: Merge.rc:336
#, c-format
msgid "&Print..."
msgstr "\x88\xF3\x8D\xFC(&P)..."
-#: Merge.rc:334
+#: Merge.rc:337
#, c-format
msgid "Page Se&tup"
msgstr "\x83y\x81[\x83W\x90ݒ\xE8(&T)"
-#: Merge.rc:335
+#: Merge.rc:338
#, c-format
msgid "Print Previe&w"
msgstr "\x88\xF3\x8D\xFC\x83v\x83\x8C\x83r\x83\x85\x81[(&W)"
-#: Merge.rc:340
+#: Merge.rc:343
#, c-format
msgid "&Convert Line Endings to"
msgstr "\x89\xFC\x8Ds\x83R\x81[\x83h\x82̕ϊ\xB7(&C)"
-#: Merge.rc:342
+#: Merge.rc:345
#, c-format
msgid "&Windows (CRLF)"
msgstr "&Windows (CRLF)"
-#: Merge.rc:343
+#: Merge.rc:346
#, c-format
msgid "&Unix (LF)"
msgstr "&Unix (LF)"
-#: Merge.rc:344
+#: Merge.rc:347
#, c-format
msgid "&Mac (CR)"
msgstr "&Mac (CR)"
-#: Merge.rc:347
+#: Merge.rc:350
#, c-format
msgid "&Merge Mode\tF9"
msgstr "\x83}\x81[\x83W\x83\x82\x81[\x83h(&M)\tF9"
-#: Merge.rc:349
+#: Merge.rc:352
#, c-format
msgid "&File Encoding..."
msgstr "\x83t\x83@...)..."
-#: Merge.rc:355
+#: Merge.rc:358
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "\x8C\xB3\x82ɖ߂\xB7(&U)\tCtrl+Z"
-#: Merge.rc:356
+#: Merge.rc:359
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "\x82\xE2\x82蒼\x82\xB5(&R)\tCtrl+Y"
-#: Merge.rc:358
+#: Merge.rc:361
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "\x90\xE8\x8E\xE6\x82\xE8(&T)\tCtrl+X"
-#: Merge.rc:359
+#: Merge.rc:362
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "\x83R\x83s\x81[(&C)\tCtrl+C"
-#: Merge.rc:360
+#: Merge.rc:363
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "\x93\\x82\xE8\x95t\x82\xAF(&P)\tCtrl+V"
-#: Merge.rc:362
+#: Merge.rc:365
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "\x8Ds\x93\xE0\x82̍\xB7\x88ق\xF0\x91I\x91\xF0(&D)\tF4"
-#: Merge.rc:365
+#: Merge.rc:368
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "\x8C\x9F\x8D\xF5(&F)...\tCtrl+F"
-#: Merge.rc:366
+#: Merge.rc:369
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "\x92u\x8A\xB7(&E)...\tCtrl+H"
-#: Merge.rc:368
+#: Merge.rc:371
#, c-format
msgid "&Scripts"
msgstr "\x83X\x83N\x83\x8A\x83v\x83g(&S)"
-#: Merge.rc:370
-#: Merge.rc:2789
+#: Merge.rc:373
+#: Merge.rc:2695
#, c-format
msgid "< Empty >"
msgstr "< \x82Ȃ\xB5 >"
-#: Merge.rc:373
+#: Merge.rc:376
#, c-format
msgid "Advanced"
msgstr "\x8D\x82\x93x\x82ȑ\x80\x8D\xEC"
-#: Merge.rc:375
+#: Merge.rc:378
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "\x8Ds\x94ԍ\x86\x95t\x82\xAB\x82ŃR\x83s\x81[(&C)\tCtrl+Shift+C"
-#: Merge.rc:378
+#: Merge.rc:381
#, c-format
msgid "&Bookmarks"
msgstr "\x83u\x83b\x83N\x83}\x81[\x83N(&B)"
-#: Merge.rc:380
+#: Merge.rc:383
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "\x83u\x83b\x83N\x83}\x81[\x83N\x82̍쐬\x81E\x8D폜(&T)\tCtrl+F2"
-#: Merge.rc:381
+#: Merge.rc:384
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "\x8E\x9F\x82̃u\x83b\x83N\x83}\x81[\x83N\x82ֈړ\xAE(&N)\tF2"
-#: Merge.rc:382
+#: Merge.rc:385
#, c-format
msgid "&Previous bookmark\tShift+F2"
msgstr "\x91O\x82̃u\x83b\x83N\x83}\x81[\x83N\x82ֈړ\xAE(&P)\tShift+F2"
-#: Merge.rc:383
+#: Merge.rc:386
#, c-format
msgid "&Clear All Bookmarks"
msgstr "\x91S\x82Ẵu\x83b\x83N\x83}\x81[\x83N\x82\xF0\x83N\x83\x8A\x83A(&C)"
-#: Merge.rc:385
+#: Merge.rc:388
#, c-format
msgid "&Go To...\tCtrl+G"
msgstr "\x88ړ\xAE(&G)...\tCtrl+G"
-#: Merge.rc:393
+#: Merge.rc:396
#, c-format
msgid "&Zoom"
msgstr "\x8Ag\x91\xE5(&Z)"
-#: Merge.rc:395
+#: Merge.rc:398
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "\x83t\x83H\x83\x93\x83g\x83T\x83C\x83Y\x82\xF0\x8Ag\x91\xE5\tCtrl++"
-#: Merge.rc:396
+#: Merge.rc:399
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "\x83t\x83H\x83\x93\x83g\x83T\x83C\x83Y\x82\xF0\x8Fk\x8F\xAC\tCtrl+-"
#. Zoom to normal
-#: Merge.rc:397
+#: Merge.rc:400
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "\x83t\x83H\x83\x93\x83g\x83T\x83C\x83Y\x82\xF0\x8C\xB3\x82ɖ߂\xB7(&N)\tCtrl+*"
-#: Merge.rc:399
+#: Merge.rc:402
#, c-format
msgid "Syntax Highlight"
msgstr "\x83V\x83\x93\x83^\x83b\x83N\x83X\x83n\x83C\x83\x89\x83C\x83g"
-#: Merge.rc:404
+#: Merge.rc:407
#, c-format
msgid "&Lock Panes"
msgstr "\x83y\x83C\x83\x93\x82\xF0\x83\x8D\x83b\x83N(&L)"
-#: Merge.rc:405
+#: Merge.rc:408
#, c-format
msgid "&View Whitespace"
msgstr "\x8B\xF0\x95\\x8E\xA6(&V)"
-#: Merge.rc:406
+#: Merge.rc:409
#, c-format
msgid "Vie&w Line Differences"
msgstr "\x8Ds\x93\xE0\x82̍\xB7\x88ق\xF0\x95\\x8E\xA6(&W)"
-#: Merge.rc:407
+#: Merge.rc:410
#, c-format
msgid "View Line &Numbers"
msgstr "\x8Ds\x94ԍ\x86\x82\xF0\x95\\x8E\xA6(&N)"
-#: Merge.rc:408
+#: Merge.rc:411
#, c-format
msgid "View &Margins"
msgstr "\x83}\x81[\x83W\x83\x93\x82\xF0\x95\\x8E\xA6(&M)"
-#: Merge.rc:409
+#: Merge.rc:412
#, c-format
msgid "W&rap Lines"
msgstr "\x8Ds\x82\xF0\x89E\x92[\x82ŐܕԂ\xB7(&R)"
-#: Merge.rc:411
+#: Merge.rc:414
#, c-format
msgid "Sw&ap Panes"
msgstr "\x83y\x83C\x83\x93\x82̌\xF0\x8A\xB7(&A)"
-#: Merge.rc:421
+#: Merge.rc:424
#, c-format
msgid "Diff &Pane"
msgstr "Diff\x83y\x83C\x83\x93(&P)"
-#: Merge.rc:422
+#: Merge.rc:425
#, c-format
msgid "Lo&cation Pane"
msgstr "\x83\x8D\x83P\x81[\x83V\x83\x87\x83\x93\x83y\x83C\x83\x93(&C)"
-#: Merge.rc:440
+#: Merge.rc:443
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr "\x89E\x82ɃR\x83s\x81[\x82\xB5\x82Ď\x9F\x82ɐi\x82\xDE(&O)\tAlt+Ctrl+Right"
-#: Merge.rc:441
+#: Merge.rc:444
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr "\x8D\xB6\x82ɃR\x83s\x81[\x82\xB5\x82Ď\x9F\x82ɐi\x82\xDE(&T)\tAlt+Ctrl+Left"
-#: Merge.rc:443
+#: Merge.rc:446
#, c-format
msgid "Copy &All to Right"
msgstr "\x91S\x82Ă\xF0\x89E\x82ɃR\x83s\x81[(&A)"
-#: Merge.rc:444
+#: Merge.rc:447
#, c-format
msgid "Cop&y All to Left"
msgstr "\x91S\x82Ă\xF0\x8D\xB6\x82ɃR\x83s\x81[(&Y)"
-#: Merge.rc:461
+#: Merge.rc:464
#, c-format
msgid "&Prediffer"
msgstr "\x94\xE4\x8Ar\x91O\x8F\x88\x97\x9D\x83v\x83\x89\x83O\x83C\x83\x93(&P)"
-#: Merge.rc:502
+#: Merge.rc:505
#, c-format
msgid "Comp&are"
msgstr "\x94\xE4\x8Ar(&A)"
-#: Merge.rc:503
+#: Merge.rc:506
#, c-format
-msgid "Co&mpare Special"
-msgstr "\x93\xC1\x8E\xEA\x82Ȕ\xE4\x8Ar(&M)"
+msgid "Co&mpare As"
+msgstr "\x8C`\x8E\xAE\x82\xF0\x8Ew\x92肵\x82Ĕ\xE4\x8Ar(&M)"
-#: Merge.rc:505
+#: Merge.rc:508
#, c-format
msgid "&XML"
msgstr "XML(&X)"
-#: Merge.rc:510
+#: Merge.rc:509
#, c-format
+msgid "&Binary"
+msgstr "\x83o\x83C\x83i\x83\x8A(&B)"
+
+#: Merge.rc:514
+#, c-format
msgid "&Left to Right"
msgstr "\x8D\xB6\x82\xA9\x82\xE7\x89E\x82\xC9(&L)"
-#: Merge.rc:511
+#: Merge.rc:515
#, c-format
msgid "L&eft to..."
msgstr "\x8D\xB6\x82\xA9\x82\xE7\x8EQ\x8FƐ\xE6\x82\xD6(&E)..."
-#: Merge.rc:512
+#: Merge.rc:516
#, c-format
msgid "&Right to Left"
msgstr "\x89E\x82\xA9\x82獶\x82\xC9(&R)"
-#: Merge.rc:513
+#: Merge.rc:517
#, c-format
msgid "R&ight to..."
msgstr "\x89E\x82\xA9\x82\xE7\x8EQ\x8FƐ\xE6\x82\xD6(&I)..."
-#: Merge.rc:515
+#: Merge.rc:519
#, c-format
msgid "&Move"
msgstr "\x88ړ\xAE(&M)"
-#: Merge.rc:517
+#: Merge.rc:521
#, c-format
msgid "&Left to..."
msgstr "\x8D\xB6\x82\xA9\x82\xE7\x8EQ\x8FƐ\xE6\x82\xD6(&L)..."
-#: Merge.rc:518
+#: Merge.rc:522
#, c-format
msgid "&Right to..."
msgstr "\x89E\x82\xA9\x82\xE7\x8EQ\x8FƐ\xE6\x82\xD6(&R)..."
-#: Merge.rc:520
+#: Merge.rc:524
#, c-format
msgid "&Delete"
msgstr "\x8D폜(&D)"
-#: Merge.rc:522
-#: Merge.rc:1135
-#: Merge.rc:1517
+#: Merge.rc:526
+#: Merge.rc:1138
+#: Merge.rc:1503
#, c-format
msgid "&Left"
msgstr "\x8D\xB6(&L)"
-#: Merge.rc:523
-#: Merge.rc:1137
-#: Merge.rc:1520
+#: Merge.rc:527
+#: Merge.rc:1140
+#: Merge.rc:1506
#, c-format
msgid "&Right"
msgstr "\x89E(&R)"
-#: Merge.rc:524
+#: Merge.rc:528
#, c-format
msgid "&Both"
msgstr "\x97\xBC\x91\xA4(&B)"
-#: Merge.rc:526
+#: Merge.rc:530
#, c-format
msgid "Re&name"
msgstr "\x96\xBC\x91O\x82̕ύX(&N)"
-#: Merge.rc:527
+#: Merge.rc:531
#, c-format
msgid "&Hide Items"
msgstr "\x8D\x80\x96ڂ\xF0\x94\xF1\x95\\x8E\xA6(&H)"
-#: Merge.rc:529
+#: Merge.rc:533
#, c-format
msgid "&Open Left"
msgstr "\x8D\xB6\x82\xF0\x8AJ\x82\xAD(&O)"
-#: Merge.rc:535
+#: Merge.rc:539
#, c-format
msgid "O&pen Right"
msgstr "\x89E\x82\xF0\x8AJ\x82\xAD(&P)"
-#: Merge.rc:542
+#: Merge.rc:546
#, c-format
msgid "Cop&y Pathnames"
msgstr "\x83p\x83X\x96\xBC\x82\xF0\x83R\x83s\x81[(&Y)"
-#: Merge.rc:544
+#: Merge.rc:548
#, c-format
msgid "&Left (%1 of %2)"
msgstr "\x8D\xB6(&L) (%1 / %2)"
-#: Merge.rc:545
+#: Merge.rc:549
#, c-format
msgid "&Right (%1 of %2)"
msgstr "\x89E(&R) (%1 / %2)"
-#: Merge.rc:546
+#: Merge.rc:550
#, c-format
msgid "&Both (%1 of %2)"
msgstr "\x97\xBC\x91\xA4(&B) (%1 / %2)"
-#: Merge.rc:548
+#: Merge.rc:552
#, c-format
msgid "Copy &Filenames"
msgstr "\x83t\x83@...)"
-#: Merge.rc:550
+#: Merge.rc:554
#, c-format
msgid "&Zip"
msgstr "\x88\xB3\x8Fk(&Z)"
-#: Merge.rc:552
+#: Merge.rc:556
#, c-format
msgid "&Left... (%1 of %2)"
msgstr "\x8D\xB6(&L)... (%1 / %2)"
-#: Merge.rc:553
+#: Merge.rc:557
#, c-format
msgid "&Right... (%1 of %2)"
msgstr "\x89E(&R)... (%1 / %2)"
-#: Merge.rc:554
+#: Merge.rc:558
#, c-format
msgid "&Both... (%1 of %2)"
msgstr "\x97\xBC\x91\xA4(&B)... (%1 / %2)"
-#: Merge.rc:555
+#: Merge.rc:559
#, c-format
msgid "&Differences... (%1 of %2)"
msgstr "\x8D\xB7\x88\xD9(&D)... (%1 / %2)"
-#: Merge.rc:558
+#: Merge.rc:562
#, c-format
msgid "&Refresh"
msgstr "\x91I\x91\xF0\x8D\x80\x96ڂ\xF0\x8DŐV\x8DX\x90V(&R)"
-#: Merge.rc:570
+#: Merge.rc:574
#, c-format
msgid "&Copy Full Path"
msgstr "\x83t\x83\x8B\x83p\x83X\x82\xF0\x83R\x83s\x81[(&C)"
-#: Merge.rc:571
+#: Merge.rc:575
#, c-format
msgid "Copy &Filename"
msgstr "\x83t\x83@...)"
-#: Merge.rc:577
+#: Merge.rc:581
#, c-format
msgid "Prediffer Settings"
msgstr "\x94\xE4\x8Ar\x91O\x8F\x88\x97\x9D\x83v\x83\x89\x83O\x83C\x83\x93\x90ݒ\xE8"
-#: Merge.rc:579
+#: Merge.rc:583
#, c-format
msgid "&No prediffer"
msgstr "\x8Eg\x97p\x82\xB5\x82Ȃ\xA2(&N)"
-#: Merge.rc:580
+#: Merge.rc:584
#, c-format
msgid "Auto prediffer"
msgstr "\x8E\xA9\x93\xAE"
-#: Merge.rc:588
+#: Merge.rc:592
#, c-format
msgid "G&oto Diff"
msgstr "\x8D\xB7\x88قֈړ\xAE(&O)"
-#: Merge.rc:591
+#: Merge.rc:595
#, c-format
msgid "&No Moved Blocks"
msgstr "\x88ړ\xAE\x83u\x83\x8D\x83b\x83N\x95\\x8E\xA6\x82Ȃ\xB5(&N)"
-#: Merge.rc:592
+#: Merge.rc:596
#, c-format
msgid "&All Moved Blocks"
msgstr "\x91S\x88ړ\xAE\x83u\x83\x8D\x83b\x83N\x95\\x8E\xA6(&A)"
-#: Merge.rc:593
+#: Merge.rc:597
#, c-format
msgid "Moved Block for &Current Diff"
msgstr "\x8C\xBB\x8Dݍ\xB7\x88ق̈ړ\xAE\x83u\x83\x8D\x83b\x83N\x82̂ݕ\\x8E\xA6(&C)"
-#: Merge.rc:662
+#: Merge.rc:668
#, c-format
msgid "About WinMerge"
msgstr "WinMerge\x82ɂ\xA2\x82\xC4"
-#: Merge.rc:668
+#: Merge.rc:674
#, c-format
msgid "(Private Build)"
msgstr "(Private Build)"
-#: Merge.rc:669
+#: Merge.rc:675
#, c-format
msgid "All rights reserved."
msgstr "All rights reserved."
-#: Merge.rc:670
+#: Merge.rc:676
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr "WinMerge\x82̃z\x81[\x83\x80\x83y\x81[\x83W\x82ɍs\x82\xAD!"
-#: Merge.rc:673
-#: Merge.rc:705
-#: Merge.rc:797
-#: Merge.rc:983
-#: Merge.rc:1054
-#: Merge.rc:1083
-#: Merge.rc:1093
-#: Merge.rc:1259
-#: Merge.rc:1323
-#: Merge.rc:1336
-#: Merge.rc:1428
-#: Merge.rc:1443
-#: Merge.rc:1665
+#: Merge.rc:679
+#: Merge.rc:711
+#: Merge.rc:803
+#: Merge.rc:986
+#: Merge.rc:1057
+#: Merge.rc:1086
+#: Merge.rc:1096
+#: Merge.rc:1245
+#: Merge.rc:1309
+#: Merge.rc:1322
+#: Merge.rc:1414
+#: Merge.rc:1429
+#: Merge.rc:1651
#, c-format
msgid "OK"
msgstr "OK"
-#: Merge.rc:674
+#: Merge.rc:680
#, c-format
msgid "Contributors"
msgstr "\x8Dv\x8C\xA3\x8E\xD2"
-#: Merge.rc:681
+#: Merge.rc:687
#, c-format
msgid "Select Files or Folders"
msgstr "\x83t\x83@......"
-#: Merge.rc:684
-#: Merge.rc:1594
+#: Merge.rc:690
+#: Merge.rc:1580
#, c-format
msgid "&Left:"
msgstr "\x8D\xB6(&L):"
-#: Merge.rc:688
-#: Merge.rc:749
-#: Merge.rc:997
-#: Merge.rc:1019
+#: Merge.rc:694
+#: Merge.rc:755
+#: Merge.rc:1000
+#: Merge.rc:1022
#, c-format
msgid "&Browse..."
msgstr "\x8EQ\x8F\xC6(&B)..."
-#: Merge.rc:689
-#: Merge.rc:1598
+#: Merge.rc:695
+#: Merge.rc:1584
#, c-format
msgid "&Right:"
msgstr "\x89E(&R):"
-#: Merge.rc:693
-#: Merge.rc:1030
+#: Merge.rc:699
+#: Merge.rc:1033
#, c-format
msgid "Bro&wse..."
msgstr "\x8EQ\x8F\xC6(&W)..."
-#: Merge.rc:694
-#: Merge.rc:1602
+#: Merge.rc:700
+#: Merge.rc:1588
#, c-format
msgid "&Filter:"
msgstr "\x83t\x83B\x83\x8B\x83^(&F):"
-#: Merge.rc:697
-#: Merge.rc:1604
+#: Merge.rc:703
+#: Merge.rc:1590
#, c-format
msgid "Select..."
msgstr "\x91I\x91\xF0..."
-#: Merge.rc:698
+#: Merge.rc:704
#, c-format
msgid "&Unpacker:"
msgstr "\x93W\x8AJ\x83v\x83\x89\x83O\x83C\x83\x93(&U):"
-#: Merge.rc:701
+#: Merge.rc:707
#, c-format
msgid "&Select..."
msgstr "\x91I\x91\xF0(&S)..."
-#: Merge.rc:702
-#: Merge.rc:1605
+#: Merge.rc:708
+#: Merge.rc:1591
#, c-format
msgid "&Include Subfolders"
msgstr "\x83T\x83u\x83t\x83H\x83\x8B\x83_\x82\xF0\x8A܂\xDE(&I)"
-#: Merge.rc:704
+#: Merge.rc:710
#, c-format
msgid "Status:"
msgstr "\x83X\x83e\x81[\x83^\x83X:"
-#: Merge.rc:706
-#: Merge.rc:736
-#: Merge.rc:798
-#: Merge.rc:828
-#: Merge.rc:860
-#: Merge.rc:870
-#: Merge.rc:1055
-#: Merge.rc:1084
-#: Merge.rc:1094
-#: Merge.rc:1145
-#: Merge.rc:1260
-#: Merge.rc:1337
-#: Merge.rc:1429
-#: Merge.rc:1444
-#: Merge.rc:1666
+#: Merge.rc:712
+#: Merge.rc:742
+#: Merge.rc:804
+#: Merge.rc:834
+#: Merge.rc:866
+#: Merge.rc:876
+#: Merge.rc:1058
+#: Merge.rc:1087
+#: Merge.rc:1097
+#: Merge.rc:1148
+#: Merge.rc:1246
+#: Merge.rc:1323
+#: Merge.rc:1415
+#: Merge.rc:1430
+#: Merge.rc:1652
#, c-format
msgid "Cancel"
msgstr "\x83L\x83\x83\x83\x93\x83Z\x83\x8B"
-#: Merge.rc:707
-#: Merge.rc:1338
+#: Merge.rc:713
+#: Merge.rc:1324
#, c-format
msgid "Help"
msgstr "\x83w\x83\x8B\x83v"
-#: Merge.rc:708
+#: Merge.rc:714
#, c-format
msgid "Files or Folders to Compare"
msgstr "\x94\xE4\x8Ar\x82\xB7\x82\xE9\x83t\x83@..._"
-#: Merge.rc:715
+#: Merge.rc:721
#, c-format
msgid "Visual SourceSafe"
msgstr "Visual SourceSafe"
-#: Merge.rc:720
+#: Merge.rc:726
#, c-format
msgid "Database:"
msgstr "\x83f\x81[\x83^\x83x\x81[\x83X:"
-#: Merge.rc:723
+#: Merge.rc:729
#, c-format
msgid "Project:"
msgstr "\x83v\x83\x8D\x83W\x83F\x83N\x83g:"
-#: Merge.rc:726
+#: Merge.rc:732
#, c-format
msgid "User:"
msgstr "\x83\x86\x81[\x83U\x81[:"
-#: Merge.rc:728
+#: Merge.rc:734
#, c-format
msgid "Password:"
msgstr "\x83p\x83X\x83\x8F\x81[\x83h:"
-#: Merge.rc:730
+#: Merge.rc:736
#, c-format
msgid "Link to Destination VSS project"
msgstr "\x91Ώ\xDBVSS\x83v\x83\x8D\x83W\x83F\x83N\x83g\x82ƃ\x8A\x83\x93\x83N\x82\xB7\x82\xE9"
-#: Merge.rc:732
-#: Merge.rc:875
+#: Merge.rc:738
+#: Merge.rc:881
#, c-format
msgid "Apply to all items"
msgstr "\x91S\x82Ă̍\x80\x96ڂɓK\x97p\x82\xB7\x82\xE9"
-#: Merge.rc:734
+#: Merge.rc:740
#, c-format
msgid "Check Out"
msgstr "\x83`\x83F\x83b\x83N\x83A\x83E\x83g"
-#: Merge.rc:735
-#: Merge.rc:871
+#: Merge.rc:741
+#: Merge.rc:877
#, c-format
msgid "Save As..."
msgstr "\x96\xBC\x91O\x82\xF0\x95t\x82\xAF\x82ĕۑ\xB6..."
-#: Merge.rc:741
+#: Merge.rc:747
#, c-format
msgid "Versioning System"
msgstr "\x83o\x81[\x83W\x83\x87\x83\x93\x8AǗ\x9D\x83V\x83X\x83e\x83\x80"
-#: Merge.rc:744
+#: Merge.rc:750
#, c-format
msgid "&Versioning System:"
msgstr "\x83o\x81[\x83W\x83\x87\x83\x93\x83V\x83X\x83e\x83\x80(&V):"
-#: Merge.rc:747
-#: Merge.rc:2065
+#: Merge.rc:753
+#: Merge.rc:2070
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "cleartool.exe\x82ւ̃p\x83X(&P):"
-#: Merge.rc:754
-#: Merge.rc:1941
+#: Merge.rc:760
+#: Merge.rc:1943
+#: Merge.rc:1956
#, c-format
msgid "General"
msgstr "\x88\xEA\x94\xCA"
-#: Merge.rc:757
+#: Merge.rc:763
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "\x8E\xA9\x93\xAE\x93I\x82ɍŏ\x89\x82̍\xB7\x88قɃX\x83N\x83\x8D\x81[\x83\x8B\x82\xB7\x82\xE9(&S)"
-#: Merge.rc:760
+#: Merge.rc:766
#, c-format
msgid "&Disable Splash Screen"
msgstr "\x83X\x83v\x83\x89\x83b\x83V\x83\x85\x89\xE6\x96ʂ\xF0\x94\xF1\x95\\x8E\xA6(&D)"
-#: Merge.rc:762
+#: Merge.rc:768
#, c-format
msgid "Cl&ose windows with ESC"
msgstr "ESC\x83L\x81[\x82ŃE\x83C\x83\x93\x83h\x83E\x82\xF0\x95\xB6\x82\xE9(&O)"
-#: Merge.rc:764
+#: Merge.rc:770
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr "\x8AJ\x82\xAD\x83_\x83C\x83A\x83\x8D\x83O\x82Ŏ\xA9\x93\xAE\x93I\x82Ƀp\x83X\x82\xF0\x8C\x9F\x8D\xB8\x82\xB7\x82\xE9"
-#: Merge.rc:767
+#: Merge.rc:773
#, c-format
msgid "All&ow only one instance to run"
msgstr "\x95\xA1\x90\x94\x82̃C\x83\x93\x83X\x83^\x83\x93\x83X\x82\xF0\x8BN\x93\xAE\x82\xB5\x82Ȃ\xA2(&O)"
-#: Merge.rc:769
+#: Merge.rc:775
#, c-format
msgid "As&k when closing multiple windows"
msgstr "\x95\xA1\x90\x94\x82̃E\x83C\x83\x93\x83h\x83E\x82\xF0\x95\xB6\x82\xE9\x82Ƃ\xAB\x82ɐq\x82˂\xE9(&K)"
-#: Merge.rc:771
+#: Merge.rc:777
#, c-format
msgid "&Preserve file time in file compare"
msgstr "\x83t\x83@...)"
-#: Merge.rc:774
+#: Merge.rc:780
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
msgstr "\x8BN\x93\xAE\x8E\x9E\x82Ƀt\x83@..."
-#: Merge.rc:776
+#: Merge.rc:782
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr "\x8AJ\x82\xAD\x83_\x83C\x83A\x83\x8D\x83O\x82̃I\x81[\x83g\x83R\x83\x93\x83v\x83\x8A\x81[\x83g(&O):"
-#: Merge.rc:779
+#: Merge.rc:785
#, c-format
msgid "Enable multiple compare windows for"
msgstr "\x95\xA1\x90\x94\x82̔\xE4\x8Ar\x83E\x83C\x83\x93\x83h\x83E\x82\xF0\x97L\x8C\xF8"
-#: Merge.rc:781
-#: Merge.rc:1617
+#: Merge.rc:787
+#: Merge.rc:1603
#, c-format
msgid "&Folder compare"
msgstr "\x83t\x83H\x83\x8B\x83_\x94\xE4\x8Ar(&F)"
-#: Merge.rc:783
-#: Merge.rc:1619
+#: Merge.rc:789
+#: Merge.rc:1605
#, c-format
msgid "Fil&e compare"
msgstr "\x83t\x83@...)"
-#: Merge.rc:785
+#: Merge.rc:791
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr "WinMerge \x82́A\x82\xA2\x82\xAD\x82\xA9\x82̋\xA4\x92ʃ\x81\x83b\x83Z\x81[\x83W\x83{\x83b\x83N\x83X\x82\xF0\x94\xF1\x95\\x8E\xA6\x82ɂł\xAB\x82܂\xB7\x81B \x91S\x82Ẵ\x81\x83b\x83Z\x81[\x83W\x83{\x83b\x83N\x83X\x82\xF0\x8DĂѕ\\x8E\xA6\x82\xB3\x82\xB9\x82\xE9\x82ɂ́A\x83\x8A\x83Z\x83b\x83g\x83{\x83^\x83\x93\x82\xF0\x89\x9F\x89\xBA\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B"
-#: Merge.rc:787
+#: Merge.rc:793
#, c-format
msgid "Reset"
msgstr "\x83\x8A\x83Z\x83b\x83g"
-#: Merge.rc:794
+#: Merge.rc:800
#, c-format
msgid "Language"
msgstr "\x8C\xBE\x8C\xEA"
-#: Merge.rc:801
+#: Merge.rc:807
#, c-format
msgid "Available languages:"
msgstr "\x8Eg\x97p\x89\\x82Ȍ\xBE\x8C\xEA:"
-#: Merge.rc:807
+#: Merge.rc:813
#, c-format
msgid "Find"
msgstr "\x8C\x9F\x8D\xF5"
-#: Merge.rc:810
-#: Merge.rc:837
+#: Merge.rc:816
+#: Merge.rc:843
#, c-format
msgid "Fi&nd what:"
msgstr "\x8C\x9F\x8D\x{155D8E}\x9A\x97\xF1(&N)"
-#: Merge.rc:813
-#: Merge.rc:843
+#: Merge.rc:819
+#: Merge.rc:849
#, c-format
msgid "Match &whole word only"
msgstr "\x92P\x8C\xEA\x92P\x88ʂŒT\x82\xB7(&W)"
-#: Merge.rc:815
-#: Merge.rc:845
+#: Merge.rc:821
+#: Merge.rc:851
#, c-format
msgid "Match &case"
msgstr "\x91啶\x8E\x9A\x82Ə\xAC\x95\xB6\x8E\x9A\x82\xF0\x8B\xE6\x95ʂ\xB7\x82\xE9(&C)"
-#: Merge.rc:817
-#: Merge.rc:847
+#: Merge.rc:823
+#: Merge.rc:853
#, c-format
msgid "Regular &expression"
msgstr "\x90\xB3\x8BK\x95\\x8C\xBB(&E)"
-#: Merge.rc:819
+#: Merge.rc:825
#, c-format
msgid "D&on't wrap end of file"
msgstr "\x8DŌ\xE3\x82܂Ō\x9F\x8D\x{142D42}\xBD\x8Cニ\x81[\x83v\x82\xB5\x82Ȃ\xA2(&O)"
-#: Merge.rc:822
+#: Merge.rc:828
#, c-format
msgid "Direction"
msgstr "\x8C\x9F\x8D\x{142DC2}\xE9\x95\xFB\x8C\xFC"
-#: Merge.rc:823
+#: Merge.rc:829
#, c-format
msgid "&Up"
msgstr "\x8F\xE3\x82\xD6(&U)"
-#: Merge.rc:825
+#: Merge.rc:831
#, c-format
msgid "&Down"
msgstr "\x89\xBA\x82\xD6(&D)"
-#: Merge.rc:827
-#: Merge.rc:857
+#: Merge.rc:833
+#: Merge.rc:863
#, c-format
msgid "&Find Next"
msgstr "\x8E\x9F\x82\xF0\x8C\x9F\x8D\xF5(&F)"
-#: Merge.rc:834
+#: Merge.rc:840
#, c-format
msgid "Replace"
msgstr "\x92u\x8A\xB7"
-#: Merge.rc:840
+#: Merge.rc:846
#, c-format
msgid "Re&place with:"
msgstr "\x92u\x8A\xB7\x8C\xE3\x82̕\xB6\x8E\x9A\x97\xF1(&P):"
-#: Merge.rc:849
+#: Merge.rc:855
#, c-format
msgid "&Don't wrap end of file"
msgstr "\x83t\x83@...)"
-#: Merge.rc:852
+#: Merge.rc:858
#, c-format
msgid "Replace in"
msgstr "\x92u\x8A\xB7"
-#: Merge.rc:853
+#: Merge.rc:859
#, c-format
msgid "&Selection"
msgstr "\x91I\x91\xF0\x94͈\xCD(&S)"
-#: Merge.rc:855
+#: Merge.rc:861
#, c-format
msgid "Wh&ole file"
msgstr "\x83t\x83@...)"
-#: Merge.rc:858
+#: Merge.rc:864
#, c-format
msgid "&Replace"
msgstr "\x92u\x8A\xB7\x82\xB5\x82Ď\x9F\x82\xC9(&R)"
-#: Merge.rc:859
+#: Merge.rc:865
#, c-format
msgid "Replace &All"
msgstr "\x82\xB7\x82ׂĒu\x8A\xB7(&A)"
-#: Merge.rc:866
-#: Merge.rc:2187
+#: Merge.rc:872
+#: Merge.rc:2192
#, c-format
msgid "Rational ClearCase"
msgstr "Rational ClearCase"
-#: Merge.rc:869
+#: Merge.rc:875
#, c-format
msgid "CheckOut"
msgstr "\x83`\x83F\x83b\x83N\x83A\x83E\x83g"
-#: Merge.rc:874
-#: Merge.rc:1179
+#: Merge.rc:880
+#: Merge.rc:1166
#, c-format
msgid "Comments"
msgstr "\x83R\x83\x81\x83\x93\x83g"
-#: Merge.rc:877
+#: Merge.rc:883
#, c-format
msgid "CheckIn after checkout"
msgstr "\x83`\x83F\x83b\x83N\x83A\x83E\x83g\x8C\xE3\x83`\x83F\x83b\x83N\x83C\x83\x93\x82\xB7\x82\xE9"
-#: Merge.rc:883
+#: Merge.rc:889
#, c-format
msgid "Linefilters"
msgstr "\x8Ds\x83t\x83B\x83\x8B\x83^"
-#: Merge.rc:886
+#: Merge.rc:892
#, c-format
msgid "Enable Line Filters"
msgstr "\x8Ds\x83t\x83B\x83\x8B\x83^\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9"
-#: Merge.rc:889
+#: Merge.rc:895
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "\x90\xB3\x8BK\x95\\x8C\xBB (\x8Ds\x82\xA0\x82\xBD\x82\xE8\x88\xEA\x82\xC2):"
-#: Merge.rc:896
+#: Merge.rc:900
#, c-format
-msgid "Save"
-msgstr "\x95ۑ\xB6(&S)"
-
-#: Merge.rc:897
-#, c-format
msgid "New"
msgstr "\x90V\x8BK(&N)"
-#: Merge.rc:898
+#: Merge.rc:901
#, c-format
msgid "Edit"
msgstr "\x95ҏW(&E)"
-#: Merge.rc:899
+#: Merge.rc:902
#, c-format
msgid "Remove"
msgstr "\x8D폜(&R)"
-#: Merge.rc:904
-#: Merge.rc:1944
+#: Merge.rc:907
+#: Merge.rc:1946
#, c-format
msgid "Colors"
msgstr "\x90F"
-#: Merge.rc:907
+#: Merge.rc:910
#, c-format
msgid "Difference:"
msgstr "\x8D\xB7\x88ق\xA0\x82\xE8:"
-#: Merge.rc:911
+#: Merge.rc:914
#, c-format
msgid "Selected Difference:"
msgstr "\x91I\x91\xF0\x82\xB3\x82ꂽ\x8D\xB7\x88\xD9:"
-#: Merge.rc:915
-#: Merge.rc:1569
+#: Merge.rc:918
+#: Merge.rc:1555
#, c-format
msgid "Background"
msgstr "\x94w\x8Ci"
-#: Merge.rc:916
+#: Merge.rc:919
#, c-format
msgid "Deleted"
msgstr "\x8D폜"
-#: Merge.rc:929
-#: Merge.rc:1364
-#: Merge.rc:1570
+#: Merge.rc:932
+#: Merge.rc:1350
+#: Merge.rc:1556
+#: Merge.rc:1947
#, c-format
msgid "Text"
msgstr "\x83e\x83L\x83X\x83g"
-#: Merge.rc:933
+#: Merge.rc:936
#, c-format
msgid "Ignored Difference:"
msgstr "\x96\xB3\x8E\x8B\x82\xB3\x82ꂽ\x8D\xB7\x88\xD9:"
-#: Merge.rc:943
+#: Merge.rc:946
#, c-format
msgid "Moved:"
msgstr "\x88ړ\xAE\x83u\x83\x8D\x83b\x83N:"
-#: Merge.rc:953
+#: Merge.rc:956
#, c-format
msgid "Selected Moved:"
msgstr "\x91I\x91\xF0\x82\xB3\x82ꂽ\x88ړ\xAE\x83u\x83\x8D\x83b\x83N:"
-#: Merge.rc:960
+#: Merge.rc:963
#, c-format
msgid "Word Difference:"
msgstr "\x92P\x8C\xEA\x82̍\xB7\x88\xD9:"
-#: Merge.rc:967
+#: Merge.rc:970
#, c-format
msgid "Selected Word Diff:"
msgstr "\x91I\x91\xF0\x82\xB3\x82ꂽ\x92P\x8C\xEA\x82̍\xB7\x88\xD9:"
-#: Merge.rc:974
-#: Merge.rc:1053
-#: Merge.rc:1082
-#: Merge.rc:1182
-#: Merge.rc:1410
+#: Merge.rc:977
+#: Merge.rc:1056
+#: Merge.rc:1085
+#: Merge.rc:1168
+#: Merge.rc:1396
+#: Merge.rc:1686
#, c-format
msgid "Defaults"
msgstr "\x83f\x83t\x83H\x83\x8B\x83g"
-#: Merge.rc:980
-#: Merge.rc:1352
-#: Merge.rc:1558
+#: Merge.rc:983
+#: Merge.rc:1338
+#: Merge.rc:1544
#, c-format
msgid "Dialog"
msgstr "\x83_\x83C\x83A\x83\x8D\x83O"
-#: Merge.rc:990
-#: Merge.rc:1947
+#: Merge.rc:993
+#: Merge.rc:1949
#, c-format
msgid "System"
msgstr "\x83V\x83X\x83e\x83\x80"
-#: Merge.rc:993
+#: Merge.rc:996
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr "\x8D폜\x82\xB3\x82ꂽ\x83t\x83@...)"
-#: Merge.rc:995
+#: Merge.rc:998
#, c-format
msgid "&External editor:"
msgstr "\x8AO\x95\x94\x83G\x83f\x83B\x83^(&E):"
-#: Merge.rc:998
+#: Merge.rc:1001
#, c-format
msgid "&Filter folder:"
msgstr "\x83t\x83B\x83\x8B\x83^\x83t\x83H\x83\x8B\x83_(&F):"
-#: Merge.rc:1000
+#: Merge.rc:1003
#, c-format
msgid "B&rowse..."
msgstr "\x8EQ\x8F\xC6(&R)"
-#: Merge.rc:1001
+#: Merge.rc:1004
#, c-format
msgid "Temporary files folder"
msgstr "\x83e\x83\x93\x83|\x83\x89\x83\x8A\x83t\x83@..._"
-#: Merge.rc:1002
+#: Merge.rc:1005
#, c-format
msgid "S&ystem's temp folder"
msgstr "\x83V\x83X\x83e\x83\x80\x82̃e\x83\x93\x83|\x83\x89\x83\x8A\x83t\x83H\x83\x8B\x83_(&Y)"
-#: Merge.rc:1004
+#: Merge.rc:1007
#, c-format
msgid "C&ustom folder:"
msgstr "\x83J\x83X\x83^\x83\x80\x83t\x83H\x83\x8B\x83_(&U):"
-#: Merge.rc:1007
-#: Merge.rc:1023
+#: Merge.rc:1010
+#: Merge.rc:1026
#, c-format
msgid "Br&owse..."
msgstr "\x8EQ\x8F\xC6(&O)..."
-#: Merge.rc:1013
+#: Merge.rc:1016
#, c-format
msgid "Patch Generator"
msgstr "\x83p\x83b\x83`\x90\xB6\x90\xAC"
-#: Merge.rc:1016
+#: Merge.rc:1019
#, c-format
msgid "File&1:"
msgstr "\x83t\x83@...:"
-#: Merge.rc:1020
+#: Merge.rc:1023
#, c-format
msgid "File&2:"
msgstr "\x83t\x83@...:"
-#: Merge.rc:1024
+#: Merge.rc:1027
#, c-format
msgid "&Swap"
msgstr "\x8C\xF0\x8A\xB7(&S)"
-#: Merge.rc:1025
+#: Merge.rc:1028
#, c-format
msgid "&Append to existing file"
msgstr "\x8A\xF9\x91\xB6\x82̃t\x83@...)"
-#: Merge.rc:1027
+#: Merge.rc:1030
#, c-format
msgid "&Result:"
msgstr "\x8C\x8B\x89\xCA(&R):"
-#: Merge.rc:1031
+#: Merge.rc:1034
#, c-format
msgid "&Format"
msgstr "\x8Fo\x97͌`\x8E\xAE(&F)"
-#: Merge.rc:1032
+#: Merge.rc:1035
#, c-format
msgid "St&yle:"
msgstr "\x83X\x83^\x83C\x83\x8B(&Y):"
-#: Merge.rc:1035
+#: Merge.rc:1038
#, c-format
msgid "&Context:"
msgstr "\x83R\x83\x93\x83e\x83L\x83X\x83g(&C):"
-#: Merge.rc:1038
+#: Merge.rc:1041
#, c-format
msgid "W&hitespaces"
msgstr "\x8B\xF3\x94\x92(&H)"
-#: Merge.rc:1039
+#: Merge.rc:1042
#, c-format
msgid "Com&pare"
msgstr "\x94\xE4\x8Ar\x82\xB7\x82\xE9(&P)"
-#: Merge.rc:1041
+#: Merge.rc:1044
#, c-format
msgid "I&gnore changes"
msgstr "\x95ύX\x82\x8B\x82\xB7\x82\xE9(&G)"
-#: Merge.rc:1043
+#: Merge.rc:1046
#, c-format
msgid "Ig&nore all"
msgstr "\x82\xB7\x82ׂĖ\xB3\x8E\x8B\x82\xB7\x82\xE9(&N)"
-#: Merge.rc:1045
+#: Merge.rc:1048
#, c-format
msgid "Ignor&e blank lines"
msgstr "\x8Bs\x82\x8B\x82\xB7\x82\xE9(&E)"
-#: Merge.rc:1047
+#: Merge.rc:1050
#, c-format
msgid "Case sensi&tive"
msgstr "\x91啶\x8E\x9A\x82Ə\xAC\x95\xB6\x8E\x9A\x82\xF0\x8B\xE6\x95ʂ\xB7\x82\xE9(&T)"
-#: Merge.rc:1049
+#: Merge.rc:1052
#, c-format
msgid "Inclu&de command line"
msgstr "\x83R\x83}\x83\x93\x83h\x8Ds\x82\xF0\x8A܂߂\xE9(&D)"
-#: Merge.rc:1051
+#: Merge.rc:1054
#, c-format
msgid "Open to e&xternal editor"
msgstr "\x8AO\x95\x94\x83G\x83f\x83B\x83^\x82ŊJ\x82\xAD(&X)"
-#: Merge.rc:1073
+#: Merge.rc:1076
#, c-format
msgid "Display Columns"
msgstr "\x97\xF1\x95\\x8E\xA6"
-#: Merge.rc:1079
+#: Merge.rc:1082
#, c-format
msgid "Move &Up"
msgstr "\x8F\xE3\x82\xD6(&U)"
-#: Merge.rc:1080
+#: Merge.rc:1083
#, c-format
msgid "Move &Down"
msgstr "\x89\xBA\x82\xD6(&D)"
-#: Merge.rc:1090
+#: Merge.rc:1093
#, c-format
msgid "Select Unpacker"
msgstr "\x93W\x8AJ\x83v\x83\x89\x83O\x83C\x83\x93\x82̑I\x91\xF0"
-#: Merge.rc:1095
+#: Merge.rc:1098
#, c-format
msgid "File unpacker:"
msgstr "\x83t\x83@...:"
-#: Merge.rc:1098
+#: Merge.rc:1101
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr "\x82\xB7\x82ׂĂ̓W\x8AJ\x83v\x83\x89\x83O\x83C\x83\x93\x82\xF0\x95\\x8E\xA6\x82\xB5\x81A\x8Ag\x92\xA3\x8Eq\x82\xF0\x83`\x83F\x83b\x83N\x82\xB5\x82܂\xB9\x82\xF1\x81B(&A)"
-#: Merge.rc:1101
+#: Merge.rc:1104
#, c-format
msgid "Extensions list:"
msgstr "\x8Ag\x92\xA3\x8Eq\x88ꗗ:"
-#: Merge.rc:1102
+#: Merge.rc:1105
#, c-format
msgid "Description:"
msgstr "\x90\xE0\x96\xBE:"
-#: Merge.rc:1113
+#: Merge.rc:1116
#, c-format
msgid " Folder Compare Progress"
msgstr " \x83t\x83H\x83\x8B\x83_\x94\xE4\x8Ar\x90i\x8Ds\x8F\xF3\x8B\xB5"
-#: Merge.rc:1116
-#: Merge.rc:1894
+#: Merge.rc:1119
+#: Merge.rc:1896
#, c-format
msgid "Stop"
msgstr "\x92\xE2\x8E~"
-#: Merge.rc:1121
+#: Merge.rc:1124
#, c-format
msgid "Comparing items..."
msgstr "\x8D\x80\x96ڂ\xF0\x94\xE4\x8Ar\x82\xB5\x82Ă\xA2\x82܂\xB7..."
-#: Merge.rc:1122
+#: Merge.rc:1125
#, c-format
msgid "Items compared:"
msgstr "\x94\xE4\x8Ar\x82\xB5\x82\xBD\x8D\x80\x96\xDA:"
-#: Merge.rc:1123
+#: Merge.rc:1126
#, c-format
msgid "Items total:"
msgstr "\x91S\x8D\x80\x96ڐ\x94:"
-#: Merge.rc:1129
+#: Merge.rc:1132
#, c-format
msgid "Go To"
msgstr "\x88ړ\xAE"
-#: Merge.rc:1132
+#: Merge.rc:1135
#, c-format
msgid "G&oto:"
msgstr "\x94ԍ\x86(&O):"
-#: Merge.rc:1134
+#: Merge.rc:1137
#, c-format
msgid "File"
msgstr "\x83t\x83@..."
-#: Merge.rc:1139
+#: Merge.rc:1142
#, c-format
msgid "Goto what"
msgstr "\x88ړ\xAE\x8E\xED\x95\xCA"
-#: Merge.rc:1140
+#: Merge.rc:1143
#, c-format
msgid "Li&ne"
msgstr "\x8Ds(&I)"
-#: Merge.rc:1142
+#: Merge.rc:1145
#, c-format
msgid "&Difference"
msgstr "\x8D\xB7\x88\xD9(&D)"
-#: Merge.rc:1144
+#: Merge.rc:1147
#, c-format
msgid "&Go To"
msgstr "\x88ړ\xAE(&G)"
-#: Merge.rc:1150
-#: Merge.rc:1942
+#: Merge.rc:1153
+#: Merge.rc:1944
#, c-format
msgid "Compare"
msgstr "\x94\xE4\x8Ar"
-#: Merge.rc:1153
+#: Merge.rc:1156
#, c-format
msgid "Whitespace"
msgstr "\x8B\xF3\x94\x92"
-#: Merge.rc:1154
+#: Merge.rc:1157
#, c-format
msgid "&Compare"
msgstr "\x94\xE4\x8Ar\x82\xB7\x82\xE9(&C)"
-#: Merge.rc:1156
+#: Merge.rc:1158
#, c-format
msgid "&Ignore change"
msgstr "\x95ύX\x82\x8B\x82\xB7\x82\xE9(&I)"
-#: Merge.rc:1158
+#: Merge.rc:1159
#, c-format
msgid "I&gnore all"
msgstr "\x82\xB7\x82ׂĖ\xB3\x8E\x8B\x82\xB7\x82\xE9(&G)"
@@ -1832,195 +1845,180 @@
msgid "Ignore blan&k lines"
msgstr "\x8B\xF3\x8Ds\x82\x8B\x82\xB7\x82\xE9(&K)"
-#: Merge.rc:1162
+#: Merge.rc:1161
#, c-format
msgid "Ignore &case"
msgstr "\x91啶\x8E\x9A\x82Ə\xAC\x95\xB6\x8E\x9A\x82\xF0\x8B\xE6\x95ʂ\xB5\x82Ȃ\xA2(&C)"
-#: Merge.rc:1164
+#: Merge.rc:1162
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "\x89\xFC\x8Ds\x95\xB6\x8E\x9A\x82̈Ⴂ\x82\x8B\x82\xB7\x82\xE9(&R) (Windows/Unix/Mac)"
-#: Merge.rc:1167
+#: Merge.rc:1164
#, c-format
msgid "E&nable moved block detection"
msgstr "\x88ړ\xAE\x83u\x83\x8D\x83b\x83N\x8C\x9F\x8Fo\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9(&N)"
-#: Merge.rc:1169
+#: Merge.rc:1165
#, c-format
msgid "&Match similar lines"
msgstr "\x97ގ\x97\x8Ds\x82\xF0\x83}\x83b\x83`\x82\xB3\x82\xB9\x82\xE9(&M)"
-#: Merge.rc:1171
+#: Merge.rc:1167
#, c-format
-msgid "Ign&ore time differences less than 3 seconds"
-msgstr "3\x95b\x88ȉ\xBA\x82̎\x9E\x8Aԍ\xB7\x82\x8B\x82\xB7\x82\xE9"
-
-#: Merge.rc:1174
-#, c-format
-msgid "&File Compare method:"
-msgstr "\x83t\x83@...):"
-
-#: Merge.rc:1177
-#, c-format
-msgid "S&top after first difference"
-msgstr "\x8Dŏ\x89\x82̍\xB7\x88قŔ\xE4\x8Ar\x82\xF0\x8FI\x97\xB9\x82\xB7\x82\xE9(&T)"
-
-#: Merge.rc:1180
-#, c-format
msgid "Filter Comments"
msgstr "\x83R\x83\x81\x83\x93\x83g\x82̍\xB7\x88ق\x8B\x82\xB7\x82\xE9"
-#: Merge.rc:1187
-#: Merge.rc:1943
+#: Merge.rc:1173
+#: Merge.rc:1945
#, c-format
msgid "Editor"
msgstr "\x83G\x83f\x83B\x83^"
-#: Merge.rc:1190
+#: Merge.rc:1176
#, c-format
msgid "&Highlight syntax"
msgstr "\x83V\x83\x93\x83^\x83b\x83N\x83X\x83n\x83C\x83\x89\x83C\x83g(&H)"
-#: Merge.rc:1192
+#: Merge.rc:1178
#, c-format
msgid "&Automatic rescan"
msgstr "\x8E\xA9\x93\xAE\x93I\x82ɍăX\x83L\x83\x83\x83\x93\x82\xB7\x82\xE9(&A)"
-#: Merge.rc:1194
+#: Merge.rc:1180
#, c-format
msgid "&Preserve original EOL chars"
msgstr "\x8C\xB3\x82\xCCEOL\x95\xB6\x8E\x9A\x82\xF0\x95ۑ\xB6\x82\xB7\x82\xE9(&P)"
-#: Merge.rc:1196
+#: Merge.rc:1182
#, c-format
msgid "Tabs"
msgstr "\x83^\x83u"
-#: Merge.rc:1197
+#: Merge.rc:1183
#, c-format
msgid "&Tab size:"
msgstr "\x83^\x83u\x95\x9D(&T):"
-#: Merge.rc:1200
+#: Merge.rc:1186
#, c-format
msgid "&Insert Tabs"
msgstr "\x83^\x83u\x82\xF0\x91}\x93\xFC(&I)"
-#: Merge.rc:1202
+#: Merge.rc:1188
#, c-format
msgid "Insert &Spaces"
msgstr "\x83X\x83y\x81[\x83X\x82\xF0\x91}\x93\xFC(&S)"
-#: Merge.rc:1204
+#: Merge.rc:1190
#, c-format
msgid "Line Difference Coloring"
msgstr "\x8Ds\x93\xE0\x8D\xB7\x88ق̐F\x95t\x82\xAF"
-#: Merge.rc:1206
+#: Merge.rc:1192
#, c-format
msgid "View line differences"
msgstr "\x8Ds\x93\xE0\x8D\xB7\x88ق\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9"
-#: Merge.rc:1208
+#: Merge.rc:1194
#, c-format
msgid "&Character level"
msgstr "\x95\xB6\x8E\x9A\x92P\x88\xCA(&C)"
-#: Merge.rc:1210
+#: Merge.rc:1196
#, c-format
msgid "&Word-level:"
msgstr "\x92P\x8C\xEA\x92P\x88\xCA(&W):"
-#: Merge.rc:1225
+#: Merge.rc:1211
#, c-format
msgid "Filefilters"
msgstr "\x83t\x83@...^"
-#: Merge.rc:1231
+#: Merge.rc:1217
#, c-format
msgid "Test"
msgstr "\x83e\x83X\x83g..."
-#: Merge.rc:1232
+#: Merge.rc:1218
#, c-format
msgid "Install..."
msgstr "\x83C\x83\x93\x83X\x83g\x81[\x83\x8B..."
-#: Merge.rc:1233
+#: Merge.rc:1219
#, c-format
msgid "New..."
msgstr "\x90V\x8BK..."
-#: Merge.rc:1234
+#: Merge.rc:1220
#, c-format
msgid "Edit..."
msgstr "\x95ҏW..."
-#: Merge.rc:1235
+#: Merge.rc:1221
#, c-format
msgid "Delete..."
msgstr "\x8D폜..."
-#: Merge.rc:1241
+#: Merge.rc:1227
#, c-format
msgid "Save modified files?"
msgstr "\x95ύX\x82\xB3\x82ꂽ\x83t\x83@...?"
-#: Merge.rc:1244
+#: Merge.rc:1230
#, c-format
msgid "Left side file"
msgstr "\x8D\xB6\x91\xA4\x83t\x83@..."
-#: Merge.rc:1247
+#: Merge.rc:1233
#, c-format
msgid "&Save changes"
msgstr "\x95ύX\x82\xF0\x95ۑ\xB6\x82\xB7\x82\xE9(&S)"
-#: Merge.rc:1249
+#: Merge.rc:1235
#, c-format
msgid "&Discard changes"
msgstr "\x95ύX\x82\xF0\x94j\x8A\xFC\x82\xB7\x82\xE9(&D)"
-#: Merge.rc:1251
+#: Merge.rc:1237
#, c-format
msgid "Right side file"
msgstr "\x89E\x91\xA4\x83t\x83@..."
-#: Merge.rc:1254
+#: Merge.rc:1240
#, c-format
msgid "S&ave changes"
msgstr "\x95ύX\x82\xF0\x95ۑ\xB6\x82\xB7\x82\xE9(&A)"
-#: Merge.rc:1256
+#: Merge.rc:1242
#, c-format
msgid "Dis&card changes"
msgstr "\x95ύX\x82\xF0\x94j\x8A\xFC\x82\xB7\x82\xE9(&C)"
-#: Merge.rc:1258
+#: Merge.rc:1244
#, c-format
msgid "Discard All"
msgstr "\x82\xB7\x82ׂĔj\x8A\xFC\x82\xB7\x82\xE9"
-#: Merge.rc:1265
-#: Merge.rc:1513
-#: Merge.rc:1949
+#: Merge.rc:1251
+#: Merge.rc:1499
+#: Merge.rc:1951
#, c-format
msgid "Codepage"
msgstr "\x83R\x81[\x83h\x83y\x81[\x83W"
-#: Merge.rc:1268
+#: Merge.rc:1254
#, c-format
msgid "Default Codepage"
msgstr "\x83f\x83t\x83H\x83\x8B\x83g\x83R\x81[\x83h\x83y\x81[\x83W"
-#: Merge.rc:1269
+#: Merge.rc:1255
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "\x94\xF1Unicode\x83t\x83@...:"
-#: Merge.rc:1271
+#: Merge.rc:1257
#, c-format
msgid ""
"Detect codepage info for these files: .html, .rc, .xml \n"
@@ -2029,32 +2027,32 @@
".html, .rc, .xml \x83t\x83@..."
"\x83Z\x83b\x83V\x83\x87\x83\x93\x82̍ċN\x93\xAE\x82\xAA\x95K\x97v\x82ł\xB7"
-#: Merge.rc:1274
+#: Merge.rc:1260
#, c-format
msgid "System codepage"
msgstr "\x83V\x83X\x83e\x83\x80\x83R\x81[\x83h\x83y\x81[\x83W"
-#: Merge.rc:1276
+#: Merge.rc:1262
#, c-format
msgid "According to WinMerge User Interface"
msgstr "\x8C\xBB\x8D݂\xCCWinMerge\x83\x86\x81[\x83U\x81[\x83C\x83\x93\x83^\x81[\x83t\x83F\x81[\x83X\x8C\xBE\x8C\xEA\x82ɏ]\x82\xA4"
-#: Merge.rc:1278
+#: Merge.rc:1264
#, c-format
msgid "Custom codepage:"
msgstr "\x83J\x83X\x83^\x83\x80\x83R\x81[\x83h\x83y\x81[\x83W:"
-#: Merge.rc:1286
+#: Merge.rc:1272
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr "WinMerge - \x83A\x81[\x83J\x83C\x83u\x83T\x83|\x81[\x83g\x82\xAA\x96\xB3\x8C\xF8"
-#: Merge.rc:1289
+#: Merge.rc:1275
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "7-Zip\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xAA\x8C\x9F\x8Fo\x82ł\xAB\x82܂\xB9\x82\xF1\x81B(\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2?)"
-#: Merge.rc:1292
+#: Merge.rc:1278
#, c-format
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
@@ -2063,24 +2061,24 @@
"\x83A\x81[\x83J\x83C\x83u\x83T\x83|\x81[\x83g\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9\x82ɂ\xCD 7-Zip \x82̃o\x81[\x83W\x83\x87\x83\x93 3.11 \x88ȍ~\x82\xF0\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB7\x82邩\x81A\n"
"\x83X\x83^\x83\x93\x83h\x83A\x83\x8D\x83\x93\x91\x80\x8D\xEC\x82̂\xBD\x82߂ɕK\x97v\x82ȃR\x83\x93\x83|\x81[\x83l\x83\x93\x83g\x82\xF0\x83v\x83\x8D\x83O\x83\x89\x83\x80\x83t\x83H\x83\x8B\x83_\x82ɃR\x83s\x81[\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B"
-#: Merge.rc:1294
+#: Merge.rc:1280
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "\x82܂\xBD\x81A\x93K\x90ȃC\x83\x93\x83^\x81[\x83t\x83F\x81[\x83X\x83v\x83\x89\x83O\x83C\x83\x93 (Merge7z*.dll) \x82\xAAPATH\x8F\xE3\x82ɑ\xB6\x8D݂\xB5\x82Ă\xA2\x82Ȃ\xAF\x82\xEA\x82Ȃ\xE8\x82܂\xB9\x82\xF1\x81B"
-#: Merge.rc:1296
+#: Merge.rc:1282
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
"versions become available."
msgstr "\x8DŐV\x82̃o\x81[\x83W\x83\x87\x83\x93\x82̃C\x83\x93\x83^\x81[\x83t\x83F\x81[\x83X\x83v\x83\x89\x83O\x83C\x83\x93\x82\xAA\x97\x98\x97p\x89\\x82ɂȂ\xE9\x82܂ŁA\x88ȉ\xBA\x82̐\x84\x8F\xA7\x82\xB3\x82\xEA\x82\xE97-Zip \x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B"
-#: Merge.rc:1298
+#: Merge.rc:1284
#, c-format
msgid "Version"
msgstr "\x83o\x81[\x83W\x83\x87\x83\x93"
-#: Merge.rc:1300
+#: Merge.rc:1286
#, c-format
msgid ""
"Plugin required\n"
@@ -2089,54 +2087,54 @@
"\x95K\x97v\x82ȃv\x83\x89\x83O\x83C\x83\x93\n"
"(dllbuild %04u)"
-#: Merge.rc:1302
+#: Merge.rc:1288
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "7-Zip \x82̐\x84\x8F\xA7\x83o\x81[\x83W\x83\x87\x83\x93:"
-#: Merge.rc:1305
-#: Merge.rc:1308
+#: Merge.rc:1291
+#: Merge.rc:1294
#, c-format
msgid "present"
msgstr "\x8C\xBB\x8D\xDD"
-#: Merge.rc:1306
+#: Merge.rc:1292
#, c-format
msgid "Merge7z000U.dll"
msgstr "Merge7z000U.dll"
-#: Merge.rc:1309
+#: Merge.rc:1295
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr "\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9 7-Zip:"
-#: Merge.rc:1311
-#: Merge.rc:1316
+#: Merge.rc:1297
+#: Merge.rc:1302
#, c-format
msgid "none"
msgstr "\x82Ȃ\xB5"
-#: Merge.rc:1313
+#: Merge.rc:1299
#, c-format
msgid "missing"
msgstr "missing"
-#: Merge.rc:1314
+#: Merge.rc:1300
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "\xBD\xC0\xDD\xC4ޱ\xDBݑ\x80\x8D\xEC\x82ɕK\x97v\x82\xC8 7-Zip \xBA\xDD\xCE߰\xC8\xDD\xC4:"
-#: Merge.rc:1318
+#: Merge.rc:1304
#, c-format
msgid "outdated"
msgstr "\x8B\x8C\x8E\xAE"
-#: Merge.rc:1319
+#: Merge.rc:1305
#, c-format
msgid "Plugins on path:"
msgstr "PATH\x8F\xE3\x82̃v\x83\x89\x83O\x83C\x83\x93:"
-#: Merge.rc:1320
+#: Merge.rc:1306
#, c-format
msgid ""
"Don't display this &message again.\n"
@@ -2145,535 +2143,562 @@
"\x8Dēx\x82\xB1\x82̃\x81\x83b\x83Z\x81[\x83W\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2(&M)\x81B\n"
"(\x83w\x83\x8B\x83v\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82炱\x82̃\x81\x83b\x83Z\x81[\x83W\x82\xF0\x95\\x8E\xA6\x82ł\xAB\x82܂\xB7\x81B)"
-#: Merge.rc:1324
+#: Merge.rc:1310
#, c-format
msgid "Plugin Download"
msgstr "\xCC\xDF\xDD\xC0\xDD۰\xC4\xDE"
-#: Merge.rc:1333
+#: Merge.rc:1319
#, c-format
msgid "Options"
msgstr "\x83I\x83v\x83V\x83\x87\x83\x93"
-#: Merge.rc:1344
+#: Merge.rc:1330
#, c-format
msgid " Categories"
msgstr " \x83J\x83e\x83S\x83\x8A"
-#: Merge.rc:1346
+#: Merge.rc:1332
#, c-format
msgid "Import..."
msgstr "\x83C\x83\x93\x83|\x81[\x83g..."
-#: Merge.rc:1347
+#: Merge.rc:1333
#, c-format
msgid "Export..."
msgstr "\x83G\x83N\x83X\x83|\x81[\x83g..."
-#: Merge.rc:1355
+#: Merge.rc:1341
#, c-format
msgid "Keywords:"
msgstr "\x83L\x81[\x83\x8F\x81[\x83h:"
-#: Merge.rc:1356
+#: Merge.rc:1342
#, c-format
msgid "Function names:"
msgstr "\x8A\x94\x96\xBC:"
-#: Merge.rc:1357
+#: Merge.rc:1343
#, c-format
msgid "Comments:"
msgstr "\x83R\x83\x81\x83\x93\x83g:"
-#: Merge.rc:1358
+#: Merge.rc:1344
#, c-format
msgid "Numbers:"
msgstr "\x90\x94\x92l:"
-#: Merge.rc:1359
+#: Merge.rc:1345
#, c-format
msgid "Operators:"
msgstr "\x83I\x83y\x83\x8C\x81[\x83^:"
-#: Merge.rc:1360
+#: Merge.rc:1346
#, c-format
msgid "Strings:"
msgstr "\x95\xB6\x8E\x9A\x97\xF1:"
-#: Merge.rc:1361
+#: Merge.rc:1347
#, c-format
msgid "Preprocessor:"
msgstr "\x83v\x83\x8A\x83v\x83\x8D\x83Z\x83b\x83T:"
-#: Merge.rc:1362
+#: Merge.rc:1348
#, c-format
msgid "User 1:"
msgstr "\x83\x86\x81[\x83U\x81[1:"
-#: Merge.rc:1363
+#: Merge.rc:1349
#, c-format
msgid "User 2:"
msgstr "\x83\x86\x81[\x83U\x81[2:"
-#: Merge.rc:1368
-#: Merge.rc:1373
-#: Merge.rc:1378
-#: Merge.rc:1383
-#: Merge.rc:1388
-#: Merge.rc:1393
-#: Merge.rc:1398
-#: Merge.rc:1403
-#: Merge.rc:1408
+#: 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 "\x91\xBE\x8E\x9A"
-#: Merge.rc:1416
+#: Merge.rc:1402
#, c-format
msgid "Folder Compare Report"
msgstr "\x83t\x83H\x83\x8B\x83_\x94\xE4\x8Ar\x83\x8C\x83|\x81[\x83g"
-#: Merge.rc:1419
+#: Merge.rc:1405
#, c-format
msgid "Report &File:"
msgstr "\x83\x8C\x83|\x81[\x83g\x83t\x83@...):"
-#: Merge.rc:1422
-#: Merge.rc:1596
-#: Merge.rc:1600
-#: Merge.rc:1627
+#: Merge.rc:1408
+#: Merge.rc:1582
+#: Merge.rc:1586
+#: Merge.rc:1613
#, c-format
msgid "Browse..."
msgstr "\x8EQ\x8F\xC6..."
-#: Merge.rc:1423
+#: Merge.rc:1409
#, c-format
msgid "&Style:"
msgstr "\x83X\x83^\x83C\x83\x8B(&S):"
-#: Merge.rc:1426
+#: Merge.rc:1412
#, c-format
msgid "&Copy to Clipboard"
msgstr "\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɃR\x83s\x81[(&C)"
-#: Merge.rc:1434
+#: Merge.rc:1420
#, c-format
msgid "Shared or Private Filter"
msgstr "\x8B\xA4\x97L/\x83v\x83\x89\x83C\x83x\x81[\x83g\x83t\x83B\x83\x8B\x83^"
-#: Merge.rc:1437
+#: Merge.rc:1423
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "\x82ǂ̃^\x83C\x83v\x82̃t\x83B\x83\x8B\x83^\x82\xF0\x8D쐬\x82\xB5\x82܂\xB7\x82\xA9?"
-#: Merge.rc:1439
+#: Merge.rc:1425
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "\x8B\xA4\x97L\x83t\x83B\x83\x8B\x83^ (\x82\xB1\x82̃}\x83V\x83\x93\x8F\xE3\x82̑S\x82Ẵ\x86\x81[\x83U\x81[\x82ɗL\x8C\xF8)"
-#: Merge.rc:1441
+#: Merge.rc:1427
#, c-format
msgid "Private Filter (only for current user)"
msgstr "\x83v\x83\x89\x83C\x83x\x81[\x83g\x83t\x83B\x83\x8B\x83^ (\x8C\xBB\x8D݂̃\x86\x81[\x83U\x81[\x82̂\xDD)"
-#: Merge.rc:1449
-#: Merge.rc:1950
+#: Merge.rc:1435
+#: Merge.rc:1952
#, c-format
msgid "Archive Support"
msgstr "\x83A\x81[\x83J\x83C\x83u\x83T\x83|\x81[\x83g"
-#: Merge.rc:1452
+#: Merge.rc:1438
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr "\x83A\x81[\x83J\x83C\x83u\x83T\x83|\x81[\x83g\x8B@... \x83v\x83\x89\x83O\x83C\x83\x93\x82̃C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xAA\x95K\x97v\x82ł\xB7:"
-#: Merge.rc:1454
+#: Merge.rc:1440
#, c-format
msgid "Download 7-zip Plugin"
msgstr "7-zip \x83v\x83\x89\x83O\x83C\x83\x93 \x83_\x83E\x83\x93\x83\x8D\x81[\x83h"
-#: Merge.rc:1455
+#: Merge.rc:1441
#, c-format
msgid "&Enable archive file support"
msgstr "\x83A\x81[\x83J\x83C\x83u\x83t\x83@...)"
-#: Merge.rc:1457
+#: Merge.rc:1443
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "\x97\x98\x97p\x89\\x82ł\xA0\x82\xEA\x82A\x83X\x83^\x83\x93\x83h\x83A\x83\x8D\x83\x93\x82\xCC7-Zip\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9(&U)"
-#: Merge.rc:1460
+#: Merge.rc:1446
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "WinMerge\x83t\x83H\x83\x8B\x83_\x82̃\x8D\x81[\x83J\x83\x8B\x82\xC87-Zip\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9(&S)"
-#: Merge.rc:1462
+#: Merge.rc:1448
#, c-format
msgid "&Detect archive type from file signature"
msgstr "\x83t\x83@...)"
-#: Merge.rc:1470
+#: Merge.rc:1456
#, c-format
msgid "Compare Statistics"
msgstr "\x94\xE4\x8Ar\x93\x9D\x8Cv"
-#: Merge.rc:1473
+#: Merge.rc:1459
#, c-format
msgid "Folders:"
msgstr "\x83t\x83H\x83\x8B\x83_:"
-#: Merge.rc:1474
+#: Merge.rc:1460
#, c-format
msgid "Files:"
msgstr "\x83t\x83@...:"
-#: Merge.rc:1475
-#: Merge.rc:2341
+#: Merge.rc:1461
+#: Merge.rc:2346
#, c-format
msgid "Different"
msgstr "\x8D\xB7\x88\xD9"
-#: Merge.rc:1476
+#: Merge.rc:1462
#, c-format
msgid "Text:"
msgstr "\x83e\x83L\x83X\x83g:"
-#: Merge.rc:1479
-#: Merge.rc:1498
+#: Merge.rc:1465
+#: Merge.rc:1484
#, c-format
msgid "Binary:"
msgstr "\x83o\x83C\x83i\x83\x8A:"
-#: Merge.rc:1482
+#: Merge.rc:1468
#, c-format
msgid "Unique"
msgstr "\x95Е\xFB\x82̂\xDD"
-#: Merge.rc:1483
+#: Merge.rc:1469
#, c-format
msgid "Left:"
msgstr "\x8D\xB6\x91\xA4:"
-#: Merge.rc:1488
+#: Merge.rc:1474
#, c-format
msgid "Right:"
msgstr "\x89E\x91\xA4:"
-#: Merge.rc:1493
-#: Merge.rc:2335
+#: Merge.rc:1479
+#: Merge.rc:2340
#, c-format
msgid "Identical"
msgstr "\x93\xAF\x88\xEA"
-#: Merge.rc:1502
+#: Merge.rc:1488
#, c-format
msgid "Total:"
msgstr "\x8D\x87\x8Cv:"
-#: Merge.rc:1507
+#: Merge.rc:1493
#, c-format
msgid "Close"
msgstr "\x95\xB6\x82\xE9"
-#: Merge.rc:1516
+#: Merge.rc:1502
#, c-format
msgid "Affects"
msgstr "\x8D\xEC\x97p"
-#: Merge.rc:1519
-#: Merge.rc:1522
+#: Merge.rc:1505
+#: Merge.rc:1508
#, c-format
msgid "(Affects)"
msgstr "(Affects)"
-#: Merge.rc:1523
+#: Merge.rc:1509
#, c-format
msgid "Select Codepage for"
msgstr "\x83R\x81[\x83h\x83y\x81[\x83W\x82̑I\x91\xF0"
-#: Merge.rc:1524
+#: Merge.rc:1510
#, c-format
msgid "&File Loading:"
msgstr "\x83t\x83@...):"
-#: Merge.rc:1526
-#: Merge.rc:1529
+#: Merge.rc:1512
+#: Merge.rc:1515
#, c-format
msgid "..."
msgstr "..."
-#: Merge.rc:1527
+#: Merge.rc:1513
#, c-format
msgid "File &Saving:"
msgstr "\x83t\x83@...)"
-#: Merge.rc:1530
+#: Merge.rc:1516
#, c-format
msgid "&Use same codepage for both"
msgstr "\x97\xBC\x91\xA4\x82ɓ\xAF\x82\xB6\x83R\x81[\x83h\x83y\x81[\x83W\x82\xF0\x8Eg\x97p"
-#: Merge.rc:1533
+#: Merge.rc:1519
#, c-format
msgid "&Apply"
msgstr "\x93K\x97p(&A)"
-#: Merge.rc:1534
-#: Merge.rc:1916
+#: Merge.rc:1520
+#: Merge.rc:1918
#, c-format
msgid "&Cancel"
msgstr "\x83L\x83\x83\x83\x93\x83Z\x83\x8B(&C)"
-#: Merge.rc:1539
+#: Merge.rc:1525
#, c-format
msgid "Test Filter"
msgstr "\x83t\x83B\x83\x8B\x83^\x82̃e\x83X\x83g"
-#: Merge.rc:1542
+#: Merge.rc:1528
#, c-format
msgid "Testing filter ..."
msgstr "\x83e\x83X\x83g\x82\xB7\x82\xE9\x83t\x83B\x83\x8B\x83^..."
-#: Merge.rc:1544
+#: Merge.rc:1530
#, c-format
msgid "&Enter text to test:"
msgstr "\x83e\x83X\x83g\x82\xB7\x82\xE9\x83e\x83L\x83X\x83g\x82̓\xFC\x97\xCD(&E):"
-#: Merge.rc:1546
+#: Merge.rc:1532
#, c-format
msgid "&Folder Name"
msgstr "\x83t\x83H\x83\x8B\x83_\x96\xBC(&F)"
-#: Merge.rc:1548
+#: Merge.rc:1534
#, c-format
msgid "Result:"
msgstr "\x8C\x8B\x89\xCA:"
-#: Merge.rc:1552
+#: Merge.rc:1538
#, c-format
msgid "&Test"
msgstr "\x83e\x83X\x83g(&T)"
-#: Merge.rc:1553
+#: Merge.rc:1539
#, c-format
msgid "&Close"
msgstr "\x95\xB6\x82\xE9(&C)"
-#: Merge.rc:1561
+#: Merge.rc:1547
#, c-format
msgid "&Use customized text colors"
msgstr "\x83J\x83X\x83^\x83\x80\x83e\x83L\x83X\x83g\x83J\x83\x89\x81[\x82\xF0\x8Eg\x97p(&U)"
-#: Merge.rc:1564
+#: Merge.rc:1550
#, c-format
msgid "Custom text colors"
msgstr "\x83J\x83X\x83^\x83\x80\x83e\x83L\x83X\x83g\x83J\x83\x89\x81["
-#: Merge.rc:1566
+#: Merge.rc:1552
#, c-format
msgid "Whitespace:"
msgstr "\x8B\xF3\x94\x92:"
-#: Merge.rc:1567
+#: Merge.rc:1553
#, c-format
msgid "Regular text:"
msgstr "\x95W\x8F\x80\x83e\x83L\x83X\x83g:"
-#: Merge.rc:1568
+#: Merge.rc:1554
#, c-format
msgid "Selection:"
msgstr "\x91I\x91\xF0:"
-#: Merge.rc:1591
+#: Merge.rc:1577
#, c-format
msgid "Paths"
msgstr "\x83p\x83X"
-#: Merge.rc:1597
+#: Merge.rc:1583
#, c-format
msgid "R&ead-only"
msgstr "\x93ǂݎ\xE6\x82\xE8\x90\xEA\x97p(&E)"
-#: Merge.rc:1601
+#: Merge.rc:1587
#, c-format
msgid "Re&ad-only"
msgstr "\x93ǂݎ\xE6\x82\xE8\x90\xEA\x97p(&A)"
-#: Merge.rc:1607
+#: Merge.rc:1593
#, c-format
msgid "Open..."
msgstr "\x8AJ\x82\xAD..."
-#: Merge.rc:1608
+#: Merge.rc:1594
#, c-format
msgid "Save..."
msgstr "\x95ۑ\xB6..."
-#: Merge.rc:1613
-#: Merge.rc:1951
+#: Merge.rc:1599
+#: Merge.rc:1953
#, c-format
msgid "Backup Files"
msgstr "\x83o\x83b\x83N\x83A\x83b\x83v\x83t\x83@..."
-#: Merge.rc:1616
+#: Merge.rc:1602
#, c-format
msgid "Create backup files in:"
msgstr "\x8D쐬\x82\xB7\x82\xE9\x83o\x83b\x83N\x83A\x83b\x83v:"
-#: Merge.rc:1621
+#: Merge.rc:1607
#, c-format
msgid "Create backup files into:"
msgstr "\x83o\x83b\x83N\x83A\x83b\x83v\x83t\x83@...:"
-#: Merge.rc:1622
+#: Merge.rc:1608
#, c-format
msgid "&Original file's folder"
msgstr "\x8C\xB3\x83t\x83@...)"
-#: Merge.rc:1624
+#: Merge.rc:1610
#, c-format
msgid "&Global backup folder:"
msgstr "\x83o\x83b\x83N\x83A\x83b\x83v\x83t\x83H\x83\x8B\x83_(&G):"
-#: Merge.rc:1628
+#: Merge.rc:1614
#, c-format
msgid "Backup filename:"
msgstr "\x83o\x83b\x83N\x83A\x83b\x83v\x83t\x83@...:"
-#: Merge.rc:1629
+#: Merge.rc:1615
#, c-format
msgid "&Append .bak -extension"
msgstr ".bak \x8Ag\x92\xA3\x8Eq\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9"
-#: Merge.rc:1631
+#: Merge.rc:1617
#, c-format
msgid "A&ppend timestamp"
msgstr "\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9(&P)"
-#: Merge.rc:1638
-#: Merge.rc:2243
+#: Merge.rc:1624
+#: Merge.rc:2248
#, c-format
msgid "Confirm Copy"
msgstr "\x83R\x83s\x81[\x82̊m\x94F"
-#: Merge.rc:1642
+#: Merge.rc:1628
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "\x96{\x93\x96\x82ɍ\x80\x96\xDA XXX \x82\xF0\x83R\x83s\x81[\x82\xB5\x82܂\xB7\x82\xA9?"
-#: Merge.rc:1644
+#: Merge.rc:1630
#, c-format
msgid "From left"
msgstr "\x8D\xB6\x82\xA9\x82\xE7"
-#: Merge.rc:1647
+#: Merge.rc:1633
#, c-format
msgid "To right"
msgstr "\x89E\x82\xD6"
-#: Merge.rc:1650
+#: Merge.rc:1636
#, c-format
msgid "Yes"
msgstr "\x82͂\xA2"
-#: Merge.rc:1651
+#: Merge.rc:1637
#, c-format
msgid "No"
msgstr "\x82\xA2\x82\xA2\x82\xA6"
-#: Merge.rc:1657
+#: Merge.rc:1643
#, c-format
msgid "Plugins"
msgstr "\x83v\x83\x89\x83O\x83C\x83\x93"
-#: Merge.rc:1660
+#: Merge.rc:1646
#, c-format
msgid "&Enable plugins"
msgstr "\x83v\x83\x89\x83O\x83C\x83\x93\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9(&E)"
-#: Merge.rc:1671
-#: Merge.rc:1952
+#: Merge.rc:1657
+#: Merge.rc:1954
#, c-format
msgid "Shell Integration"
msgstr "\x83V\x83F\x83\x8B\x93\x9D\x8D\x87"
-#: Merge.rc:1674
+#: Merge.rc:1660
#, c-format
msgid "Explorer"
msgstr "\x83G\x83N\x83X\x83v\x83\x8D\x81[\x83\x89"
-#: Merge.rc:1675
+#: Merge.rc:1661
#, c-format
msgid "E&nable advanced menu"
msgstr "\x8Ag\x92\xA3\x83\x81\x83j\x83\x85\x81[\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9(&N)"
-#: Merge.rc:1677
+#: Merge.rc:1663
#, c-format
msgid "In&clude subfolders by default"
msgstr "\x81u\x83T\x83u\x83t\x83H\x83\x8B\x83_\x82\xF0\x8A܂ށv\x82\xF0\x83f\x83t\x83H\x83\x8B\x83g\x82Ƃ\xB7\x82\xE9(&C)"
-#: Merge.rc:1679
+#: Merge.rc:1665
#, c-format
msgid "&Add to context menu"
msgstr "\x83R\x83\x93\x83e\x83L\x83X\x83g\x83\x81\x83j\x83\x85\x81[\x82ɒlj\xC1(&A)"
-#: Merge.rc:1681
+#: Merge.rc:1667
#, c-format
msgid "Folder compare"
msgstr "\x83t\x83H\x83\x8B\x83_\x94\xE4\x8Ar"
-#: Merge.rc:1682
+#: Merge.rc:1668
#, c-format
msgid "Add &Shell menu to context menu"
msgstr "\x83V\x83F\x83\x8B\x83\x81\x83j\x83\x85\x81[\x82\xF0\x83R\x83\x93\x83e\x83L\x83X\x83g\x83\x81\x83j\x83\x85\x81[\x82ɒlj\xC1(&S)"
+#: Merge.rc:1675
+#: Merge.rc:1957
+#: Merge.rc:2294
+#, c-format
+msgid "Folder"
+msgstr "\x83t\x83H\x83\x8B\x83_"
+
+#: Merge.rc:1679
+#, c-format
+msgid "S&top after first difference"
+msgstr "\x8Dŏ\x89\x82̍\xB7\x88قŔ\xE4\x8Ar\x82\xF0\x8FI\x97\xB9\x82\xB7\x82\xE9(&T)"
+
+#: Merge.rc:1681
+#, c-format
+msgid "Ign&ore time differences less than 3 seconds"
+msgstr "3\x95b\x88ȉ\xBA\x82̎\x9E\x8Aԍ\xB7\x82\x8B\x82\xB7\x82\xE9"
+
+#: Merge.rc:1683
+#, c-format
+msgid "&Compare method:"
+msgstr "\x94\xE4\x8Ar\x95\xFB\x96@...):"
+
+#: Merge.rc:1684
+#, c-format
+msgid "&Quick compare limit (MB):"
+msgstr "\x83N\x83C\x83b\x83N\x83R\x83\x93\x83e\x83\x93\x83c\x90\xA7\x8C\xC0(MB)(&Q):"
+
#. StringFileInfo.Block
-#: Merge.rc:1708
+#: Merge.rc:1710
#, c-format
msgid "040904e4"
msgstr "041103a4"
#. VarFileInfo.Translation
-#: Merge.rc:1724
+#: Merge.rc:1726
#, c-format
msgid "0x409, 1252"
msgstr "0x411, 932"
-#: Merge.rc:1739
+#: Merge.rc:1741
#, c-format
msgid "Ready"
msgstr "\x83\x8C\x83f\x83B"
-#: Merge.rc:1745
+#: Merge.rc:1747
#, c-format
msgid "EXT"
msgstr "EXT"
-#: Merge.rc:1746
+#: Merge.rc:1748
#, c-format
msgid "CAP"
msgstr "CAP"
-#: Merge.rc:1747
+#: Merge.rc:1749
#, c-format
msgid "NUM"
msgstr "NUM"
-#: Merge.rc:1748
+#: Merge.rc:1750
#, c-format
msgid "SCRL"
msgstr "SCRL"
-#: Merge.rc:1749
+#: Merge.rc:1751
#, c-format
msgid "OVR"
msgstr "\x8F㏑"
-#: Merge.rc:1750
+#: Merge.rc:1752
#, c-format
msgid "REC"
msgstr "\x8BL\x98^"
-#: Merge.rc:1756
+#: Merge.rc:1758
#, c-format
msgid ""
"Create empty documents\n"
@@ -2682,7 +2707,7 @@
"\x90V\x82\xB5\x82\xA2\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xAC\x82\xB5\x82܂\xB7\n"
"\x90V\x8BK\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g (Ctrl-N)"
-#: Merge.rc:1757
+#: Merge.rc:1759
#, c-format
msgid ""
"Open an existing document\n"
@@ -2691,7 +2716,7 @@
"\x8A\xF9\x91\xB6\x82̃h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x8AJ\x82\xAB\x82܂\xB7\n"
"\x8AJ\x82\xAD (Ctrl+O)"
-#: Merge.rc:1758
+#: Merge.rc:1760
#, c-format
msgid ""
"Close the active document\n"
@@ -2700,7 +2725,7 @@
"\x8D\xEC\x8Bƒ\x86\x82̃h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x95\xB6\x82܂\xB7\n"
"\x95\xB6\x82\xE9"
-#: Merge.rc:1759
+#: Merge.rc:1761
#, c-format
msgid ""
"Save the active document\n"
@@ -2709,7 +2734,7 @@
"\x8D\xEC\x8Bƒ\x86\x82̃h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x95ۑ\xB6\x82\xB5\x82܂\xB7\n"
"\x95ۑ\xB6 (Ctrl+S)"
-#: Merge.rc:1760
+#: Merge.rc:1762
#, c-format
msgid ""
"Save the active document with a new name\n"
@@ -2718,7 +2743,7 @@
"\x8D\xEC\x8Bƒ\x86\x82̃h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x90V\x82\xB5\x82\xA2\x96\xBC\x91O\x82\xF0\x82\xAF\x82ĕۑ\xB6\x82\xB5\x82܂\xB7\n"
"\x96\xBC\x91O\x82\xF0\x95t\x82\xAF\x82ĕۑ\xB6"
-#: Merge.rc:1761
+#: Merge.rc:1763
#, c-format
msgid ""
"Change the printing options\n"
@@ -2727,7 +2752,7 @@
"\x88\xF3\x8D\xFC\x83I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x95ύX\x82\xB5\x82܂\xB7\n"
"\x83y\x81[\x83W \x83\x8C\x83C\x83A\x83E\x83g\x82̐ݒ\xE8"
-#: Merge.rc:1762
+#: Merge.rc:1764
#, c-format
msgid ""
"Change the printer and printing options\n"
@@ -2736,7 +2761,7 @@
"\x83v\x83\x8A\x83\x93\x83^/\x88\xF3\x8D\xFC\x83I\x83v\x83V\x83\x87\x83\x93\x82̕ύX\n"
"\x88\xF3\x8D\xFC\x90ݒ\xE8"
-#: Merge.rc:1763
+#: Merge.rc:1765
#, c-format
msgid ""
"Print the active document\n"
@@ -2745,7 +2770,7 @@
"\x8D\xEC\x8Bƒ\x86\x82̃h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x88\xF3\x8D\xFC\x82\xB5\x82܂\xB7\n"
"\x88\xF3\x8D\xFC"
-#: Merge.rc:1764
+#: Merge.rc:1766
#, c-format
msgid ""
"Display full pages\n"
@@ -2754,27 +2779,27 @@
"\x88\xF3\x8D\xFC\x83C\x83\x81\x81[\x83W\x82\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB7\n"
"\x88\xF3\x8D\xFC\x83v\x83\x8C\x83r\x83\x85\x81["
-#: Merge.rc:1769
+#: Merge.rc:1771
#, c-format
msgid "Make all hidden items visible again"
msgstr "\x94\xF1\x95\\x8E\xA6\x82ɂ\xB5\x82\xBD\x8D\x80\x96ڂ\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB7"
-#: Merge.rc:1770
+#: Merge.rc:1772
#, c-format
msgid "Toggle tree mode"
msgstr "\x83c\x83\x8A\x81[\x95\\x8E\xA6/\x83t\x83\x89\x83b\x83g\x95\\x8E\xA6\x82\xF0\x90\xE8\x91ւ\xA6\x82܂\xB7"
-#: Merge.rc:1771
+#: Merge.rc:1773
#, c-format
msgid "Expand all subfolders"
msgstr "\x82\xB7\x82ׂẴT\x83u\x83t\x83H\x83\x8B\x83_\x82\xF0\x93W\x8AJ\x82\xB7\x82\xE9"
-#: Merge.rc:1772
+#: Merge.rc:1774
#, c-format
msgid "Collapse all subfolders"
msgstr "\x82\xB7\x82ׂẴT\x83u\x83t\x83H\x83\x8B\x83_\x82\xF0\x90܂肽\x82\xBD\x82\xDE"
-#: Merge.rc:1778
+#: Merge.rc:1780
#, c-format
msgid ""
"Open project file\n"
@@ -2783,32 +2808,32 @@
"\x83v\x83\x8D\x83W\x83F\x83N\x83g\x82\xF0\x8AJ\x82\xAB\x82܂\xB7\n"
"\x83v\x83\x8D\x83W\x83F\x83N\x83g\x82\xF0\x8AJ\x82\xAD (Ctrl+J)"
-#: Merge.rc:1779
+#: Merge.rc:1781
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "\x96\xA2\x92m\x82̃G\x83\x89\x81[:\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83t\x83@..."
-#: Merge.rc:1780
+#: Merge.rc:1782
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "\x96\xA2\x92m\x82̃G\x83\x89\x81[:\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83t\x83@..."
-#: Merge.rc:1781
+#: Merge.rc:1783
#, c-format
msgid "Project File"
msgstr "\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83t\x83@..."
-#: Merge.rc:1782
+#: Merge.rc:1784
#, c-format
msgid "Project file successfully loaded."
msgstr "\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83t\x83@..."
-#: Merge.rc:1783
+#: Merge.rc:1785
#, c-format
msgid "Project file successfully saved."
msgstr "\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83t\x83@..."
-#: Merge.rc:1784
+#: Merge.rc:1786
#, c-format
msgid ""
"Save current paths and options to project file\n"
@@ -2817,7 +2842,7 @@
"\x8C\xBB\x8D݂̃p\x83X\x82ƃI\x83v\x83V\x83\x87\x83\x93\x90ݒ\xE8\x82\xF0\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83t\x83@..."
"\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83t\x83@..."
-#: Merge.rc:1789
+#: Merge.rc:1791
#, c-format
msgid ""
"Display program information, version number and copyright\n"
@@ -2826,7 +2851,7 @@
"\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82̏\xEE\x95\xF1\x81A\x83o\x81[\x83W\x83\x87\x83\x93\x82\xBB\x82\xB5\x82Ē\x98\x8D쌠\x82\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB7\n"
"\x83o\x81[\x83W\x83\x87\x83\x93\x8F\xEE\x95\xF1"
-#: Merge.rc:1790
+#: Merge.rc:1792
#, c-format
msgid ""
"Quit the application; prompts to save documents\n"
@@ -2835,8 +2860,6 @@
"\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82\xF0\x8FI\x97\xB9\x82\xB5\x81A\x83t\x83@..."
"\x8FI\x97\xB9"
-#: Merge.rc:1796
-#: Merge.rc:1797
#: Merge.rc:1798
#: Merge.rc:1799
#: Merge.rc:1800
@@ -2851,11 +2874,13 @@
#: Merge.rc:1809
#: Merge.rc:1810
#: Merge.rc:1811
+#: Merge.rc:1812
+#: Merge.rc:1813
#, c-format
msgid "Open this document"
msgstr "\x8Ew\x92\xE8\x82̃t\x83@..."
-#: Merge.rc:1816
+#: Merge.rc:1818
#, c-format
msgid ""
"Switch to the next window pane\n"
@@ -2864,7 +2889,7 @@
"\x8E\x9F\x82̃E\x83B\x83\x93\x83h\x83E\x83y\x83C\x83\x93\x82ɐ\xE8\x91ւ\xA6\x82܂\xB7\n"
"\x8E\x9F\x82̃y\x83C\x83\x93"
-#: Merge.rc:1817
+#: Merge.rc:1819
#, c-format
msgid ""
"Switch back to the previous window pane\n"
@@ -2873,7 +2898,7 @@
"\x91O\x82̃E\x83B\x83\x93\x83h\x83E\x83y\x83C\x83\x93\x82ɐ\xE8\x91ւ\xA6\x82܂\xB7\n"
"\x91O\x82̃y\x83C\x83\x93"
-#: Merge.rc:1823
+#: Merge.rc:1825
#, c-format
msgid ""
"Arrange windows so they overlap\n"
@@ -2882,7 +2907,7 @@
"\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Fd\x82˂ĕ\\x8E\xA6\x82\xB5\x82܂\xB7\n"
"\x8Fd\x82˂ĕ\\x8E\xA6"
-#: Merge.rc:1824
+#: Merge.rc:1826
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
@@ -2891,7 +2916,7 @@
"\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8F㉺\x82ɕ\xC0\x82ׂĕ\\x8E\xA6\x82\xB5\x82܂\xB7\n"
"\x8F㉺\x82ɕ\xC0\x82ׂĕ\\x8E\xA6"
-#: Merge.rc:1825
+#: Merge.rc:1827
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
@@ -2900,7 +2925,7 @@
"\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8D\xB6\x89E\x82ɕ\xC0\x82ׂĕ\\x8E\xA6\x82\xB5\x82܂\xB7\n"
"\x8D\xB6\x89E\x82ɕ\xC0\x82ׂĕ\\x8E\xA6"
-#: Merge.rc:1831
+#: Merge.rc:1833
#, c-format
msgid ""
"Copy the selection and put it on the Clipboard\n"
@@ -2909,7 +2934,7 @@
"\x91I\x91\xF0\x94͈͂\xF0\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɃR\x83s\x81[\x82\xB5\x82܂\xB7\n"
"\x83R\x83s\x81["
-#: Merge.rc:1832
+#: Merge.rc:1834
#, c-format
msgid ""
"Cut the selection and put it on the Clipboard\n"
@@ -2918,7 +2943,7 @@
"\x91I\x91\xF0\x94͈͂\xF0\x90\xE8\x8E\xE6\x82\xC1\x82āA\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɃR\x83s\x81[\x82\xB5\x82܂\xB7\n"
"\x90\xE8\x8E\xE6\x82\xE8"
-#: Merge.rc:1833
+#: Merge.rc:1835
#, c-format
msgid ""
"Find the specified text\n"
@@ -2927,7 +2952,7 @@
"\x8Ew\x92肵\x82\xBD\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x8C\x9F\x8D\x{142D42}܂\xB7\n"
"\x8C\x9F\x8D\xF5"
-#: Merge.rc:1834
+#: Merge.rc:1836
#, c-format
msgid ""
"Insert Clipboard contents\n"
@@ -2936,7 +2961,7 @@
"\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82̓\xE0\x97e\x82\xF0\x91}\x93\xFC\x82\xB5\x82܂\xB7\n"
"\x93\\x82\xE8\x95t\x82\xAF"
-#: Merge.rc:1835
+#: Merge.rc:1837
#, c-format
msgid ""
"Repeat the last action\n"
@@ -2945,7 +2970,7 @@
"\x92\xBC\x91O\x82ɍs\x82\xC1\x82\xBD\x93\xAE\x8D\xEC\x82\xF0\x8CJ\x82\xE8\x95Ԃ\xB7\n"
"\x8CJ\x82\xE8\x95Ԃ\xB5"
-#: Merge.rc:1836
+#: Merge.rc:1838
#, c-format
msgid ""
"Replace specific text with different text\n"
@@ -2954,7 +2979,7 @@
"\x8Ew\x92肳\x82ꂽ\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x81A\x82ق\xA9\x82̕\xB6\x8E\x9A\x97\xF1\x82ɒu\x82\xAB\x8A\xB7\x82\xA6\x82܂\xB7\n"
"\x92u\x8A\xB7"
-#: Merge.rc:1837
+#: Merge.rc:1839
#, c-format
msgid ""
"Select the entire document\n"
@@ -2963,7 +2988,7 @@
"\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x91S\x91̂\xF0\x91I\x91\xF0\x82\xB5\x82܂\xB7\n"
"\x82\xB7\x82ׂđI\x91\xF0"
-#: Merge.rc:1838
+#: Merge.rc:1840
#, c-format
msgid ""
"Undo the last action\n"
@@ -2972,7 +2997,7 @@
"\x92\xBC\x91O\x82ɍs\x82Ȃ\xC1\x82\xBD\x91\x80\x8D\xEC\x82\xF0\x8E\xE6\x82\xE8\x8F\xC1\x82\xB5\x82܂\xB7\n"
"\x8C\xB3\x82ɖ߂\xB7 (Ctrl+Z)"
-#: Merge.rc:1839
+#: Merge.rc:1841
#, c-format
msgid ""
"Redo the previously undone action\n"
@@ -2981,7 +3006,7 @@
"\x92\xBC\x91O\x82ɍs\x82\xC1\x82\xBD\x93\xAE\x8D\xEC\x82\xF0\x8CJ\x82\xE8\x95Ԃ\xB7\n"
"\x8CJ\x82\xE8\x95Ԃ\xB7 (Ctrl+Y)"
-#: Merge.rc:1845
+#: Merge.rc:1847
#, c-format
msgid ""
"Show or hide the toolbar\n"
@@ -2990,7 +3015,7 @@
"\x83c\x81[\x83\x8B\x83o\x81[\x82̕\\x8E\xA6/\x94\xF1\x95\\x8E\xA6\x82\xF0\x90\xE8\x91ւ\xA6\x82܂\xB7\n"
"\x83c\x81[\x83\x8B\x83o\x81[\x95\\x8E\xA6\x82̃g\x83O\x83\x8B"
-#: Merge.rc:1846
+#: Merge.rc:1848
#, c-format
msgid ""
"Show or hide the status bar\n"
@@ -2999,7 +3024,7 @@
"\x83X\x83e\x81[\x83^\x83X\x83o\x81[\x82̕\\x8E\xA6/\x94\xF1\x95\\x8E\xA6\x82\xF0\x90\xE8\x91ւ\xA6\x82܂\xB7\n"
"\x83X\x83e\x81[\x83^\x83X\x83o\x81[\x95\\x8E\xA6\x82̃g\x83O\x83\x8B"
-#: Merge.rc:1847
+#: Merge.rc:1849
#, c-format
msgid ""
"Show or hide the tab bar\n"
@@ -3008,7 +3033,7 @@
"\x83^\x83u\x83o\x81[\x82̕\\x8E\xA6/\x94\xF1\x95\\x8E\xA6\x82\xF0\x90\xE8\x91ւ\xA6\x82܂\xB7\n"
"\x83^\x83u\x83o\x81[\x95\\x8E\xA6\x82̃g\x83O\x83\x8B"
-#: Merge.rc:1848
+#: Merge.rc:1850
#, c-format
msgid ""
"Automatically resize panes\n"
@@ -3017,57 +3042,57 @@
"\x8E\xA9\x93\xAE\x93I\x82Ƀy\x83C\x83\x93\x82\xF0\x83\x8A\x83T\x83C\x83Y\x82\xB5\x82܂\xB7\n"
"\x83y\x83C\x83\x93\x82̃\x8D\x83b\x83N"
-#: Merge.rc:1854
+#: Merge.rc:1856
#, c-format
msgid "Change the window size"
msgstr "\x83E\x83B\x83\x93\x83h\x83E\x82̃T\x83C\x83Y\x82\xF0\x95ύX"
-#: Merge.rc:1855
+#: Merge.rc:1857
#, c-format
msgid "Change the window position"
msgstr "\x83E\x83B\x83\x93\x83h\x83E\x82̈ʒu\x82\xF0\x95ύX"
-#: Merge.rc:1856
+#: Merge.rc:1858
#, c-format
msgid "Reduce the window to an icon"
msgstr "\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Dŏ\xAC\x89\xBB\x82\xB7\x82\xE9"
-#: Merge.rc:1857
+#: Merge.rc:1859
#, c-format
msgid "Enlarge the window to full size"
msgstr "\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Dő剻\x82\xB7\x82\xE9"
-#: Merge.rc:1858
+#: Merge.rc:1860
#, c-format
msgid "Switch to the next document window"
msgstr "\x8E\x9F\x82̃E\x83B\x83\x93\x83h\x83E\x82ɐ\xE8\x91ւ\xA6\x82\xE9"
-#: Merge.rc:1859
+#: Merge.rc:1861
#, c-format
msgid "Switch to the previous document window"
msgstr "\x91O\x82̃E\x83B\x83\x93\x83h\x83E\x82ɐ\xE8\x91ւ\xA6\x82\xE9"
-#: Merge.rc:1860
+#: Merge.rc:1862
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr "\x8D\xEC\x8Bƒ\x86\x82̃E\x83B\x83\x93\x83h\x83E\x82\xF0\x95\xB6\x81A\x95ύX\x82\xB5\x82\xBD\x83t\x83@..."
-#: Merge.rc:1865
+#: Merge.rc:1867
#, c-format
msgid "Restore the window to normal size"
msgstr "\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x92ʏ\xED\x82̃T\x83C\x83Y\x82ɖ߂\xB7"
-#: Merge.rc:1866
+#: Merge.rc:1868
#, c-format
msgid "Activate Task List"
msgstr "\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82̐\xE8\x91ւ\xA6"
-#: Merge.rc:1867
+#: Merge.rc:1869
#, c-format
msgid "Activate this window"
msgstr "\x8Ew\x92\xE8\x82̃E\x83B\x83\x93\x83h\x83E\x82\xF0\x95\\x8E\xA6"
-#: Merge.rc:1873
+#: Merge.rc:1875
#, c-format
msgid ""
"Close print preview mode\n"
@@ -3076,7 +3101,7 @@
"\x88\xF3\x8D\xFC\x83v\x83\x8C\x83r\x83\x85\x81[\x83\x82\x81[\x83h\x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7\n"
"\x83v\x83\x8C\x83r\x83\x85\x81[\x82̃L\x83\x83\x83\x93\x83Z\x83\x8B"
-#: Merge.rc:1880
+#: Merge.rc:1882
#, c-format
msgid ""
"\n"
@@ -3095,7 +3120,7 @@
"WinMerge.FileCompare\n"
"WinMerge File Compare"
-#: Merge.rc:1881
+#: Merge.rc:1883
#, c-format
msgid ""
"\n"
@@ -3114,23 +3139,23 @@
"WinMerge.FolderCompare\n"
"WinMerge Folder Compare"
-#: Merge.rc:1888
+#: Merge.rc:1890
#, c-format
msgid "Preserve original EOL chars"
msgstr "\x8C\xB3\x82\xCCEOL\x95\xB6\x8E\x9A\x82\xF0\x95ێ\x9D\x82\xB5\x82܂\xB7"
-#: Merge.rc:1895
+#: Merge.rc:1897
#, c-format
msgid "Press any key"
msgstr "\x89\xBD\x82\xA9\x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2"
-#: Merge.rc:1901
-#: Merge.rc:1902
+#: Merge.rc:1903
+#: Merge.rc:1904
#, c-format
msgid "Right click on the path to copy"
msgstr "\x89E\x83N\x83\x8A\x83b\x83N\x82Ńp\x83X\x82\xF0\x83R\x83s\x81["
-#: Merge.rc:1908
+#: Merge.rc:1910
#, c-format
msgid ""
"Developers:\n"
@@ -3139,157 +3164,158 @@
"Developers:\n"
"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-#: Merge.rc:1909
+#: Merge.rc:1911
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
-#: Merge.rc:1915
+#: Merge.rc:1917
#, c-format
msgid "&Ok"
msgstr "&Ok"
-#: Merge.rc:1917
+#: Merge.rc:1919
#, c-format
msgid "&Abort"
msgstr "\x92\x86\x8E~(&A)"
-#: Merge.rc:1918
+#: Merge.rc:1920
#, c-format
msgid "&Retry"
msgstr "\x8DĎ\x8E\x8Ds(&R)"
-#: Merge.rc:1919
+#: Merge.rc:1921
#, c-format
msgid "&Ignore"
msgstr "\x96\xB3\x8E\x8B(&I)"
-#: Merge.rc:1920
+#: Merge.rc:1922
#, c-format
msgid "Ignore &all"
msgstr "\x91S\x82Ė\xB3\x8E\x8B(&A)"
-#: Merge.rc:1921
+#: Merge.rc:1923
#, c-format
msgid "&Yes"
msgstr "\x82͂\xA2(&Y)"
-#: Merge.rc:1927
+#: Merge.rc:1929
#, c-format
msgid "Yes to &all"
msgstr "\x91S\x82Ă͂\xA2(&A)"
-#: Merge.rc:1928
+#: Merge.rc:1930
#, c-format
msgid "&No"
msgstr "\x82\xA2\x82\xA2\x82\xA6(&N)"
-#: Merge.rc:1929
+#: Merge.rc:1931
#, c-format
msgid "No to a&ll"
msgstr "\x91S\x82Ă\xA2\x82\xA2\x82\xA6(&L)"
-#: Merge.rc:1930
+#: Merge.rc:1932
#, c-format
msgid "&Continue"
msgstr "\x91\xB1\x8Ds(&C)"
-#: Merge.rc:1931
+#: Merge.rc:1933
#, c-format
msgid "&Skip"
msgstr "\x83X\x83L\x83b\x83v(&S)"
-#: Merge.rc:1932
+#: Merge.rc:1934
#, c-format
msgid "Skip &all"
msgstr "\x82\xB7\x82ׂăX\x83L\x83b\x83v(&A)"
-#: Merge.rc:1934
+#: Merge.rc:1936
#, c-format
msgid "Don't display this &message again."
msgstr "\x8DĂт\xB1\x82̃\x81\x83b\x83Z\x81[\x83W\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2(&M)"
-#: Merge.rc:1935
+#: Merge.rc:1937
#, c-format
msgid "Don't ask this &question again."
msgstr "\x8DĂт\xB1\x82̎\xBF\x96\xE2\x82\xF0\x82\xB5\x82Ȃ\xA2(&Q)"
-#: Merge.rc:1945
+#: Merge.rc:1948
#, c-format
-msgid "Syntax colors"
-msgstr "\x83V\x83\x93\x83^\x83b\x83N\x83X\x83J\x83\x89\x81["
+msgid "Syntax"
+msgstr "\x83V\x83\x93\x83^\x83b\x83N\x83X"
-#: Merge.rc:1946
+#: Merge.rc:1950
#, c-format
-msgid "Text Colors"
-msgstr "\x83e\x83L\x83X\x83g\x83J\x83\x89\x81["
-
-#: Merge.rc:1948
-#, c-format
msgid "Version Control"
msgstr "\x83o\x81[\x83W\x83\x87\x83\x93\x8AǗ\x9D"
-#: Merge.rc:1959
+#: Merge.rc:1955
+#: Merge.rc:2326
#, c-format
+msgid "Differences"
+msgstr "\x8D\xB7\x88ِ\x94"
+
+#: Merge.rc:1964
+#, c-format
msgid "To:"
msgstr "To:"
-#: Merge.rc:1960
+#: Merge.rc:1965
#, c-format
msgid "From left:"
msgstr "\x8D\xB6\x82\xA9\x82\xE7:"
-#: Merge.rc:1961
+#: Merge.rc:1966
#, c-format
msgid "To left:"
msgstr "\x8D\xB6\x82\xD6:"
-#: Merge.rc:1962
+#: Merge.rc:1967
#, c-format
msgid "From right:"
msgstr "\x89E\x82\xA9\x82\xE7:"
-#: Merge.rc:1963
+#: Merge.rc:1968
#, c-format
msgid "To right:"
msgstr "\x89E\x82\xD6:"
-#: Merge.rc:1969
+#: Merge.rc:1974
#, c-format
msgid "Version %1"
msgstr "Version %1 - Japanese"
-#: Merge.rc:1970
+#: Merge.rc:1975
#, c-format
msgid "Unicode"
msgstr "Unicode"
-#: Merge.rc:1971
+#: Merge.rc:1976
#, c-format
msgid "X64"
msgstr "X64"
-#: Merge.rc:1977
+#: Merge.rc:1982
#, c-format
msgid "Options (%1)"
msgstr "\x83I\x83v\x83V\x83\x87\x83\x93 (%1)"
-#: Merge.rc:1978
+#: Merge.rc:1983
#, c-format
msgid "All message boxes are now displayed again."
msgstr "\x82\xB7\x82ׂẴ\x81\x83b\x83Z\x81[\x83W\x83{\x83b\x83N\x83X\x82\xAA\x81A\x8DĂѕ\\x8E\xA6\x82\xB3\x82\xEA\x82܂\xB7\x81B"
-#: Merge.rc:1979
+#: Merge.rc:1984
#, 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 "\x8C\xBB\x8D݊J\x82\xA2\x82Ă\xA2\x82\xE9\x83t\x83@..."
-#: Merge.rc:1980
+#: Merge.rc:1985
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr "\x91I\x91\xF0\x82\xB3\x82ꂽ\x83t\x83H\x83\x93\x83g\x82͌\xBB\x8Dݕ\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82鍷\x88كE\x83C\x83\x93\x83h\x83E\x82ɂ͓K\x97p\x82\xB3\x82\xEA\x82܂\xB9\x82\xF1\x81B"
-#: Merge.rc:1982
+#: Merge.rc:1987
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
@@ -3300,7 +3326,7 @@
"\n"
"1\x82\xA9\x82\xE7%1\x82܂ł̒l\x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B"
-#: Merge.rc:1984
+#: Merge.rc:1989
#, c-format
msgid ""
"Are you sure you want to reset all WinMerge options to default values?\n"
@@ -3311,129 +3337,129 @@
"\n"
"\x83\x8A\x83Z\x83b\x83g\x8C\xE3\x82\xCDWinMerge\x82\xF0\x8DċN\x93\xAE\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B"
-#: Merge.rc:1990
+#: Merge.rc:1995
#, c-format
msgid "Open"
msgstr "\x8AJ\x82\xAD"
-#: Merge.rc:1991
+#: Merge.rc:1996
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "\x83v\x83\x8D\x83O\x83\x89\x83\x80|*.exe;*.bat;*.cmd|\x82\xB7\x82ׂẴt\x83@...(*.*)|*.*||"
-#: Merge.rc:1992
+#: Merge.rc:1997
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "\x82\xB7\x82ׂẴt\x83@... (*.*)|*.*||"
-#: Merge.rc:1993
+#: Merge.rc:1998
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge \x83v\x83\x8D\x83W\x83F\x83N\x83g\x83t\x83@... (*.WinMerge)|*.WinMerge||"
-#: Merge.rc:1995
+#: Merge.rc:2000
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "\x90ݒ\xE8\x83t\x83@... (*.ini)|*.ini|\x82\xB7\x82ׂẴt\x83@...(*.*)|*.*||"
-#: Merge.rc:2001
+#: Merge.rc:2006
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "\x83e\x83L\x83X\x83g\x83t\x83@... (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
-#: Merge.rc:2002
+#: Merge.rc:2007
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML \x83t\x83@... (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
-#: Merge.rc:2003
+#: Merge.rc:2008
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML \x83t\x83@... (*.xml)|*.xml|All Files (*.*)|*.*||"
-#: Merge.rc:2009
+#: Merge.rc:2014
#, c-format
msgid "UTF-8"
msgstr "UTF-8"
-#: Merge.rc:2010
+#: Merge.rc:2015
#, c-format
msgid "UTF-8 (B)"
msgstr "UTF-8 (B)"
-#: Merge.rc:2011
+#: Merge.rc:2016
#, c-format
msgid "UCS-2 LE"
msgstr "UCS-2 LE"
-#: Merge.rc:2012
+#: Merge.rc:2017
#, c-format
msgid "UCS-2 BE"
msgstr "UCS-2 BE"
-#: Merge.rc:2018
+#: Merge.rc:2023
#, c-format
msgid "Full Contents"
msgstr "\x83t\x83\x8B\x83R\x83\x93\x83e\x83\x93\x83c"
-#: Merge.rc:2019
+#: Merge.rc:2024
#, c-format
msgid "Quick Contents"
msgstr "\x83N\x83C\x83b\x83N\x83R\x83\x93\x83e\x83\x93\x83c"
-#: Merge.rc:2020
+#: Merge.rc:2025
#, c-format
msgid "Modified Date"
msgstr "\x8DX\x90V\x93\xFA\x8E\x9E"
-#: Merge.rc:2021
+#: Merge.rc:2026
#, c-format
msgid "Modified Date and Size"
msgstr "\x8DX\x90V\x93\xFA\x8E\x9E\x82ƃT\x83C\x83Y"
-#: Merge.rc:2022
+#: Merge.rc:2027
#, c-format
msgid "Size"
msgstr "\x83T\x83C\x83Y"
-#: Merge.rc:2028
-#: Merge.rc:2653
+#: Merge.rc:2033
+#: Merge.rc:2559
#, c-format
msgid "Name"
msgstr "\x96\xBC\x8F\xCC"
-#: Merge.rc:2029
+#: Merge.rc:2034
#, c-format
msgid "Location"
msgstr "\x8Fꏊ"
-#: Merge.rc:2030
+#: Merge.rc:2035
#, c-format
msgid "Filters"
msgstr "\x83t\x83B\x83\x8B\x83^"
-#: Merge.rc:2031
+#: Merge.rc:2036
#, c-format
msgid "[F] "
msgstr "[F] "
-#: Merge.rc:2032
-#: Merge.rc:2655
+#: Merge.rc:2037
+#: Merge.rc:2561
#, c-format
msgid "Description"
msgstr "\x90\xE0\x96\xBE"
-#: Merge.rc:2033
+#: Merge.rc:2038
#, c-format
msgid "Select filename for new filter"
msgstr "\x90V\x82\xB5\x82\xA2\x83t\x83B\x83\x8B\x83^\x82̃t\x83@..."
-#: Merge.rc:2034
+#: Merge.rc:2039
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "\x83t\x83@...^ (*.flt)|*.flt|All Files (*.*)|*.*||"
-#: Merge.rc:2036
+#: Merge.rc:2041
#, c-format
msgid ""
"Cannot find file filter template file!\n"
@@ -3446,7 +3472,7 @@
"\x83t\x83@... %1 \x82\xF0\x88ȉ\xBA\x82\xCC WinMerge/Filters \x83t\x83H\x83\x8B\x83_\x82ɃR\x83s\x81[\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2:\n"
"%2"
-#: Merge.rc:2038
+#: Merge.rc:2043
#, c-format
msgid ""
"Cannot copy filter template file to filter folder:\n"
@@ -3458,7 +3484,7 @@
"\n"
"\x83t\x83H\x83\x8B\x83_\x82̑\xB6\x8D݂܂\xBD\x82͏\x91\x82\xAB\x8D\x9E\x82݉\\x82ł\xA0\x82邩\x8Am\x94F\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B"
-#: Merge.rc:2040
+#: Merge.rc:2045
#, c-format
msgid ""
"User's filter file folder is not defined!\n"
@@ -3469,7 +3495,7 @@
"\n"
"[\x83I\x83v\x83V\x83\x87\x83\x93/\x83V\x83X\x83e\x83\x80]\x82Ńt\x83B\x83\x8B\x83^\x83t\x83H\x83\x8B\x83_\x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B"
-#: Merge.rc:2042
+#: Merge.rc:2047
#, c-format
msgid ""
"Failed to delete the filter file:\n"
@@ -3481,12 +3507,12 @@
"\n"
"\x82\xBB\x82̃t\x83@...?"
-#: Merge.rc:2043
+#: Merge.rc:2048
#, c-format
msgid "Locate filter file to install"
msgstr "\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB7\x82\xE9\x83t\x83B\x83\x8B\x83^\x83t\x83@..."
-#: Merge.rc:2045
+#: Merge.rc:2050
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -3497,17 +3523,17 @@
"\n"
"\x90V\x82\xB5\x82\xA2\x83t\x83B\x83\x8B\x83^\x83t\x83@..."
-#: Merge.rc:2047
+#: Merge.rc:2052
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr "\x83t\x83B\x83\x8B\x83^\x83t\x83@...?"
-#: Merge.rc:2053
+#: Merge.rc:2058
#, c-format
msgid "Regular expression"
msgstr "\x90\xB3\x8BK\x95\\x8C\xBB"
-#: Merge.rc:2059
+#: Merge.rc:2064
#, c-format
msgid ""
"Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3518,203 +3544,203 @@
"\n"
"\x82\xE0\x82\xB5\x81A\x82\xA2\x82܂͂\xB7\x82ׂĂ̔\xE4\x8Ar\x83E\x83C\x83\x93\x83h\x83E\x82\xF0\x8DX\x90V\x82\xB5\x82\xBD\x82\xAD\x82Ȃ\xA2\x8Fꍇ\x81A\x82\xA2\x82\xA2\x82\xA6\x82\xF0\x91I\x91\xF0\x82\xB5\x81A\x8C\xE3\x82Ŕ\xE4\x8Ar\x83E\x83C\x83\x93\x83h\x83E\x82\xF0\x8DX\x90V\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B"
-#: Merge.rc:2066
+#: Merge.rc:2071
#, c-format
msgid "&Path to SS.EXE:"
msgstr "SS.EXE\x82ւ̃p\x83X(&P):"
-#: Merge.rc:2072
+#: Merge.rc:2077
#, c-format
msgid "Folder Comparison Results"
msgstr "\x83t\x83H\x83\x8B\x83_\x94\xE4\x8Ar\x8C\x8B\x89\xCA"
-#: Merge.rc:2073
+#: Merge.rc:2078
#, c-format
msgid "File Comparison"
msgstr "\x83t\x83@..."
-#: Merge.rc:2074
+#: Merge.rc:2079
#, c-format
msgid "Untitled left"
msgstr "\x8D\xB6\x96\xB3\x91\xE8"
-#: Merge.rc:2075
+#: Merge.rc:2080
#, c-format
msgid "Untitled right"
msgstr "\x89E\x96\xB3\x91\xE8"
-#: Merge.rc:2076
+#: Merge.rc:2081
#, c-format
msgid "Theirs File"
msgstr "Theirs File"
-#: Merge.rc:2077
+#: Merge.rc:2082
#, c-format
msgid "Mine File"
msgstr "Mine File"
-#: Merge.rc:2083
+#: Merge.rc:2088
#, c-format
msgid "Scanning files..."
msgstr "\x83t\x83@......"
-#: Merge.rc:2084
+#: Merge.rc:2089
#, c-format
msgid "Opening selection"
msgstr "\x91I\x91\xF0\x82\xB3\x82ꂽ\x83t\x83@..."
-#: Merge.rc:2085
+#: Merge.rc:2090
#, c-format
msgid "Copying Left to Right"
msgstr "\x8D\xB6\x82\xA9\x82\xE7\x89E\x82ɃR\x83s\x81[\x82\xB5\x82Ă\xA2\x82܂\xB7"
-#: Merge.rc:2086
+#: Merge.rc:2091
#, c-format
msgid "Copying Right to Left"
msgstr "\x89E\x82\xA9\x82獶\x82ɃR\x83s\x81[\x82\xB5\x82Ă\xA2\x82܂\xB7"
-#: Merge.rc:2087
+#: Merge.rc:2092
#, c-format
msgid "Copying All to Left"
msgstr "\x91S\x82Ă\xF0\x8D\xB6\x82ɃR\x83s\x81[\x82\xB5\x82Ă\xA2\x82܂\xB7"
-#: Merge.rc:2088
+#: Merge.rc:2093
#, c-format
msgid "Copying All to Right"
msgstr "\x91S\x82Ă\xF0\x89E\x82ɃR\x83s\x81[\x82\xB5\x82Ă\xA2\x82܂\xB7"
-#: Merge.rc:2089
+#: Merge.rc:2094
#, c-format
msgid "Copying files..."
msgstr "\x83t\x83@......"
-#: Merge.rc:2090
+#: Merge.rc:2095
#, c-format
msgid "Deleting files..."
msgstr "\x83t\x83@......"
-#: Merge.rc:2091
+#: Merge.rc:2096
#, c-format
msgid "Moving files..."
msgstr "\x83t\x83@......"
-#: Merge.rc:2092
+#: Merge.rc:2097
#, c-format
msgid "Creating the report..."
msgstr "\x83\x8C\x83|\x81[\x83g\x82\xAC\x82\xB5\x82Ă\xA2\x82܂\xB7..."
-#: Merge.rc:2093
+#: Merge.rc:2098
#, c-format
msgid "Undoing the last operation..."
msgstr "\x8DŌ\xE3\x82̑\x80\x8D\xEC\x82\xF0\x8C\xB3\x82ɖ߂\xB5\x82Ă\xA2\x82܂\xB7..."
-#: Merge.rc:2094
+#: Merge.rc:2099
#, c-format
msgid "Redoing the previous operation..."
msgstr "\x91O\x82̑\x80\x8D\xEC\x82\xF0\x82\xE2\x82蒼\x82\xB5\x82Ă\xA2\x82܂\xB7..."
-#: Merge.rc:2100
+#: Merge.rc:2105
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "\x8Ds: %s \x97\xF1: %d/%d \x95\xB6\x8E\x9A: %d/%d EOL: %s"
-#: Merge.rc:2101
+#: Merge.rc:2106
#, c-format
msgid "Line: %s"
msgstr "\x8Ds: %s"
-#: Merge.rc:2102
+#: Merge.rc:2107
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "\x8Ds: %s \x97\xF1: %d/%d \x95\xB6\x8E\x9A: %d/%d"
-#: Merge.rc:2103
+#: Merge.rc:2108
#, c-format
msgid "Merge"
msgstr "\x83}\x81[\x83W"
-#: Merge.rc:2104
+#: Merge.rc:2109
#, c-format
msgid "Difference %1 of %2"
msgstr "\x8D\xB7\x88\xD9 %1/%2"
-#: Merge.rc:2105
+#: Merge.rc:2110
#, c-format
msgid "%1 Differences Found"
msgstr "%1\x8C̍\xB7\x88ق\xAA\x8C\xA9\x82\xA9\x82\xE8\x82܂\xB5\x82\xBD"
-#: Merge.rc:2106
+#: Merge.rc:2111
#, c-format
msgid "1 Difference Found"
msgstr "1\x8C̍\xB7\x88ق\xAA\x8C\xA9\x82\xA9\x82\xE8\x82܂\xB5\x82\xBD"
#. Abbreviation from "Read Only"
-#: Merge.rc:2107
+#: Merge.rc:2112
#, c-format
msgid "RO"
msgstr "RO"
-#: Merge.rc:2113
+#: Merge.rc:2118
#, c-format
msgid "Item %1 of %2"
msgstr "\x8D\x80\x96\xDA %1/%2"
-#: Merge.rc:2114
+#: Merge.rc:2119
#, c-format
msgid "Items: %1"
msgstr "\x8D\x80\x96\xDA: %1"
-#: Merge.rc:2120
+#: Merge.rc:2125
#, c-format
msgid "Select two existing folders or files to compare"
msgstr "\x91\xB6\x8D݂\xB7\x82\xE9\x83t\x83H\x83\x8B\x83_\x82܂\xBD\x82́A\x83t\x83@..."
-#: Merge.rc:2121
+#: Merge.rc:2126
#, c-format
msgid "Folder Selection"
msgstr "Folder Selection"
-#: Merge.rc:2122
+#: Merge.rc:2127
#, c-format
msgid "Select two folders or two files to compare."
msgstr "2\x82̃t\x83H\x83\x8B\x83_\x82܂\xBD\x82́A2\x82̃t\x83@..."
-#: Merge.rc:2123
+#: Merge.rc:2128
#, c-format
msgid "Left path is invalid!"
msgstr "\x8D\xB6\x91\xA4\x82̃p\x83X\x82͕s\x90\xB3\x82ȃp\x83X\x82ł\xB7!"
-#: Merge.rc:2124
+#: Merge.rc:2129
#, c-format
msgid "Right path is invalid!"
msgstr "\x89E\x91\xA4\x82̃p\x83X\x82͕s\x90\xB3\x82ȃp\x83X\x82ł\xB7!"
-#: Merge.rc:2125
+#: Merge.rc:2130
#, c-format
msgid "Both paths are invalid!"
msgstr "\x97\xBC\x91\xA4\x82̃p\x83X\x82͕s\x90\xB3\x82ȃp\x83X\x82ł\xB7!"
-#: Merge.rc:2126
+#: Merge.rc:2131
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr "\x93W\x8AJ\x83v\x83\x89\x83O\x83C\x83\x93\x91I\x91\xF0\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9\x82ɂ̓t\x83@..."
-#: Merge.rc:2127
+#: Merge.rc:2132
#, c-format
msgid "Cannot compare file and folder!"
msgstr "\x83t\x83@...!"
-#: Merge.rc:2133
+#: Merge.rc:2138
#, c-format
msgid "File not found: %1"
msgstr "\x83t\x83@...: %1"
-#: Merge.rc:2134
+#: Merge.rc:2139
#, c-format
msgid "File not unpacked: %1"
msgstr "\x83t\x83@...: %1"
-#: Merge.rc:2135
+#: Merge.rc:2140
#, c-format
msgid ""
"Cannot open file\n"
@@ -3727,12 +3753,12 @@
"\n"
"%2"
-#: Merge.rc:2136
+#: Merge.rc:2141
#, c-format
msgid "Failed to parse conflict file."
msgstr "\x83R\x83\x93\x83t\x83\x8A\x83N\x83g\x83t\x83@..."
-#: Merge.rc:2137
+#: Merge.rc:2142
#, c-format
msgid ""
"The file\n"
@@ -3743,34 +3769,34 @@
"%1\n"
"\x82̓R\x83\x93\x83t\x83\x8A\x83N\x83g\x83t\x83@..."
-#: Merge.rc:2143
+#: Merge.rc:2148
#, c-format
msgid "Save As"
msgstr "\x96\xBC\x91O\x82\xF0\x95t\x82\xAF\x82ĕۑ\xB6"
-#: Merge.rc:2144
+#: Merge.rc:2149
#, c-format
msgid "Save changes to %1?"
msgstr ""
"\x83t\x83@... %1 \x82̓\xE0\x97e\x82͕ύX\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B\n"
"\x95ύX\x82\xF0\x95ۑ\xB6\x82\xB5\x82܂\xB7\x82\xA9?"
-#: Merge.rc:2145
+#: Merge.rc:2150
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
msgstr "%1\x82͓ǂݎ\xE6\x82\xE8\x90\xEA\x97p\x83t\x83@... \x93ǂݎ\xE6\x82\xE8\x90\xEA\x97p\x83t\x83@...? (\x90V\x82\xB5\x82\xA2\x83t\x83@...)"
-#: Merge.rc:2146
+#: Merge.rc:2151
#, c-format
msgid "Error checking destination writeability"
msgstr "\x83t\x83@...["
-#: Merge.rc:2147
+#: Merge.rc:2152
#, c-format
msgid "Error backing up file"
msgstr "\x83t\x83@...["
-#: Merge.rc:2149
+#: Merge.rc:2154
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -3783,7 +3809,7 @@
"\x82\xF0\x83o\x83b\x83N\x83A\x83b\x83v\x82ł\xAB\x82܂\xB9\x82\xF1\x81B\n"
"\x96\xB3\x8E\x8B\x82\xB5\x82đ\xB1\x82\xAF\x82܂\xB7\x82\xA9?"
-#: Merge.rc:2150
+#: Merge.rc:2155
#, c-format
msgid ""
"Saving file failed.\n"
@@ -3799,7 +3825,7 @@
"\x95ʖ\xBC\x82ŕۑ\xB6\x82\xB7\x82\xE9\x8Fꍇ\x82\xCDOk\x82\xF0\x81A\n"
"\x92\x86\x8E~\x82\xB7\x82\xE9\x8Fꍇ\x82́A\x83L\x83\x83\x83\x93\x83Z\x83\x8B\x82\xF0\x89\x9F\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2"
-#: Merge.rc:2151
+#: Merge.rc:2156
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -3814,7 +3840,7 @@
"\n"
"\x93W\x8AJ\x82\xB3\x82ꂽ\x82\xE0\x82̂\xF0\x95ʃt\x83@...?"
-#: Merge.rc:2152
+#: Merge.rc:2157
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -3829,7 +3855,7 @@
"\n"
"\x93W\x8AJ\x82\xB3\x82ꂽ\x82\xE0\x82̂\xF0\x95ʃt\x83@...?"
-#: Merge.rc:2153
+#: Merge.rc:2158
#, c-format
msgid ""
"Another application has updated file\n"
@@ -3841,7 +3867,7 @@
"%1\n"
"\x82\xB1\x82̃t\x83@... WinMerge \x88ȊO\x82̃A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82ŏC\x90\xB3\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B\x8FC\x90\xB3\x82\xB3\x82ꂽ\x83t\x83@...?"
-#: Merge.rc:2154
+#: Merge.rc:2159
#, c-format
msgid ""
"%1\n"
@@ -3850,7 +3876,7 @@
"%1\n"
"\x82́A\x93ǂݎ\xE6\x82\xE8\x90\xEA\x97p\x82ł\xB7\x81B \x93ǂݎ\xE6\x82\xE8\x90\xEA\x97p\x82̍\x80\x96ڂ\xF0\x8F㏑\x82\xAB\x82\xB5\x82܂\xB7\x82\xA9?"
-#: Merge.rc:2155
+#: Merge.rc:2160
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|