Commits

Steve Borho  committed 7328c65 Merge

Merge with stable

  • Participants
  • Parent commits 57b674d, 78fd9d1

Comments (0)

Files changed (38)

File i18n/tortoisehg/ar.po

 msgstr ""
 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-02 19:55-0200\n"
+"POT-Creation-Date: 2012-02-05 08:55-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-02-03 05:46+0000\n"
-"X-Generator: Launchpad (build 14738)\n"
+"X-Launchpad-Export-Date: 2012-02-06 04:49+0000\n"
+"X-Generator: Launchpad (build 14747)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 msgstr "فقط الملفات المعدلة/المنشأة في هذه المراجعة"
 
 #: tortoisehg/hgqt/archive.py:47 tortoisehg/hgqt/grep.py:68
-#: tortoisehg/hgqt/sync.py:1545
+#: tortoisehg/hgqt/sync.py:1563
 msgid "Recurse into subrepositories"
 msgstr "النزول للمجلدات الفرعية"
 
 #: tortoisehg/hgqt/merge.py:312 tortoisehg/hgqt/quickop.py:187
 #: tortoisehg/hgqt/rebase.py:237 tortoisehg/hgqt/rebase.py:258
 #: tortoisehg/hgqt/rename.py:110 tortoisehg/hgqt/reporegistry.py:208
-#: tortoisehg/hgqt/resolve.py:356 tortoisehg/hgqt/settings.py:963
-#: tortoisehg/hgqt/settings.py:1081 tortoisehg/hgqt/wctxactions.py:269
+#: tortoisehg/hgqt/resolve.py:356 tortoisehg/hgqt/settings.py:979
+#: tortoisehg/hgqt/settings.py:1097 tortoisehg/hgqt/wctxactions.py:269
 #: tortoisehg/hgqt/wctxactions.py:282 tortoisehg/hgqt/wctxactions.py:371
 #: tortoisehg/hgtk/shellconf.py:28 tortoisehg/hgtk/thgshelve.py:163
 msgid "Cancel"
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:228 tortoisehg/hgqt/merge.py:215
-#: tortoisehg/hgqt/rebase.py:76 tortoisehg/hgqt/sync.py:1089
+#: tortoisehg/hgqt/rebase.py:76 tortoisehg/hgqt/sync.py:1107
 #: tortoisehg/hgqt/update.py:103
 msgid "Automatically resolve merge conflicts where possible"
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:299 tortoisehg/hgqt/compress.py:149
 #: tortoisehg/hgqt/merge.py:234 tortoisehg/hgqt/merge.py:311
-#: tortoisehg/hgqt/rebase.py:236 tortoisehg/hgqt/settings.py:1081
+#: tortoisehg/hgqt/rebase.py:236 tortoisehg/hgqt/settings.py:1097
 #: tortoisehg/hgqt/update.py:263 tortoisehg/hgtk/thgconfig.py:775
 #: tortoisehg/hgtk/update.py:233
 msgid "&Discard"
 msgid "Do not verify host certificate"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1570
+#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1588
 #: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:202
 msgid "Remote command:"
 msgstr ""
 
 #: tortoisehg/hgqt/cmdui.py:793 tortoisehg/hgqt/merge.py:101
 #: tortoisehg/hgqt/rebase.py:259 tortoisehg/hgqt/resolve.py:357
-#: tortoisehg/hgqt/settings.py:960 tortoisehg/hgtk/commit.py:322
+#: tortoisehg/hgqt/settings.py:976 tortoisehg/hgtk/commit.py:322
 #: tortoisehg/hgtk/merge.py:196 tortoisehg/hgtk/thgconfig.py:846
 msgid "Confirm Exit"
 msgstr ""
 msgstr ""
 
 #: tortoisehg/hgqt/commit.py:125 tortoisehg/hgqt/commit.py:476
-#: tortoisehg/hgqt/settings.py:303
+#: tortoisehg/hgqt/settings.py:308
 msgid "Issue Tracker"
 msgstr ""
 
 
 #: tortoisehg/hgqt/commit.py:1046 tortoisehg/hgqt/commit.py:1069
 #: tortoisehg/hgqt/commit.py:1092 tortoisehg/hgqt/commit.py:1115
-#: tortoisehg/hgqt/sync.py:1031 tortoisehg/hgqt/sync.py:1129
-#: tortoisehg/hgqt/sync.py:1199 tortoisehg/hgqt/sync.py:1367
+#: tortoisehg/hgqt/sync.py:1049 tortoisehg/hgqt/sync.py:1147
+#: tortoisehg/hgqt/sync.py:1217 tortoisehg/hgqt/sync.py:1385
 msgid "Iniparse must be installed."
 msgstr ""
 
 #: tortoisehg/hgqt/commit.py:1061 tortoisehg/hgqt/commit.py:1084
 #: tortoisehg/hgqt/commit.py:1107 tortoisehg/hgqt/commit.py:1130
-#: tortoisehg/hgqt/settings.py:1305 tortoisehg/hgqt/sync.py:1041
-#: tortoisehg/hgqt/sync.py:1140 tortoisehg/hgqt/sync.py:1217
-#: tortoisehg/hgqt/sync.py:1406 tortoisehg/hgtk/thgconfig.py:1654
+#: tortoisehg/hgqt/settings.py:1321 tortoisehg/hgqt/sync.py:1059
+#: tortoisehg/hgqt/sync.py:1158 tortoisehg/hgqt/sync.py:1235
+#: tortoisehg/hgqt/sync.py:1424 tortoisehg/hgtk/thgconfig.py:1654
 msgid "Unable to write configuration file"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/csinfo.py:108 tortoisehg/hgqt/csinfo.py:110
-#: tortoisehg/hgqt/sync.py:1576 tortoisehg/hgtk/csinfo.py:214
+#: tortoisehg/hgqt/sync.py:1594 tortoisehg/hgtk/csinfo.py:214
 #: tortoisehg/hgtk/csinfo.py:215
 msgid "Branch:"
 msgstr ""
 "pull the missing revisions from its source repository."
 msgstr ""
 
-#: tortoisehg/hgqt/filedata.py:220 tortoisehg/hgqt/settings.py:526
+#: tortoisehg/hgqt/filedata.py:220 tortoisehg/hgqt/settings.py:531
 msgid "Initial revision"
 msgstr ""
 
 msgstr ""
 
 #: tortoisehg/hgqt/filedata.py:255
+msgid "The subrepository is dirty."
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:255
 msgid "File Status:"
 msgstr ""
 
 msgid "Rev"
 msgstr ""
 
-#: tortoisehg/hgqt/grep.py:721 tortoisehg/hgqt/settings.py:679
-#: tortoisehg/hgqt/settings.py:810 tortoisehg/hgqt/settings.py:891
+#: tortoisehg/hgqt/grep.py:721 tortoisehg/hgqt/settings.py:695
+#: tortoisehg/hgqt/settings.py:826 tortoisehg/hgqt/settings.py:907
 #: 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/logview/treeview.py:512
 msgid "Failed to open Email dialog"
 msgstr ""
 
-#: tortoisehg/hgqt/hgemail_ui.py:255 tortoisehg/hgqt/settings.py:685
+#: tortoisehg/hgqt/hgemail_ui.py:255 tortoisehg/hgqt/settings.py:701
 #: tortoisehg/hgtk/synch.py:78 tortoisehg/hgtk/thgconfig.py:238
 msgid "Email"
 msgstr ""
 msgstr ""
 
 #: tortoisehg/hgqt/hgignore.py:73 tortoisehg/hgqt/resolve.py:128
-#: tortoisehg/hgqt/settings.py:1013 tortoisehg/hgtk/hgignore.py:77
+#: tortoisehg/hgqt/settings.py:1029 tortoisehg/hgtk/hgignore.py:77
 #: tortoisehg/hgtk/thgconfig.py:676
 msgid "Edit File"
 msgstr ""
 msgid "Drag to change order"
 msgstr ""
 
-#: tortoisehg/hgqt/logcolumns.py:100 tortoisehg/hgqt/settings.py:520
+#: tortoisehg/hgqt/logcolumns.py:100 tortoisehg/hgqt/settings.py:525
 #: tortoisehg/hgqt/workbench.py:712 tortoisehg/util/menuthg.py:46
 msgid "Workbench"
 msgstr ""
 #: tortoisehg/hgqt/postreview.py:110 tortoisehg/hgqt/postreview.py:126
 #: tortoisehg/hgqt/postreview.py:343 tortoisehg/hgqt/postreview.py:366
 #: tortoisehg/hgqt/postreview.py:378 tortoisehg/hgqt/postreview_ui.py:163
-#: tortoisehg/hgqt/settings.py:806
+#: tortoisehg/hgqt/settings.py:822
 msgid "Review Board"
 msgstr ""
 
 msgid "Patch queues:"
 msgstr ""
 
-#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:1016
+#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:1032
 #: tortoisehg/hgtk/thgconfig.py:680
 msgid "Reload"
 msgstr ""
 msgid "Mercurial User"
 msgstr ""
 
-#: tortoisehg/hgqt/repomodel.py:687
-msgid "draft"
-msgstr ""
-
 #: tortoisehg/hgqt/reporegistry.py:175 tortoisehg/hgqt/reporegistry.py:688
 #, python-format
 msgid "Unsupported repository type (%s)"
 msgid "Reject incoming changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:536 tortoisehg/hgqt/sync.py:991
+#: tortoisehg/hgqt/repowidget.py:536 tortoisehg/hgqt/sync.py:1009
 #: tortoisehg/hgtk/history.py:2021
 #, python-format
 msgid "%d outgoing changesets"
 #: tortoisehg/hgqt/repowidget.py:1761
 #, python-format
 msgid ""
-"You are trying to move the phase of revision %d backwards, from "
-"\"<i>%s</i>\" to \"<i>%s</i>\". However, \"<i>%s</i>\" is a lower phase "
-"level than \"<i>%s</i>\".\n"
+"You are trying to move the phase of revision %d backwards,\n"
+"from \"<i>%s</i>\" to \"<i>%s</i>\".\n"
 "\n"
-"Moving the phase backwards is not recommended. For example, it may result in "
-"having multiple heads if you modify a revision that you have already pushed "
+"However, \"<i>%s</i>\" is a lower phase level than \"<i>%s</i>\".\n"
+"\n"
+"Moving the phase backwards is not recommended.\n"
+"For example, it may result in having multiple heads\n"
+"if you modify a revision that you have already pushed\n"
 "to a server.\n"
 "\n"
 "Please be careful!"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1768
+#: tortoisehg/hgqt/repowidget.py:1769
 msgid "&Force"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1769 tortoisehg/hgtk/commit.py:324
+#: tortoisehg/hgqt/repowidget.py:1770 tortoisehg/hgtk/commit.py:324
 #: tortoisehg/hgtk/commit.py:1192 tortoisehg/hgtk/commit.py:1199
 #: tortoisehg/hgtk/history.py:220 tortoisehg/hgtk/history.py:2636
 #: tortoisehg/hgtk/status.py:1320 tortoisehg/hgtk/statusact.py:127
 msgid "&Cancel"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1800
+#: tortoisehg/hgqt/repowidget.py:1801
 msgid "Cannot import selected revision"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1801
+#: tortoisehg/hgqt/repowidget.py:1802
 #, 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:1921
+#: tortoisehg/hgqt/repowidget.py:1922
 msgid "Unable to start"
 msgstr ""
 
-#: tortoisehg/hgqt/repowidget.py:1922
+#: tortoisehg/hgqt/repowidget.py:1923
 msgid "Previous command is still running"
 msgstr ""
 
 msgid "Start"
 msgstr ""
 
-#: tortoisehg/hgqt/serve_ui.py:88 tortoisehg/hgqt/settings.py:952
+#: tortoisehg/hgqt/serve_ui.py:88 tortoisehg/hgqt/settings.py:968
 #: tortoisehg/hgtk/gdialog.py:497
 msgid "Settings"
 msgstr ""
 msgid "<unspecified>"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:117
+#: tortoisehg/hgqt/settings.py:122
 msgid "&True"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:118
+#: tortoisehg/hgqt/settings.py:123
 msgid "&False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:119
+#: tortoisehg/hgqt/settings.py:124
 msgid "&Unspecified"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:179
+#: tortoisehg/hgqt/settings.py:184
 msgid "&Set..."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:180
+#: tortoisehg/hgqt/settings.py:185
 msgid "&Clear"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:304
+#: tortoisehg/hgqt/settings.py:309
 #, python-format
 msgid "Failed to load issue tracker: '%s': %s. "
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:334
+#: tortoisehg/hgqt/settings.py:339
 msgid "&Browse..."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:453 tortoisehg/hgtk/thgconfig.py:43
+#: tortoisehg/hgqt/settings.py:458 tortoisehg/hgtk/thgconfig.py:43
 msgid "UI Language"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:455 tortoisehg/hgtk/thgconfig.py:44
+#: tortoisehg/hgqt/settings.py:460 tortoisehg/hgtk/thgconfig.py:44
 msgid "Specify your preferred user interface language (restart needed)"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:457 tortoisehg/hgtk/thgconfig.py:45
+#: tortoisehg/hgqt/settings.py:462 tortoisehg/hgtk/thgconfig.py:45
 msgid "Three-way Merge Tool"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:459
+#: tortoisehg/hgqt/settings.py:464
 msgid ""
 "Graphical merge program for resolving merge conflicts.  If left unspecified, "
 "Mercurial will use the first applicable tool it finds on your system or use "
 "manual merging"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:465 tortoisehg/hgtk/thgconfig.py:52
+#: tortoisehg/hgqt/settings.py:470 tortoisehg/hgtk/thgconfig.py:52
 msgid "Visual Diff Tool"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:467 tortoisehg/hgtk/thgconfig.py:53
+#: tortoisehg/hgqt/settings.py:472 tortoisehg/hgtk/thgconfig.py:53
 msgid ""
 "Specify visual diff tool, as described in the [merge-tools] section of your "
 "Mercurial configuration files.  If left unspecified, TortoiseHg will use the "
 "selected merge tool. Failing that it uses the first applicable tool it finds."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:471 tortoisehg/hgtk/thgconfig.py:57
+#: tortoisehg/hgqt/settings.py:476 tortoisehg/hgtk/thgconfig.py:57
 msgid "Visual Editor"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:472
+#: tortoisehg/hgqt/settings.py:477
 #, python-format
 msgid ""
 "Specify the visual editor used to view files.  Format:<br>myeditor -flags "
 "href=\"%s\">OpenAtLine</a>"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:476
+#: tortoisehg/hgqt/settings.py:481
 msgid "Shell"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:477
+#: tortoisehg/hgqt/settings.py:482
 #, python-format
 msgid ""
 "Specify the command to launch your preferred terminal shell application. If "
 "other: xterm -T \"%(reponame)s\""
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:485
+#: tortoisehg/hgqt/settings.py:490
 msgid "Immediate Operations"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:486
+#: tortoisehg/hgqt/settings.py:491
 msgid ""
 "Space separated list of shell operations you would like to be performed "
 "immediately, without user interaction. Commands are \"add remove revert "
 "forget\". Default: None (leave blank)"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:490 tortoisehg/hgtk/thgconfig.py:63
+#: tortoisehg/hgqt/settings.py:495 tortoisehg/hgtk/thgconfig.py:63
 msgid "Tab Width"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:491
+#: tortoisehg/hgqt/settings.py:496
 msgid ""
 "Specify the number of spaces that tabs expand to in various TortoiseHg "
 "windows. Default: 0, Not expanded"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:494
+#: tortoisehg/hgqt/settings.py:499
 msgid "Force Repo Tab"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:495
+#: tortoisehg/hgqt/settings.py:500
 msgid "Always show repo tabs, even for a single repo. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:496
+#: tortoisehg/hgqt/settings.py:501
 msgid "Monitor Repo Changes"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:498
+#: tortoisehg/hgqt/settings.py:503
 msgid ""
 "Specify the target filesystem where TortoiseHg monitors changes. Default: "
 "always"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:500 tortoisehg/hgtk/thgconfig.py:67
+#: tortoisehg/hgqt/settings.py:505 tortoisehg/hgtk/thgconfig.py:67
 msgid "Max Diff Size"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:501
+#: tortoisehg/hgqt/settings.py:506
 msgid ""
 "The maximum size file (in KB) that TortoiseHg will show changes for in the "
 "changelog, status, and commit windows. A value of zero implies no limit.  "
 "Default: 1024 (1MB)"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:504
+#: tortoisehg/hgqt/settings.py:509
 msgid "Fork GUI"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:505
+#: tortoisehg/hgqt/settings.py:510
 msgid ""
 "When running from the command line, fork a background process to run "
 "graphical dialogs.  Default: True"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:507 tortoisehg/hgtk/thgconfig.py:81
+#: tortoisehg/hgqt/settings.py:512 tortoisehg/hgtk/thgconfig.py:81
 msgid "Full Path Title"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:508
+#: tortoisehg/hgqt/settings.py:513
 msgid ""
 "Show a full directory path of the repository in the dialog title instead of "
 "just the root directory name.  Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:510
+#: tortoisehg/hgqt/settings.py:515
 msgid "Auto-resolve merges"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:511
+#: tortoisehg/hgqt/settings.py:516
 msgid ""
 "Indicates whether TortoiseHg should attempt to automatically resolve changes "
 "from both sides to the same file, and only report merge conflicts when this "
 "to review and resolve changes manually. Default: False."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:521
+#: tortoisehg/hgqt/settings.py:526
 msgid "Default widget"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:523
+#: tortoisehg/hgqt/settings.py:528
 msgid ""
 "Select the initial widget that will be shown when opening a repository. "
 "Default: revdetails"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:528
+#: tortoisehg/hgqt/settings.py:533
 msgid ""
 "Select the initial revision that will be selected when opening a repository. "
 " You can select the \"current\" (i.e. the working directory parent), the "
 "current \"tip\" or the working directory (\"workingdir\"). Default: current"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:532
+#: tortoisehg/hgqt/settings.py:537
 msgid ""
 "Open new tabs next\n"
 "to the current tab"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:534
+#: tortoisehg/hgqt/settings.py:539
 msgid ""
 "Should new tabs be open next to the current tab? If False new tabs will be "
 "open after the last tab. Default: True"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:537 tortoisehg/hgtk/thgconfig.py:130
+#: tortoisehg/hgqt/settings.py:542 tortoisehg/hgtk/thgconfig.py:130
 msgid "Author Coloring"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:538 tortoisehg/hgtk/thgconfig.py:131
+#: tortoisehg/hgqt/settings.py:543 tortoisehg/hgtk/thgconfig.py:131
 msgid ""
 "Color changesets by author name.  If not enabled, the changes are colored "
 "green for merge, red for non-trivial parents, black for normal. Default: "
 "False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:542
+#: tortoisehg/hgqt/settings.py:547
 msgid "Task Tabs"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:544
+#: tortoisehg/hgqt/settings.py:549
 msgid ""
 "Show tabs along the side of the bottom half of each repo widget allowing one "
 "to switch task tabs without using the toolbar. Default: off"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:547 tortoisehg/hgtk/thgconfig.py:135
+#: tortoisehg/hgqt/settings.py:552 tortoisehg/hgtk/thgconfig.py:135
 msgid "Long Summary"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:548 tortoisehg/hgtk/thgconfig.py:136
+#: tortoisehg/hgqt/settings.py:553 tortoisehg/hgtk/thgconfig.py:136
 msgid ""
 "If true, concatenate multiple lines of changeset summary until they reach 80 "
 "characters. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:551 tortoisehg/hgtk/thgconfig.py:139
+#: tortoisehg/hgqt/settings.py:556 tortoisehg/hgtk/thgconfig.py:139
 msgid "Log Batch Size"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:552 tortoisehg/hgtk/thgconfig.py:140
+#: tortoisehg/hgqt/settings.py:557 tortoisehg/hgtk/thgconfig.py:140
 msgid ""
 "The number of revisions to read and display in the changelog viewer in a "
 "single batch. Default: 500"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:555 tortoisehg/hgtk/thgconfig.py:143
+#: tortoisehg/hgqt/settings.py:560 tortoisehg/hgtk/thgconfig.py:143
 msgid "Dead Branches"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:556 tortoisehg/hgtk/thgconfig.py:144
+#: tortoisehg/hgqt/settings.py:561 tortoisehg/hgtk/thgconfig.py:144
 msgid ""
 "Comma separated list of branch names that should be ignored when building a "
 "list of branch names for a repository. Default: None (leave blank)"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:559 tortoisehg/hgtk/thgconfig.py:147
+#: tortoisehg/hgqt/settings.py:564 tortoisehg/hgtk/thgconfig.py:147
 msgid "Branch Colors"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:560
+#: tortoisehg/hgqt/settings.py:565
 msgid ""
 "Space separated list of branch names and colors of the form branch:#XXXXXX. "
 "Spaces and colons in the branch name must be escaped using a backslash (\\). "
 "blank)"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:566 tortoisehg/hgtk/thgconfig.py:154
+#: tortoisehg/hgqt/settings.py:571 tortoisehg/hgtk/thgconfig.py:154
 msgid "Hide Tags"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:567
+#: tortoisehg/hgqt/settings.py:572
 msgid ""
 "Space separated list of tags that will not be shown.Useful example: Specify "
 "\"qbase qparent qtip\" to hide the standard tags inserted by the Mercurial "
 "Queues Extension. Default: None (leave blank)"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:571 tortoisehg/hgtk/thgconfig.py:172
+#: tortoisehg/hgqt/settings.py:576 tortoisehg/hgtk/thgconfig.py:172
 msgid "After Pull Operation"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:573
+#: tortoisehg/hgqt/settings.py:578
 msgid ""
 "Operation which is performed directly after a successful pull. update "
 "equates to pull --update, fetch equates to the fetch extension, rebase "
 "equates to pull --rebase.  Default: none"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:578
+#: tortoisehg/hgqt/settings.py:581
+msgid "Default Push"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:583
+msgid ""
+"Select the revisions that will be pushed by default, whenever you click the "
+"Push button.<ul><li><b>all</b>: The default. Push all changes in <i>all "
+"branches</i>.<li><b>branch</b>: Push all changes in the <i>current "
+"branch</i>.<li><b>revision</b>: Push the changes in the current branch "
+"<i><u>up to</u> the current revision</i>.</ul><p>Default: all"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:591
 msgctxt "config item"
 msgid "Commit"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:579 tortoisehg/hgqt/sync.py:1320
+#: tortoisehg/hgqt/settings.py:592 tortoisehg/hgqt/sync.py:1338
 #: tortoisehg/hgtk/thgconfig.py:90
 msgid "Username"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:580
+#: tortoisehg/hgqt/settings.py:593
 msgid ""
 "Name associated with commits.  The common format is:<br>Full Name "
 "&lt;email@example.com&gt;"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:582 tortoisehg/hgtk/thgconfig.py:92
+#: tortoisehg/hgqt/settings.py:595 tortoisehg/hgtk/thgconfig.py:92
 msgid "Summary Line Length"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:583
+#: tortoisehg/hgqt/settings.py:596
 msgid ""
 "Suggested length of commit message lines. A red vertical line will mark this "
 "length.  CTRL-E will reflow the current paragraph to the specified line "
 "length. Default: 80"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:586 tortoisehg/hgtk/thgconfig.py:103
+#: tortoisehg/hgqt/settings.py:599 tortoisehg/hgtk/thgconfig.py:103
 msgid "Close After Commit"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:587
+#: tortoisehg/hgqt/settings.py:600
 msgid "Close the commit tool after every successful commit.  Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:589 tortoisehg/hgtk/thgconfig.py:106
+#: tortoisehg/hgqt/settings.py:602 tortoisehg/hgtk/thgconfig.py:106
 msgid "Push After Commit"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:591
+#: tortoisehg/hgqt/settings.py:604
 msgid ""
 "Attempt to push to specified URL or alias after each successful commit.  "
 "Default: No push"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:593 tortoisehg/hgtk/thgconfig.py:109
+#: tortoisehg/hgqt/settings.py:606 tortoisehg/hgtk/thgconfig.py:109
 msgid "Auto Commit List"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:594 tortoisehg/hgtk/thgconfig.py:110
+#: tortoisehg/hgqt/settings.py:607 tortoisehg/hgtk/thgconfig.py:110
 msgid ""
 "Comma separated list of files that are automatically included in every "
 "commit.  Intended for use only as a repository setting. Default: None (leave "
 "blank)"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:597 tortoisehg/hgtk/thgconfig.py:113
+#: tortoisehg/hgqt/settings.py:610 tortoisehg/hgtk/thgconfig.py:113
 msgid "Auto Exclude List"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:598
+#: tortoisehg/hgqt/settings.py:611
 msgid ""
 "Comma separated list of files that are automatically unchecked when the "
 "status, and commit dialogs are opened. Default: None (leave blank)"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:601 tortoisehg/hgtk/thgconfig.py:117
+#: tortoisehg/hgqt/settings.py:614 tortoisehg/hgtk/thgconfig.py:117
 msgid "English Messages"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:602 tortoisehg/hgtk/thgconfig.py:118
+#: tortoisehg/hgqt/settings.py:615 tortoisehg/hgtk/thgconfig.py:118
 msgid ""
 "Generate English commit messages even if LANGUAGE or LANG environment "
 "variables are set to a non-English language. This setting is used by the "
 "Merge, Tag and Backout dialogs. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:606
+#: tortoisehg/hgqt/settings.py:619
+msgid "Secret MQ Patches"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:620
+msgid "Make MQ patches secret (instead of draft). Default: False"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:622
 msgid "Monitor working<br>directory changes"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:610
+#: tortoisehg/hgqt/settings.py:626
 msgid ""
 "Select when the working directory status list will be refreshed:<br>- "
 "<b>auto</b>: [<i>default</i>] let TortoiseHg decide when to refresh the "
 "to <i>local repos</i>.<br>Default: auto"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:624 tortoisehg/hgtk/thgconfig.py:179
+#: tortoisehg/hgqt/settings.py:640 tortoisehg/hgtk/thgconfig.py:179
 #: tortoisehg/util/menuthg.py:55
 msgid "Web Server"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:625 tortoisehg/hgtk/thgconfig.py:180
+#: tortoisehg/hgqt/settings.py:641 tortoisehg/hgtk/thgconfig.py:180
 #: tortoisehg/hgtk/thgpbranch.py:210
 msgid "Name"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:626
+#: tortoisehg/hgqt/settings.py:642
 msgid ""
 "Repository name to use in the web interface, and by TortoiseHg as a "
 "shorthand name.  Default is the working directory."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:628 tortoisehg/hgtk/thgconfig.py:183
+#: tortoisehg/hgqt/settings.py:644 tortoisehg/hgtk/thgconfig.py:183
 #: tortoisehg/hgtk/thgconfig.py:745
 msgid "Description"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:629 tortoisehg/hgtk/thgconfig.py:184
+#: tortoisehg/hgqt/settings.py:645 tortoisehg/hgtk/thgconfig.py:184
 msgid "Textual description of the repository's purpose or contents."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:631 tortoisehg/hgtk/thgconfig.py:186
+#: tortoisehg/hgqt/settings.py:647 tortoisehg/hgtk/thgconfig.py:186
 msgid "Contact"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:632 tortoisehg/hgtk/thgconfig.py:187
+#: tortoisehg/hgqt/settings.py:648 tortoisehg/hgtk/thgconfig.py:187
 msgid "Name or email address of the person in charge of the repository."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:634 tortoisehg/hgtk/thgconfig.py:189
+#: tortoisehg/hgqt/settings.py:650 tortoisehg/hgtk/thgconfig.py:189
 msgid "Style"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:636 tortoisehg/hgtk/thgconfig.py:191
+#: tortoisehg/hgqt/settings.py:652 tortoisehg/hgtk/thgconfig.py:191
 msgid "Which template map style to use"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:637 tortoisehg/hgtk/thgconfig.py:192
+#: tortoisehg/hgqt/settings.py:653 tortoisehg/hgtk/thgconfig.py:192
 msgid "Archive Formats"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:639 tortoisehg/hgtk/thgconfig.py:193
+#: tortoisehg/hgqt/settings.py:655 tortoisehg/hgtk/thgconfig.py:193
 msgid "Comma separated list of archive formats allowed for downloading"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:641 tortoisehg/hgqt/sync.py:241
+#: tortoisehg/hgqt/settings.py:657 tortoisehg/hgqt/sync.py:241
 #: tortoisehg/hgtk/thgconfig.py:195 tortoisehg/hgtk/thgconfig.py:368
 msgid "Port"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:641 tortoisehg/hgtk/thgconfig.py:195
+#: tortoisehg/hgqt/settings.py:657 tortoisehg/hgtk/thgconfig.py:195
 msgid "Port to listen on"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:642 tortoisehg/hgtk/thgconfig.py:196
+#: tortoisehg/hgqt/settings.py:658 tortoisehg/hgtk/thgconfig.py:196
 msgid "Push Requires SSL"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:643 tortoisehg/hgtk/thgconfig.py:197
+#: tortoisehg/hgqt/settings.py:659 tortoisehg/hgtk/thgconfig.py:197
 msgid ""
 "Whether to require that inbound pushes be transported over SSL to prevent "
 "password sniffing."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:645 tortoisehg/hgtk/thgconfig.py:199
+#: tortoisehg/hgqt/settings.py:661 tortoisehg/hgtk/thgconfig.py:199
 msgid "Stripes"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:646 tortoisehg/hgtk/thgconfig.py:200
+#: tortoisehg/hgqt/settings.py:662 tortoisehg/hgtk/thgconfig.py:200
 msgid ""
 "How many lines a \"zebra stripe\" should span in multiline output. Default "
 "is 1; set to 0 to disable."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:648 tortoisehg/hgtk/thgconfig.py:202
+#: tortoisehg/hgqt/settings.py:664 tortoisehg/hgtk/thgconfig.py:202
 msgid "Max Files"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:649
+#: tortoisehg/hgqt/settings.py:665
 msgid "Maximum number of files to list per changeset. Default: 10"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:650 tortoisehg/hgtk/thgconfig.py:204
+#: tortoisehg/hgqt/settings.py:666 tortoisehg/hgtk/thgconfig.py:204
 msgid "Max Changes"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:651
+#: tortoisehg/hgqt/settings.py:667
 msgid "Maximum number of changes to list on the changelog. Default: 10"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:653 tortoisehg/hgtk/thgconfig.py:206
+#: tortoisehg/hgqt/settings.py:669 tortoisehg/hgtk/thgconfig.py:206
 msgid "Allow Push"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:654 tortoisehg/hgtk/thgconfig.py:207
+#: tortoisehg/hgqt/settings.py:670 tortoisehg/hgtk/thgconfig.py:207
 msgid ""
 "Whether to allow pushing to the repository. If empty or not set, push is not "
 "allowed. If the special value \"*\", any remote user can push, including "
 "examined after the deny_push list."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:661 tortoisehg/hgtk/thgconfig.py:214
+#: tortoisehg/hgqt/settings.py:677 tortoisehg/hgtk/thgconfig.py:214
 msgid "Deny Push"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:662 tortoisehg/hgtk/thgconfig.py:215
+#: tortoisehg/hgqt/settings.py:678 tortoisehg/hgtk/thgconfig.py:215
 msgid ""
 "Whether to deny pushing to the repository. If empty or not set, push is not "
 "denied. If the special value \"*\", all remote users are denied push. "
 "The contents of the deny_push list are examined before the allow_push list."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:668 tortoisehg/hgtk/thgconfig.py:221
+#: tortoisehg/hgqt/settings.py:684 tortoisehg/hgtk/thgconfig.py:221
 msgid "Encoding"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:669 tortoisehg/hgtk/thgconfig.py:222
+#: tortoisehg/hgqt/settings.py:685 tortoisehg/hgtk/thgconfig.py:222
 msgid "Character encoding name"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:672 tortoisehg/hgtk/thgconfig.py:225
+#: tortoisehg/hgqt/settings.py:688 tortoisehg/hgtk/thgconfig.py:225
 msgid "Proxy"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:673 tortoisehg/hgtk/thgconfig.py:226
+#: tortoisehg/hgqt/settings.py:689 tortoisehg/hgtk/thgconfig.py:226
 #: tortoisehg/hgtk/thgconfig.py:369
 msgid "Host"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:674 tortoisehg/hgtk/thgconfig.py:227
+#: tortoisehg/hgqt/settings.py:690 tortoisehg/hgtk/thgconfig.py:227
 msgid ""
 "Host name and (optional) port of proxy server, for example \"myproxy:8000\""
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:676 tortoisehg/hgtk/thgconfig.py:229
+#: tortoisehg/hgqt/settings.py:692 tortoisehg/hgtk/thgconfig.py:229
 msgid "Bypass List"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:677 tortoisehg/hgtk/thgconfig.py:230
+#: tortoisehg/hgqt/settings.py:693 tortoisehg/hgtk/thgconfig.py:230
 msgid ""
 "Optional. Comma-separated list of host names that should bypass the proxy"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:680 tortoisehg/hgtk/thgconfig.py:233
+#: tortoisehg/hgqt/settings.py:696 tortoisehg/hgtk/thgconfig.py:233
 msgid "Optional. User name to authenticate with at the proxy server"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:681 tortoisehg/hgqt/settings.py:812
-#: tortoisehg/hgqt/sync.py:1328 tortoisehg/hgtk/thgconfig.py:234
+#: tortoisehg/hgqt/settings.py:697 tortoisehg/hgqt/settings.py:828
+#: tortoisehg/hgqt/sync.py:1346 tortoisehg/hgtk/thgconfig.py:234
 #: tortoisehg/hgtk/thgconfig.py:370
 msgid "Password"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:682 tortoisehg/hgtk/thgconfig.py:235
+#: tortoisehg/hgqt/settings.py:698 tortoisehg/hgtk/thgconfig.py:235
 msgid "Optional. Password to authenticate with at the proxy server"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:686 tortoisehg/hgtk/thgconfig.py:239
+#: tortoisehg/hgqt/settings.py:702 tortoisehg/hgtk/thgconfig.py:239
 msgid "From"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:687 tortoisehg/hgtk/thgconfig.py:240
+#: tortoisehg/hgqt/settings.py:703 tortoisehg/hgtk/thgconfig.py:240
 msgid "Email address to use in the \"From\" header and for the SMTP envelope"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:689 tortoisehg/hgtk/thgconfig.py:242
+#: tortoisehg/hgqt/settings.py:705 tortoisehg/hgtk/thgconfig.py:242
 msgid "To"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:690 tortoisehg/hgtk/thgconfig.py:243
+#: tortoisehg/hgqt/settings.py:706 tortoisehg/hgtk/thgconfig.py:243
 msgid "Comma-separated list of recipient email addresses"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:691 tortoisehg/hgtk/thgconfig.py:244
+#: tortoisehg/hgqt/settings.py:707 tortoisehg/hgtk/thgconfig.py:244
 msgid "Cc"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:692 tortoisehg/hgtk/thgconfig.py:245
+#: tortoisehg/hgqt/settings.py:708 tortoisehg/hgtk/thgconfig.py:245
 msgid "Comma-separated list of carbon copy recipient email addresses"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:693 tortoisehg/hgtk/thgconfig.py:246
+#: tortoisehg/hgqt/settings.py:709 tortoisehg/hgtk/thgconfig.py:246
 msgid "Bcc"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:694 tortoisehg/hgtk/thgconfig.py:247
+#: tortoisehg/hgqt/settings.py:710 tortoisehg/hgtk/thgconfig.py:247
 msgid "Comma-separated list of blind carbon copy recipient email addresses"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:696 tortoisehg/hgtk/thgconfig.py:249
+#: tortoisehg/hgqt/settings.py:712 tortoisehg/hgtk/thgconfig.py:249
 msgid "method"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:697 tortoisehg/hgtk/thgconfig.py:250
+#: tortoisehg/hgqt/settings.py:713 tortoisehg/hgtk/thgconfig.py:250
 msgid ""
 "Optional. Method to use to send email messages. If value is \"smtp\" "
 "(default), use SMTP (configured below).  Otherwise, use as name of program "
 "messages."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:703 tortoisehg/hgtk/thgconfig.py:256
+#: tortoisehg/hgqt/settings.py:719 tortoisehg/hgtk/thgconfig.py:256
 msgid "SMTP Host"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:704 tortoisehg/hgtk/thgconfig.py:256
+#: tortoisehg/hgqt/settings.py:720 tortoisehg/hgtk/thgconfig.py:256
 msgid "Host name of mail server"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:705 tortoisehg/hgtk/thgconfig.py:257
+#: tortoisehg/hgqt/settings.py:721 tortoisehg/hgtk/thgconfig.py:257
 msgid "SMTP Port"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:706 tortoisehg/hgtk/thgconfig.py:258
+#: tortoisehg/hgqt/settings.py:722 tortoisehg/hgtk/thgconfig.py:258
 msgid "Port to connect to on mail server. Default: 25"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:708 tortoisehg/hgtk/thgconfig.py:260
+#: tortoisehg/hgqt/settings.py:724 tortoisehg/hgtk/thgconfig.py:260
 msgid "SMTP TLS"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:709 tortoisehg/hgtk/thgconfig.py:261
+#: tortoisehg/hgqt/settings.py:725 tortoisehg/hgtk/thgconfig.py:261
 msgid "Connect to mail server using TLS. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:711 tortoisehg/hgtk/thgconfig.py:263
+#: tortoisehg/hgqt/settings.py:727 tortoisehg/hgtk/thgconfig.py:263
 msgid "SMTP Username"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:712 tortoisehg/hgtk/thgconfig.py:264
+#: tortoisehg/hgqt/settings.py:728 tortoisehg/hgtk/thgconfig.py:264
 msgid "Username to authenticate to mail server with"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:713 tortoisehg/hgtk/thgconfig.py:265
+#: tortoisehg/hgqt/settings.py:729 tortoisehg/hgtk/thgconfig.py:265
 msgid "SMTP Password"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:714 tortoisehg/hgtk/thgconfig.py:266
+#: tortoisehg/hgqt/settings.py:730 tortoisehg/hgtk/thgconfig.py:266
 msgid "Password to authenticate to mail server with"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:715 tortoisehg/hgtk/thgconfig.py:267
+#: tortoisehg/hgqt/settings.py:731 tortoisehg/hgtk/thgconfig.py:267
 msgid "Local Hostname"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:716 tortoisehg/hgtk/thgconfig.py:268
+#: tortoisehg/hgqt/settings.py:732 tortoisehg/hgtk/thgconfig.py:268
 msgid "Hostname the sender can use to identify itself to the mail server."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:720 tortoisehg/hgtk/thgconfig.py:272
+#: tortoisehg/hgqt/settings.py:736 tortoisehg/hgtk/thgconfig.py:272
 msgid "Diff"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:722 tortoisehg/hgtk/thgconfig.py:273
+#: tortoisehg/hgqt/settings.py:738 tortoisehg/hgtk/thgconfig.py:273
 msgid "Patch EOL"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:724 tortoisehg/hgtk/thgconfig.py:274
+#: tortoisehg/hgqt/settings.py:740 tortoisehg/hgtk/thgconfig.py:274
 msgid ""
 "Normalize file line endings during and after patch to lf or crlf.  Strict "
 "does no normalization.  Auto does per-file detection, and is the recommended "
 "setting. Default: strict"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:728 tortoisehg/hgtk/thgconfig.py:278
+#: tortoisehg/hgqt/settings.py:744 tortoisehg/hgtk/thgconfig.py:278
 msgid "Git Format"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:729 tortoisehg/hgtk/thgconfig.py:279
+#: tortoisehg/hgqt/settings.py:745 tortoisehg/hgtk/thgconfig.py:279
 msgid "Use git extended diff header format. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:731
+#: tortoisehg/hgqt/settings.py:747
 msgid "MQ Git Format"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:733
+#: tortoisehg/hgqt/settings.py:749
 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 "
 "possibly losing data in the second case."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:737 tortoisehg/hgtk/thgconfig.py:281
+#: tortoisehg/hgqt/settings.py:753 tortoisehg/hgtk/thgconfig.py:281
 msgid "No Dates"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:738 tortoisehg/hgtk/thgconfig.py:282
+#: tortoisehg/hgqt/settings.py:754 tortoisehg/hgtk/thgconfig.py:282
 msgid "Do not include modification dates in diff headers. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:740 tortoisehg/hgtk/thgconfig.py:284
+#: tortoisehg/hgqt/settings.py:756 tortoisehg/hgtk/thgconfig.py:284
 msgid "Show Function"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:741 tortoisehg/hgtk/thgconfig.py:285
+#: tortoisehg/hgqt/settings.py:757 tortoisehg/hgtk/thgconfig.py:285
 msgid "Show which function each change is in. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:743 tortoisehg/hgtk/thgconfig.py:287
+#: tortoisehg/hgqt/settings.py:759 tortoisehg/hgtk/thgconfig.py:287
 msgid "Ignore White Space"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:744 tortoisehg/hgtk/thgconfig.py:288
+#: tortoisehg/hgqt/settings.py:760 tortoisehg/hgtk/thgconfig.py:288
 msgid "Ignore white space when comparing lines. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:746 tortoisehg/hgtk/thgconfig.py:290
+#: tortoisehg/hgqt/settings.py:762 tortoisehg/hgtk/thgconfig.py:290
 msgid "Ignore WS Amount"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:747 tortoisehg/hgtk/thgconfig.py:291
+#: tortoisehg/hgqt/settings.py:763 tortoisehg/hgtk/thgconfig.py:291
 msgid "Ignore changes in the amount of white space. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:749 tortoisehg/hgtk/thgconfig.py:293
+#: tortoisehg/hgqt/settings.py:765 tortoisehg/hgtk/thgconfig.py:293
 msgid "Ignore Blank Lines"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:750 tortoisehg/hgtk/thgconfig.py:294
+#: tortoisehg/hgqt/settings.py:766 tortoisehg/hgtk/thgconfig.py:294
 msgid "Ignore changes whose lines are all blank. Default: False"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:754
+#: tortoisehg/hgqt/settings.py:770
 msgid "Fonts"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:755
+#: tortoisehg/hgqt/settings.py:771
 msgid "Message Font"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:756
+#: tortoisehg/hgqt/settings.py:772
 msgid "Font used to display commit messages. Default: monospace 10"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:758
+#: tortoisehg/hgqt/settings.py:774
 msgid "Diff Font"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:759
+#: tortoisehg/hgqt/settings.py:775
 msgid "Font used to display text differences. Default: monospace 10"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:761
+#: tortoisehg/hgqt/settings.py:777
 msgid "List Font"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:762
+#: tortoisehg/hgqt/settings.py:778
 msgid "Font used to display file lists. Default: sans 9"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:764
+#: tortoisehg/hgqt/settings.py:780
 msgid "ChangeLog Font"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:765
+#: tortoisehg/hgqt/settings.py:781
 msgid "Font used to display changelog data. Default: monospace 10"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:767
+#: tortoisehg/hgqt/settings.py:783
 msgid "Output Font"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:768
+#: tortoisehg/hgqt/settings.py:784
 msgid "Font used to display output messages. Default: sans 8"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:772 tortoisehg/hgqt/settings.py:1314
+#: tortoisehg/hgqt/settings.py:788 tortoisehg/hgqt/settings.py:1330
 #: tortoisehg/hgtk/thgconfig.py:318
 msgid "Extensions"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:775 tortoisehg/hgtk/thgconfig.py:321
+#: tortoisehg/hgqt/settings.py:791 tortoisehg/hgtk/thgconfig.py:321
 msgid "Issue Tracking"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:776 tortoisehg/hgtk/thgconfig.py:323
+#: tortoisehg/hgqt/settings.py:792 tortoisehg/hgtk/thgconfig.py:323
 msgid "Issue Regex"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:777 tortoisehg/hgtk/thgconfig.py:324
+#: tortoisehg/hgqt/settings.py:793 tortoisehg/hgtk/thgconfig.py:324
 msgid "Defines the regex to match when picking up issue numbers."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:778 tortoisehg/hgtk/thgconfig.py:325
+#: tortoisehg/hgqt/settings.py:794 tortoisehg/hgtk/thgconfig.py:325
 msgid "Issue Link"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:779 tortoisehg/hgtk/thgconfig.py:326
+#: tortoisehg/hgqt/settings.py:795 tortoisehg/hgtk/thgconfig.py:326
 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:786 tortoisehg/hgtk/thgconfig.py:333
+#: tortoisehg/hgqt/settings.py:802 tortoisehg/hgtk/thgconfig.py:333
 msgid "Mandatory Issue Reference"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:787
+#: tortoisehg/hgqt/settings.py:803
 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:790
+#: tortoisehg/hgqt/settings.py:806
 msgid "Issue Tracker Plugin"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:792
+#: tortoisehg/hgqt/settings.py:808
 msgid ""
 "Configures a COM IBugTraqProvider or IBugTrackProvider2 issue tracking "
 "plugin."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:794
+#: tortoisehg/hgqt/settings.py:810
 msgid "Configure Issue Tracker"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:795
+#: tortoisehg/hgqt/settings.py:811
 msgid "Configure the selected COM Bug Tracker plugin."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:797
+#: tortoisehg/hgqt/settings.py:813
 msgid "Issue Tracker Trigger"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:799
+#: tortoisehg/hgqt/settings.py:815
 msgid ""
 "Determines when the issue tracker state will be updated by TortoiseHg. Valid "
 "settings values are:<ul><li><b>never</b>: Do not update the Issue Tracker "
 "successful commit.</ol><p>Default: never"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:807
+#: tortoisehg/hgqt/settings.py:823
 msgid "Server"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:808
+#: tortoisehg/hgqt/settings.py:824
 msgid "Path to review board example \"http://demo.reviewboard.org\""
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:811
+#: tortoisehg/hgqt/settings.py:827
 msgid "User name to authenticate with review board"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:813
+#: tortoisehg/hgqt/settings.py:829
 msgid "Password to authenticate with review board"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:814
+#: tortoisehg/hgqt/settings.py:830
 msgid "Server Repository ID"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:815
+#: tortoisehg/hgqt/settings.py:831
 msgid "The default repository id for this repo on the review board server"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:816
+#: tortoisehg/hgqt/settings.py:832
 msgid "Target Groups"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:817
+#: tortoisehg/hgqt/settings.py:833
 msgid "A comma separated list of target groups"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:818
+#: tortoisehg/hgqt/settings.py:834
 msgid "Target People"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:819
+#: tortoisehg/hgqt/settings.py:835
 msgid "A comma separated list of target people"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:822
+#: tortoisehg/hgqt/settings.py:838
 msgid "Kiln Bfiles"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:823 tortoisehg/hgqt/settings.py:833
+#: tortoisehg/hgqt/settings.py:839 tortoisehg/hgqt/settings.py:849
 #: tortoisehg/hgtk/hgignore.py:104
 msgid "Patterns"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:824
+#: tortoisehg/hgqt/settings.py:840
 msgid ""
 "Files with names meeting the specified patterns will be automatically added "
 "as bfiles"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:826 tortoisehg/hgqt/settings.py:836
+#: tortoisehg/hgqt/settings.py:842 tortoisehg/hgqt/settings.py:852
 msgid "Size"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:827
+#: tortoisehg/hgqt/settings.py:843
 msgid ""
 "Files of at least the specified size (in megabytes) will be added as bfiles"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:828 tortoisehg/hgqt/settings.py:838
+#: tortoisehg/hgqt/settings.py:844 tortoisehg/hgqt/settings.py:854
 msgid "System Cache"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:829
+#: tortoisehg/hgqt/settings.py:845
 msgid ""
 "Path to the directory where a system-wide cache of bfiles will be stored"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:832
+#: tortoisehg/hgqt/settings.py:848
 msgid "Largefiles"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:834
+#: tortoisehg/hgqt/settings.py:850
 msgid ""
 "Files with names meeting the specified patterns will be automatically added "
 "as largefiles"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:837
+#: tortoisehg/hgqt/settings.py:853
 msgid ""
 "Files of at least the specified size (in megabytes) will be added as "
 "largefiles"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:839
+#: tortoisehg/hgqt/settings.py:855
 msgid ""
 "Path to the directory where a system-wide cache of largefiles will be stored"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:842
+#: tortoisehg/hgqt/settings.py:858
 msgid "Projrc"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:843
+#: tortoisehg/hgqt/settings.py:859
 msgid "Require confirmation"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:844
+#: tortoisehg/hgqt/settings.py:860
 msgid ""
 "Ask the user to confirm the update of the local \"projrc\" configuration "
 "file when the remote projrc file changes. Default is \"True\"."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:846
+#: tortoisehg/hgqt/settings.py:862
 msgid "Servers"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:847
+#: tortoisehg/hgqt/settings.py:863
 msgid ""
 "List of Servers from which \"projrc\" configuration files must be pulled. "
 "Set it to \"*\" to pull from all servers. Set it to \"default\" to pull from "
 "the default sync path.Default is pull from NO servers."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:850
+#: tortoisehg/hgqt/settings.py:866
 msgid "Include"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:851
+#: tortoisehg/hgqt/settings.py:867
 msgid ""
 "List of settings that will be pulled form the project configuration file. "
 "Default is include NO settings."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:852
+#: tortoisehg/hgqt/settings.py:868
 msgid "Exclude"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:853
+#: tortoisehg/hgqt/settings.py:869
 msgid ""
 "List of settings that will NOT be pulled form the project configuration "
 "file. Default is exclude none of the included settings."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:866
+#: tortoisehg/hgqt/settings.py:882
 msgid "TortoiseHg Settings"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:872 tortoisehg/hgtk/thgconfig.py:648
+#: tortoisehg/hgqt/settings.py:888 tortoisehg/hgtk/thgconfig.py:648
 msgid "Iniparse package not found"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:873 tortoisehg/hgtk/thgconfig.py:649
+#: tortoisehg/hgqt/settings.py:889 tortoisehg/hgtk/thgconfig.py:649
 msgid "Can't change settings without iniparse package - view is readonly."
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:897
+#: tortoisehg/hgqt/settings.py:913
 #, python-format
 msgid "%s's global settings"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:911 tortoisehg/hgtk/thgconfig.py:638
+#: tortoisehg/hgqt/settings.py:927 tortoisehg/hgtk/thgconfig.py:638
 msgid "No repository found"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:912 tortoisehg/hgtk/thgconfig.py:639
+#: tortoisehg/hgqt/settings.py:928 tortoisehg/hgtk/thgconfig.py:639
 msgid "no repo at "
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:920
+#: tortoisehg/hgqt/settings.py:936
 #, python-format
 msgid "%s project settings (.hg/projrc)"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:926 tortoisehg/hgtk/thgconfig.py:671
+#: tortoisehg/hgqt/settings.py:942 tortoisehg/hgtk/thgconfig.py:671
 #, python-format
 msgid "%s repository settings"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:953
+#: tortoisehg/hgqt/settings.py:969
 msgid ""
 "Restart all TortoiseHg applications for the following changes to take effect:"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:961
+#: tortoisehg/hgqt/settings.py:977
 msgid "Apply changes before exit?"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:962 tortoisehg/hgtk/commit.py:324
+#: tortoisehg/hgqt/settings.py:978 tortoisehg/hgtk/commit.py:324
 #: tortoisehg/hgtk/commit.py:1192 tortoisehg/hgtk/commit.py:1199
 #: tortoisehg/hgtk/status.py:1320 tortoisehg/hgtk/thgconfig.py:848
 #: tortoisehg/hgtk/thgmq.py:369
 msgid "&Yes"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:962 tortoisehg/hgtk/thgconfig.py:848
+#: tortoisehg/hgqt/settings.py:978 tortoisehg/hgtk/thgconfig.py:848
 msgid "&No (discard changes)"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:1019
+#: tortoisehg/hgqt/settings.py:1035
 msgid "Settings File:"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:1079
+#: tortoisehg/hgqt/settings.py:1095
 msgid "Confirm Save"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:1080
+#: tortoisehg/hgqt/settings.py:1096
 msgid "Save changes before editing?"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:1081 tortoisehg/hgtk/thgconfig.py:775
+#: tortoisehg/hgqt/settings.py:1097 tortoisehg/hgtk/thgconfig.py:775
 msgid "&Save"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:1144 tortoisehg/hgtk/thgconfig.py:822
+#: tortoisehg/hgqt/settings.py:1160 tortoisehg/hgtk/thgconfig.py:822
 msgid "Confirm Reload"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:1145 tortoisehg/hgtk/thgconfig.py:823
+#: tortoisehg/hgqt/settings.py:1161 tortoisehg/hgtk/thgconfig.py:823
 msgid ""
 "Unsaved changes will be lost.\n"
 "Do you want to reload?"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:1264 tortoisehg/hgtk/thgconfig.py:1550
+#: tortoisehg/hgqt/settings.py:1280 tortoisehg/hgtk/thgconfig.py:1550
 msgid "Unable to create a Mercurial.ini file"
 msgstr ""
 
-#: tortoisehg/hgqt/settings.py:1265
+#: tortoisehg/hgqt/settings.py:1281
 msgid "Insufficient access rights, reverting to read-only mode."
 msgstr ""
 
 msgid "Specify name of new shelf"
 msgstr ""
 
+#: tortoisehg/hgqt/shelve.py:266
+msgid "Bad filename"
+msgstr ""
+
 #: tortoisehg/hgqt/shelve.py:267
+msgid "A shelf name cannot contain :#/\\<>|"
+msgstr ""
+
+#: tortoisehg/hgqt/shelve.py:273
 msgid "File already exists"
 msgstr ""
 
-#: tortoisehg/hgqt/shelve.py:268
+#: tortoisehg/hgqt/shelve.py:274
 msgid "A shelf file of that name already exists"
 msgstr ""
 
-#: tortoisehg/hgqt/shelve.py:271
+#: tortoisehg/hgqt/shelve.py:277
 msgid "New shelf created"
 msgstr ""
 
-#: tortoisehg/hgqt/shelve.py:282 tortoisehg/hgqt/shelve.py:295
-#: tortoisehg/hgqt/shelve.py:308 tortoisehg/hgqt/shelve.py:323
-#: tortoisehg/hgqt/shelve.py:337
+#: tortoisehg/hgqt/shelve.py:288 tortoisehg/hgqt/shelve.py:301
+#: tortoisehg/hgqt/shelve.py:314 tortoisehg/hgqt/shelve.py:329
+#: tortoisehg/hgqt/shelve.py:343
 msgid "Are you sure?"
 msgstr ""
 
-#: tortoisehg/hgqt/shelve.py:283 tortoisehg/hgqt/shelve.py:324
+#: tortoisehg/hgqt/shelve.py:289 tortoisehg/hgqt/shelve.py:330
 #, python-format
 msgid "Delete shelf file %s?"
 msgstr ""
 
-#: tortoisehg/hgqt/shelve.py:287 tortoisehg/hgqt/shelve.py:328
+#: tortoisehg/hgqt/shelve.py:293 tortoisehg/hgqt/shelve.py:334
 msgid "Shelf deleted"
 msgstr ""
 
-#: tortoisehg/hgqt/shelve.py:296
+#: tortoisehg/hgqt/shelve.py:302
 msgid "Revert all working copy changes?"
 msgstr ""
 
-#: tortoisehg/hgqt/shelve.py:309 tortoisehg/hgqt/shelve.py:338
+#: tortoisehg/hgqt/shelve.py:315 tortoisehg/hgqt/shelve.py:344
 #, python-format
 msgid "Clear contents of shelf file %s?"
 msgstr ""
 
-#: tortoisehg/hgqt/shelve.py:314 tortoisehg/hgqt/shelve.py:343
+#: tortoisehg/hgqt/shelve.py:320 tortoisehg/hgqt/shelve.py:349
 msgid "Shelf cleared"
 msgstr ""
 
-#: tortoisehg/hgqt/shelve.py:380
+#: tortoisehg/hgqt/shelve.py:386
 #, python-format
 msgid "Shelf: %s"
 msgstr ""
 
-#: tortoisehg/hgqt/shelve.py:383
+#: tortoisehg/hgqt/shelve.py:389
 #, python-format
 msgid "Patch: %s"
 msgstr ""
 msgid "A terminal shell cannot be opened for remote"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:606 tortoisehg/hgqt/sync.py:1440
+#: tortoisehg/hgqt/sync.py:606 tortoisehg/hgqt/sync.py:1458
 msgid "Confirm path delete"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:607 tortoisehg/hgqt/sync.py:1441
+#: tortoisehg/hgqt/sync.py:607 tortoisehg/hgqt/sync.py:1459
 #, python-format
 msgid "Delete %s from your repo configuration file?"
 msgstr ""
 "repository?"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:987
+#: tortoisehg/hgqt/sync.py:984
+#, python-format
+msgid ""
+"Invalid default push revision: %s.Please check your mercurial configuration "
+"(tortoisehg.defaultpush)"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:1005
 msgid "Determining outgoing changesets to email..."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1001 tortoisehg/hgtk/history.py:2025
+#: tortoisehg/hgqt/sync.py:1019 tortoisehg/hgtk/history.py:2025
 msgid "No outgoing changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1003
+#: tortoisehg/hgqt/sync.py:1021
 #, python-format
 msgid "Outgoing aborted, ret %d"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1010
+#: tortoisehg/hgqt/sync.py:1028
 msgid "Select bundle file"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1011
+#: tortoisehg/hgqt/sync.py:1029
 msgid "Bundle files (*.hg)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1030
+#: tortoisehg/hgqt/sync.py:1048
 msgid "Unable to remove URL"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1052
+#: tortoisehg/hgqt/sync.py:1070
 msgid "Post Pull Behavior"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1056
+#: tortoisehg/hgqt/sync.py:1074
 msgid "Select post-pull operation for this repository"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1059
+#: tortoisehg/hgqt/sync.py:1077
 msgid "None - simply pull changesets"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1060
+#: tortoisehg/hgqt/sync.py:1078
 msgid "Update - pull, then try to update"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1066
+#: tortoisehg/hgqt/sync.py:1084
 msgid "Fetch - use fetch (auto merge pulled changes)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1068
+#: tortoisehg/hgqt/sync.py:1086
 msgid "Fetch - use fetch extension (fetch is not active!)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1075
+#: tortoisehg/hgqt/sync.py:1093
 msgid "Rebase - rebase local commits above pulled changes"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1077
+#: tortoisehg/hgqt/sync.py:1095
 msgid "Rebase - use rebase extension (rebase is not active!)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1095
+#: tortoisehg/hgqt/sync.py:1113
 msgid "<a href=\"config\">Launch settings tool...</a>"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1128
+#: tortoisehg/hgqt/sync.py:1146
 msgid "Unable to save post pull operation"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1152
+#: tortoisehg/hgqt/sync.py:1170
 msgid "Save Path"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1162 tortoisehg/hgqt/sync.py:1484
+#: tortoisehg/hgqt/sync.py:1180 tortoisehg/hgqt/sync.py:1502
 #: tortoisehg/hgtk/thgconfig.py:371 tortoisehg/hgtk/thgconfig.py:954
 msgid "Alias"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1165 tortoisehg/hgqt/sync.py:1484
+#: tortoisehg/hgqt/sync.py:1183 tortoisehg/hgqt/sync.py:1502
 #: tortoisehg/hgtk/thgconfig.py:368
 msgid "URL"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1174
+#: tortoisehg/hgqt/sync.py:1192
 msgid "Remove authentication data from URL"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1176
+#: tortoisehg/hgqt/sync.py:1194
 msgid ""
 "User authentication data should be associated with the hostname using the "
 "security dialog."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1198
+#: tortoisehg/hgqt/sync.py:1216
 msgid "Unable to save an URL"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1209
+#: tortoisehg/hgqt/sync.py:1227
 msgid "Confirm URL replace"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1210
+#: tortoisehg/hgqt/sync.py:1228
 #, python-format
 msgid "%s already exists, replace URL?"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1234
+#: tortoisehg/hgqt/sync.py:1252
 msgid "Certificate Query Error"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1247
+#: tortoisehg/hgqt/sync.py:1265
 msgid "Security: "
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1266
+#: tortoisehg/hgqt/sync.py:1284
 #, python-format
 msgid "<b>Host:</b> %s"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1268
+#: tortoisehg/hgqt/sync.py:1286
 msgid "Secure HTTPS Connection"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1275
+#: tortoisehg/hgqt/sync.py:1293
 msgid "Verify with Certificate Authority certificates (best)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1277
+#: tortoisehg/hgqt/sync.py:1295
 msgid "Verify with stored host fingerprint (good)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1279
+#: tortoisehg/hgqt/sync.py:1297
 msgid "No host validation, but still encrypted (bad)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1286
+#: tortoisehg/hgqt/sync.py:1304
 msgid "### host certificate fingerprint ###"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1290
+#: tortoisehg/hgqt/sync.py:1308
 msgid "Query"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1309
+#: tortoisehg/hgqt/sync.py:1327
 msgid "User Authentication"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1316
+#: tortoisehg/hgqt/sync.py:1334
 msgid ""
 "Optional. Username to authenticate with. If not given, and the remote\n"
 "site requires basic or digest authentication, the user will be prompted for\n"
 "foo.username = $USER."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1325
+#: tortoisehg/hgqt/sync.py:1343
 msgid ""
 "Optional. Password to authenticate with. If not given, and the remote\n"
 "site requires basic or digest authentication, the user will be prompted for\n"
 "it."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1332
+#: tortoisehg/hgqt/sync.py:1350
 msgid ""
 "Mercurial keyring extension is enabled. Passwords will be stored in a "
 "platform-native secure method."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1338
+#: tortoisehg/hgqt/sync.py:1356
 msgid ""
 "Optional. PEM encoded client certificate key file. Environment variables\n"
 "are expanded in the filename."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1340
+#: tortoisehg/hgqt/sync.py:1358
 msgid "User Certificate Key File"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1344
+#: tortoisehg/hgqt/sync.py:1362
 msgid ""
 "Optional. PEM encoded client certificate chain file. Environment variables\n"
 "are expanded in the filename."
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1346
+#: tortoisehg/hgqt/sync.py:1364
 msgid "User Certificate Chain File"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1366
+#: tortoisehg/hgqt/sync.py:1384
 msgid "Unable to save authentication"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1528
+#: tortoisehg/hgqt/sync.py:1546
 #, python-format
 msgid "%s - sync options"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1535
+#: tortoisehg/hgqt/sync.py:1553
 msgid "Allow push of a new branch (--new-branch)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1540
+#: tortoisehg/hgqt/sync.py:1558
 msgid "Force push or pull (override safety checks, --force)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1550
+#: tortoisehg/hgqt/sync.py:1568
 msgid "Temporarily disable configured HTTP proxy"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1557
+#: tortoisehg/hgqt/sync.py:1575
 msgid "Emit debugging output (--debug)"
 msgstr ""
 
-#: tortoisehg/hgqt/sync.py:1563
+#: tortoisehg/hgqt/sync.py:1581
 msgid "Work on patch queue (--mq)"
 msgstr ""
 

File i18n/tortoisehg/ca.po

 msgstr ""
 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-02 19:55-0200\n"
+"POT-Creation-Date: 2012-02-05 08:55-0200\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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-02-03 05:46+0000\n"
-"X-Generator: Launchpad (build 14738)\n"
+"X-Launchpad-Export-Date: 2012-02-06 04:49+0000\n"
+"X-Generator: Launchpad (build 14747)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 msgstr ""
 
 #: tortoisehg/hgqt/archive.py:47 tortoisehg/hgqt/grep.py:68
-#: tortoisehg/hgqt/sync.py:1545
+#: tortoisehg/hgqt/sync.py:1563
 msgid "Recurse into subrepositories"
 msgstr ""
 
 #: tortoisehg/hgqt/merge.py:312 tortoisehg/hgqt/quickop.py:187
 #: tortoisehg/hgqt/rebase.py:237 tortoisehg/hgqt/rebase.py:258
 #: tortoisehg/hgqt/rename.py:110 tortoisehg/hgqt/reporegistry.py:208
-#: tortoisehg/hgqt/resolve.py:356 tortoisehg/hgqt/settings.py:963
-#: tortoisehg/hgqt/settings.py:1081 tortoisehg/hgqt/wctxactions.py:269
+#: tortoisehg/hgqt/resolve.py:356 tortoisehg/hgqt/settings.py:979
+#: tortoisehg/hgqt/settings.py:1097 tortoisehg/hgqt/wctxactions.py:269
 #: tortoisehg/hgqt/wctxactions.py:282 tortoisehg/hgqt/wctxactions.py:371
 #: tortoisehg/hgtk/shellconf.py:28 tortoisehg/hgtk/thgshelve.py:163
 msgid "Cancel"
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:228 tortoisehg/hgqt/merge.py:215
-#: tortoisehg/hgqt/rebase.py:76 tortoisehg/hgqt/sync.py:1089
+#: tortoisehg/hgqt/rebase.py:76 tortoisehg/hgqt/sync.py:1107
 #: tortoisehg/hgqt/update.py:103
 msgid "Automatically resolve merge conflicts where possible"
 msgstr ""
 
 #: tortoisehg/hgqt/backout.py:299 tortoisehg/hgqt/compress.py:149
 #: tortoisehg/hgqt/merge.py:234 tortoisehg/hgqt/merge.py:311
-#: tortoisehg/hgqt/rebase.py:236 tortoisehg/hgqt/settings.py:1081
+#: tortoisehg/hgqt/rebase.py:236 tortoisehg/hgqt/settings.py:1097
 #: tortoisehg/hgqt/update.py:263 tortoisehg/hgtk/thgconfig.py:775
 #: tortoisehg/hgtk/update.py:233
 msgid "&Discard"
 msgid "Do not verify host certificate"
 msgstr ""
 
-#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1570
+#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1588
 #: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:202
 msgid "Remote command:"
 msgstr ""
 
 #: tortoisehg/hgqt/cmdui.py:793 tortoisehg/hgqt/merge.py:101
 #: tortoisehg/hgqt/rebase.py:259 tortoisehg/hgqt/resolve.py:357
-#: tortoisehg/hgqt/settings.py:960 tortoisehg/hgtk/commit.py:322
+#: tortoisehg/hgqt/settings.py:976 tortoisehg/hgtk/commit.py:322
 #: tortoisehg/hgtk/merge.py:196 tortoisehg/hgtk/thgconfig.py:846
 msgid "Confirm Exit"
 msgstr ""
 msgstr ""
 
 #: tortoisehg/hgqt/commit.py:125 tortoisehg/hgqt/commit.py:476
-#: tortoisehg/hgqt/settings.py:303
+#: tortoisehg/hgqt/settings.py:308
 msgid "Issue Tracker"
 msgstr ""
 
 
 #: tortoisehg/hgqt/commit.py:1046 tortoisehg/hgqt/commit.py:1069
 #: tortoisehg/hgqt/commit.py:1092 tortoisehg/hgqt/commit.py:1115
-#: tortoisehg/hgqt/sync.py:1031 tortoisehg/hgqt/sync.py:1129
-#: tortoisehg/hgqt/sync.py:1199 tortoisehg/hgqt/sync.py:1367
+#: tortoisehg/hgqt/sync.py:1049 tortoisehg/hgqt/sync.py:1147
+#: tortoisehg/hgqt/sync.py:1217 tortoisehg/hgqt/sync.py:1385
 msgid "Iniparse must be installed."
 msgstr ""
 
 #: tortoisehg/hgqt/commit.py:1061 tortoisehg/hgqt/commit.py:1084
 #: tortoisehg/hgqt/commit.py:1107 tortoisehg/hgqt/commit.py:1130
-#: tortoisehg/hgqt/settings.py:1305 tortoisehg/hgqt/sync.py:1041
-#: tortoisehg/hgqt/sync.py:1140 tortoisehg/hgqt/sync.py:1217
-#: tortoisehg/hgqt/sync.py:1406 tortoisehg/hgtk/thgconfig.py:1654
+#: tortoisehg/hgqt/settings.py:1321 tortoisehg/hgqt/sync.py:1059
+#: tortoisehg/hgqt/sync.py:1158 tortoisehg/hgqt/sync.py:1235
+#: tortoisehg/hgqt/sync.py:1424 tortoisehg/hgtk/thgconfig.py:1654