Commits

Steve Borho committed ee53105

i18n: pull latest translations

Comments (0)

Files changed (29)

i18n/tortoisehg/ca.po

 msgstr ""
 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-01 13:49-0300\n"
-"PO-Revision-Date: 2009-10-18 09:21+0000\n"
-"Last-Translator: peso <peer.sommerlund@gmail.com>\n"
+"POT-Creation-Date: 2011-03-09 17:23-0300\n"
+"PO-Revision-Date: 2011-03-07 18:36+0000\n"
+"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-01 19:42+0000\n"
-"X-Generator: Launchpad (build 12460)\n"
+"X-Launchpad-Export-Date: 2011-03-10 19:20+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
 
 #: TortoiseHgOverlayServer.py:50
 msgid "TortoiseHg Overlay Icon Server"
 msgid "Exit"
 msgstr "Sortir"
 
-#: tortoisehg/hgqt/about.py:35 tortoisehg/hgqt/workbench.py:287
+#: tortoisehg/hgqt/about.py:34 tortoisehg/hgqt/workbench.py:287
 #: tortoisehg/hgtk/gdialog.py:505
 msgid "About"
 msgstr ""
 
-#: tortoisehg/hgqt/about.py:60
+#: tortoisehg/hgqt/about.py:59
 msgid "Copyright 2008-2011 Steve Borho and others"
 msgstr ""
 
-#: tortoisehg/hgqt/about.py:65 tortoisehg/hgtk/about.py:42
+#: tortoisehg/hgqt/about.py:64 tortoisehg/hgtk/about.py:42
 msgid "Several icons are courtesy of the TortoiseSVN project"
 msgstr "Algunes icones són cortesia del projecte TortoiseSVN"
 
-#: tortoisehg/hgqt/about.py:75
+#: tortoisehg/hgqt/about.py:74
 msgid "You can visit our site here"
 msgstr ""
 
-#: tortoisehg/hgqt/about.py:84
+#: tortoisehg/hgqt/about.py:83
 msgid "&License"
 msgstr ""
 
-#: tortoisehg/hgqt/about.py:90 tortoisehg/hgqt/archive.py:106
-#: tortoisehg/hgqt/hgemail_ui.py:272 tortoisehg/hgqt/hginit.py:58
+#: tortoisehg/hgqt/about.py:89 tortoisehg/hgqt/archive.py:106
+#: tortoisehg/hgqt/hgemail_ui.py:273 tortoisehg/hgqt/hginit.py:58
 #: tortoisehg/hgqt/license.py:45 tortoisehg/hgqt/postreview_ui.py:178
 #: tortoisehg/hgqt/rename.py:99
 msgid "&Close"
 msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
 msgstr ""
 
-#: tortoisehg/hgqt/about.py:189 tortoisehg/hgtk/about.py:70
+#: tortoisehg/hgqt/about.py:159 tortoisehg/hgtk/about.py:70
 msgid "A new version of TortoiseHg is ready for download!"
 msgstr "Una nova versió de TortoiseHg està llesta per descarregar !"
 
 msgid "%s is not found in revision %d"
 msgstr ""
 
-#: tortoisehg/hgqt/annotate.py:359
+#: tortoisehg/hgqt/annotate.py:178 tortoisehg/hgqt/fileview.py:523
+#: tortoisehg/hgtk/chunks.py:85
+msgid "File is binary.\n"
+msgstr ""
+
+#: tortoisehg/hgqt/annotate.py:364
 #, python-format
 msgid "Annotate %s@%d"
 msgstr ""
 msgid "= Working Directory Parent ="
 msgstr ""
 
-#: tortoisehg/hgqt/archive.py:40 tortoisehg/hgqt/bookmark.py:73
+#: tortoisehg/hgqt/archive.py:40 tortoisehg/hgqt/bookmark.py:50
 #: tortoisehg/hgqt/csinfo.py:105 tortoisehg/hgqt/csinfo.py:106
-#: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/merge.py:573
-#: tortoisehg/hgqt/tag.py:74 tortoisehg/hgtk/bookmark.py:83
+#: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/merge.py:574
+#: tortoisehg/hgqt/tag.py:49 tortoisehg/hgtk/bookmark.py:83
 #: tortoisehg/hgtk/csinfo.py:211 tortoisehg/hgtk/csinfo.py:212
 #: tortoisehg/hgtk/cslist.py:142 tortoisehg/hgtk/tagadd.py:66
 msgid "Revision:"
 msgid "Destination path:"
 msgstr ""
 
-#: tortoisehg/hgqt/archive.py:56 tortoisehg/hgqt/clone.py:53
-#: tortoisehg/hgqt/clone.py:65 tortoisehg/hgqt/hginit.py:37
+#: tortoisehg/hgqt/archive.py:56 tortoisehg/hgqt/clone.py:56
+#: tortoisehg/hgqt/clone.py:68 tortoisehg/hgqt/hginit.py:37
 #: tortoisehg/hgqt/thgimport.py:53 tortoisehg/hgtk/archive.py:69
 #: tortoisehg/hgtk/clone.py:70 tortoisehg/hgtk/hginit.py:55
 #: tortoisehg/hgtk/thgconfig.py:394 tortoisehg/hgtk/thgimport.py:63
 msgid "&Detail"
 msgstr ""
 
-#: tortoisehg/hgqt/archive.py:112 tortoisehg/hgqt/commit.py:516
-#: tortoisehg/hgqt/commit.py:523 tortoisehg/hgqt/commit.py:550
-#: tortoisehg/hgqt/commit.py:563 tortoisehg/hgqt/compress.py:150
+#: tortoisehg/hgqt/archive.py:112 tortoisehg/hgqt/commit.py:525
+#: tortoisehg/hgqt/commit.py:533 tortoisehg/hgqt/commit.py:560
+#: tortoisehg/hgqt/commit.py:573 tortoisehg/hgqt/compress.py:150
 #: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:169
-#: tortoisehg/hgqt/merge.py:363 tortoisehg/hgqt/merge.py:396
-#: tortoisehg/hgqt/merge.py:460 tortoisehg/hgqt/rebase.py:214
+#: tortoisehg/hgqt/merge.py:363 tortoisehg/hgqt/merge.py:397
+#: tortoisehg/hgqt/merge.py:461 tortoisehg/hgqt/rebase.py:214
 #: tortoisehg/hgqt/rebase.py:235 tortoisehg/hgqt/rename.py:104
 #: tortoisehg/hgqt/repotreeitem.py:283 tortoisehg/hgqt/resolve.py:317
-#: tortoisehg/hgqt/settings.py:653 tortoisehg/hgqt/settings.py:751
+#: tortoisehg/hgqt/settings.py:672 tortoisehg/hgqt/settings.py:770
 #: tortoisehg/hgqt/wctxactions.py:232 tortoisehg/hgqt/wctxactions.py:245
-#: tortoisehg/hgqt/wctxactions.py:300 tortoisehg/hgtk/shellconf.py:29
+#: tortoisehg/hgqt/wctxactions.py:300 tortoisehg/hgtk/shellconf.py:28
 #: tortoisehg/hgtk/thgshelve.py:163
 msgid "Cancel"
 msgstr "Cancel·lar"
 msgid "Backed out changeset: "
 msgstr "Grup de canvis retirat: "
 
-#: tortoisehg/hgqt/backout.py:60 tortoisehg/hgqt/clone.py:91
-#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/merge.py:313
+#: tortoisehg/hgqt/backout.py:60 tortoisehg/hgqt/clone.py:94
+#: tortoisehg/hgqt/commit.py:220 tortoisehg/hgqt/merge.py:313
 #: tortoisehg/hgqt/mq.py:53 tortoisehg/hgqt/postreview_ui.py:169
-#: tortoisehg/hgqt/rebase.py:56 tortoisehg/hgqt/sync.py:132
-#: tortoisehg/hgqt/tag.py:78 tortoisehg/hgtk/hgemail.py:64
+#: tortoisehg/hgqt/rebase.py:56 tortoisehg/hgqt/sync.py:136
+#: tortoisehg/hgqt/tag.py:64 tortoisehg/hgtk/hgemail.py:64
 msgid "Options"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:80 tortoisehg/hgqt/merge.py:330
-#: tortoisehg/hgqt/rebase.py:68 tortoisehg/hgqt/sync.py:895
+#: tortoisehg/hgqt/rebase.py:68 tortoisehg/hgqt/sync.py:905
 #: tortoisehg/hgqt/update.py:97
 msgid "Automatically resolve merge conflicts where possible"
 msgstr ""
 msgid "&Backout"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:115 tortoisehg/hgqt/clone.py:155
+#: tortoisehg/hgqt/backout.py:115 tortoisehg/hgqt/clone.py:158
 #: tortoisehg/hgqt/cmdui.py:737 tortoisehg/hgqt/thgimport.py:117
 #: tortoisehg/hgqt/thgstrip.py:110 tortoisehg/hgqt/update.py:129
 msgid "Detail"
 msgid "Backout '%s' - %s"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:146 tortoisehg/hgqt/commit.py:387
+#: tortoisehg/hgqt/backout.py:146 tortoisehg/hgqt/commit.py:394
 #: tortoisehg/hgqt/mq.py:455 tortoisehg/hgtk/backout.py:139
 #: tortoisehg/hgtk/commit.py:581
 msgid "Confirm Discard Message"
 msgid "Discard current backout message?"
 msgstr ""
 
-#: tortoisehg/hgqt/backout.py:213 tortoisehg/hgqt/commit.py:181
-#: tortoisehg/hgqt/commit.py:917 tortoisehg/hgqt/compress.py:122
-#: tortoisehg/hgqt/repowidget.py:161 tortoisehg/hgqt/repowidget.py:235
+#: tortoisehg/hgqt/backout.py:213 tortoisehg/hgqt/commit.py:179
+#: tortoisehg/hgqt/commit.py:909 tortoisehg/hgqt/compress.py:122
+#: tortoisehg/hgqt/repowidget.py:162 tortoisehg/hgqt/repowidget.py:236
 #: tortoisehg/hgqt/settings.py:367 tortoisehg/hgtk/commit.py:654
 #: tortoisehg/hgtk/commit.py:951 tortoisehg/hgtk/commit.py:1015
 #: tortoisehg/hgtk/commit.py:1264 tortoisehg/hgtk/gdialog.py:485
 msgstr ""
 
 #: tortoisehg/hgqt/bisect.py:114 tortoisehg/hgqt/bisect.py:135
-#: tortoisehg/hgqt/commit.py:580 tortoisehg/hgqt/commit.py:845
-#: tortoisehg/hgqt/commit.py:865 tortoisehg/hgqt/hgignore.py:232
+#: tortoisehg/hgqt/commit.py:590 tortoisehg/hgqt/commit.py:837
+#: tortoisehg/hgqt/commit.py:857 tortoisehg/hgqt/hgignore.py:232
 #: tortoisehg/hgqt/hginit.py:180 tortoisehg/hgqt/status.py:382
 #: tortoisehg/hgqt/wctxactions.py:119
 #, python-format
 msgid "%s (hint: %s)"
 msgstr ""
 
-#: tortoisehg/hgqt/bookmark.py:54 tortoisehg/hgtk/bookmark.py:71
+#: tortoisehg/hgqt/bookmark.py:57 tortoisehg/hgtk/bookmark.py:71
 msgid "Bookmark:"
 msgstr ""
 
-#: tortoisehg/hgqt/bookmark.py:61
-msgid "New name:"
-msgstr ""
-
-#: tortoisehg/hgqt/bookmark.py:80 tortoisehg/hgqt/tag.py:113
-#: tortoisehg/hgqt/wctxactions.py:53 tortoisehg/hgqt/wctxactions.py:59
+#: tortoisehg/hgqt/bookmark.py:62 tortoisehg/hgtk/bookmark.py:86
+msgid "New Name:"
+msgstr ""
+
+#: tortoisehg/hgqt/bookmark.py:67 tortoisehg/hgqt/commit.py:560
+#: tortoisehg/hgqt/tag.py:98 tortoisehg/hgqt/wctxactions.py:53
+#: tortoisehg/hgqt/wctxactions.py:59
 msgid "&Add"
 msgstr ""
 
-#: tortoisehg/hgqt/bookmark.py:83
-msgid "&Rename"
-msgstr ""
-
-#: tortoisehg/hgqt/bookmark.py:86 tortoisehg/hgqt/tag.py:116
+#: tortoisehg/hgqt/bookmark.py:68
+msgid "Re&name"
+msgstr ""
+
+#: tortoisehg/hgqt/bookmark.py:69 tortoisehg/hgqt/commit.py:573
+#: tortoisehg/hgqt/tag.py:99
 msgid "&Remove"
 msgstr ""
 
-#: tortoisehg/hgqt/bookmark.py:109 tortoisehg/hgtk/bookmark.py:37
+#: tortoisehg/hgqt/bookmark.py:70
+msgid "&Move"
+msgstr ""
+
+#: tortoisehg/hgqt/bookmark.py:92 tortoisehg/hgtk/bookmark.py:37
 #, python-format
 msgid "Bookmark - %s"
 msgstr ""
 
-#: tortoisehg/hgqt/bookmark.py:196 tortoisehg/hgqt/bookmark.py:241
+#: tortoisehg/hgqt/bookmark.py:160 tortoisehg/hgqt/bookmark.py:214
 #, python-format
 msgid "A bookmark named \"%s\" already exists"
 msgstr ""
 
-#: tortoisehg/hgqt/bookmark.py:202
+#: tortoisehg/hgqt/bookmark.py:165
 #, python-format
 msgid "Bookmark '%s' has been added"
 msgstr ""
 
-#: tortoisehg/hgqt/bookmark.py:216 tortoisehg/hgqt/bookmark.py:237
+#: tortoisehg/hgqt/bookmark.py:176
+#, python-format
+msgid "Bookmark named \"%s\" does not exist"
+msgstr ""
+
+#: tortoisehg/hgqt/bookmark.py:181
+#, python-format
+msgid "Bookmark '%s' has been moved"
+msgstr ""
+
+#: tortoisehg/hgqt/bookmark.py:192 tortoisehg/hgqt/bookmark.py:210
 #: tortoisehg/hgtk/bookmark.py:364
 #, python-format
 msgid "Bookmark '%s' does not exist"
 msgstr ""
 
-#: tortoisehg/hgqt/bookmark.py:222
+#: tortoisehg/hgqt/bookmark.py:196
 #, python-format
 msgid "Bookmark '%s' has been removed"
 msgstr ""
 
-#: tortoisehg/hgqt/bookmark.py:249
+#: tortoisehg/hgqt/bookmark.py:219
 #, python-format
 msgid "Bookmark '%s' has been renamed to '%s'"
 msgstr ""
 msgid "Select branch of merge commit"
 msgstr ""
 
-#: tortoisehg/hgqt/branchop.py:36 tortoisehg/hgtk/commit.py:77
+#: tortoisehg/hgqt/branchop.py:41 tortoisehg/hgtk/commit.py:77
 msgid "Changes take effect on next commit"
 msgstr ""
 
-#: tortoisehg/hgqt/branchop.py:41 tortoisehg/hgtk/commit.py:60
+#: tortoisehg/hgqt/branchop.py:46 tortoisehg/hgtk/commit.py:60
 msgid "No branch changes"
 msgstr "Sense canvis de branca"
 
-#: tortoisehg/hgqt/branchop.py:42 tortoisehg/hgtk/commit.py:62
+#: tortoisehg/hgqt/branchop.py:47 tortoisehg/hgtk/commit.py:62
 msgid "Open a new named branch"
 msgstr ""
 
-#: tortoisehg/hgqt/branchop.py:43
+#: tortoisehg/hgqt/branchop.py:48
 msgid "Close current branch"
 msgstr ""
 
 msgid "Add or remove patches must be merged in the working directory"
 msgstr ""
 
-#: tortoisehg/hgqt/chunks.py:431 tortoisehg/hgqt/status.py:128
+#: tortoisehg/hgqt/chunks.py:433 tortoisehg/hgqt/status.py:128
 msgctxt "files"
 msgid "All"
 msgstr ""
 
-#: tortoisehg/hgqt/chunks.py:435 tortoisehg/hgqt/status.py:132
+#: tortoisehg/hgqt/chunks.py:437 tortoisehg/hgqt/status.py:132
 msgctxt "files"
 msgid "None"
 msgstr ""
 
-#: tortoisehg/hgqt/chunks.py:491
+#: tortoisehg/hgqt/chunks.py:493
 #, python-format
 msgid "Chunks selected: %d / %d"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:56 tortoisehg/hgqt/rename.py:65
+#: tortoisehg/hgqt/clone.py:59 tortoisehg/hgqt/rename.py:65
 #: tortoisehg/hgqt/thgimport.py:62 tortoisehg/hgtk/thgimport.py:82
 msgid "Source:"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:68 tortoisehg/hgqt/rename.py:70
+#: tortoisehg/hgqt/clone.py:71 tortoisehg/hgqt/rename.py:70
 #: tortoisehg/hgtk/hginit.py:58
 msgid "Destination:"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:113 tortoisehg/hgtk/clone.py:127
+#: tortoisehg/hgqt/clone.py:116 tortoisehg/hgtk/clone.py:127
 msgid "Clone to revision:"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:116 tortoisehg/hgtk/clone.py:141
+#: tortoisehg/hgqt/clone.py:119 tortoisehg/hgtk/clone.py:141
 msgid "Do not update the new working directory"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:117 tortoisehg/hgtk/clone.py:142
+#: tortoisehg/hgqt/clone.py:120 tortoisehg/hgtk/clone.py:142
 msgid "Use pull protocol to copy metadata"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:118 tortoisehg/hgtk/clone.py:143
+#: tortoisehg/hgqt/clone.py:121 tortoisehg/hgtk/clone.py:143
 msgid "Use uncompressed transfer"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:119
+#: tortoisehg/hgqt/clone.py:122
 msgid "Include patch queue"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:125 tortoisehg/hgtk/clone.py:149
+#: tortoisehg/hgqt/clone.py:128 tortoisehg/hgtk/clone.py:149
 #: tortoisehg/hgtk/history.py:467 tortoisehg/hgtk/synch.py:179
 msgid "Use proxy server"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:131 tortoisehg/hgqt/sync.py:1368
-#: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:201
+#: tortoisehg/hgqt/clone.py:134 tortoisehg/hgqt/sync.py:1368
+#: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:202
 msgid "Remote command:"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:134
+#: tortoisehg/hgqt/clone.py:137
 msgid "Start revision:"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:152
+#: tortoisehg/hgqt/clone.py:155
 msgid "&Clone"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:165
+#: tortoisehg/hgqt/clone.py:168
 #, python-format
 msgid "Clone - %s"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:225 tortoisehg/hgqt/clone.py:252
-#: tortoisehg/hgqt/clone.py:259 tortoisehg/hgtk/clone.py:37
+#: tortoisehg/hgqt/clone.py:228 tortoisehg/hgqt/clone.py:255
+#: tortoisehg/hgqt/clone.py:262 tortoisehg/hgtk/clone.py:37
 msgid "TortoiseHg Clone"
 msgstr "TortoiseHg: Clonar"
 
-#: tortoisehg/hgqt/clone.py:226
+#: tortoisehg/hgqt/clone.py:229
 msgid "Error creating destination folder"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:227
+#: tortoisehg/hgqt/clone.py:230
 msgid "Please specify a different path."
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:253 tortoisehg/hgtk/clone.py:288
+#: tortoisehg/hgqt/clone.py:256 tortoisehg/hgtk/clone.py:288
 msgid "Source path is empty"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:254
+#: tortoisehg/hgqt/clone.py:257
 msgid "Please enter a valid source path."
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:260 tortoisehg/hgtk/clone.py:294
+#: tortoisehg/hgqt/clone.py:263 tortoisehg/hgtk/clone.py:294
 msgid "Source and destination are the same"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:261
+#: tortoisehg/hgqt/clone.py:264
 msgid "Please specify different paths."
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:322
+#: tortoisehg/hgqt/clone.py:325
 msgid "Select source repository"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:330
+#: tortoisehg/hgqt/clone.py:334
 msgid "Select destination repository"
 msgstr ""
 
 msgid "Terminated"
 msgstr ""
 
-#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:736
+#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:737
 #: tortoisehg/hgtk/p4pending.py:101
 msgid "Finished"
 msgstr ""
 
 #: tortoisehg/hgqt/cmdui.py:766 tortoisehg/hgqt/merge.py:65
 #: tortoisehg/hgqt/rebase.py:236 tortoisehg/hgqt/resolve.py:318
-#: tortoisehg/hgqt/settings.py:650 tortoisehg/hgtk/commit.py:323
+#: tortoisehg/hgqt/settings.py:669 tortoisehg/hgtk/commit.py:323
 #: tortoisehg/hgtk/merge.py:196 tortoisehg/hgtk/thgconfig.py:846
 msgid "Confirm Exit"
 msgstr ""
 
-#: tortoisehg/hgqt/cmdui.py:766
+#: tortoisehg/hgqt/cmdui.py:767
 msgid ""
 "Mercurial command is still running.\n"
 "Are you sure you want to terminate?"
 msgstr ""
 
-#: tortoisehg/hgqt/cmdui.py:810
+#: tortoisehg/hgqt/cmdui.py:811
 msgid "TortoiseHg"
 msgstr ""
 
+#: tortoisehg/hgqt/commit.py:81
+msgid "Paste &Filenames"
+msgstr ""
+
 #: tortoisehg/hgqt/commit.py:83
-msgid "Paste &Filenames"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:85
 msgid "App&ly Format"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:86
+#: tortoisehg/hgqt/commit.py:84
 msgid "C&onfigure Format"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:213 tortoisehg/hgqt/commit.py:332
+#: tortoisehg/hgqt/commit.py:206
+msgid "Commit Dialog Toolbar"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:210
+msgid "Copy message"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:212
+msgid "Copy one of the recent commit messages"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:216 tortoisehg/hgqt/commit.py:330
 msgid "Branch: "
 msgstr ""
 
+#: tortoisehg/hgqt/commit.py:332
+msgid "Close Branch: "
+msgstr ""
+
 #: tortoisehg/hgqt/commit.py:334
-msgid "Close Branch: "
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:336
 msgid "New Branch: "
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:358
+#: tortoisehg/hgqt/commit.py:356
 #, python-format
 msgid "Rollback commit to revision %d"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:367
+#: tortoisehg/hgqt/commit.py:365
 msgid "Confirm Undo"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:388 tortoisehg/hgqt/mq.py:456
+#: tortoisehg/hgqt/commit.py:395 tortoisehg/hgqt/mq.py:456
 #: tortoisehg/hgtk/commit.py:582
 msgid "Discard current commit message?"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:472
+#: tortoisehg/hgqt/commit.py:480
 msgid "Please enter a username"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:473
+#: tortoisehg/hgqt/commit.py:481
 msgid "You must identify yourself to Mercurial"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:488 tortoisehg/hgtk/commit.py:935
+#: tortoisehg/hgqt/commit.py:496 tortoisehg/hgtk/commit.py:935
 #: tortoisehg/hgtk/commit.py:1079 tortoisehg/hgtk/commit.py:1098
 msgid "Nothing Commited"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:489 tortoisehg/hgtk/commit.py:1080
+#: tortoisehg/hgqt/commit.py:497 tortoisehg/hgtk/commit.py:1080
 #: tortoisehg/hgtk/tagadd.py:225
 msgid "Please enter commit message"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:510 tortoisehg/hgtk/commit.py:1186
+#: tortoisehg/hgqt/commit.py:518 tortoisehg/hgtk/commit.py:1186
 msgid "Confirm Branch Change"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:511
-#, python-format
-msgid ""
-"Named branch \"%s\" already exists, last used in revision %d\n"
-"Yes\t- Make commit restarting this named branch\n"
-"No\t- Make commit without changing branch\n"
-"Cancel\t- Cancel this commit"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:516 tortoisehg/hgqt/commit.py:523
-#: tortoisehg/hgqt/settings.py:652 tortoisehg/hgtk/commit.py:325
-#: tortoisehg/hgtk/commit.py:1193 tortoisehg/hgtk/commit.py:1200
-#: tortoisehg/hgtk/status.py:1320 tortoisehg/hgtk/thgconfig.py:848
-#: tortoisehg/hgtk/thgmq.py:369
-msgid "&Yes"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:516 tortoisehg/hgqt/commit.py:523
-#: tortoisehg/hgqt/thgstrip.py:206 tortoisehg/hgtk/commit.py:325
-#: tortoisehg/hgtk/commit.py:1193 tortoisehg/hgtk/commit.py:1200
-#: tortoisehg/hgtk/thgstrip.py:217
-msgid "&No"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:518 tortoisehg/hgtk/commit.py:1195
+#: tortoisehg/hgqt/commit.py:519
+#, python-format
+msgid "Named branch \"%s\" already exists, last used in revision %d\n"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:523
+msgid "Restart &Branch"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:524 tortoisehg/hgqt/commit.py:532
+msgid "&Commit to current branch"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:527 tortoisehg/hgtk/commit.py:1195
 msgid "Confirm New Branch"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:519
-#, python-format
-msgid ""
-"Create new named branch \"%s\" with this commit?\n"
-"Yes\t- Start new branch with this commit\n"
-"No\t- Make commit without branch change\n"
-"Cancel\t- Cancel this commit"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:532
+#: tortoisehg/hgqt/commit.py:528
+#, python-format
+msgid "Create new named branch \"%s\" with this commit?\n"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:531
+msgid "Create &Branch"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:542
 msgid "No files checked"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:533
+#: tortoisehg/hgqt/commit.py:543
 msgid "No modified files checkmarked for commit"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:548
+#: tortoisehg/hgqt/commit.py:558
 msgid "Confirm Add"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:549
-msgid "Add checked untracked files?"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:550 tortoisehg/hgqt/commit.py:563
-msgid "&OK"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:561
+#: tortoisehg/hgqt/commit.py:559
+msgid "Add selected untracked files?"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:571
 msgid "Confirm Remove"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:562
-msgid "Remove checked deleted files?"
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:621 tortoisehg/hgtk/commit.py:429
-msgid "Recent commit messages..."
-msgstr ""
-
-#: tortoisehg/hgqt/commit.py:645
+#: tortoisehg/hgqt/commit.py:572
+msgid "Remove selected deleted files?"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:635
 msgid "Set username:"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:670 tortoisehg/hgqt/commit.py:717
-#: tortoisehg/hgqt/commit.py:740
+#: tortoisehg/hgqt/commit.py:662 tortoisehg/hgqt/commit.py:709
+#: tortoisehg/hgqt/commit.py:732
 msgid "Save in Repo"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:675
+#: tortoisehg/hgqt/commit.py:667
 msgid "Save Global"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:687
+#: tortoisehg/hgqt/commit.py:679
 msgid "Set Date:"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:691 tortoisehg/hgtk/history.py:1594
+#: tortoisehg/hgqt/commit.py:683 tortoisehg/hgtk/history.py:1594
 #: tortoisehg/hgtk/synch.py:148 tortoisehg/hgtk/update.py:128
 msgid "Update"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:710
+#: tortoisehg/hgqt/commit.py:702
 msgid "Push After Commit:"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:733
+#: tortoisehg/hgqt/commit.py:725
 msgid "Auto Includes:"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:772
+#: tortoisehg/hgqt/commit.py:764
 msgid "Unable to save username"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:773 tortoisehg/hgqt/commit.py:796
-#: tortoisehg/hgqt/commit.py:819 tortoisehg/hgqt/sync.py:837
-#: tortoisehg/hgqt/sync.py:935 tortoisehg/hgqt/sync.py:1005
-#: tortoisehg/hgqt/sync.py:1160
+#: tortoisehg/hgqt/commit.py:765 tortoisehg/hgqt/commit.py:788
+#: tortoisehg/hgqt/commit.py:811 tortoisehg/hgqt/sync.py:847
+#: tortoisehg/hgqt/sync.py:945 tortoisehg/hgqt/sync.py:1015
+#: tortoisehg/hgqt/sync.py:1175
 msgid "Iniparse must be installed."
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:788 tortoisehg/hgqt/commit.py:811
-#: tortoisehg/hgqt/commit.py:834 tortoisehg/hgqt/settings.py:948
-#: tortoisehg/hgqt/sync.py:847 tortoisehg/hgqt/sync.py:946
-#: tortoisehg/hgqt/sync.py:1023 tortoisehg/hgqt/sync.py:1198
+#: tortoisehg/hgqt/commit.py:780 tortoisehg/hgqt/commit.py:803
+#: tortoisehg/hgqt/commit.py:826 tortoisehg/hgqt/settings.py:967
+#: tortoisehg/hgqt/sync.py:857 tortoisehg/hgqt/sync.py:956
+#: tortoisehg/hgqt/sync.py:1033 tortoisehg/hgqt/sync.py:1213
 #: tortoisehg/hgtk/thgconfig.py:1654
 msgid "Unable to write configuration file"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:795
+#: tortoisehg/hgqt/commit.py:787
 msgid "Unable to save after commit push"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:818
+#: tortoisehg/hgqt/commit.py:810
 msgid "Unable to save auto include list"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:849
+#: tortoisehg/hgqt/commit.py:841
 msgid "Invalid date format"
 msgstr ""
 
-#: tortoisehg/hgqt/commit.py:869
+#: tortoisehg/hgqt/commit.py:861
 msgid "No username configured"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:362
-#: tortoisehg/hgqt/merge.py:395 tortoisehg/hgqt/merge.py:459
-#: tortoisehg/hgqt/rebase.py:213 tortoisehg/hgqt/settings.py:751
+#: tortoisehg/hgqt/merge.py:396 tortoisehg/hgqt/merge.py:460
+#: tortoisehg/hgqt/rebase.py:213 tortoisehg/hgqt/settings.py:770
 #: tortoisehg/hgqt/update.py:219 tortoisehg/hgtk/thgconfig.py:775
 #: tortoisehg/hgtk/update.py:233
 msgid "&Discard"
 msgstr ""
 
-#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:461
+#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:462
 #: tortoisehg/hgqt/rebase.py:215
 msgid "Confirm Discard"
 msgstr ""
 
-#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:461
-#: tortoisehg/hgqt/rebase.py:215
-msgid "Discard outstanding changes in working directory?"
+#: tortoisehg/hgqt/compress.py:152 tortoisehg/hgqt/merge.py:463
+#: tortoisehg/hgqt/rebase.py:216
+msgid "Discard outstanding changes to working directory?"
 msgstr ""
 
 #: tortoisehg/hgqt/csinfo.py:48 tortoisehg/hgtk/csinfo.py:49
 msgid "Forward"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:206 tortoisehg/hgqt/manifestdialog.py:284
+#: tortoisehg/hgqt/filelistview.py:205 tortoisehg/hgqt/manifestdialog.py:284
 #, python-format
 msgid "Hg file log viewer - %s"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:215
+#: tortoisehg/hgqt/filelistview.py:214
 msgid "Show All"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:217
+#: tortoisehg/hgqt/filelistview.py:216
 msgid "Toggle display of all files and the direction they were merged"
 msgstr ""
 
+#: tortoisehg/hgqt/filelistview.py:219
+msgid "Other"
+msgstr ""
+
 #: tortoisehg/hgqt/filelistview.py:221
-msgid "Other"
-msgstr ""
-
-#: tortoisehg/hgqt/filelistview.py:223
 msgid "Toggle display of diffs to second (other) parent"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:231 tortoisehg/hgqt/manifestdialog.py:196
+#: tortoisehg/hgqt/filelistview.py:228 tortoisehg/hgqt/manifestdialog.py:196
 msgid "File history"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:232 tortoisehg/hgqt/manifestdialog.py:197
+#: tortoisehg/hgqt/filelistview.py:229 tortoisehg/hgqt/manifestdialog.py:197
 msgid "Show the history of the selected file"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:233 tortoisehg/hgqt/manifestdialog.py:198
+#: tortoisehg/hgqt/filelistview.py:230 tortoisehg/hgqt/manifestdialog.py:198
 msgid "Compare file revisions"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:234 tortoisehg/hgqt/manifestdialog.py:199
+#: tortoisehg/hgqt/filelistview.py:231 tortoisehg/hgqt/manifestdialog.py:199
 msgid "Compare revisions of the selected file"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:235 tortoisehg/hgqt/grep.py:502
+#: tortoisehg/hgqt/filelistview.py:232 tortoisehg/hgqt/grep.py:502
 #: tortoisehg/hgqt/manifestdialog.py:200 tortoisehg/util/menuthg.py:76
 msgid "Visual Diff"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:236 tortoisehg/hgqt/manifestdialog.py:201
+#: tortoisehg/hgqt/filelistview.py:233 tortoisehg/hgqt/manifestdialog.py:201
 msgid "View file changes in external diff tool"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:237 tortoisehg/hgqt/manifestdialog.py:202
+#: tortoisehg/hgqt/filelistview.py:234 tortoisehg/hgqt/manifestdialog.py:202
 msgid "Visual Diff to Local"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:238 tortoisehg/hgqt/manifestdialog.py:203
+#: tortoisehg/hgqt/filelistview.py:235 tortoisehg/hgqt/manifestdialog.py:203
 msgid "View changes to current in external diff tool"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:240 tortoisehg/hgqt/manifestdialog.py:205
+#: tortoisehg/hgqt/filelistview.py:237 tortoisehg/hgqt/manifestdialog.py:205
 msgid "View at Revision"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:241 tortoisehg/hgqt/manifestdialog.py:206
+#: tortoisehg/hgqt/filelistview.py:238 tortoisehg/hgqt/manifestdialog.py:206
 msgid "View file as it appeared at this revision"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:242 tortoisehg/hgqt/manifestdialog.py:207
+#: tortoisehg/hgqt/filelistview.py:239 tortoisehg/hgqt/manifestdialog.py:207
 msgid "Edit Local"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:243 tortoisehg/hgqt/manifestdialog.py:208
+#: tortoisehg/hgqt/filelistview.py:240 tortoisehg/hgqt/manifestdialog.py:208
 msgid "Edit current file in working copy"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:244 tortoisehg/hgqt/manifestdialog.py:209
+#: tortoisehg/hgqt/filelistview.py:241 tortoisehg/hgqt/manifestdialog.py:209
 msgid "Revert to Revision"
 msgstr ""
 
-#: tortoisehg/hgqt/filelistview.py:245 tortoisehg/hgqt/manifestdialog.py:210
+#: tortoisehg/hgqt/filelistview.py:242 tortoisehg/hgqt/manifestdialog.py:210
 msgid "Revert file(s) to contents at this revision"
 msgstr ""
 
 msgid "File is larger than the specified max size.\n"
 msgstr ""
 
-#: tortoisehg/hgqt/fileview.py:523 tortoisehg/hgtk/chunks.py:85
-msgid "File is binary.\n"
-msgstr ""
-
 #: tortoisehg/hgqt/fileview.py:552 tortoisehg/hgqt/fileview.py:657
 #, python-format
 msgid "exec mode has been <font color='red'>%s</font>"
 msgid "Revision has changed from:"
 msgstr ""
 
-#: tortoisehg/hgqt/fileview.py:604 tortoisehg/hgqt/hgemail_ui.py:244
+#: tortoisehg/hgqt/fileview.py:604 tortoisehg/hgqt/hgemail_ui.py:245
 #: tortoisehg/hgtk/hgemail.py:76
 msgid "To:"
 msgstr ""
 msgstr ""
 
 #: tortoisehg/hgqt/grep.py:49 tortoisehg/hgqt/qscilib.py:301
-#: tortoisehg/hgqt/qscilib.py:324 tortoisehg/hgqt/repowidget.py:173
+#: tortoisehg/hgqt/qscilib.py:324 tortoisehg/hgqt/repowidget.py:174
 #: tortoisehg/hgtk/datamine.py:310
 msgid "Search"
 msgstr ""
 msgid "No matches found"
 msgstr ""
 
-#: tortoisehg/hgqt/grep.py:329 tortoisehg/hgqt/revset.py:382
+#: tortoisehg/hgqt/grep.py:329 tortoisehg/hgqt/revset.py:384
 #, python-format
 msgid "%d matches found"
 msgstr ""
 msgid "Annotate file"
 msgstr ""
 
-#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:364
+#: tortoisehg/hgqt/grep.py:644 tortoisehg/hgtk/datamine.py:364
 #: tortoisehg/hgtk/datamine.py:654
 msgid "File"
 msgstr ""
 
-#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:652
+#: tortoisehg/hgqt/grep.py:644 tortoisehg/hgtk/datamine.py:652
 msgid "Line"
 msgstr ""
 
-#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgtk/datamine.py:363
+#: tortoisehg/hgqt/grep.py:644 tortoisehg/hgtk/datamine.py:363
 #: tortoisehg/hgtk/datamine.py:653 tortoisehg/hgtk/logview/treeview.py:441
 msgid "Rev"
 msgstr ""
 
-#: tortoisehg/hgqt/grep.py:646 tortoisehg/hgqt/settings.py:451
-#: tortoisehg/hgqt/settings.py:551 tortoisehg/hgqt/settings.py:590
+#: tortoisehg/hgqt/grep.py:644 tortoisehg/hgqt/settings.py:451
+#: tortoisehg/hgqt/settings.py:564 tortoisehg/hgqt/settings.py:609
 #: tortoisehg/hgtk/datamine.py:142 tortoisehg/hgtk/datamine.py:655
 #: tortoisehg/hgtk/history.py:101 tortoisehg/hgtk/history.py:502
 #: tortoisehg/hgtk/history.py:695 tortoisehg/hgtk/thgconfig.py:232
 msgid "User"
 msgstr ""
 
-#: tortoisehg/hgqt/grep.py:647
+#: tortoisehg/hgqt/grep.py:645
 msgid "Match Text"
 msgstr ""
 
 msgid "% Match"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail.py:262
+#: tortoisehg/hgqt/hgemail.py:263
 msgid "Sending Email"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail.py:438
+#: tortoisehg/hgqt/hgemail.py:439
 msgid "use only one form to specify the revision"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail.py:448
+#: tortoisehg/hgqt/hgemail.py:449
 msgid "Failed to open Email dialog"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:243 tortoisehg/hgqt/settings.py:457
+#: tortoisehg/hgqt/hgemail_ui.py:244 tortoisehg/hgqt/settings.py:457
 #: tortoisehg/hgtk/synch.py:78 tortoisehg/hgtk/thgconfig.py:238
 msgid "Email"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:245 tortoisehg/hgtk/hgemail.py:81
+#: tortoisehg/hgqt/hgemail_ui.py:246 tortoisehg/hgtk/hgemail.py:81
 msgid "Cc:"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:246 tortoisehg/hgtk/hgemail.py:86
+#: tortoisehg/hgqt/hgemail_ui.py:247 tortoisehg/hgtk/hgemail.py:86
 msgid "From:"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:247 tortoisehg/hgtk/hgemail.py:90
+#: tortoisehg/hgqt/hgemail_ui.py:248 tortoisehg/hgtk/hgemail.py:90
 msgid "In-Reply-To:"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:248 tortoisehg/hgtk/hgemail.py:92
+#: tortoisehg/hgqt/hgemail_ui.py:249 tortoisehg/hgtk/hgemail.py:92
 msgid "Message identifier to reply to, for threading"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:249
+#: tortoisehg/hgqt/hgemail_ui.py:250
 msgid "Flag:"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:250 tortoisehg/hgtk/hgemail.py:101
+#: tortoisehg/hgqt/hgemail_ui.py:251 tortoisehg/hgtk/hgemail.py:101
 msgid ""
 "Hg patches (as generated by export command) are compatible with most patch "
 "programs.  They include a header which contains the most important changeset "
 "metadata."
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:251 tortoisehg/hgtk/hgemail.py:98
+#: tortoisehg/hgqt/hgemail_ui.py:252 tortoisehg/hgtk/hgemail.py:98
 msgid "Send changesets as Hg patches"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:252 tortoisehg/hgtk/hgemail.py:109
+#: tortoisehg/hgqt/hgemail_ui.py:253 tortoisehg/hgtk/hgemail.py:109
 msgid ""
 "Git patches can describe binary files, copies, and permission changes, but "
 "recipients may not be able to use them if they are not using git or "
 "Mercurial."
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:253 tortoisehg/hgtk/hgemail.py:106
+#: tortoisehg/hgqt/hgemail_ui.py:254 tortoisehg/hgtk/hgemail.py:106
 msgid "Use extended (git) patch format"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:254 tortoisehg/hgtk/hgemail.py:117
+#: tortoisehg/hgqt/hgemail_ui.py:255 tortoisehg/hgtk/hgemail.py:117
 msgid ""
 "Stripping Mercurial header removes username and parent information.  Only "
 "useful if recipient is not using Mercurial (and does not like to see the "
 "headers)."
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:255 tortoisehg/hgtk/hgemail.py:114
+#: tortoisehg/hgqt/hgemail_ui.py:256 tortoisehg/hgtk/hgemail.py:114
 msgid "Plain, do not prepend Hg header"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:256 tortoisehg/hgtk/hgemail.py:126
+#: tortoisehg/hgqt/hgemail_ui.py:257 tortoisehg/hgtk/hgemail.py:126
 msgid ""
 "Bundles store complete changesets in binary form. Upstream users can pull "
 "from them. This is the safest way to send changes to recipient Mercurial "
 "users."
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:257 tortoisehg/hgtk/hgemail.py:122
+#: tortoisehg/hgqt/hgemail_ui.py:258 tortoisehg/hgtk/hgemail.py:122
 msgid "Send single binary bundle, not patches"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:258 tortoisehg/hgtk/hgemail.py:137
+#: tortoisehg/hgqt/hgemail_ui.py:259 tortoisehg/hgtk/hgemail.py:137
 msgid "send patches as attachments"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:259 tortoisehg/hgtk/hgemail.py:135
+#: tortoisehg/hgqt/hgemail_ui.py:260 tortoisehg/hgtk/hgemail.py:135
 msgid "attach"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:260 tortoisehg/hgtk/hgemail.py:140
+#: tortoisehg/hgqt/hgemail_ui.py:261 tortoisehg/hgtk/hgemail.py:140
 msgid "send patches as inline attachments"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:261 tortoisehg/hgtk/hgemail.py:138
+#: tortoisehg/hgqt/hgemail_ui.py:262 tortoisehg/hgtk/hgemail.py:138
 msgid "inline"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:262 tortoisehg/hgtk/hgemail.py:143
+#: tortoisehg/hgqt/hgemail_ui.py:263 tortoisehg/hgtk/hgemail.py:143
 msgid "add diffstat output to messages"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:263 tortoisehg/hgtk/hgemail.py:141
+#: tortoisehg/hgqt/hgemail_ui.py:264 tortoisehg/hgtk/hgemail.py:141
 msgid "diffstat"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:264 tortoisehg/hgtk/hgemail.py:232
+#: tortoisehg/hgqt/hgemail_ui.py:265 tortoisehg/hgtk/hgemail.py:232
 msgid ""
 "Patch series description is sent in initial summary email with [PATCH 0 of "
 "N] subject.  It should describe the effects of the entire patch series.  "
 "subject prefix."
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:265
+#: tortoisehg/hgqt/hgemail_ui.py:266
 msgid "Write patch series (bundle) description"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:266 tortoisehg/hgtk/hgemail.py:151
+#: tortoisehg/hgqt/hgemail_ui.py:267 tortoisehg/hgtk/hgemail.py:151
 msgid "Subject:"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:267 tortoisehg/hgqt/postreview_ui.py:173
+#: tortoisehg/hgqt/hgemail_ui.py:268 tortoisehg/hgqt/postreview_ui.py:173
 msgid "Changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:268 tortoisehg/hgqt/wctxactions.py:47
+#: tortoisehg/hgqt/hgemail_ui.py:269 tortoisehg/hgqt/wctxactions.py:47
 #: tortoisehg/hgqt/webconf.py:256 tortoisehg/hgqt/webconf_ui.py:79
 #: tortoisehg/hgtk/status.py:1243
 msgid "Edit"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:269
+#: tortoisehg/hgqt/hgemail_ui.py:270
 msgid "Preview"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:270 tortoisehg/hgqt/postreview_ui.py:174
+#: tortoisehg/hgqt/hgemail_ui.py:271 tortoisehg/hgqt/postreview_ui.py:174
 msgid "&Settings"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:271
+#: tortoisehg/hgqt/hgemail_ui.py:272
 msgid "Send &Email"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/hgignore.py:53 tortoisehg/hgqt/qqueue.py:91
-#: tortoisehg/hgqt/quickop.py:19 tortoisehg/hgqt/webconf.py:246
-#: tortoisehg/hgqt/webconf_ui.py:78 tortoisehg/hgtk/bookmark.py:48
-#: tortoisehg/hgtk/hgignore.py:50 tortoisehg/hgtk/hgignore.py:58
-#: tortoisehg/hgtk/quickop.py:19 tortoisehg/hgtk/tagadd.py:39
+#: tortoisehg/hgqt/quickop.py:19 tortoisehg/hgqt/tag.py:186
+#: tortoisehg/hgqt/webconf.py:246 tortoisehg/hgqt/webconf_ui.py:78
+#: tortoisehg/hgtk/bookmark.py:48 tortoisehg/hgtk/hgignore.py:50
+#: tortoisehg/hgtk/hgignore.py:58 tortoisehg/hgtk/quickop.py:19
+#: tortoisehg/hgtk/tagadd.py:39
 msgid "Add"
 msgstr ""
 
 #: tortoisehg/hgqt/hgignore.py:72 tortoisehg/hgqt/resolve.py:94
-#: tortoisehg/hgqt/settings.py:700 tortoisehg/hgtk/hgignore.py:77
+#: tortoisehg/hgqt/settings.py:719 tortoisehg/hgtk/hgignore.py:77
 #: tortoisehg/hgtk/thgconfig.py:676
 msgid "Edit File"
 msgstr ""
 msgid "Unable to read repository status"
 msgstr ""
 
-#: tortoisehg/hgqt/hgignore.py:271 tortoisehg/hgtk/hgignore.py:256
+#: tortoisehg/hgqt/hgignore.py:271 tortoisehg/hgtk/hgignore.py:261
 msgid "Unable to write .hgignore file"
 msgstr ""
 
 msgid "Annotate"
 msgstr ""
 
-#: tortoisehg/hgqt/manifestdialog.py:403 tortoisehg/hgqt/status.py:107
+#: tortoisehg/hgqt/manifestdialog.py:417 tortoisehg/hgqt/status.py:107
 #: tortoisehg/hgtk/thgmq.py:862
 msgid "Status"
 msgstr ""
 msgstr ""
 
 #: tortoisehg/hgqt/merge.py:61
-msgid ""
-"To complete merging, you need to commit merged files in working directory."
+msgid "To finish merging, you need to commit the working directory."
 msgstr ""
 
 #: tortoisehg/hgqt/merge.py:63 tortoisehg/hgqt/rebase.py:234
 msgid "Cancel merge and discard changes?"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:394
-msgid "Discard unfinished local changes and restart merge?"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:397
+#: tortoisehg/hgqt/merge.py:395
+msgid "Discard local changes and restart merge?"
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:398
 msgid "Confirm Clean Up"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:400
+#: tortoisehg/hgqt/merge.py:401
 msgid "Canceling merge...\n"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:401
-msgid "(Please close any running merge tool)\n"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:421
+#: tortoisehg/hgqt/merge.py:402
+msgid "(Please close any running merge tools)\n"
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:422
 msgid "Merge failed"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:421
+#: tortoisehg/hgqt/merge.py:422
 msgid "Returning to first page"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:477
+#: tortoisehg/hgqt/merge.py:478
 msgid "Rename Patch"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:478
+#: tortoisehg/hgqt/merge.py:479
 msgid "Input a new patch name:"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:486
+#: tortoisehg/hgqt/merge.py:487
 #, python-format
 msgid ""
 "The patch <b>%(old)s</b> is renamed to <b>%(new)s</b>.  <a "
 "href=\"rename:%(new)s\"><b>Rename</b></a> again?"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:541
+#: tortoisehg/hgqt/merge.py:542
 msgid "<b>Uncommitted local changes are detected</b>"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:546 tortoisehg/hgtk/recovery.py:52
+#: tortoisehg/hgqt/merge.py:547 tortoisehg/hgtk/recovery.py:52
 msgid "Clean"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:575 tortoisehg/hgtk/commit.py:237
+#: tortoisehg/hgqt/merge.py:576 tortoisehg/hgtk/commit.py:237
 #: tortoisehg/hgtk/history.py:66 tortoisehg/hgtk/history.py:481
 #: tortoisehg/hgtk/history.py:1223
 msgid "Parents"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:579 tortoisehg/hgqt/repomodel.py:514
+#: tortoisehg/hgqt/merge.py:580 tortoisehg/hgqt/repomodel.py:514
 #: tortoisehg/hgqt/repomodel.py:516 tortoisehg/hgqt/shelve.py:24
 #: tortoisehg/hgqt/thgimport.py:87
 msgid "Working Directory"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:617
+#: tortoisehg/hgqt/merge.py:618
 msgid "Working Directory (merged)"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:626
+#: tortoisehg/hgqt/merge.py:627
 msgid "Commit message"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:633 tortoisehg/hgtk/commit.py:823
+#: tortoisehg/hgqt/merge.py:634 tortoisehg/hgtk/commit.py:823
 msgid "Merge "
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:656 tortoisehg/hgqt/workbench.py:231
+#: tortoisehg/hgqt/merge.py:657 tortoisehg/hgqt/workbench.py:231
 msgid "&Commit"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:662 tortoisehg/hgqt/qscilib.py:174
+#: tortoisehg/hgqt/merge.py:663 tortoisehg/hgqt/qscilib.py:174
 #: tortoisehg/hgtk/merge.py:137
 msgid "Undo"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:672
+#: tortoisehg/hgqt/merge.py:673
 msgid "Commit merged files"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:676
+#: tortoisehg/hgqt/merge.py:677
 msgid "Committing..."
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:677
+#: tortoisehg/hgqt/merge.py:678
 msgid "Please wait while committing merged files."
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:692
+#: tortoisehg/hgqt/merge.py:693
 msgid ""
 "There were <b>merge conflicts</b> that must be <a "
 "href=\"resolve\"><b>resolved</b></a>"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:697
+#: tortoisehg/hgqt/merge.py:698
 msgid "No merge conflicts, ready to commit"
 msgstr ""
 
-#: tortoisehg/hgqt/merge.py:749
+#: tortoisehg/hgqt/merge.py:753
 msgid "Merge changeset"
 msgstr ""
 
 msgid "QRefresh"
 msgstr ""
 
+#: tortoisehg/hgqt/mq.py:201
+msgid "### patch name ###"
+msgstr ""
+
 #: tortoisehg/hgqt/mq.py:207
 msgid "TortoiseHg Patch Queue"
 msgstr ""
 msgid "QNew"
 msgstr ""
 
-#: tortoisehg/hgqt/mq.py:766
+#: tortoisehg/hgqt/mq.py:767
 #, python-format
 msgid "Guards: %d/%d"
 msgstr ""
 
-#: tortoisehg/hgqt/mq.py:848
+#: tortoisehg/hgqt/mq.py:849
 msgid "Patch commit messages..."
 msgstr ""
 
-#: tortoisehg/hgqt/mq.py:874
+#: tortoisehg/hgqt/mq.py:875
 msgid "Force use of git extended diff format (--git)"
 msgstr ""
 
-#: tortoisehg/hgqt/mq.py:878
+#: tortoisehg/hgqt/mq.py:879
 msgid "Force push or pop (--force)"
 msgstr ""
 
-#: tortoisehg/hgqt/mq.py:882
+#: tortoisehg/hgqt/mq.py:883
 msgid "Apply patch to its recorded parent (--exact)"
 msgstr ""
 
-#: tortoisehg/hgqt/mq.py:886
+#: tortoisehg/hgqt/mq.py:887
 msgid "Update date field with current date (--currentdate)"
 msgstr ""
 
-#: tortoisehg/hgqt/mq.py:890
+#: tortoisehg/hgqt/mq.py:891
 msgid "Specify an explicit date:"
 msgstr ""
 
-#: tortoisehg/hgqt/mq.py:893
+#: tortoisehg/hgqt/mq.py:894
 msgid "Update author field with current user (--currentuser)"
 msgstr ""
 
-#: tortoisehg/hgqt/mq.py:897
+#: tortoisehg/hgqt/mq.py:898
 msgid "Specify an explicit author:"
 msgstr ""
 
 #: tortoisehg/hgqt/postreview.py:104 tortoisehg/hgqt/postreview.py:120
 #: tortoisehg/hgqt/postreview.py:337 tortoisehg/hgqt/postreview.py:360
 #: tortoisehg/hgqt/postreview.py:372 tortoisehg/hgqt/postreview_ui.py:162
-#: tortoisehg/hgqt/settings.py:547
+#: tortoisehg/hgqt/settings.py:560
 msgid "Review Board"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/qdelete.py:33
-#, python-format
-msgid "<b>Remove patches from queue?<ul><li>%s</ul></b>"
-msgstr ""
-
-#: tortoisehg/hgqt/qdelete.py:37 tortoisehg/hgqt/qfold.py:43
+msgid "Remove patches from queue?"
+msgstr ""
+
+#: tortoisehg/hgqt/qdelete.py:38 tortoisehg/hgqt/qfold.py:43
 msgid "Keep patch files"
 msgstr ""
 
 msgid "Patch queues:"
 msgstr ""
 
-#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:703
+#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:722
 #: tortoisehg/hgtk/thgconfig.py:680
 msgid "Reload"
 msgstr ""
 msgid "Unable to read/write config file"
 msgstr ""
 
+#: tortoisehg/hgqt/qtlib.py:76
+msgid "Unable to create a config file"
+msgstr ""
+
+#: tortoisehg/hgqt/qtlib.py:77
+msgid "Insufficient access rights."
+msgstr ""
+
 #: tortoisehg/hgqt/quickbar.py:30
 msgid "Goto"
 msgstr ""
 msgid "Checkmark files to remove"
 msgstr ""
 
-#: tortoisehg/hgqt/quickop.py:22 tortoisehg/hgqt/sync.py:450
+#: tortoisehg/hgqt/quickop.py:22 tortoisehg/hgqt/sync.py:454
 #: tortoisehg/hgqt/webconf_ui.py:80 tortoisehg/hgtk/bookmark.py:50
 #: tortoisehg/hgtk/quickop.py:22 tortoisehg/hgtk/tagadd.py:40
 msgid "Remove"
 msgstr ""
 
 #: tortoisehg/hgqt/rebase.py:232
-msgid "Rebase is incomplete, exiting is not recommended"
+msgid "Exiting with an unfinished rebase is not recommended."
 msgstr ""
 
 #: tortoisehg/hgqt/rebase.py:233
-msgid "Abort is recommended before exit."
+msgid "Consider aborting the rebase first."
 msgstr ""
 
 #: tortoisehg/hgqt/rebase.py:245
 msgid "Toggle filtering of non-matched changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:189 tortoisehg/hgtk/history.py:487
+#: tortoisehg/hgqt/repofilter.py:198 tortoisehg/hgtk/history.py:487
 #: tortoisehg/hgtk/logview/treeview.py:478
 msgid "Branch"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:190
+#: tortoisehg/hgqt/repofilter.py:199
 msgid "Display graph the named branch only"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:193
+#: tortoisehg/hgqt/repofilter.py:202
 msgid "Display closed branches"
 msgstr ""
 
-#: tortoisehg/hgqt/repofilter.py:196
+#: tortoisehg/hgqt/repofilter.py:205
 msgid "Include all ancestors"
 msgstr ""
 
 msgid "Clone Repository"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/hgqt/sync.py:448
+#: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/hgqt/sync.py:452
 #: tortoisehg/hgqt/workbench.py:279
 msgid "Explore"
 msgstr ""
 msgid "Open the repository in Windows Explorer"
 msgstr ""
 
-#: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:449
+#: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:453
 #: tortoisehg/hgqt/workbench.py:282
 msgid "Terminal"
 msgstr ""
 msgid "default"
 msgstr ""
 
-#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:362
-#: tortoisehg/hgqt/sync.py:195 tortoisehg/hgqt/webconf.py:266
+#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:360
+#: tortoisehg/hgqt/sync.py:199 tortoisehg/hgqt/webconf.py:266
 msgid "Path"
 msgstr ""
 
 msgid "Failed to add repository"
 msgstr ""
 
-#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:582
+#: tortoisehg/hgqt/repotreemodel.py:221 tortoisehg/hgqt/workbench.py:584
 #, python-format
 msgid "%s is not a valid repository"
 msgstr ""
 
-#: tortoisehg/hgqt/repoview.py:197
+#: tortoisehg/hgqt/repoview.py:193
 #, python-format
 msgid "Goto ancestor of %s and %s"
 msgstr ""
 
-#: tortoisehg/hgqt/repoview.py:233
+#: tortoisehg/hgqt/repoview.py:229
 #, python-format
 msgid "Can't find revision '%s'"
 msgstr ""
 msgid "Reject incoming changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:157
+#: tortoisehg/hgqt/repowidget.py:158
 msgid "Revision details"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:165 tortoisehg/hgtk/gdialog.py:495
+#: tortoisehg/hgqt/repowidget.py:166 tortoisehg/hgtk/gdialog.py:495
 #: tortoisehg/hgtk/thgconfig.py:170 tortoisehg/util/menuthg.py:52
 msgid "Synchronize"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:169
+#: tortoisehg/hgqt/repowidget.py:170
 msgid "Manifest"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:178 tortoisehg/hgtk/commit.py:227
+#: tortoisehg/hgqt/repowidget.py:179 tortoisehg/hgtk/commit.py:227
 #: tortoisehg/hgtk/commit.py:309 tortoisehg/hgtk/history.py:258
 #: tortoisehg/hgtk/history.py:368 tortoisehg/hgtk/thgimport.py:111
 msgid "Patch Queue"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:186 tortoisehg/hgtk/history.py:266
+#: tortoisehg/hgqt/repowidget.py:187 tortoisehg/hgtk/history.py:266
 #: tortoisehg/hgtk/history.py:385
 msgid "Patch Branch"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:199
+#: tortoisehg/hgqt/repowidget.py:200
 #, python-format
 msgid "%s <incoming>"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:483
+#: tortoisehg/hgqt/repowidget.py:486
 #, python-format
 msgid "%s - verify repository"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:490
+#: tortoisehg/hgqt/repowidget.py:493
 #, python-format
 msgid "%s - recover repository"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:506
+#: tortoisehg/hgqt/repowidget.py:509
 msgid "No transaction available"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:507
+#: tortoisehg/hgqt/repowidget.py:510
 msgid "There is no rollback transaction available"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:510 tortoisehg/hgtk/commit.py:1035
+#: tortoisehg/hgqt/repowidget.py:513 tortoisehg/hgtk/commit.py:1035
 msgid "Undo last commit?"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:511
+#: tortoisehg/hgqt/repowidget.py:514
 #, python-format
 msgid "Undo most recent commit (%d), preserving file changes?"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:515
+#: tortoisehg/hgqt/repowidget.py:518
 msgid "Undo last transaction?"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:516
+#: tortoisehg/hgqt/repowidget.py:519
 #, python-format
 msgid "Rollback to revision %d (undo %s)?"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:522
+#: tortoisehg/hgqt/repowidget.py:525 tortoisehg/hgqt/run.py:466
 msgid "Repository Error"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:523
+#: tortoisehg/hgqt/repowidget.py:526
 msgid "Unable to determine working copy revision\n"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:527
+#: tortoisehg/hgqt/repowidget.py:530
 msgid "Remove current working revision?"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:528
+#: tortoisehg/hgqt/repowidget.py:531
 #, python-format
 msgid ""
 "Your current working revision (%d) will be removed by this rollback, leaving "
 " Continue?"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:641
-msgid "Repository stripped, incoming preview  cleared"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:646
+#: tortoisehg/hgqt/repowidget.py:648
+msgid "Repository stripped, incoming preview cleared"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:653
 msgid "Repository stripped, revision set cleared"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:758
+#: tortoisehg/hgqt/repowidget.py:766
 msgid "Commit tab cannot exit"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:762
+#: tortoisehg/hgqt/repowidget.py:770
 msgid "Sync tab cannot exit"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:766
+#: tortoisehg/hgqt/repowidget.py:774
 msgid "MQ tab cannot exit"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:770
+#: tortoisehg/hgqt/repowidget.py:778
 msgid "Search tab cannot exit"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:773
+#: tortoisehg/hgqt/repowidget.py:781
 msgid "Repository command still running"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:927 tortoisehg/util/menuthg.py:58
+#: tortoisehg/hgqt/repowidget.py:936 tortoisehg/util/menuthg.py:58
 msgid "Update..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:930 tortoisehg/hgqt/repowidget.py:1140
+#: tortoisehg/hgqt/repowidget.py:939 tortoisehg/hgqt/repowidget.py:1149
 msgid "Visual diff..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:932
+#: tortoisehg/hgqt/repowidget.py:941
 msgid "Diff to local..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:934
+#: tortoisehg/hgqt/repowidget.py:943
 msgid "Browse at rev..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:937
+#: tortoisehg/hgqt/repowidget.py:946
 msgid "Merge with local..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:940
+#: tortoisehg/hgqt/repowidget.py:949
 msgid "Tag..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:942
+#: tortoisehg/hgqt/repowidget.py:951
 msgid "Bookmark..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:945 tortoisehg/hgtk/history.py:1290
+#: tortoisehg/hgqt/repowidget.py:954 tortoisehg/hgtk/history.py:1290
 msgid "Backout..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:949 tortoisehg/hgtk/history.py:1293
+#: tortoisehg/hgqt/repowidget.py:958 tortoisehg/hgtk/history.py:1293
 msgid "Export"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:950
-msgid "Export patch"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:952
+#: tortoisehg/hgqt/repowidget.py:959
+msgid "Export patch..."
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:961
 msgid "Email patch..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:954
+#: tortoisehg/hgqt/repowidget.py:963
 msgid "Archive..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:956 tortoisehg/hgqt/wctxactions.py:46
+#: tortoisehg/hgqt/repowidget.py:965 tortoisehg/hgqt/wctxactions.py:46
 msgid "Copy patch"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:960
+#: tortoisehg/hgqt/repowidget.py:969
 msgid "Copy hash"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:964
+#: tortoisehg/hgqt/repowidget.py:973
 msgid "Transplant to local"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:968
+#: tortoisehg/hgqt/repowidget.py:977
 msgid "Modify history"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:969 tortoisehg/hgqt/repowidget.py:1101
+#: tortoisehg/hgqt/repowidget.py:978 tortoisehg/hgqt/repowidget.py:1110
 msgid "QGoto"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:971
+#: tortoisehg/hgqt/repowidget.py:980
 msgid "Import to MQ"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:973
+#: tortoisehg/hgqt/repowidget.py:982
 msgid "Finish patch"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:976
+#: tortoisehg/hgqt/repowidget.py:985
 msgid "Rebase..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:979
+#: tortoisehg/hgqt/repowidget.py:988
 msgid "Strip..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:982
+#: tortoisehg/hgqt/repowidget.py:991
 msgid "Post to Review Board..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1037
+#: tortoisehg/hgqt/repowidget.py:1046
 msgid "Unable to compress history"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1038
+#: tortoisehg/hgqt/repowidget.py:1047
 msgid "Selected changeset pair not related"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1046
+#: tortoisehg/hgqt/repowidget.py:1055
 msgid "Visual Diff..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1047 tortoisehg/hgqt/repowidget.py:1122
-msgid "Export Selected"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1048 tortoisehg/hgqt/repowidget.py:1123
+#: tortoisehg/hgqt/repowidget.py:1056 tortoisehg/hgqt/repowidget.py:1131
+msgid "Export Selected..."
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1057 tortoisehg/hgqt/repowidget.py:1132
 msgid "Email Selected..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1049
-msgid "Export DAG Range"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1050
+#: tortoisehg/hgqt/repowidget.py:1058
+msgid "Export DAG Range..."
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1059
 msgid "Email DAG Range..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1051
+#: tortoisehg/hgqt/repowidget.py:1060
 msgid "Bisect - Good, Bad..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1052
+#: tortoisehg/hgqt/repowidget.py:1061
 msgid "Bisect - Bad, Good..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1053
+#: tortoisehg/hgqt/repowidget.py:1062
 msgid "Compress History..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1061
+#: tortoisehg/hgqt/repowidget.py:1070
 msgid "Post Pair to Review Board..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1080
+#: tortoisehg/hgqt/repowidget.py:1089
 msgid ""
 "<p>ATTENTION!<br>Guard or comment found.<br>Reordering patches will destroy "
 "them.<br><br>Continue?</p>"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1102
+#: tortoisehg/hgqt/repowidget.py:1111
 msgid "QPush --move"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1103
+#: tortoisehg/hgqt/repowidget.py:1112
 msgid "Fold patches..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1104
+#: tortoisehg/hgqt/repowidget.py:1113
 msgid "Delete patches..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1105
+#: tortoisehg/hgqt/repowidget.py:1114
 msgid "Reorder patches..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1131
+#: tortoisehg/hgqt/repowidget.py:1140
 msgid "Post Selected to Review Board..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1139
+#: tortoisehg/hgqt/repowidget.py:1148
 msgid "Pull to here..."
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1306
+#: tortoisehg/hgqt/repowidget.py:1161
+msgid "Export patch"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1320
 msgid "Unable to start"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1307
+#: tortoisehg/hgqt/repowidget.py:1321
 msgid "Previous command is still running"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/resolve.py:314
-msgid "Quit without finishing resolve?"
+msgid "Exit without finishing resolve?"
 msgstr ""
 
 #: tortoisehg/hgqt/resolve.py:315
 msgid "Unresolved conflicts remain. Are you sure?"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:316 tortoisehg/hgtk/visdiff.py:532
-msgid "&Quit"
-msgstr ""
-
-#: tortoisehg/hgqt/resolve.py:362
+#: tortoisehg/hgqt/resolve.py:316 tortoisehg/hgqt/workbench.py:190
+msgid "E&xit"
+msgstr ""
+
+#: tortoisehg/hgqt/resolve.py:360
 msgid "Ext"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:362 tortoisehg/hgqt/thgimport.py:85
+#: tortoisehg/hgqt/resolve.py:360 tortoisehg/hgqt/thgimport.py:85
 #: tortoisehg/hgtk/thgimport.py:110
 msgid "Repository"
 msgstr ""
 
-#: tortoisehg/hgqt/resolve.py:405
+#: tortoisehg/hgqt/resolve.py:403
 msgid "<default>"
 msgstr ""
 
-#: tortoisehg/hgqt/revdetails.py:88
-msgid "Merge Toolbar"
+#: tortoisehg/hgqt/revdetails.py:89
+msgid "File List Toolbar"
+msgstr ""
+
+#: tortoisehg/hgqt/revdetails.py:182
+msgid "Update to this revision"
 msgstr ""
 
 #: tortoisehg/hgqt/revert.py:22
 msgid "All changesets, the same as 0:tip."
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:121
+#: tortoisehg/hgqt/revset.py:123
 msgid "Revision Set Query"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:132
+#: tortoisehg/hgqt/revset.py:134
 msgid "all revisions converted from subversion"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:134
+#: tortoisehg/hgqt/revset.py:136
 msgid "changeset which represents converted svn revision"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:145
+#: tortoisehg/hgqt/revset.py:147
 msgid "Common sets"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:157
+#: tortoisehg/hgqt/revset.py:159
 msgid "File pattern sets"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:169
+#: tortoisehg/hgqt/revset.py:171
 msgid "Set Ancestry"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:181
+#: tortoisehg/hgqt/revset.py:183
 msgid "Set Logic"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:208
+#: tortoisehg/hgqt/revset.py:210
 msgid ""
 "<a href=\"http://www.selenic.com/mercurial/hg.1.html#revsets\">help "
 "revsets</a>"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:219
+#: tortoisehg/hgqt/revset.py:221
 msgid "Searching..."
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:220 tortoisehg/hgqt/revset.py:232
+#: tortoisehg/hgqt/revset.py:222 tortoisehg/hgqt/revset.py:234
 msgid "Running"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:220
+#: tortoisehg/hgqt/revset.py:222
 msgid "query"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:370
+#: tortoisehg/hgqt/revset.py:372
 msgid "found revision"
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:390
+#: tortoisehg/hgqt/revset.py:392
 msgid "Parse Error: "
 msgstr ""
 
-#: tortoisehg/hgqt/revset.py:392
+#: tortoisehg/hgqt/revset.py:394
 msgid "Invalid query: "
 msgstr ""
 
 msgid "Close this application?"
 msgstr ""
 
-#: tortoisehg/hgqt/run.py:677
+#: tortoisehg/hgqt/run.py:689
 msgid "annotate requires a single filename\n"
 msgstr ""
 
-#: tortoisehg/hgqt/run.py:731 tortoisehg/hgtk/hgtk.py:546
+#: tortoisehg/hgqt/run.py:743 tortoisehg/hgtk/hgtk.py:546
 msgid "global options:"
 msgstr ""
 
-#: tortoisehg/hgqt/run.py:733
+#: tortoisehg/hgqt/run.py:745
 msgid "use \"thg help\" for the full list of commands"
 msgstr ""
 
-#: tortoisehg/hgqt/run.py:737
+#: tortoisehg/hgqt/run.py:749
 msgid ""
 "use \"thg help\" for the full list of commands or \"thg -v\" for details"
 msgstr ""
 
-#: tortoisehg/hgqt/run.py:740
+#: tortoisehg/hgqt/run.py:752
 #, python-format
 msgid "use \"thg -v help%s\" to show aliases and global options"
 msgstr ""
 
-#: tortoisehg/hgqt/run.py:743
+#: tortoisehg/hgqt/run.py:755
 #, python-format
 msgid "use \"thg -v help %s\" to show global options"
 msgstr ""
 
-#: tortoisehg/hgqt/run.py:755 tortoisehg/hgqt/run.py:864
+#: tortoisehg/hgqt/run.py:767 tortoisehg/hgqt/run.py:876
 #: tortoisehg/hgtk/hgtk.py:570 tortoisehg/hgtk/hgtk.py:679
 msgid ""
 "list of commands:\n"
 "\n"
 msgstr ""
 
-#: tortoisehg/hgqt/run.py:763 tortoisehg/hgtk/hgtk.py:578
+#: tortoisehg/hgqt/run.py:775 tortoisehg/hgtk/hgtk.py:578
 #, python-format
 msgid ""