Commits

Wagner Bruna committed a9da35d

i18n: pull latest translations from Launchpad

Including messages up to 35febb954904 .

Comments (0)

Files changed (34)

i18n/tortoisehg/ar.po

 msgstr ""
 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-05 23:09-0200\n"
+"POT-Creation-Date: 2012-11-25 08:56-0200\n"
 "PO-Revision-Date: 2011-10-25 07:12+0000\n"
 "Last-Translator: Fadi Mansour <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2012-11-06 10:48+0000\n"
-"X-Generator: Launchpad (build 16232)\n"
+"X-Launchpad-Export-Date: 2012-11-26 04:45+0000\n"
+"X-Generator: Launchpad (build 16293)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 #: tortoisehg/hgqt/archive.py:40 tortoisehg/hgqt/backout.py:420
 #: tortoisehg/hgqt/bookmark.py:50 tortoisehg/hgqt/csinfo.py:105
 #: tortoisehg/hgqt/csinfo.py:106 tortoisehg/hgqt/cslist.py:86
-#: tortoisehg/hgqt/merge.py:454 tortoisehg/hgqt/tag.py:49
+#: tortoisehg/hgqt/merge.py:458 tortoisehg/hgqt/tag.py:49
 msgid "Revision:"
 msgstr "المراجعة:"
 
 msgstr ""
 
 #: tortoisehg/hgqt/archive.py:114 tortoisehg/hgqt/backout.py:300
-#: tortoisehg/hgqt/commit.py:416 tortoisehg/hgqt/commit.py:424
-#: tortoisehg/hgqt/commit.py:763 tortoisehg/hgqt/commit.py:777
-#: tortoisehg/hgqt/commit.py:846 tortoisehg/hgqt/commit.py:874
+#: tortoisehg/hgqt/commit.py:435 tortoisehg/hgqt/commit.py:443
+#: tortoisehg/hgqt/commit.py:777 tortoisehg/hgqt/commit.py:791
+#: tortoisehg/hgqt/commit.py:860 tortoisehg/hgqt/commit.py:888
 #: tortoisehg/hgqt/compress.py:152 tortoisehg/hgqt/customtools.py:452
 #: tortoisehg/hgqt/graft.py:45 tortoisehg/hgqt/graft.py:271
 #: tortoisehg/hgqt/graft.py:292 tortoisehg/hgqt/lfprompt.py:23
-#: tortoisehg/hgqt/merge.py:105 tortoisehg/hgqt/merge.py:241
-#: tortoisehg/hgqt/merge.py:319 tortoisehg/hgqt/quickop.py:186
+#: tortoisehg/hgqt/merge.py:107 tortoisehg/hgqt/merge.py:243
+#: tortoisehg/hgqt/merge.py:322 tortoisehg/hgqt/quickop.py:186
 #: tortoisehg/hgqt/rebase.py:240 tortoisehg/hgqt/rebase.py:261
 #: tortoisehg/hgqt/rename.py:110 tortoisehg/hgqt/reporegistry.py:208
-#: tortoisehg/hgqt/resolve.py:393 tortoisehg/hgqt/settings.py:1134
-#: tortoisehg/hgqt/settings.py:1259 tortoisehg/hgqt/wctxactions.py:267
+#: tortoisehg/hgqt/resolve.py:423 tortoisehg/hgqt/settings.py:1137
+#: tortoisehg/hgqt/settings.py:1262 tortoisehg/hgqt/wctxactions.py:267
 #: tortoisehg/hgqt/wctxactions.py:282 tortoisehg/hgqt/wctxactions.py:291
 #: tortoisehg/hgqt/wctxactions.py:358
 msgid "Cancel"
 msgid "Backout to the second parent of the merge revision"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:203 tortoisehg/hgqt/merge.py:160
+#: tortoisehg/hgqt/backout.py:203 tortoisehg/hgqt/merge.py:162
 msgid "Working directory status"
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:209 tortoisehg/hgqt/compress.py:69
-#: tortoisehg/hgqt/graft.py:118 tortoisehg/hgqt/merge.py:168
+#: tortoisehg/hgqt/graft.py:118 tortoisehg/hgqt/merge.py:170
 #: tortoisehg/hgqt/rebase.py:113
 msgid "Checking..."
 msgstr ""
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:228 tortoisehg/hgqt/graft.py:91
-#: tortoisehg/hgqt/merge.py:221 tortoisehg/hgqt/rebase.py:76
+#: tortoisehg/hgqt/merge.py:223 tortoisehg/hgqt/rebase.py:76
 #: tortoisehg/hgqt/sync.py:1229 tortoisehg/hgqt/update.py:103
 msgid "Automatically resolve merge conflicts where possible"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:274 tortoisehg/hgqt/merge.py:291
+#: tortoisehg/hgqt/backout.py:274 tortoisehg/hgqt/merge.py:294
 msgid "<b>Uncommitted local changes are detected</b>"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:299 tortoisehg/hgqt/compress.py:151
-#: tortoisehg/hgqt/graft.py:270 tortoisehg/hgqt/merge.py:240
-#: tortoisehg/hgqt/merge.py:318 tortoisehg/hgqt/rebase.py:239
-#: tortoisehg/hgqt/settings.py:1259 tortoisehg/hgqt/update.py:321
+#: tortoisehg/hgqt/graft.py:270 tortoisehg/hgqt/merge.py:242
+#: tortoisehg/hgqt/merge.py:321 tortoisehg/hgqt/rebase.py:239
+#: tortoisehg/hgqt/settings.py:1262 tortoisehg/hgqt/update.py:321
 msgid "&Discard"
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:301 tortoisehg/hgqt/compress.py:153
-#: tortoisehg/hgqt/graft.py:272 tortoisehg/hgqt/merge.py:320
+#: tortoisehg/hgqt/graft.py:272 tortoisehg/hgqt/merge.py:323
 #: tortoisehg/hgqt/rebase.py:241
 msgid "Confirm Discard"
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:302 tortoisehg/hgqt/compress.py:154
-#: tortoisehg/hgqt/graft.py:273 tortoisehg/hgqt/merge.py:321
+#: tortoisehg/hgqt/graft.py:273 tortoisehg/hgqt/merge.py:324
 #: tortoisehg/hgqt/rebase.py:242
 msgid "Discard outstanding changes to working directory?"
 msgstr ""
 msgid "Backing out, then merging..."
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:328 tortoisehg/hgqt/merge.py:349
+#: tortoisehg/hgqt/backout.py:328 tortoisehg/hgqt/merge.py:352
 msgid "All conflicting files will be marked unresolved."
 msgstr ""
 
 "Automatically advance to next page when backout and merge are complete."
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:372 tortoisehg/hgqt/merge.py:402
+#: tortoisehg/hgqt/backout.py:372 tortoisehg/hgqt/merge.py:406
 #, python-format
 msgid ""
 "%d files have <b>merge conflicts</b> that must be <a "
 "href=\"resolve\"><b>resolved</b></a>"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:377 tortoisehg/hgqt/merge.py:412
+#: tortoisehg/hgqt/backout.py:377 tortoisehg/hgqt/merge.py:416
 msgid "No merge conflicts, ready to commit"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:422 tortoisehg/hgqt/matching.py:101
-#: tortoisehg/hgqt/merge.py:456
+#: tortoisehg/hgqt/merge.py:460
 msgid "Parents"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:426 tortoisehg/hgqt/merge.py:460
+#: tortoisehg/hgqt/backout.py:426 tortoisehg/hgqt/merge.py:464
 #: tortoisehg/hgqt/repomodel.py:668 tortoisehg/hgqt/repomodel.py:670
 #: tortoisehg/hgqt/shelve.py:24 tortoisehg/hgqt/thgimport.py:88
 msgid "Working Directory"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:466 tortoisehg/hgqt/merge.py:497
+#: tortoisehg/hgqt/backout.py:466 tortoisehg/hgqt/merge.py:501
 msgid "Working Directory (merged)"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:474 tortoisehg/hgqt/merge.py:505
+#: tortoisehg/hgqt/backout.py:474 tortoisehg/hgqt/merge.py:509
 msgid "Commit message"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:498 tortoisehg/hgqt/merge.py:531
+#: tortoisehg/hgqt/backout.py:498 tortoisehg/hgqt/merge.py:535
 msgid "Skip final confirmation page, close after commit."
 msgstr ""
 
 msgid "Backed out changeset: "
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:514 tortoisehg/hgqt/commit.py:677
+#: tortoisehg/hgqt/backout.py:514 tortoisehg/hgqt/commit.py:691
 #: tortoisehg/hgqt/mq.py:771
 msgid "Confirm Discard Message"
 msgstr ""
 msgid "Please wait while making backout."
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:594 tortoisehg/hgqt/merge.py:584
+#: tortoisehg/hgqt/backout.py:594 tortoisehg/hgqt/merge.py:612
 msgid "Committing..."
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:595 tortoisehg/hgqt/merge.py:585
+#: tortoisehg/hgqt/backout.py:595 tortoisehg/hgqt/merge.py:613
 msgid "Please wait while committing merged files."
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:620 tortoisehg/hgqt/cmdui.py:311
-#: tortoisehg/hgqt/merge.py:620
+#: tortoisehg/hgqt/merge.py:686
 msgid "Finished"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/bisect.py:114 tortoisehg/hgqt/bisect.py:135
-#: tortoisehg/hgqt/commit.py:893 tortoisehg/hgqt/commit.py:1214
-#: tortoisehg/hgqt/commit.py:1234 tortoisehg/hgqt/hgignore.py:260
-#: tortoisehg/hgqt/hginit.py:179 tortoisehg/hgqt/status.py:487
-#: tortoisehg/hgqt/wctxactions.py:185
+#: tortoisehg/hgqt/commit.py:907 tortoisehg/hgqt/commit.py:1232
+#: tortoisehg/hgqt/commit.py:1252 tortoisehg/hgqt/hgignore.py:260
+#: tortoisehg/hgqt/hginit.py:179 tortoisehg/hgqt/merge.py:629
+#: tortoisehg/hgqt/status.py:487 tortoisehg/hgqt/wctxactions.py:185
 #, python-format
 msgid "%s (hint: %s)"
 msgstr ""
 msgid "New Name:"
 msgstr ""
 
-#: tortoisehg/hgqt/bookmark.py:67 tortoisehg/hgqt/commit.py:846
+#: tortoisehg/hgqt/bookmark.py:67 tortoisehg/hgqt/commit.py:860
 #: tortoisehg/hgqt/tag.py:98 tortoisehg/hgqt/wctxactions.py:56
 #: tortoisehg/hgqt/wctxactions.py:62
 msgid "&Add"
 msgid "Re&name"
 msgstr ""
 
-#: tortoisehg/hgqt/bookmark.py:69 tortoisehg/hgqt/commit.py:874
+#: tortoisehg/hgqt/bookmark.py:69 tortoisehg/hgqt/commit.py:888
 #: tortoisehg/hgqt/tag.py:99
 msgid "&Remove"
 msgstr ""
 msgid "Destination:"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:95 tortoisehg/hgqt/commit.py:121
-#: tortoisehg/hgqt/graft.py:88 tortoisehg/hgqt/merge.py:208
+#: tortoisehg/hgqt/clone.py:95 tortoisehg/hgqt/commit.py:140
+#: tortoisehg/hgqt/graft.py:88 tortoisehg/hgqt/merge.py:210
 #: tortoisehg/hgqt/mq.py:570 tortoisehg/hgqt/postreview_ui.py:170
 #: tortoisehg/hgqt/rebase.py:57 tortoisehg/hgqt/sync.py:177
 #: tortoisehg/hgqt/tag.py:64
 msgstr ""
 
 #: tortoisehg/hgqt/cmdui.py:506 tortoisehg/hgqt/graft.py:293
-#: tortoisehg/hgqt/merge.py:106 tortoisehg/hgqt/rebase.py:262
-#: tortoisehg/hgqt/resolve.py:394 tortoisehg/hgqt/settings.py:1131
+#: tortoisehg/hgqt/merge.py:108 tortoisehg/hgqt/rebase.py:262
+#: tortoisehg/hgqt/resolve.py:424 tortoisehg/hgqt/settings.py:1134
 msgid "Confirm Exit"
 msgstr ""
 
 msgid "TortoiseHg"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:80
+#: tortoisehg/hgqt/commit.py:99
 msgctxt "window title"
 msgid "Commit"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:102
+#: tortoisehg/hgqt/commit.py:121
 msgid "Commit Dialog Toolbar"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:106 tortoisehg/hgqt/commit.py:569
+#: tortoisehg/hgqt/commit.py:125 tortoisehg/hgqt/commit.py:591
 msgid "Branch: "
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:114
+#: tortoisehg/hgqt/commit.py:133
 msgid "Copy message"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:116
+#: tortoisehg/hgqt/commit.py:135
 msgid "Copy one of the recent commit messages"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:128
+#: tortoisehg/hgqt/commit.py:147
 msgid "Show Issues"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:130
+#: tortoisehg/hgqt/commit.py:149
 msgid "Please wait..."
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:138
+#: tortoisehg/hgqt/commit.py:157
 #, python-format
 msgid "Failed to load issue tracker '%s': %s"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:141 tortoisehg/hgqt/commit.py:511
+#: tortoisehg/hgqt/commit.py:160 tortoisehg/hgqt/commit.py:530
 #: tortoisehg/hgqt/settings.py:370
 msgid "Issue Tracker"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:149
+#: tortoisehg/hgqt/commit.py:168
 msgid "Show Issues..."
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:153 tortoisehg/hgqt/grep.py:53
+#: tortoisehg/hgqt/commit.py:172 tortoisehg/hgqt/grep.py:53
 #: tortoisehg/hgqt/serve_ui.py:87
 msgid "Stop"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:270
+#: tortoisehg/hgqt/commit.py:289
 msgid "Commit changes"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:270
+#: tortoisehg/hgqt/commit.py:289
 msgid "Commit"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:271
+#: tortoisehg/hgqt/commit.py:290
 msgid "Amend current revision"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:271
+#: tortoisehg/hgqt/commit.py:290
 msgid "Amend"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:275
+#: tortoisehg/hgqt/commit.py:294
 msgid "Create a new patch"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:275 tortoisehg/hgqt/mq.py:925
+#: tortoisehg/hgqt/commit.py:294 tortoisehg/hgqt/mq.py:925
 msgid "QNew"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:276
+#: tortoisehg/hgqt/commit.py:295
 msgid "Refresh current patch"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:276 tortoisehg/hgqt/mq.py:553
+#: tortoisehg/hgqt/commit.py:295 tortoisehg/hgqt/mq.py:553
 #: tortoisehg/hgqt/mq.py:934
 msgid "QRefresh"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:409
+#: tortoisehg/hgqt/commit.py:428
 msgid "Confirm Branch Change"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:410
+#: tortoisehg/hgqt/commit.py:429
 #, python-format
 msgid "Named branch \"%s\" already exists, last used in revision %d\n"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:414
+#: tortoisehg/hgqt/commit.py:433
 msgid "Restart &Branch"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:415 tortoisehg/hgqt/commit.py:423
+#: tortoisehg/hgqt/commit.py:434 tortoisehg/hgqt/commit.py:442
 msgid "&Commit to current branch"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:418 tortoisehg/hgqt/sync.py:1081
+#: tortoisehg/hgqt/commit.py:437 tortoisehg/hgqt/sync.py:1081
 msgid "Confirm New Branch"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:419
+#: tortoisehg/hgqt/commit.py:438
 #, python-format
 msgid "Create new named branch \"%s\" with this commit?\n"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:422
+#: tortoisehg/hgqt/commit.py:441
 msgid "Create &Branch"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:462
+#: tortoisehg/hgqt/commit.py:481
 msgctxt "start progress"
 msgid "MQ Action"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:571
+#: tortoisehg/hgqt/commit.py:593
 msgid "Close Branch: "
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:573
+#: tortoisehg/hgqt/commit.py:595
 msgid "New Branch: "
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:586
+#: tortoisehg/hgqt/commit.py:600 tortoisehg/hgqt/merge.py:546
 #, python-format
 msgid "<b>Selected Options:</b> %s"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:600 tortoisehg/hgqt/revpanel.py:24
+#: tortoisehg/hgqt/commit.py:614 tortoisehg/hgqt/revpanel.py:24
 #: tortoisehg/hgqt/update.py:87
 msgid "Parent:"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:601 tortoisehg/hgqt/pbranch.py:879
+#: tortoisehg/hgqt/commit.py:615 tortoisehg/hgqt/pbranch.py:879
 msgid "Patch name:"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:623
+#: tortoisehg/hgqt/commit.py:637
 #, python-format
 msgid "Close %s branch"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:636
+#: tortoisehg/hgqt/commit.py:650
 #, python-format
 msgid "Rollback commit to revision %d"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:645
+#: tortoisehg/hgqt/commit.py:659
 msgid "Confirm Undo"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:650
+#: tortoisehg/hgqt/commit.py:664
 msgctxt "start progress"
 msgid "Rollback"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:678 tortoisehg/hgqt/mq.py:772
+#: tortoisehg/hgqt/commit.py:692 tortoisehg/hgqt/mq.py:772
 msgid "Discard current commit message?"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:757
+#: tortoisehg/hgqt/commit.py:771
 msgid "Default username is not configured"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:758
+#: tortoisehg/hgqt/commit.py:772
 msgid ""
 "A default username is not configured. This username is used when you commit "
 "unless you set a different username on a given repository.\n"
 "Do you want to configure your default username now?"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:763
+#: tortoisehg/hgqt/commit.py:777
 msgid "&Configure"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:773
+#: tortoisehg/hgqt/commit.py:787
 msgid "Message Translation Failure"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:774
+#: tortoisehg/hgqt/commit.py:788
 msgid ""
 "Unable to translate message to local encoding\n"
 "Consider setting HGENCODING environment variable\n"
 "Replace untranslatable characters with \"?\"?\n"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:777
+#: tortoisehg/hgqt/commit.py:791
 msgid "&Replace"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:785 tortoisehg/hgqt/commit.py:798
+#: tortoisehg/hgqt/commit.py:799 tortoisehg/hgqt/commit.py:812
 msgid "Nothing Commited"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:786
+#: tortoisehg/hgqt/commit.py:800
 msgid "Please enter commit message"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:799
+#: tortoisehg/hgqt/commit.py:813
 msgid ""
 "No issue link was found in the commit message.  The commit message should "
 "contain an issue link.  Configure this in the 'Issue Tracking' section of "
 "the settings."
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:828
+#: tortoisehg/hgqt/commit.py:842
 msgid "No files checked"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:829
+#: tortoisehg/hgqt/commit.py:843
 msgid "No modified files checkmarked for commit"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:844 tortoisehg/hgqt/lfprompt.py:16
+#: tortoisehg/hgqt/commit.py:858 tortoisehg/hgqt/lfprompt.py:16
 msgid "Confirm Add"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:845
+#: tortoisehg/hgqt/commit.py:859
 msgid "Add selected untracked files?"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:872 tortoisehg/hgqt/quickop.py:181
+#: tortoisehg/hgqt/commit.py:886 tortoisehg/hgqt/quickop.py:181
 msgid "Confirm Remove"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:873
+#: tortoisehg/hgqt/commit.py:887
 msgid "Remove selected deleted files?"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:931
+#: tortoisehg/hgqt/commit.py:947
 msgctxt "start progress"
 msgid "Commit"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:967
+#: tortoisehg/hgqt/commit.py:983
 #, python-format
 msgid "%s - commit options"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:974
+#: tortoisehg/hgqt/commit.py:990
 msgid "Set username:"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1001 tortoisehg/hgqt/commit.py:1048
-#: tortoisehg/hgqt/commit.py:1071 tortoisehg/hgqt/commit.py:1087
+#: tortoisehg/hgqt/commit.py:1017 tortoisehg/hgqt/commit.py:1064
+#: tortoisehg/hgqt/commit.py:1087 tortoisehg/hgqt/commit.py:1105
 msgid "Save in Repo"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1006
+#: tortoisehg/hgqt/commit.py:1022
 msgid "Save Global"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1018
+#: tortoisehg/hgqt/commit.py:1034
 msgid "Set Date:"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1022
+#: tortoisehg/hgqt/commit.py:1038
 msgid "Update"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1041
+#: tortoisehg/hgqt/commit.py:1057
 msgid "Push After Commit:"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1064
+#: tortoisehg/hgqt/commit.py:1080
 msgid "Auto Includes:"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1089
+#: tortoisehg/hgqt/commit.py:1107
 msgid "Recurse into subrepositories (--subrepos)"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1118
+#: tortoisehg/hgqt/commit.py:1136
 msgid "Unable to save username"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1119 tortoisehg/hgqt/commit.py:1142
-#: tortoisehg/hgqt/commit.py:1165 tortoisehg/hgqt/commit.py:1188
+#: tortoisehg/hgqt/commit.py:1137 tortoisehg/hgqt/commit.py:1160
+#: tortoisehg/hgqt/commit.py:1183 tortoisehg/hgqt/commit.py:1206
 #: tortoisehg/hgqt/sync.py:1171 tortoisehg/hgqt/sync.py:1269
 #: tortoisehg/hgqt/sync.py:1347 tortoisehg/hgqt/sync.py:1536
 msgid "Iniparse must be installed."
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1134 tortoisehg/hgqt/commit.py:1157
-#: tortoisehg/hgqt/commit.py:1180 tortoisehg/hgqt/commit.py:1203
-#: tortoisehg/hgqt/settings.py:1499 tortoisehg/hgqt/sync.py:1181
+#: tortoisehg/hgqt/commit.py:1152 tortoisehg/hgqt/commit.py:1175
+#: tortoisehg/hgqt/commit.py:1198 tortoisehg/hgqt/commit.py:1221
+#: tortoisehg/hgqt/settings.py:1502 tortoisehg/hgqt/sync.py:1181
 #: tortoisehg/hgqt/sync.py:1280 tortoisehg/hgqt/sync.py:1370
 #: tortoisehg/hgqt/sync.py:1575
 msgid "Unable to write configuration file"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1141
+#: tortoisehg/hgqt/commit.py:1159
 msgid "Unable to save after commit push"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1164
+#: tortoisehg/hgqt/commit.py:1182
 msgid "Unable to save auto include list"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1187
+#: tortoisehg/hgqt/commit.py:1205
 msgid "Unable to save recurse in subrepos."
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1218
+#: tortoisehg/hgqt/commit.py:1236
 msgid "Invalid date format"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1238
+#: tortoisehg/hgqt/commit.py:1256
 msgid "No username configured"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1309
+#: tortoisehg/hgqt/commit.py:1327
 #, python-format
 msgid "%s - commit"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1362
+#: tortoisehg/hgqt/commit.py:1380
 msgid "TortoiseHg Commit"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:1363
+#: tortoisehg/hgqt/commit.py:1381
 msgid "Are you sure that you want to cancel the commit operation?"
 msgstr ""
 
 msgid "Open a shell terminal in the selected folder"
 msgstr ""
 
-#: tortoisehg/hgqt/filectxactions.py:188
+#: tortoisehg/hgqt/filectxactions.py:194
 msgid "Cannot display visual diff"
 msgstr ""
 
-#: tortoisehg/hgqt/filectxactions.py:189
+#: tortoisehg/hgqt/filectxactions.py:195
 msgid "Visual diffs are not supported for unapplied patches"
 msgstr ""
 
-#: tortoisehg/hgqt/filectxactions.py:265
+#: tortoisehg/hgqt/filectxactions.py:271
 #, python-format
 msgid "Hg file log viewer - %s"
 msgstr ""
 
-#: tortoisehg/hgqt/filectxactions.py:309 tortoisehg/hgqt/wctxactions.py:238
+#: tortoisehg/hgqt/filectxactions.py:315 tortoisehg/hgqt/wctxactions.py:238
 msgid "Cannot open subrepository"
 msgstr ""
 
-#: tortoisehg/hgqt/filectxactions.py:310 tortoisehg/hgqt/wctxactions.py:239
+#: tortoisehg/hgqt/filectxactions.py:316 tortoisehg/hgqt/wctxactions.py:239
 msgid "The selected subrepository does not exist on the working directory"
 msgstr ""
 
 msgid "File or diffs not displayed: "
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:54
+#: tortoisehg/hgqt/filedata.py:54 tortoisehg/hgqt/filedata.py:121
 #, python-format
 msgid ""
 "File is larger than the specified max size.\n"
 "maxdiff = %s KB"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:61
+#: tortoisehg/hgqt/filedata.py:61 tortoisehg/hgqt/filedata.py:124
 msgid "File is binary"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:65
+#: tortoisehg/hgqt/filedata.py:65 tortoisehg/hgqt/filedata.py:128
 msgid "File may be binary (maximum line length exceeded)"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:74 tortoisehg/hgqt/filedata.py:381
+#: tortoisehg/hgqt/filedata.py:74 tortoisehg/hgqt/filedata.py:395
 #, python-format
 msgid " <i>(renamed from %s)</i>"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:76 tortoisehg/hgqt/filedata.py:376
-#: tortoisehg/hgqt/filedata.py:386
+#: tortoisehg/hgqt/filedata.py:76 tortoisehg/hgqt/filedata.py:390
+#: tortoisehg/hgqt/filedata.py:400
 msgid " <i>(was added)</i>"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:109 tortoisehg/hgqt/filedata.py:369
+#: tortoisehg/hgqt/filedata.py:110 tortoisehg/hgqt/filedata.py:383
 msgid "exec mode has been <font color='red'>set</font>"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:111 tortoisehg/hgqt/filedata.py:371
+#: tortoisehg/hgqt/filedata.py:112 tortoisehg/hgqt/filedata.py:385
 msgid "exec mode has been <font color='red'>unset</font>"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:113 tortoisehg/hgqt/filedata.py:133
+#: tortoisehg/hgqt/filedata.py:114 tortoisehg/hgqt/filedata.py:148
 msgid " <i>(is a symlink)</i>"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:162
+#: tortoisehg/hgqt/filedata.py:117
+msgid "Diff not displayed: "
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:177
 #, python-format
 msgid ""
 "[WARNING] Invalid subrepo revision ID:\n"
 "\n"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:182
+#: tortoisehg/hgqt/filedata.py:197
 msgid "Subrepo created and set to initial revision."
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:186
+#: tortoisehg/hgqt/filedata.py:201
 msgid "Subrepo initialized to revision:"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:189
+#: tortoisehg/hgqt/filedata.py:204
 msgid "Subrepo removed from repository."
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:193
+#: tortoisehg/hgqt/filedata.py:208
 msgid "Subrepo was not changed."
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:194
+#: tortoisehg/hgqt/filedata.py:209
 msgid "Subrepo state is:"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:196 tortoisehg/hgqt/filedata.py:206
-#: tortoisehg/hgqt/filedata.py:211 tortoisehg/hgqt/filedata.py:215
-#: tortoisehg/hgqt/filedata.py:221
+#: tortoisehg/hgqt/filedata.py:211 tortoisehg/hgqt/filedata.py:221
+#: tortoisehg/hgqt/filedata.py:226 tortoisehg/hgqt/filedata.py:230
+#: tortoisehg/hgqt/filedata.py:236
 #, python-format
 msgid "changeset: %s"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:203
+#: tortoisehg/hgqt/filedata.py:218
 msgid "Revision has changed to:"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:212 tortoisehg/hgqt/hgemail_ui.py:264
+#: tortoisehg/hgqt/filedata.py:227 tortoisehg/hgqt/hgemail_ui.py:264
 msgid "From:"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:216
+#: tortoisehg/hgqt/filedata.py:231
 msgid "Subrepository not found in the working directory."
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:218 tortoisehg/hgqt/filedata.py:224
+#: tortoisehg/hgqt/filedata.py:233 tortoisehg/hgqt/filedata.py:239
 msgid "Further subrepository revision information cannot be retrieved."
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:222
+#: tortoisehg/hgqt/filedata.py:237
 msgid "Subrepository is either damaged or missing some revisions"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:226
+#: tortoisehg/hgqt/filedata.py:241
 msgid ""
 "You may need to open the missing subrepository and manually\n"
 "pull the missing revisions from its source repository."
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:235 tortoisehg/hgqt/settings.py:610
+#: tortoisehg/hgqt/filedata.py:250 tortoisehg/hgqt/settings.py:610
 msgid "Initial revision"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:255
+#: tortoisehg/hgqt/filedata.py:270
 msgid "Not a Mercurial subrepo, not previewable"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:270
+#: tortoisehg/hgqt/filedata.py:285
 msgid "The subrepository is dirty."
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:270
+#: tortoisehg/hgqt/filedata.py:285
 msgid "File Status:"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:295
+#: tortoisehg/hgqt/filedata.py:310
 msgid "(is a changed sub-repository)"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:296
+#: tortoisehg/hgqt/filedata.py:311
 msgid "(is an unchanged sub-repository)"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:297
+#: tortoisehg/hgqt/filedata.py:312
 msgid "(is a dirty sub-repository)"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:298
+#: tortoisehg/hgqt/filedata.py:313
 msgid "(is a new sub-repository)"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:299 tortoisehg/hgqt/filedata.py:302
+#: tortoisehg/hgqt/filedata.py:314 tortoisehg/hgqt/filedata.py:317
 msgid "(is a removed sub-repository)"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:300
+#: tortoisehg/hgqt/filedata.py:315
 msgid "(is a changed and dirty sub-repository)"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:301
+#: tortoisehg/hgqt/filedata.py:316
 msgid "(is a new and dirty sub-repository)"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:306
+#: tortoisehg/hgqt/filedata.py:321
 #, python-format
 msgid " <a href=\"subrepo:%s\">open...</a>"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:309
+#: tortoisehg/hgqt/filedata.py:324
 #, python-format
 msgid "Error previewing subrepo: %s"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:316
+#: tortoisehg/hgqt/filedata.py:330
 #, python-format
 msgid ""
 "File or diffs not displayed: File is larger than the specified max size.\n"
 "maxdiff = %s KB"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:331 tortoisehg/hgqt/filedata.py:334
+#: tortoisehg/hgqt/filedata.py:345 tortoisehg/hgqt/filedata.py:348
 msgid " <i>(was deleted)</i>"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:336
+#: tortoisehg/hgqt/filedata.py:350
 msgid " <i>(was added, now missing)</i>"
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:342
+#: tortoisehg/hgqt/filedata.py:356
 msgid " <i>(is unversioned)</i>"
 msgstr ""
 
 msgid "Too many rows selected for menu"
 msgstr ""
 
-#: tortoisehg/hgqt/filedialogs.py:184 tortoisehg/hgqt/workbench.py:347
+#: tortoisehg/hgqt/filedialogs.py:184 tortoisehg/hgqt/workbench.py:346
 msgid "Back"
 msgstr ""
 
-#: tortoisehg/hgqt/filedialogs.py:186 tortoisehg/hgqt/workbench.py:350
+#: tortoisehg/hgqt/filedialogs.py:186 tortoisehg/hgqt/workbench.py:349
 msgid "Forward"
 msgstr ""
 
 msgid "Consider aborting the graft first."
 msgstr ""
 
-#: tortoisehg/hgqt/graft.py:291 tortoisehg/hgqt/merge.py:104
+#: tortoisehg/hgqt/graft.py:291 tortoisehg/hgqt/merge.py:106
 #: tortoisehg/hgqt/rebase.py:260
 msgid "&Exit"
 msgstr ""
 msgid "grep: %s\n"
 msgstr ""
 
-#: tortoisehg/hgqt/grep.py:361 tortoisehg/hgqt/revset.py:395
+#: tortoisehg/hgqt/grep.py:361 tortoisehg/hgqt/revset.py:401
 #, python-format
 msgid "%d matches found"
 msgstr ""
 
-#: tortoisehg/hgqt/grep.py:363 tortoisehg/hgqt/revset.py:397
+#: tortoisehg/hgqt/grep.py:363 tortoisehg/hgqt/revset.py:403
 msgid "No matches found"
 msgstr ""
 
 msgid "Annotate file"
 msgstr ""
 
-#: tortoisehg/hgqt/grep.py:723
+#: tortoisehg/hgqt/grep.py:727
 msgid "File"
 msgstr ""
 
-#: tortoisehg/hgqt/grep.py:723
+#: tortoisehg/hgqt/grep.py:727
 msgid "Line"
 msgstr ""
 
-#: tortoisehg/hgqt/grep.py:723
+#: tortoisehg/hgqt/grep.py:727
 msgid "Rev"
 msgstr ""
 
-#: tortoisehg/hgqt/grep.py:723 tortoisehg/hgqt/settings.py:816
-#: tortoisehg/hgqt/settings.py:962 tortoisehg/hgqt/settings.py:1062
+#: tortoisehg/hgqt/grep.py:727 tortoisehg/hgqt/settings.py:816
+#: tortoisehg/hgqt/settings.py:965 tortoisehg/hgqt/settings.py:1065
 msgid "User"
 msgstr ""
 
-#: tortoisehg/hgqt/grep.py:724
+#: tortoisehg/hgqt/grep.py:728
 msgid "Match Text"
 msgstr ""
 
 msgid "Add"
 msgstr ""
 
-#: tortoisehg/hgqt/hgignore.py:73 tortoisehg/hgqt/resolve.py:143
-#: tortoisehg/hgqt/resolve.py:169 tortoisehg/hgqt/settings.py:1184
+#: tortoisehg/hgqt/hgignore.py:73 tortoisehg/hgqt/resolve.py:151
+#: tortoisehg/hgqt/resolve.py:177 tortoisehg/hgqt/settings.py:1187
 msgid "Edit File"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/logcolumns.py:100 tortoisehg/hgqt/settings.py:599
-#: tortoisehg/hgqt/workbench.py:840 tortoisehg/util/menuthg.py:46
+#: tortoisehg/hgqt/workbench.py:839 tortoisehg/util/menuthg.py:46
 msgid "Workbench"
 msgstr ""
 
 msgid "Subrepo states"
 msgstr ""
 
-#: tortoisehg/hgqt/matching.py:100 tortoisehg/hgqt/repofilter.py:226
+#: tortoisehg/hgqt/matching.py:100 tortoisehg/hgqt/repofilter.py:227
 msgid "Branch"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/merge.py:102
-msgid "To finish merging, you need to commit the working directory."
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:124
+msgid ""
+"To finish merging, you must commit the working directory.\n"
+"\n"
+"To cancel the merge you can update to one of the merge parent revisions."
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:126
 msgid "Prepare to merge"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:125
+#: tortoisehg/hgqt/merge.py:127
 msgid "Verify merge targets and ensure your working directory is clean."
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:134 tortoisehg/hgqt/repomodel.py:674
+#: tortoisehg/hgqt/merge.py:136 tortoisehg/hgqt/repomodel.py:674
 #: tortoisehg/hgqt/revpanel.py:159
 msgid "Not a head revision!"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:141
+#: tortoisehg/hgqt/merge.py:143
 msgid "Merge from (other revision)"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:148 tortoisehg/hgqt/merge.py:670
+#: tortoisehg/hgqt/merge.py:150 tortoisehg/hgqt/merge.py:737
 msgid "Unable to merge"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:149 tortoisehg/hgqt/merge.py:671
+#: tortoisehg/hgqt/merge.py:151 tortoisehg/hgqt/merge.py:738
 msgid "Merge revision not specified or not found"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:153
+#: tortoisehg/hgqt/merge.py:155
 msgid "Merge to (working directory)"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:176
+#: tortoisehg/hgqt/merge.py:178
 msgid ""
 "The working directory is already <b>merged</b>. <a "
 "href=\"skip\"><b>Continue</b></a> or <a href=\"discard\"><b>discard</b></a> "
 "existing merge."
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:185
+#: tortoisehg/hgqt/merge.py:187
 msgid ""
 "Before merging, you must <a href=\"commit\"><b>commit</b></a>, <a "
 "href=\"shelve\"><b>shelve</b></a> to patch, or <a "
 "href=\"discard\"><b>discard</b></a> changes."
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:197
+#: tortoisehg/hgqt/merge.py:199
 msgid "Or use:"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:200
+#: tortoisehg/hgqt/merge.py:202
 msgid "Force a merge with outstanding changes (-f/--force)"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:214
+#: tortoisehg/hgqt/merge.py:216
 msgid "Discard all changes from merge target (other) revision"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:242
+#: tortoisehg/hgqt/merge.py:244
 msgid "Confirm Discard Changes"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:243
+#: tortoisehg/hgqt/merge.py:245
 #, python-format
 msgid ""
 "The changes from revision %s and all unmerged parents will be discarded.\n"
 "Are you sure this is what you want to do?"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:296
+#: tortoisehg/hgqt/merge.py:299
 msgctxt "working dir state"
 msgid "Clean"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:348
+#: tortoisehg/hgqt/merge.py:351
 msgid "Merging..."
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:362
+#: tortoisehg/hgqt/merge.py:365
 msgid "Automatically advance to next page when merge is complete."
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:407
+#: tortoisehg/hgqt/merge.py:411
 #, python-format
 msgid ""
 "%d files were modified on both branches and must be <a "
 "href=\"resolve\"><b>resolved</b></a>"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:446
+#: tortoisehg/hgqt/merge.py:450
 msgid "Commit merge results"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:549
+#: tortoisehg/hgqt/merge.py:543
+msgid "Commit Options"
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:552
+msgid "Commit Now"
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:554
+msgid "Commit Later"
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:577
 msgid "Merge"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:553
+#: tortoisehg/hgqt/merge.py:581
 #, python-format
 msgid "Merge with %s"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:625
+#: tortoisehg/hgqt/merge.py:633
+msgid "TortoiseHg Merge Commit"
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:634
+#, python-format
+msgid ""
+"Error creating interpreting commit date (%s).\n"
+"Using current date instead."
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:691
 msgid "Merge changeset"
 msgstr ""
 
 #: tortoisehg/hgqt/postreview.py:110 tortoisehg/hgqt/postreview.py:126
 #: tortoisehg/hgqt/postreview.py:342 tortoisehg/hgqt/postreview.py:365
 #: tortoisehg/hgqt/postreview.py:377 tortoisehg/hgqt/postreview_ui.py:163
-#: tortoisehg/hgqt/settings.py:958
+#: tortoisehg/hgqt/settings.py:961
 msgid "Review Board"
 msgstr ""
 
 msgid "Patch queues:"
 msgstr ""
 
-#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:1187
+#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:1190
 msgid "Reload"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/qqueue.py:94 tortoisehg/hgqt/rename.py:170
-#: tortoisehg/hgqt/reporegistry.py:439
+#: tortoisehg/hgqt/reporegistry.py:440
 msgid "Rename"
 msgstr ""
 
 msgid "Show all"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:70
+#: tortoisehg/hgqt/repofilter.py:71
 msgid "### revision set query ###"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:76
+#: tortoisehg/hgqt/repofilter.py:77
 msgid "Clear current query and query text"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:85
+#: tortoisehg/hgqt/repofilter.py:86
 msgid "Trigger revision set query"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:91
+#: tortoisehg/hgqt/repofilter.py:92
 msgid "Open advanced query editor"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:99
+#: tortoisehg/hgqt/repofilter.py:100
 msgid "Delete selected query from history"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:105
+#: tortoisehg/hgqt/repofilter.py:106
 msgid "filter"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:107
+#: tortoisehg/hgqt/repofilter.py:108
 msgid "Toggle filtering of non-matched changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:227
+#: tortoisehg/hgqt/repofilter.py:228
 msgid "Display graph the named branch only"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:231
+#: tortoisehg/hgqt/repofilter.py:232
 msgid "Display only active branches"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:234
+#: tortoisehg/hgqt/repofilter.py:235
 msgid "Display closed branches"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:237
+#: tortoisehg/hgqt/repofilter.py:238
 msgid "Include all ancestors"
 msgstr ""
 
 msgid "Mercurial User"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:175 tortoisehg/hgqt/reporegistry.py:708
+#: tortoisehg/hgqt/reporegistry.py:175 tortoisehg/hgqt/reporegistry.py:709
 #, python-format
 msgid "Unsupported repository type (%s)"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:176 tortoisehg/hgqt/reporegistry.py:709
+#: tortoisehg/hgqt/reporegistry.py:176 tortoisehg/hgqt/reporegistry.py:710
 msgid "Cannot open non mercurial repositories or subrepositories"
 msgstr ""
 
 msgid "Repository Registry"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:431
+#: tortoisehg/hgqt/reporegistry.py:432
 msgid "Refresh repository list"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:432
+#: tortoisehg/hgqt/reporegistry.py:433
 msgid "Refresh the Repository Registry list"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:433 tortoisehg/hgqt/wctxactions.py:43
+#: tortoisehg/hgqt/reporegistry.py:434 tortoisehg/hgqt/wctxactions.py:43
 #: tortoisehg/hgqt/webconf_ui.py:76
 msgid "Open"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:434
+#: tortoisehg/hgqt/reporegistry.py:435
 msgid "Open the repository in a new tab"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:435
+#: tortoisehg/hgqt/reporegistry.py:436
 msgid "Open All"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:436
+#: tortoisehg/hgqt/reporegistry.py:437
 msgid "Open all repositories in new tabs"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:437 tortoisehg/hgqt/reporegistry.py:720
+#: tortoisehg/hgqt/reporegistry.py:438 tortoisehg/hgqt/reporegistry.py:721
 msgid "New Group"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:438
+#: tortoisehg/hgqt/reporegistry.py:439
 msgid "Create a new group"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:440
+#: tortoisehg/hgqt/reporegistry.py:441
 msgid "Rename the entry"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:441
+#: tortoisehg/hgqt/reporegistry.py:442
 msgid "Settings..."
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:442
+#: tortoisehg/hgqt/reporegistry.py:443
 msgid "View the repository's settings"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:443
+#: tortoisehg/hgqt/reporegistry.py:444
 msgid "Remove from registry"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:444
+#: tortoisehg/hgqt/reporegistry.py:445
 msgid ""
 "Remove the node and all its subnodes. Repositories are not deleted from disk."
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:447 tortoisehg/util/menuthg.py:25
+#: tortoisehg/hgqt/reporegistry.py:448 tortoisehg/util/menuthg.py:25
 msgid "Clone..."
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:448
+#: tortoisehg/hgqt/reporegistry.py:449
 msgid "Clone Repository"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:449 tortoisehg/hgqt/sync.py:631
-#: tortoisehg/hgqt/workbench.py:318
+#: tortoisehg/hgqt/reporegistry.py:450 tortoisehg/hgqt/sync.py:631
+#: tortoisehg/hgqt/workbench.py:317
 msgid "Explore"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:450
+#: tortoisehg/hgqt/reporegistry.py:451
 msgid "Open the repository in a file browser"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:451 tortoisehg/hgqt/sync.py:632
-#: tortoisehg/hgqt/workbench.py:321
+#: tortoisehg/hgqt/reporegistry.py:452 tortoisehg/hgqt/sync.py:632
+#: tortoisehg/hgqt/workbench.py:320
 msgid "Terminal"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:452
+#: tortoisehg/hgqt/reporegistry.py:453
 msgid "Open a shell terminal in the repository root"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:453
+#: tortoisehg/hgqt/reporegistry.py:454
 msgid "Add repository..."
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:454
+#: tortoisehg/hgqt/reporegistry.py:455
 msgid "Add a repository to this group"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:455
+#: tortoisehg/hgqt/reporegistry.py:456
 msgid "Add a subrepository..."
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:456
+#: tortoisehg/hgqt/reporegistry.py:457
 msgid "Convert an existing repository into a subrepository"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:458 tortoisehg/hgqt/sync.py:633
+#: tortoisehg/hgqt/reporegistry.py:459 tortoisehg/hgqt/sync.py:633
 #: tortoisehg/hgqt/wctxactions.py:52
 msgid "Copy path"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:459
+#: tortoisehg/hgqt/reporegistry.py:460
 msgid "Copy the root path of the repository to the clipboard"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:461
+#: tortoisehg/hgqt/reporegistry.py:462
 msgid "Sort by name"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:462
+#: tortoisehg/hgqt/reporegistry.py:463
 msgid "Sort the group by short name"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:463
+#: tortoisehg/hgqt/reporegistry.py:464
 msgid "Sort by path"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:464
+#: tortoisehg/hgqt/reporegistry.py:465
 msgid "Sort the group by full path"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:465
+#: tortoisehg/hgqt/reporegistry.py:466
 msgid "Sort by .hgsub"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:466
+#: tortoisehg/hgqt/reporegistry.py:467
 msgid "Order the subrepos as in .hgsub"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:527
+#: tortoisehg/hgqt/reporegistry.py:528
 msgid "Select repository directory to add"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:538 tortoisehg/hgqt/reporegistry.py:632
-#: tortoisehg/hgqt/reporegistry.py:660 tortoisehg/hgqt/reporegistry.py:666
+#: tortoisehg/hgqt/reporegistry.py:539 tortoisehg/hgqt/reporegistry.py:633
+#: tortoisehg/hgqt/reporegistry.py:661 tortoisehg/hgqt/reporegistry.py:667
 msgid "Failed to add repository"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:539 tortoisehg/hgqt/reporegistry.py:557
+#: tortoisehg/hgqt/reporegistry.py:540 tortoisehg/hgqt/reporegistry.py:558
 #, python-format
 msgid "%s is not a valid repository"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:545
+#: tortoisehg/hgqt/reporegistry.py:546
 msgid "Select an existing repository to add as a subrepo"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:556 tortoisehg/hgqt/reporegistry.py:561
-#: tortoisehg/hgqt/reporegistry.py:566 tortoisehg/hgqt/reporegistry.py:571
+#: tortoisehg/hgqt/reporegistry.py:557 tortoisehg/hgqt/reporegistry.py:562
+#: tortoisehg/hgqt/reporegistry.py:567 tortoisehg/hgqt/reporegistry.py:572
 msgid "Cannot add subrepository"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:562
+#: tortoisehg/hgqt/reporegistry.py:563
 #, python-format
 msgid "\"%s\" is not a folder"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:567
+#: tortoisehg/hgqt/reporegistry.py:568
 msgid "A repository cannot be added as a subrepo of itself"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:572
+#: tortoisehg/hgqt/reporegistry.py:573
 #, python-format
 msgid ""
 "The selected folder:<br><br>%s<br><br>is not inside the target "
 "<i>.hgsub</i> file"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:590
+#: tortoisehg/hgqt/reporegistry.py:591
 msgid "Cannot open repository"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:591
+#: tortoisehg/hgqt/reporegistry.py:592
 #, python-format
 msgid "The selected repository:<br><br>%s<br><br>cannot be open!"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:596
+#: tortoisehg/hgqt/reporegistry.py:597
 msgid "Subrepository already exists"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:597
+#: tortoisehg/hgqt/reporegistry.py:598
 #, python-format
 msgid ""
 "The selected repository:<br><br>%s<br><br>is already a subrepository "
 "of:<br><br>%s<br><br>as: \"%s\""
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:614
+#: tortoisehg/hgqt/reporegistry.py:615
 msgid "Failed to add subrepository"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:615
+#: tortoisehg/hgqt/reporegistry.py:616
 #, python-format
 msgid "Cannot open the .hgsub file in:<br><br>%s"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:633
+#: tortoisehg/hgqt/reporegistry.py:634
 #, python-format
 msgid "The .hgsub file already contains the line:<br><br>%s"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:650
+#: tortoisehg/hgqt/reporegistry.py:651
 msgid "Subrepo added to .hgsub file"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:651
+#: tortoisehg/hgqt/reporegistry.py:652
 #, python-format
 msgid ""
 "The selected subrepo:<br><br><i>%s</i><br><br>has been added to the .hgsub "
 "the .hgsub file in order to confirm the addition of the subrepo."
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:661
+#: tortoisehg/hgqt/reporegistry.py:662
 #, python-format
 msgid "Cannot update the .hgsub file in:<br><br>%s"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:667
+#: tortoisehg/hgqt/reporegistry.py:668
 #, python-format
 msgid "\"%s\" is not a valid repository inside \"%s\""
 msgstr ""
 
-#: tortoisehg/hgqt/repotreeitem.py:240 tortoisehg/hgqt/repotreeitem.py:422
-#: tortoisehg/hgqt/repotreeitem.py:471 tortoisehg/hgqt/repotreeitem.py:526
+#: tortoisehg/hgqt/repotreeitem.py:239 tortoisehg/hgqt/repotreeitem.py:421
+#: tortoisehg/hgqt/repotreeitem.py:470 tortoisehg/hgqt/repotreeitem.py:525
 msgid "Sort"
 msgstr ""
 
-#: tortoisehg/hgqt/repotreeitem.py:262
+#: tortoisehg/hgqt/repotreeitem.py:261
 #, python-format
 msgid "Local Repository %s"
 msgstr ""
 
-#: tortoisehg/hgqt/repotreeitem.py:338
+#: tortoisehg/hgqt/repotreeitem.py:337
 #, python-format
 msgid ""
 "An exception happened while loading the subrepos of:<br><br>\"%s\"<br><br>"
 msgstr ""
 
+#: tortoisehg/hgqt/repotreeitem.py:339
+#, python-format
+msgid "The exception error message was:<br><br>%s<br><br>"
+msgstr ""
+
 #: tortoisehg/hgqt/repotreeitem.py:340
-#, python-format
-msgid "The exception error message was:<br><br>%s<br><br>"
-msgstr ""
-
-#: tortoisehg/hgqt/repotreeitem.py:341
 msgid "Click OK to continue or Abort to exit."
 msgstr ""
 
-#: tortoisehg/hgqt/repotreeitem.py:343
+#: tortoisehg/hgqt/repotreeitem.py:342
 msgid "Error loading subrepos"
 msgstr ""
 
+#: tortoisehg/hgqt/repotreeitem.py:360
+msgid "Unable to update repository name"
+msgstr ""
+
 #: tortoisehg/hgqt/repotreeitem.py:361
-msgid "Unable to update repository name"
-msgstr ""
-
-#: tortoisehg/hgqt/repotreeitem.py:362
 #, python-format
 msgid "An error occurred while updating the repository hgrc file (%s)"
 msgstr ""
 
-#: tortoisehg/hgqt/repotreeitem.py:522
+#: tortoisehg/hgqt/repotreeitem.py:521
 msgid "default"
 msgstr ""
 
-#: tortoisehg/hgqt/repotreemodel.py:168 tortoisehg/hgqt/resolve.py:444
+#: tortoisehg/hgqt/repotreemodel.py:168 tortoisehg/hgqt/resolve.py:480
 #: tortoisehg/hgqt/sync.py:282 tortoisehg/hgqt/webconf.py:266
 msgid "Path"
 msgstr ""
 msgid "Repository Registry updated"
 msgstr ""
 
-#: tortoisehg/hgqt/repoview.py:97 tortoisehg/hgqt/workbench.py:226
+#: tortoisehg/hgqt/repoview.py:97 tortoisehg/hgqt/workbench.py:225
 msgid "Choose Log Columns..."
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/repowidget.py:561 tortoisehg/hgqt/repowidget.py:1216
-#: tortoisehg/hgqt/workbench.py:377
+#: tortoisehg/hgqt/workbench.py:376
 msgid "Push"
 msgstr ""
 
 msgid "Write bundle"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1855
+#: tortoisehg/hgqt/repowidget.py:1856
 msgid "Backwards phase change requested"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1856
+#: tortoisehg/hgqt/repowidget.py:1857
 msgid "Do you really want to <i>force</i> a backwards phase transition?"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1857
+#: tortoisehg/hgqt/repowidget.py:1858
 #, python-format
 msgid ""
 "You are trying to move the phase of revision %d backwards,\n"
 "Please be careful!"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1865
+#: tortoisehg/hgqt/repowidget.py:1866
 msgid "&Force"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1866
+#: tortoisehg/hgqt/repowidget.py:1867
 msgid "&Cancel"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1897
+#: tortoisehg/hgqt/repowidget.py:1898
 msgid "Cannot import selected revision"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1898
+#: tortoisehg/hgqt/repowidget.py:1899
 #, python-format
 msgid ""
 "The selected revision (rev #%d) cannot be imported because it is not a "
 "descendant of qparent (rev #%d)"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:2024
+#: tortoisehg/hgqt/repowidget.py:2025
 msgid "Invalid command"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:2025
+#: tortoisehg/hgqt/repowidget.py:2026
 msgid "The selected command is empty"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:2054
+#: tortoisehg/hgqt/repowidget.py:2055
 msgid "Failed to execute custom command"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:2055
+#: tortoisehg/hgqt/repowidget.py:2056
 #, python-format
 msgid "The command \"%s\" could not be executed."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:2056
+#: tortoisehg/hgqt/repowidget.py:2057
 #, python-format
 msgid ""
 "The following error message was returned:\n"
 "application"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:2063
+#: tortoisehg/hgqt/repowidget.py:2064
 msgid "Unable to start"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:2064
+#: tortoisehg/hgqt/repowidget.py:2065
 msgid "Previous command is still running"
 msgstr ""
 
 msgid "Mark this file as resolved"
 msgstr ""
 
+#: tortoisehg/hgqt/resolve.py:127
+msgid "Diff Local to Ancestor"
+msgstr ""
+
 #: tortoisehg/hgqt/resolve.py:129
+msgid "Diff Other to Ancestor"
+msgstr ""
+
+#: tortoisehg/hgqt/resolve.py:137
 msgid "Resolved conflicts"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:144
+#: tortoisehg/hgqt/resolve.py:152
 msgid "Edit resolved file"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:146 tortoisehg/hgqt/resolve.py:171
+#: tortoisehg/hgqt/resolve.py:154 tortoisehg/hgqt/resolve.py:179
 msgid "3-Way Diff"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:147
+#: tortoisehg/hgqt/resolve.py:155
 msgid "Visual three-way diff"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:149 tortoisehg/hgqt/resolve.py:173
+#: tortoisehg/hgqt/resolve.py:157 tortoisehg/hgqt/resolve.py:181
 msgid "Diff to Local"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:150
+#: tortoisehg/hgqt/resolve.py:158
 msgid "Visual diff between resolved file and first parent"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:152 tortoisehg/hgqt/resolve.py:175
+#: tortoisehg/hgqt/resolve.py:160 tortoisehg/hgqt/resolve.py:183
 msgid "Diff to Other"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:153
+#: tortoisehg/hgqt/resolve.py:161
 msgid "Visual diff between resolved file and second parent"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:155 tortoisehg/hgqt/resolve.py:177
+#: tortoisehg/hgqt/resolve.py:163 tortoisehg/hgqt/resolve.py:185
 msgid "Mark as Unresolved"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:156
+#: tortoisehg/hgqt/resolve.py:164
 msgid "Mark this file as unresolved"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:189
+#: tortoisehg/hgqt/resolve.py:199
 msgid "Detected merge/diff tools:"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:193
+#: tortoisehg/hgqt/resolve.py:203
 msgid "Command output"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:278
+#: tortoisehg/hgqt/resolve.py:288
 msgid "Unable to show subrepository files"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:279
+#: tortoisehg/hgqt/resolve.py:289
 msgid ""
 "Visual diffs are not supported for files in subrepositories. They will not "
 "be shown."
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:379
+#: tortoisehg/hgqt/resolve.py:409
 msgid "There are merge <b>conflicts</b> to be resolved"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:381
+#: tortoisehg/hgqt/resolve.py:411
 msgid "All conflicts are resolved."
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:383
+#: tortoisehg/hgqt/resolve.py:413
 msgid "There are no conflicting file merges."
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:390
+#: tortoisehg/hgqt/resolve.py:420
 msgid "Exit without finishing resolve?"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:391
+#: tortoisehg/hgqt/resolve.py:421
 msgid "Unresolved conflicts remain. Are you sure?"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:392 tortoisehg/hgqt/workbench.py:182
+#: tortoisehg/hgqt/resolve.py:422 tortoisehg/hgqt/workbench.py:181
 msgid "E&xit"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:444
+#: tortoisehg/hgqt/resolve.py:480
 msgid "Ext"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:444 tortoisehg/hgqt/thgimport.py:86
+#: tortoisehg/hgqt/resolve.py:480 tortoisehg/hgqt/thgimport.py:86
 msgid "Repository"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:487
+#: tortoisehg/hgqt/resolve.py:523
 msgid "<default>"
 msgstr ""
 
 "revsets</a>"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:227
+#: tortoisehg/hgqt/revset.py:231
 msgid "Searching..."
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:228 tortoisehg/hgqt/revset.py:240
+#: tortoisehg/hgqt/revset.py:232 tortoisehg/hgqt/revset.py:246
 msgid "Running"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:228
+#: tortoisehg/hgqt/revset.py:232
 msgid "query"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:382
+#: tortoisehg/hgqt/revset.py:388
 msgid "found revision"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:405
+#: tortoisehg/hgqt/revset.py:411
 msgid "Parse Error: "
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:409
+#: tortoisehg/hgqt/revset.py:415
 msgid "Invalid query: "
 msgstr ""
 
 msgid "Start"
 msgstr ""
 
-#: tortoisehg/hgqt/serve_ui.py:88 tortoisehg/hgqt/settings.py:1123
+#: tortoisehg/hgqt/serve_ui.py:88 tortoisehg/hgqt/settings.py:1126
 msgid "Settings"
 msgstr ""
 
 "dialog.  Default: True"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:754 tortoisehg/hgqt/settings.py:959
+#: tortoisehg/hgqt/settings.py:754 tortoisehg/hgqt/settings.py:962
 msgid "Server"
 msgstr ""
 
 msgid "Optional. User name to authenticate with at the proxy server"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:818 tortoisehg/hgqt/settings.py:964
+#: tortoisehg/hgqt/settings.py:818 tortoisehg/hgqt/settings.py:967
 #: tortoisehg/hgqt/sync.py:1497
 msgid "Password"
 msgstr ""
 
 #: tortoisehg/hgqt/settings.py:870
 msgid ""
-"If set to 'keep', mq will obey the [diff] section configuration while "
-"preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq "
-"will override the [diff] section and always generate git or regular patches, "
-"possibly losing data in the second case."
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:874
+"When set to 'auto', mq will automatically use git patches when required to "
+"avoid losing changes to file modes, copy records or binary files. If set to "
+"'keep', mq will obey the [diff] section configuration while preserving "
+"existing git patches upon qrefresh. If set to 'yes' or 'no', mq will "
+"override the [diff] section and always generate git or regular patches, "
+"possibly losing data in the second case. Default: auto"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:877
 msgid "No Dates"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:875
+#: tortoisehg/hgqt/settings.py:878
 msgid "Do not include modification dates in diff headers. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:877
+#: tortoisehg/hgqt/settings.py:880
 msgid "Show Function"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:878
+#: tortoisehg/hgqt/settings.py:881
 msgid "Show which function each change is in. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:880 tortoisehg/hgqt/settings.py:890
+#: tortoisehg/hgqt/settings.py:883 tortoisehg/hgqt/settings.py:893
 msgid "Ignore White Space"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:881
+#: tortoisehg/hgqt/settings.py:884
 msgid "Ignore white space when comparing lines in diff views. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:883 tortoisehg/hgqt/settings.py:893
+#: tortoisehg/hgqt/settings.py:886 tortoisehg/hgqt/settings.py:896
 msgid "Ignore WS Amount"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:884
+#: tortoisehg/hgqt/settings.py:887
 msgid ""
 "Ignore changes in the amount of white space in diff views. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:886 tortoisehg/hgqt/settings.py:896
+#: tortoisehg/hgqt/settings.py:889 tortoisehg/hgqt/settings.py:899
 msgid "Ignore Blank Lines"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:887
+#: tortoisehg/hgqt/settings.py:890
 msgid ""
 "Ignore changes whose lines are all blank in diff views. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:889
+#: tortoisehg/hgqt/settings.py:892
 msgid "<b>Annotate:</b>"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:891
+#: tortoisehg/hgqt/settings.py:894
 msgid ""
 "Ignore white space when comparing lines in the annotate view. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:894
+#: tortoisehg/hgqt/settings.py:897
 msgid ""
 "Ignore changes in the amount of white space in the annotate view. Default: "
 "False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:897
+#: tortoisehg/hgqt/settings.py:900
 msgid ""
 "Ignore changes whose lines are all blank in the annotate view. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:901
+#: tortoisehg/hgqt/settings.py:904
 msgid "Fonts"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:902
+#: tortoisehg/hgqt/settings.py:905
 msgid "Message Font"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:903
+#: tortoisehg/hgqt/settings.py:906
 msgid "Font used to display commit messages. Default: monospace 10"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:905
+#: tortoisehg/hgqt/settings.py:908
 msgid "Diff Font"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:906
+#: tortoisehg/hgqt/settings.py:909
 msgid "Font used to display text differences. Default: monospace 10"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:908
+#: tortoisehg/hgqt/settings.py:911
 msgid "List Font"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:909
+#: tortoisehg/hgqt/settings.py:912
 msgid "Font used to display file lists. Default: sans 9"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:911
+#: tortoisehg/hgqt/settings.py:914
 msgid "ChangeLog Font"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:912
+#: tortoisehg/hgqt/settings.py:915
 msgid "Font used to display changelog data. Default: monospace 10"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:914
+#: tortoisehg/hgqt/settings.py:917
 msgid "Output Font"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:915
+#: tortoisehg/hgqt/settings.py:918
 msgid "Font used to display output messages. Default: sans 8"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:919 tortoisehg/hgqt/settings.py:1508
+#: tortoisehg/hgqt/settings.py:922 tortoisehg/hgqt/settings.py:1511
 msgid "Extensions"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:922 tortoisehg/hgqt/settings.py:1566
+#: tortoisehg/hgqt/settings.py:925 tortoisehg/hgqt/settings.py:1569
 msgid "Tools"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:925
+#: tortoisehg/hgqt/settings.py:928
 msgid "Issue Tracking"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:926
+#: tortoisehg/hgqt/settings.py:929
 msgid "Issue Regex"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:927
+#: tortoisehg/hgqt/settings.py:930
 msgid "Defines the regex to match when picking up issue numbers."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:928
+#: tortoisehg/hgqt/settings.py:931
 msgid "Issue Link"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:929
+#: tortoisehg/hgqt/settings.py:932
 msgid ""
 "Defines the command to run when an issue number is recognized. You may "
 "include groups in issue.regex, and corresponding {n} tokens in issue.link "
 "tokensare found in issue.link, the entire matched string is appended instead."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:936
+#: tortoisehg/hgqt/settings.py:939
 msgid "Inline Tags"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:937
+#: tortoisehg/hgqt/settings.py:940
 msgid "Show tags at start of commit message."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:938
+#: tortoisehg/hgqt/settings.py:941
 msgid "Mandatory Issue Reference"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:939
+#: tortoisehg/hgqt/settings.py:942
 msgid ""
 "When committing, require that a reference to an issue be specified.  If "
 "enabled, the regex configured in 'Issue Regex' must find a match in the "
 "commit message."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:942
+#: tortoisehg/hgqt/settings.py:945