We are currently indexing your data, so search results may be incomplete until we finish.
Merge with stable
by
Changes to 38 files · Browse files at c25b4666832b Showing diff from parent df80bd602a1f 400d31672119 Diff from another changeset...
-
.hgtags
-
i18n/tortoisehg/ca.po
-
i18n/tortoisehg/cs.po
-
i18n/tortoisehg/da.po
-
i18n/tortoisehg/de.po
-
i18n/tortoisehg/en_AU.po
-
i18n/tortoisehg/en_GB.po
-
i18n/tortoisehg/es.po
-
i18n/tortoisehg/et.po
-
i18n/tortoisehg/fa.po
-
i18n/tortoisehg/fr.po
-
i18n/tortoisehg/he.po
-
i18n/tortoisehg/hr.po
-
i18n/tortoisehg/hu.po
-
i18n/tortoisehg/it.po
-
i18n/tortoisehg/ja.po
-
i18n/tortoisehg/ko.po
-
i18n/tortoisehg/nb.po
-
i18n/tortoisehg/nl.po
-
i18n/tortoisehg/nn.po
-
i18n/tortoisehg/oc.po
-
i18n/tortoisehg/pl.po
-
i18n/tortoisehg/pt.po
-
i18n/tortoisehg/pt_BR.po
-
i18n/tortoisehg/ru.po
-
i18n/tortoisehg/sr.po
-
i18n/tortoisehg/sv.po
-
i18n/tortoisehg/tr.po
-
i18n/tortoisehg/uk.po
-
i18n/tortoisehg/zh_CN.po
-
i18n/tortoisehg/zh_TW.po
-
tortoisehg/hgqt/grep.py
-
tortoisehg/hgqt/htmlui.py
-
tortoisehg/hgqt/qtlib.py
-
tortoisehg/hgqt/repoview.py
-
tortoisehg/hgqt/settings.py
-
tortoisehg/hgqt/thgrepo.py
-
tortoisehg/util/paths.py
|
@@ -58,3 +58,4 @@ f2165388e6870c643636a0a74f1ebd1d008bdf3e 2.0.5
2a970d5e40fe4f757347464d820218809d58251b 2.1
65a385cf4238af969487dc1a7a2b5ee60cf388cc 2.1.1
+d9e84b581ef3961a12fe695a566ffafb9944920e 2.1.2
|
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
|
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-07-23 12:05-0300\n"
+"POT-Creation-Date: 2011-07-30 18:52-0300\n"
"PO-Revision-Date: 2010-04-22 09:01+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: English (Australia) <en_AU@li.org>\n"
@@ -15,7 +15,7 @@"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: 2011-07-24 04:43+0000\n"
+"X-Launchpad-Export-Date: 2011-07-31 04:46+0000\n"
"X-Generator: Launchpad (build 13405)\n"
#: TortoiseHgOverlayServer.py:51
@@ -86,7 +86,7 @@msgstr ""
#: tortoisehg/hgqt/archive.py:47 tortoisehg/hgqt/grep.py:69
-#: tortoisehg/hgqt/sync.py:1485
+#: tortoisehg/hgqt/sync.py:1484
msgid "Recurse into subrepositories"
msgstr ""
@@ -158,8 +158,8 @@#: tortoisehg/hgqt/merge.py:235 tortoisehg/hgqt/merge.py:312
#: tortoisehg/hgqt/rebase.py:231 tortoisehg/hgqt/rebase.py:252
#: tortoisehg/hgqt/rename.py:110 tortoisehg/hgqt/reporegistry.py:213
-#: tortoisehg/hgqt/resolve.py:356 tortoisehg/hgqt/settings.py:779
-#: tortoisehg/hgqt/settings.py:892 tortoisehg/hgqt/wctxactions.py:229
+#: tortoisehg/hgqt/resolve.py:356 tortoisehg/hgqt/settings.py:834
+#: tortoisehg/hgqt/settings.py:947 tortoisehg/hgqt/wctxactions.py:229
#: tortoisehg/hgqt/wctxactions.py:242 tortoisehg/hgqt/wctxactions.py:297
#: tortoisehg/hgtk/shellconf.py:28 tortoisehg/hgtk/thgshelve.py:163
msgid "Cancel"
@@ -322,7 +322,7 @@msgstr ""
#: tortoisehg/hgqt/backout.py:221 tortoisehg/hgqt/merge.py:215
-#: tortoisehg/hgqt/rebase.py:73 tortoisehg/hgqt/sync.py:1029
+#: tortoisehg/hgqt/rebase.py:73 tortoisehg/hgqt/sync.py:1028
#: tortoisehg/hgqt/update.py:98
msgid "Automatically resolve merge conflicts where possible"
msgstr ""
@@ -337,7 +337,7 @@
#: tortoisehg/hgqt/backout.py:292 tortoisehg/hgqt/compress.py:149
#: tortoisehg/hgqt/merge.py:234 tortoisehg/hgqt/merge.py:311
-#: tortoisehg/hgqt/rebase.py:230 tortoisehg/hgqt/settings.py:892
+#: tortoisehg/hgqt/rebase.py:230 tortoisehg/hgqt/settings.py:947
#: tortoisehg/hgqt/update.py:255 tortoisehg/hgtk/thgconfig.py:775
#: tortoisehg/hgtk/update.py:233
msgid "&Discard"
@@ -518,7 +518,7 @@#: tortoisehg/hgqt/bisect.py:114 tortoisehg/hgqt/bisect.py:135
#: tortoisehg/hgqt/commit.py:738 tortoisehg/hgqt/commit.py:1004
#: tortoisehg/hgqt/commit.py:1024 tortoisehg/hgqt/hgignore.py:252
-#: tortoisehg/hgqt/hginit.py:179 tortoisehg/hgqt/status.py:458
+#: tortoisehg/hgqt/hginit.py:179 tortoisehg/hgqt/status.py:465
#: tortoisehg/hgqt/wctxactions.py:169
#, python-format
msgid "%s (hint: %s)"
@@ -658,33 +658,33 @@"report</a>."
msgstr ""
-#: tortoisehg/hgqt/chunks.py:89 tortoisehg/hgqt/grep.py:547
-#: tortoisehg/hgqt/manifestdialog.py:197 tortoisehg/hgqt/revdetails.py:230
+#: tortoisehg/hgqt/chunks.py:89 tortoisehg/hgqt/grep.py:550
+#: tortoisehg/hgqt/manifestdialog.py:201 tortoisehg/hgqt/revdetails.py:230
#: tortoisehg/util/menuthg.py:76
msgid "Visual Diff"
msgstr "Visual Diff"
-#: tortoisehg/hgqt/chunks.py:90 tortoisehg/hgqt/manifestdialog.py:198
+#: tortoisehg/hgqt/chunks.py:90 tortoisehg/hgqt/manifestdialog.py:202
#: tortoisehg/hgqt/revdetails.py:231
msgid "View file changes in external diff tool"
msgstr ""
-#: tortoisehg/hgqt/chunks.py:91 tortoisehg/hgqt/manifestdialog.py:204
+#: tortoisehg/hgqt/chunks.py:91 tortoisehg/hgqt/manifestdialog.py:208
#: tortoisehg/hgqt/revdetails.py:239
msgid "Edit Local"
msgstr ""
-#: tortoisehg/hgqt/chunks.py:92 tortoisehg/hgqt/manifestdialog.py:205
+#: tortoisehg/hgqt/chunks.py:92 tortoisehg/hgqt/manifestdialog.py:209
#: tortoisehg/hgqt/revdetails.py:240
msgid "Edit current file in working copy"
msgstr ""
-#: tortoisehg/hgqt/chunks.py:93 tortoisehg/hgqt/manifestdialog.py:206
+#: tortoisehg/hgqt/chunks.py:93 tortoisehg/hgqt/manifestdialog.py:210
#: tortoisehg/hgqt/revdetails.py:241
msgid "Revert to Revision"
msgstr ""
-#: tortoisehg/hgqt/chunks.py:94 tortoisehg/hgqt/manifestdialog.py:207
+#: tortoisehg/hgqt/chunks.py:94 tortoisehg/hgqt/manifestdialog.py:211
#: tortoisehg/hgqt/revdetails.py:242
msgid "Revert file(s) to contents at this revision"
msgstr ""
@@ -792,7 +792,7 @@msgid "Do not verify host certificate"
msgstr ""
-#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1501
+#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1500
#: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:202
msgid "Remote command:"
msgstr "Remote command:"
@@ -924,7 +924,7 @@
#: tortoisehg/hgqt/cmdui.py:790 tortoisehg/hgqt/merge.py:101
#: tortoisehg/hgqt/rebase.py:253 tortoisehg/hgqt/resolve.py:357
-#: tortoisehg/hgqt/settings.py:776 tortoisehg/hgtk/commit.py:322
+#: tortoisehg/hgqt/settings.py:831 tortoisehg/hgtk/commit.py:322
#: tortoisehg/hgtk/merge.py:196 tortoisehg/hgtk/thgconfig.py:846
msgid "Confirm Exit"
msgstr "Confirm Exit"
@@ -961,7 +961,7 @@msgstr ""
#: tortoisehg/hgqt/commit.py:118 tortoisehg/hgqt/commit.py:456
-#: tortoisehg/hgqt/settings.py:240
+#: tortoisehg/hgqt/settings.py:297
msgid "Issue Tracker"
msgstr ""
@@ -1057,7 +1057,7 @@msgid "Parent:"
msgstr "Parent:"
-#: tortoisehg/hgqt/commit.py:525
+#: tortoisehg/hgqt/commit.py:525 tortoisehg/hgqt/pbranch.py:877
msgid "Patch name:"
msgstr ""
@@ -1154,16 +1154,16 @@msgstr ""
#: tortoisehg/hgqt/commit.py:932 tortoisehg/hgqt/commit.py:955
-#: tortoisehg/hgqt/commit.py:978 tortoisehg/hgqt/sync.py:971
-#: tortoisehg/hgqt/sync.py:1069 tortoisehg/hgqt/sync.py:1139
-#: tortoisehg/hgqt/sync.py:1307
+#: tortoisehg/hgqt/commit.py:978 tortoisehg/hgqt/sync.py:970
+#: tortoisehg/hgqt/sync.py:1068 tortoisehg/hgqt/sync.py:1138
+#: tortoisehg/hgqt/sync.py:1306
msgid "Iniparse must be installed."
msgstr ""
#: tortoisehg/hgqt/commit.py:947 tortoisehg/hgqt/commit.py:970
-#: tortoisehg/hgqt/commit.py:993 tortoisehg/hgqt/settings.py:1107
-#: tortoisehg/hgqt/sync.py:981 tortoisehg/hgqt/sync.py:1080
-#: tortoisehg/hgqt/sync.py:1157 tortoisehg/hgqt/sync.py:1346
+#: tortoisehg/hgqt/commit.py:993 tortoisehg/hgqt/settings.py:1170
+#: tortoisehg/hgqt/sync.py:980 tortoisehg/hgqt/sync.py:1079
+#: tortoisehg/hgqt/sync.py:1156 tortoisehg/hgqt/sync.py:1345
#: tortoisehg/hgtk/thgconfig.py:1654
msgid "Unable to write configuration file"
msgstr "Unable to write configuration file"
@@ -1185,7 +1185,7 @@msgstr ""
#: tortoisehg/hgqt/commit.py:1078 tortoisehg/hgqt/compress.py:122
-#: tortoisehg/hgqt/repowidget.py:325
+#: tortoisehg/hgqt/pbranch.py:870 tortoisehg/hgqt/repowidget.py:325
msgctxt "action button"
msgid "Commit"
msgstr ""
@@ -1402,7 +1402,7 @@"pull the missing revisions from its source repository."
msgstr ""
-#: tortoisehg/hgqt/filedata.py:208 tortoisehg/hgqt/settings.py:418
+#: tortoisehg/hgqt/filedata.py:208 tortoisehg/hgqt/settings.py:473
msgid "Initial revision"
msgstr ""
@@ -1622,18 +1622,18 @@msgid "### regular expression search pattern ###"
msgstr ""
-#: tortoisehg/hgqt/grep.py:45 tortoisehg/hgqt/qscilib.py:329
+#: tortoisehg/hgqt/grep.py:45 tortoisehg/hgqt/qscilib.py:332
#: tortoisehg/hgtk/datamine.py:311 tortoisehg/hgtk/hgignore.py:60
msgid "Regexp:"
msgstr "Regexp:"
-#: tortoisehg/hgqt/grep.py:48 tortoisehg/hgqt/qscilib.py:335
+#: tortoisehg/hgqt/grep.py:48 tortoisehg/hgqt/qscilib.py:338
#: tortoisehg/hgtk/datamine.py:330
msgid "Ignore case"
msgstr "Ignore case"
-#: tortoisehg/hgqt/grep.py:49 tortoisehg/hgqt/qscilib.py:316
-#: tortoisehg/hgqt/qscilib.py:339 tortoisehg/hgtk/datamine.py:310
+#: tortoisehg/hgqt/grep.py:49 tortoisehg/hgqt/qscilib.py:319
+#: tortoisehg/hgqt/qscilib.py:342 tortoisehg/hgtk/datamine.py:310
msgid "Search"
msgstr "Search"
@@ -1692,70 +1692,70 @@msgid "grep: invalid match pattern: %s\n"
msgstr ""
-#: tortoisehg/hgqt/grep.py:312
+#: tortoisehg/hgqt/grep.py:313
#, python-format
msgid "grep: %s\n"
msgstr ""
-#: tortoisehg/hgqt/grep.py:355 tortoisehg/hgqt/revset.py:387
+#: tortoisehg/hgqt/grep.py:356 tortoisehg/hgqt/revset.py:387
#, python-format
msgid "%d matches found"
msgstr ""
-#: tortoisehg/hgqt/grep.py:357 tortoisehg/hgqt/revset.py:389
+#: tortoisehg/hgqt/grep.py:358 tortoisehg/hgqt/revset.py:389
msgid "No matches found"
msgstr ""
-#: tortoisehg/hgqt/grep.py:415 tortoisehg/hgqt/grep.py:428
-#: tortoisehg/hgqt/grep.py:468
+#: tortoisehg/hgqt/grep.py:416 tortoisehg/hgqt/grep.py:429
+#: tortoisehg/hgqt/grep.py:469
msgid "Searching"
msgstr ""
-#: tortoisehg/hgqt/grep.py:415
+#: tortoisehg/hgqt/grep.py:416
msgid "history"
msgstr ""
-#: tortoisehg/hgqt/grep.py:427
+#: tortoisehg/hgqt/grep.py:428
msgid "Interrupted"
msgstr ""
-#: tortoisehg/hgqt/grep.py:469
+#: tortoisehg/hgqt/grep.py:470
msgid "files"
msgstr ""
-#: tortoisehg/hgqt/grep.py:482
+#: tortoisehg/hgqt/grep.py:483
#, python-format
msgid "Skipping %s, unable to read"
msgstr ""
-#: tortoisehg/hgqt/grep.py:545
+#: tortoisehg/hgqt/grep.py:548
msgid "View file"
msgstr ""
-#: tortoisehg/hgqt/grep.py:546
+#: tortoisehg/hgqt/grep.py:549
msgid "View Changeset"
msgstr ""
-#: tortoisehg/hgqt/grep.py:548
+#: tortoisehg/hgqt/grep.py:551
msgid "Annotate file"
msgstr ""
-#: tortoisehg/hgqt/grep.py:702 tortoisehg/hgtk/datamine.py:364
+#: tortoisehg/hgqt/grep.py:705 tortoisehg/hgtk/datamine.py:364
#: tortoisehg/hgtk/datamine.py:654
msgid "File"
msgstr "File"
-#: tortoisehg/hgqt/grep.py:702 tortoisehg/hgtk/datamine.py:652
+#: tortoisehg/hgqt/grep.py:705 tortoisehg/hgtk/datamine.py:652
msgid "Line"
msgstr "Line"
-#: tortoisehg/hgqt/grep.py:702 tortoisehg/hgtk/datamine.py:363
+#: tortoisehg/hgqt/grep.py:705 tortoisehg/hgtk/datamine.py:363
#: tortoisehg/hgtk/datamine.py:653 tortoisehg/hgtk/logview/treeview.py:441
msgid "Rev"
msgstr "Rev"
-#: tortoisehg/hgqt/grep.py:702 tortoisehg/hgqt/settings.py:550
-#: tortoisehg/hgqt/settings.py:670 tortoisehg/hgqt/settings.py:715
+#: tortoisehg/hgqt/grep.py:705 tortoisehg/hgqt/settings.py:605
+#: tortoisehg/hgqt/settings.py:725 tortoisehg/hgqt/settings.py:770
#: 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
@@ -1763,7 +1763,7 @@msgid "User"
msgstr "User"
-#: tortoisehg/hgqt/grep.py:703
+#: tortoisehg/hgqt/grep.py:706
msgid "Match Text"
msgstr ""
@@ -1776,7 +1776,7 @@msgid "<b>Unrevisioned Files</b>"
msgstr ""
-#: tortoisehg/hgqt/guess.py:65 tortoisehg/hgqt/status.py:95
+#: tortoisehg/hgqt/guess.py:65 tortoisehg/hgqt/status.py:96
msgid "Refresh file list"
msgstr ""
@@ -1876,7 +1876,7 @@msgid "Failed to open Email dialog"
msgstr ""
-#: tortoisehg/hgqt/hgemail_ui.py:244 tortoisehg/hgqt/settings.py:556
+#: tortoisehg/hgqt/hgemail_ui.py:244 tortoisehg/hgqt/settings.py:611
#: tortoisehg/hgtk/synch.py:78 tortoisehg/hgtk/thgconfig.py:238
msgid "Email"
msgstr "E-mail"
@@ -2048,7 +2048,7 @@msgstr "Add"
#: tortoisehg/hgqt/hgignore.py:72 tortoisehg/hgqt/resolve.py:128
-#: tortoisehg/hgqt/settings.py:826 tortoisehg/hgtk/hgignore.py:77
+#: tortoisehg/hgqt/settings.py:881 tortoisehg/hgtk/hgignore.py:77
#: tortoisehg/hgtk/thgconfig.py:676
msgid "Edit File"
msgstr "Edit File"
@@ -2187,7 +2187,7 @@msgid "Drag to change order"
msgstr ""
-#: tortoisehg/hgqt/logcolumns.py:100 tortoisehg/hgqt/settings.py:412
+#: tortoisehg/hgqt/logcolumns.py:100 tortoisehg/hgqt/settings.py:467
#: tortoisehg/hgqt/workbench.py:673 tortoisehg/util/menuthg.py:46
msgid "Workbench"
msgstr ""
@@ -2197,77 +2197,77 @@msgid "Manifest %s@%s"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:188 tortoisehg/hgtk/thgmq.py:862
+#: tortoisehg/hgqt/manifestdialog.py:192 tortoisehg/hgtk/thgmq.py:862
msgid "Status"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:193 tortoisehg/hgqt/revdetails.py:226
+#: tortoisehg/hgqt/manifestdialog.py:197 tortoisehg/hgqt/revdetails.py:226
msgid "File history"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:194 tortoisehg/hgqt/revdetails.py:227
+#: tortoisehg/hgqt/manifestdialog.py:198 tortoisehg/hgqt/revdetails.py:227
msgid "Show the history of the selected file"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:195 tortoisehg/hgqt/revdetails.py:228
+#: tortoisehg/hgqt/manifestdialog.py:199 tortoisehg/hgqt/revdetails.py:228
msgid "Compare file revisions"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:196 tortoisehg/hgqt/revdetails.py:229
+#: tortoisehg/hgqt/manifestdialog.py:200 tortoisehg/hgqt/revdetails.py:229
msgid "Compare revisions of the selected file"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:199 tortoisehg/hgqt/revdetails.py:232
+#: tortoisehg/hgqt/manifestdialog.py:203 tortoisehg/hgqt/revdetails.py:232
msgid "Visual Diff to Local"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:200 tortoisehg/hgqt/revdetails.py:233
+#: tortoisehg/hgqt/manifestdialog.py:204 tortoisehg/hgqt/revdetails.py:233
msgid "View changes to current in external diff tool"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:202 tortoisehg/hgqt/revdetails.py:235
+#: tortoisehg/hgqt/manifestdialog.py:206 tortoisehg/hgqt/revdetails.py:235
msgid "View at Revision"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:203 tortoisehg/hgqt/revdetails.py:236
+#: tortoisehg/hgqt/manifestdialog.py:207 tortoisehg/hgqt/revdetails.py:236
msgid "View file as it appeared at this revision"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:209 tortoisehg/hgqt/revdetails.py:244
+#: tortoisehg/hgqt/manifestdialog.py:213 tortoisehg/hgqt/revdetails.py:244
msgid "Open subrepository"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:210 tortoisehg/hgqt/revdetails.py:245
+#: tortoisehg/hgqt/manifestdialog.py:214 tortoisehg/hgqt/revdetails.py:245
#: tortoisehg/hgqt/revdetails.py:248
msgid "Open the selected subrepository"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:212 tortoisehg/hgqt/revdetails.py:247
+#: tortoisehg/hgqt/manifestdialog.py:216 tortoisehg/hgqt/revdetails.py:247
msgid "Explore subrepository"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:214
+#: tortoisehg/hgqt/manifestdialog.py:218
msgid "Open the selected subrepository in a file browser"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:216 tortoisehg/hgqt/revdetails.py:250
+#: tortoisehg/hgqt/manifestdialog.py:220 tortoisehg/hgqt/revdetails.py:250
msgid "Open terminal in subrepository"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:218 tortoisehg/hgqt/revdetails.py:252
+#: tortoisehg/hgqt/manifestdialog.py:222 tortoisehg/hgqt/revdetails.py:252
msgid "Open a shell terminal in the selected subrepository root"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:293 tortoisehg/hgqt/revdetails.py:389
+#: tortoisehg/hgqt/manifestdialog.py:297 tortoisehg/hgqt/revdetails.py:389
#, python-format
msgid "Hg file log viewer - %s"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:306 tortoisehg/hgqt/revdetails.py:403
+#: tortoisehg/hgqt/manifestdialog.py:310 tortoisehg/hgqt/revdetails.py:403
msgid "Cannot open subrepository"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:307 tortoisehg/hgqt/revdetails.py:404
+#: tortoisehg/hgqt/manifestdialog.py:311 tortoisehg/hgqt/revdetails.py:404
msgid "The selected subrepository does not exist on the working directory"
msgstr ""
@@ -2393,15 +2393,15 @@msgid "Merge changeset"
msgstr ""
-#: tortoisehg/hgqt/messageentry.py:72
+#: tortoisehg/hgqt/messageentry.py:75
msgid "Paste &Filenames"
msgstr ""
-#: tortoisehg/hgqt/messageentry.py:74
+#: tortoisehg/hgqt/messageentry.py:77
msgid "App&ly Format"
msgstr ""
-#: tortoisehg/hgqt/messageentry.py:75
+#: tortoisehg/hgqt/messageentry.py:78
msgid "C&onfigure Format"
msgstr ""
@@ -2638,39 +2638,45 @@msgid "needs update of diff base to tip of %s\n"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:347 tortoisehg/hgqt/qqueue.py:254
-#: tortoisehg/hgqt/qqueue.py:272 tortoisehg/hgqt/thread.py:223
-#: tortoisehg/hgqt/thread.py:243 tortoisehg/hgtk/dialog.py:34
-msgid "TortoiseHg Prompt"
-msgstr "TortoiseHg Prompt"
-
-#: tortoisehg/hgqt/pbranch.py:348 tortoisehg/hgtk/thgpbranch.py:432
-msgid "New Patch Name"
-msgstr ""
-
-#: tortoisehg/hgqt/pbranch.py:480
+#: tortoisehg/hgqt/pbranch.py:478
msgid "&Goto (update workdir)"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:482 tortoisehg/hgqt/update.py:259
+#: tortoisehg/hgqt/pbranch.py:480 tortoisehg/hgqt/update.py:259
#: tortoisehg/hgtk/update.py:237
msgid "&Merge"
msgstr "&Merge"
-#: tortoisehg/hgqt/pbranch.py:500
+#: tortoisehg/hgqt/pbranch.py:498
msgid "No patch branch selected"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:551
+#: tortoisehg/hgqt/pbranch.py:549
msgid "No editor found"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:552
+#: tortoisehg/hgqt/pbranch.py:550
msgid ""
"Mercurial was unable to find an editor. Please configure Mercurial to use an "
"editor installed on your system."
msgstr ""
+#: tortoisehg/hgqt/pbranch.py:843
+msgid "New Patch Branch"
+msgstr ""
+
+#: tortoisehg/hgqt/pbranch.py:878
+msgid "Patch message:"
+msgstr ""
+
+#: tortoisehg/hgqt/pbranch.py:879
+msgid "Patch date:"
+msgstr ""
+
+#: tortoisehg/hgqt/pbranch.py:880
+msgid "Patch user:"
+msgstr ""
+
#: tortoisehg/hgqt/postreview.py:34
msgid "Invalid Settings - The ReviewBoard server is not setup"
msgstr ""
@@ -2691,7 +2697,7 @@#: 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:666
+#: tortoisehg/hgqt/settings.py:721
msgid "Review Board"
msgstr ""
@@ -2889,7 +2895,7 @@msgid "Patch queues:"
msgstr ""
-#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:829
+#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:884
#: tortoisehg/hgtk/thgconfig.py:680
msgid "Reload"
msgstr ""
@@ -2899,7 +2905,7 @@msgstr ""
#: tortoisehg/hgqt/qqueue.py:94 tortoisehg/hgqt/rename.py:170
-#: tortoisehg/hgqt/reporegistry.py:400 tortoisehg/hgtk/bookmark.py:49
+#: tortoisehg/hgqt/reporegistry.py:418 tortoisehg/hgtk/bookmark.py:49
msgid "Rename"
msgstr "Rename"
@@ -2924,6 +2930,12 @@msgid "Do you really want to activate patch queue '%s' ?"
msgstr ""
+#: tortoisehg/hgqt/qqueue.py:254 tortoisehg/hgqt/qqueue.py:272
+#: tortoisehg/hgqt/thread.py:223 tortoisehg/hgqt/thread.py:243
+#: tortoisehg/hgtk/dialog.py:34
+msgid "TortoiseHg Prompt"
+msgstr "TortoiseHg Prompt"
+
#: tortoisehg/hgqt/qqueue.py:256
msgid "New patch queue name"
msgstr ""
@@ -3069,19 +3081,19 @@msgid "EolnVisibility"
msgstr ""
-#: tortoisehg/hgqt/qscilib.py:327
+#: tortoisehg/hgqt/qscilib.py:330
msgid "### regular expression ###"
msgstr ""
-#: tortoisehg/hgqt/qscilib.py:330 tortoisehg/hgtk/datamine.py:319
+#: tortoisehg/hgqt/qscilib.py:333 tortoisehg/hgtk/datamine.py:319
msgid "Regular expression search pattern"
msgstr "Regular expression search pattern"
-#: tortoisehg/hgqt/qscilib.py:337
+#: tortoisehg/hgqt/qscilib.py:340
msgid "Wrap search"
msgstr ""
-#: tortoisehg/hgqt/qscilib.py:515
+#: tortoisehg/hgqt/qscilib.py:518
msgid "Unable to read/write config file"
msgstr ""
@@ -3120,11 +3132,11 @@msgid "Show Log"
msgstr ""
-#: tortoisehg/hgqt/qtlib.py:982
+#: tortoisehg/hgqt/qtlib.py:984
msgid "Please enter a username"
msgstr ""
-#: tortoisehg/hgqt/qtlib.py:983
+#: tortoisehg/hgqt/qtlib.py:985
msgid "You must identify yourself to Mercurial"
msgstr ""
@@ -3161,7 +3173,7 @@msgid "Checkmark files to remove"
msgstr ""
-#: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:548
+#: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:547
#: tortoisehg/hgqt/webconf_ui.py:80 tortoisehg/hgtk/bookmark.py:47
#: tortoisehg/hgtk/quickop.py:22 tortoisehg/hgtk/tagadd.py:40
msgid "Remove"
@@ -3518,12 +3530,12 @@msgid "Mercurial User"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:182 tortoisehg/hgqt/reporegistry.py:614
+#: tortoisehg/hgqt/reporegistry.py:182 tortoisehg/hgqt/reporegistry.py:636
#, python-format
msgid "Unsupported repository type (%s)"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:183 tortoisehg/hgqt/reporegistry.py:615
+#: tortoisehg/hgqt/reporegistry.py:183 tortoisehg/hgqt/reporegistry.py:637
msgid "Cannot open non mercurial repositories or subrepositories"
msgstr ""
@@ -3545,163 +3557,163 @@msgid "Repository Registry"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:392
+#: tortoisehg/hgqt/reporegistry.py:410
msgid "Refresh repository list"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:393
+#: tortoisehg/hgqt/reporegistry.py:411
msgid "Refresh the Repository Registry list"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:394 tortoisehg/hgqt/webconf_ui.py:76
+#: tortoisehg/hgqt/reporegistry.py:412 tortoisehg/hgqt/webconf_ui.py:76
msgid "Open"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:395
+#: tortoisehg/hgqt/reporegistry.py:413
msgid "Open the repository in a new tab"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:396
+#: tortoisehg/hgqt/reporegistry.py:414
msgid "Open All"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:397
+#: tortoisehg/hgqt/reporegistry.py:415
msgid "Open all repositories in new tabs"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:398 tortoisehg/hgqt/reporegistry.py:626
+#: tortoisehg/hgqt/reporegistry.py:416 tortoisehg/hgqt/reporegistry.py:648
msgid "New Group"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:399
+#: tortoisehg/hgqt/reporegistry.py:417
msgid "Create a new group"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:401
+#: tortoisehg/hgqt/reporegistry.py:419
msgid "Rename the entry"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:402
+#: tortoisehg/hgqt/reporegistry.py:420
msgid "Settings..."
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:403
+#: tortoisehg/hgqt/reporegistry.py:421
msgid "View the repository's settings"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:404
+#: tortoisehg/hgqt/reporegistry.py:422
msgid "Remove from registry"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:405
+#: tortoisehg/hgqt/reporegistry.py:423
msgid ""
"Remove the node and all its subnodes. Repositories are not deleted from disk."
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:408 tortoisehg/util/menuthg.py:25
+#: tortoisehg/hgqt/reporegistry.py:426 tortoisehg/util/menuthg.py:25
msgid "Clone..."
msgstr "Clone..."
-#: tortoisehg/hgqt/reporegistry.py:409
+#: tortoisehg/hgqt/reporegistry.py:427
msgid "Clone Repository"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:410 tortoisehg/hgqt/sync.py:546
+#: tortoisehg/hgqt/reporegistry.py:428 tortoisehg/hgqt/sync.py:545
#: tortoisehg/hgqt/workbench.py:328
msgid "Explore"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:411
+#: tortoisehg/hgqt/reporegistry.py:429
msgid "Open the repository in a file browser"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:412 tortoisehg/hgqt/sync.py:547
+#: tortoisehg/hgqt/reporegistry.py:430 tortoisehg/hgqt/sync.py:546
#: tortoisehg/hgqt/workbench.py:331
msgid "Terminal"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:413
+#: tortoisehg/hgqt/reporegistry.py:431
msgid "Open a shell terminal in the repository root"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:414
+#: tortoisehg/hgqt/reporegistry.py:432
msgid "Add repository..."
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:415
+#: tortoisehg/hgqt/reporegistry.py:433
msgid "Add a repository to this group"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:416
+#: tortoisehg/hgqt/reporegistry.py:434
msgid "Add a subrepository..."
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:417
+#: tortoisehg/hgqt/reporegistry.py:435
msgid "Convert an existing repository into a subrepository"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:419 tortoisehg/hgqt/wctxactions.py:44
+#: tortoisehg/hgqt/reporegistry.py:437 tortoisehg/hgqt/wctxactions.py:44
msgid "Copy path"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:420
+#: tortoisehg/hgqt/reporegistry.py:438
msgid "Copy the root path of the repository to the clipboard"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:476
+#: tortoisehg/hgqt/reporegistry.py:494
msgid "Select repository directory to add"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:487 tortoisehg/hgqt/reporegistry.py:535
-#: tortoisehg/hgqt/reporegistry.py:552 tortoisehg/hgqt/reporegistry.py:578
-#: tortoisehg/hgqt/reporegistry.py:584
+#: tortoisehg/hgqt/reporegistry.py:505 tortoisehg/hgqt/reporegistry.py:554
+#: tortoisehg/hgqt/reporegistry.py:571 tortoisehg/hgqt/reporegistry.py:600
+#: tortoisehg/hgqt/reporegistry.py:606
msgid "Failed to add repository"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:488 tortoisehg/hgqt/workbench.py:761
+#: tortoisehg/hgqt/reporegistry.py:506 tortoisehg/hgqt/workbench.py:761
#, python-format
msgid "%s is not a valid repository"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:494
+#: tortoisehg/hgqt/reporegistry.py:512
msgid "Select an existing repository to add as a subrepo"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:512
+#: tortoisehg/hgqt/reporegistry.py:530
msgid "Cannot open repository"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:513
+#: tortoisehg/hgqt/reporegistry.py:531
#, python-format
msgid "The selected repository:<br><br>%s<br><br>cannot be open!"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:518
+#: tortoisehg/hgqt/reporegistry.py:536
msgid "Subrepository already exists"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:519
+#: tortoisehg/hgqt/reporegistry.py:537
#, python-format
msgid ""
"The selected repository:<br><br>%s<br><br>is already a subrepository "
"of:<br><br>%s<br><br>as: \"%s\""
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:536
+#: tortoisehg/hgqt/reporegistry.py:555
#, python-format
msgid "Cannot open the .hgsub file in:<br><br>%s"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:553
+#: tortoisehg/hgqt/reporegistry.py:572
#, python-format
msgid "The .hgsub file already contains the line:<br><br>%s"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:569
+#: tortoisehg/hgqt/reporegistry.py:591
msgid "Subrepo added to .hgsub file"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:570
+#: tortoisehg/hgqt/reporegistry.py:592
#, python-format
msgid ""
"The selected subrepo:<br><br><i>%s</i><br><br>has been added to the .hgsub "
@@ -3709,12 +3721,12 @@"must still commit</i> the .hgsub file changes."
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:579
+#: tortoisehg/hgqt/reporegistry.py:601
#, python-format
msgid "Cannot update the .hgsub file in:<br><br>%s"
msgstr ""
-#: tortoisehg/hgqt/reporegistry.py:585
+#: tortoisehg/hgqt/reporegistry.py:607
#, python-format
msgid "\"%s\" is not a valid repository inside \"%s\""
msgstr ""
@@ -3738,7 +3750,7 @@msgstr ""
#: tortoisehg/hgqt/repotreemodel.py:164 tortoisehg/hgqt/resolve.py:399
-#: tortoisehg/hgqt/sync.py:237 tortoisehg/hgqt/webconf.py:266
+#: tortoisehg/hgqt/sync.py:238 tortoisehg/hgqt/webconf.py:266
msgid "Path"
msgstr ""
@@ -3839,7 +3851,7 @@msgid "Reject incoming changesets"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:506 tortoisehg/hgqt/sync.py:931
+#: tortoisehg/hgqt/repowidget.py:506 tortoisehg/hgqt/sync.py:930
#: tortoisehg/hgtk/history.py:2021
#, python-format
msgid "%d outgoing changesets"
@@ -5296,7 +5308,7 @@msgid "Start"
msgstr "Start"
-#: tortoisehg/hgqt/serve_ui.py:88 tortoisehg/hgqt/settings.py:768
+#: tortoisehg/hgqt/serve_ui.py:88 tortoisehg/hgqt/settings.py:823
#: tortoisehg/hgtk/gdialog.py:497
msgid "Settings"
msgstr "Settings"
@@ -5305,24 +5317,44 @@msgid "<unspecified>"
msgstr "<unspecified>"
-#: tortoisehg/hgqt/settings.py:241
+#: tortoisehg/hgqt/settings.py:111
+msgid "&True"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:112
+msgid "&False"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:113
+msgid "&Unspecified"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:173
+msgid "&Set..."
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:174
+msgid "&Clear"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:298
#, python-format
msgid "Failed to load issue tracker: '%s': %s. "
msgstr ""
-#: tortoisehg/hgqt/settings.py:349 tortoisehg/hgtk/thgconfig.py:43
+#: tortoisehg/hgqt/settings.py:404 tortoisehg/hgtk/thgconfig.py:43
msgid "UI Language"
msgstr ""
-#: tortoisehg/hgqt/settings.py:351 tortoisehg/hgtk/thgconfig.py:44
+#: tortoisehg/hgqt/settings.py:406 tortoisehg/hgtk/thgconfig.py:44
msgid "Specify your preferred user interface language (restart needed)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:353 tortoisehg/hgtk/thgconfig.py:45
+#: tortoisehg/hgqt/settings.py:408 tortoisehg/hgtk/thgconfig.py:45
msgid "Three-way Merge Tool"
msgstr "Three-way Merge Tool"
-#: tortoisehg/hgqt/settings.py:355
+#: tortoisehg/hgqt/settings.py:410
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 "
@@ -5332,11 +5364,11 @@"manual merging"
msgstr ""
-#: tortoisehg/hgqt/settings.py:361 tortoisehg/hgtk/thgconfig.py:52
+#: tortoisehg/hgqt/settings.py:416 tortoisehg/hgtk/thgconfig.py:52
msgid "Visual Diff Tool"
msgstr "Visual Diff Tool"
-#: tortoisehg/hgqt/settings.py:363 tortoisehg/hgtk/thgconfig.py:53
+#: tortoisehg/hgqt/settings.py:418 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 "
@@ -5346,11 +5378,11 @@"Mercurial configuration files. If left unspecified TortoiseHg will use the "
"selected merge tool. Failing that it uses the first applicable tool it finds."
-#: tortoisehg/hgqt/settings.py:367 tortoisehg/hgtk/thgconfig.py:57
+#: tortoisehg/hgqt/settings.py:422 tortoisehg/hgtk/thgconfig.py:57
msgid "Visual Editor"
msgstr "Visual Editor"
-#: tortoisehg/hgqt/settings.py:368
+#: tortoisehg/hgqt/settings.py:423
#, python-format
msgid ""
"Specify the visual editor used to view files. Format:<br>myeditor -flags "
@@ -5358,11 +5390,11 @@"href=\"%s\">OpenAtLine</a>"
msgstr ""
-#: tortoisehg/hgqt/settings.py:372
+#: tortoisehg/hgqt/settings.py:427
msgid "Shell"
msgstr ""
-#: tortoisehg/hgqt/settings.py:373
+#: tortoisehg/hgqt/settings.py:428
#, python-format
msgid ""
"Specify the command to launch your preferred terminal shell application. If "
@@ -5372,40 +5404,40 @@"other: xterm -T \"%(reponame)s\""
msgstr ""
-#: tortoisehg/hgqt/settings.py:381
+#: tortoisehg/hgqt/settings.py:436
msgid "Immediate Operations"
msgstr ""
-#: tortoisehg/hgqt/settings.py:382
+#: tortoisehg/hgqt/settings.py:437
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:386 tortoisehg/hgtk/thgconfig.py:63
+#: tortoisehg/hgqt/settings.py:441 tortoisehg/hgtk/thgconfig.py:63
msgid "Tab Width"
msgstr "Tab Width"
-#: tortoisehg/hgqt/settings.py:387
+#: tortoisehg/hgqt/settings.py:442
msgid ""
"Specify the number of spaces that tabs expand to in various TortoiseHg "
"windows. Default: 0, Not expanded"
msgstr ""
-#: tortoisehg/hgqt/settings.py:390
+#: tortoisehg/hgqt/settings.py:445
msgid "Force Repo Tab"
msgstr ""
-#: tortoisehg/hgqt/settings.py:391
+#: tortoisehg/hgqt/settings.py:446
msgid "Always show repo tabs, even for a single repo. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:392 tortoisehg/hgtk/thgconfig.py:67
+#: tortoisehg/hgqt/settings.py:447 tortoisehg/hgtk/thgconfig.py:67
msgid "Max Diff Size"
msgstr "Max Diff Size"
-#: tortoisehg/hgqt/settings.py:393
+#: tortoisehg/hgqt/settings.py:448
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. "
@@ -5415,21 +5447,21 @@"changelog, status, and commit windows. A value of zero implies no limit. "
"Default: 1024 (1MB)"
-#: tortoisehg/hgqt/settings.py:396
+#: tortoisehg/hgqt/settings.py:451
msgid "Fork GUI"
msgstr ""
-#: tortoisehg/hgqt/settings.py:397
+#: tortoisehg/hgqt/settings.py:452
msgid ""
"When running from the command line, fork a background process to run "
"graphical dialogs. Default: True"
msgstr ""
-#: tortoisehg/hgqt/settings.py:399 tortoisehg/hgtk/thgconfig.py:81
+#: tortoisehg/hgqt/settings.py:454 tortoisehg/hgtk/thgconfig.py:81
msgid "Full Path Title"
msgstr "Full Path Title"
-#: tortoisehg/hgqt/settings.py:400
+#: tortoisehg/hgqt/settings.py:455
msgid ""
"Show a full directory path of the repository in the dialog title instead of "
"just the root directory name. Default: False"
@@ -5437,11 +5469,11 @@"Show a full directory path of the repository in the dialogue title instead "
"of just the root directory name. Default: False"
-#: tortoisehg/hgqt/settings.py:402
+#: tortoisehg/hgqt/settings.py:457
msgid "Auto-resolve merges"
msgstr ""
-#: tortoisehg/hgqt/settings.py:403
+#: tortoisehg/hgqt/settings.py:458
msgid ""
"Indicates whether TortoiseHg should attempt to automatically resolve changes "
"from both sides to the same file, and only report merge conflicts when this "
@@ -5451,28 +5483,28 @@"to review and resolve changes manually. Default: False."
msgstr ""
-#: tortoisehg/hgqt/settings.py:413
+#: tortoisehg/hgqt/settings.py:468
msgid "Default widget"
msgstr ""
-#: tortoisehg/hgqt/settings.py:415
+#: tortoisehg/hgqt/settings.py:470
msgid ""
"Select the initial widget that will be shown when opening a repository. "
"Default: revdetails"
msgstr ""
-#: tortoisehg/hgqt/settings.py:420
+#: tortoisehg/hgqt/settings.py:475
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:424 tortoisehg/hgtk/thgconfig.py:130
+#: tortoisehg/hgqt/settings.py:479 tortoisehg/hgtk/thgconfig.py:130
msgid "Author Coloring"
msgstr "Author Colouring"
-#: tortoisehg/hgqt/settings.py:425 tortoisehg/hgtk/thgconfig.py:131
+#: tortoisehg/hgqt/settings.py:480 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: "
@@ -5482,21 +5514,21 @@"green for merge, red for non-trivial parents, black for normal. Default: "
"False"
-#: tortoisehg/hgqt/settings.py:429
+#: tortoisehg/hgqt/settings.py:484
msgid "Task Tabs"
msgstr ""
-#: tortoisehg/hgqt/settings.py:431
+#: tortoisehg/hgqt/settings.py:486
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:434 tortoisehg/hgtk/thgconfig.py:135
+#: tortoisehg/hgqt/settings.py:489 tortoisehg/hgtk/thgconfig.py:135
msgid "Long Summary"
msgstr "Long Summary"
-#: tortoisehg/hgqt/settings.py:435 tortoisehg/hgtk/thgconfig.py:136
+#: tortoisehg/hgqt/settings.py:490 tortoisehg/hgtk/thgconfig.py:136
msgid ""
"If true, concatenate multiple lines of changeset summary until they reach 80 "
"characters. Default: False"
@@ -5504,11 +5536,11 @@"If true, concatenate multiple lines of changeset summary until they reach 80 "
"characters. Default: False"
-#: tortoisehg/hgqt/settings.py:438 tortoisehg/hgtk/thgconfig.py:139
+#: tortoisehg/hgqt/settings.py:493 tortoisehg/hgtk/thgconfig.py:139
msgid "Log Batch Size"
msgstr "Log Batch Size"
-#: tortoisehg/hgqt/settings.py:439 tortoisehg/hgtk/thgconfig.py:140
+#: tortoisehg/hgqt/settings.py:494 tortoisehg/hgtk/thgconfig.py:140
msgid ""
"The number of revisions to read and display in the changelog viewer in a "
"single batch. Default: 500"
@@ -5516,21 +5548,21 @@"The number of revisions to read and display in the changelog viewer in a "
"single batch. Default: 500"
-#: tortoisehg/hgqt/settings.py:442 tortoisehg/hgtk/thgconfig.py:143
+#: tortoisehg/hgqt/settings.py:497 tortoisehg/hgtk/thgconfig.py:143
msgid "Dead Branches"
msgstr "Dead Branches"
-#: tortoisehg/hgqt/settings.py:443 tortoisehg/hgtk/thgconfig.py:144
+#: tortoisehg/hgqt/settings.py:498 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:446 tortoisehg/hgtk/thgconfig.py:147
+#: tortoisehg/hgqt/settings.py:501 tortoisehg/hgtk/thgconfig.py:147
msgid "Branch Colors"
msgstr "Branch Colours"
-#: tortoisehg/hgqt/settings.py:447
+#: tortoisehg/hgqt/settings.py:502
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 (\\). "
@@ -5539,22 +5571,22 @@"blank)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:453 tortoisehg/hgtk/thgconfig.py:154
+#: tortoisehg/hgqt/settings.py:508 tortoisehg/hgtk/thgconfig.py:154
msgid "Hide Tags"
msgstr "Hide Tags"
-#: tortoisehg/hgqt/settings.py:454
+#: tortoisehg/hgqt/settings.py:509
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:458 tortoisehg/hgtk/thgconfig.py:172
+#: tortoisehg/hgqt/settings.py:513 tortoisehg/hgtk/thgconfig.py:172
msgid "After Pull Operation"
msgstr "After Pull Operation"
-#: tortoisehg/hgqt/settings.py:460
+#: tortoisehg/hgqt/settings.py:515
msgid ""
"Operation which is performed directly after a successful pull. update "
"equates to pull --update, fetch equates to the fetch extension, rebase "
@@ -5564,146 +5596,146 @@"equates to pull --update, fetch equates to the fetch extension, rebase "
"equates to pull --rebase. Default: none"
-#: tortoisehg/hgqt/settings.py:465
+#: tortoisehg/hgqt/settings.py:520
msgctxt "config item"
msgid "Commit"
msgstr ""
-#: tortoisehg/hgqt/settings.py:466 tortoisehg/hgqt/sync.py:1260
+#: tortoisehg/hgqt/settings.py:521 tortoisehg/hgqt/sync.py:1259
#: tortoisehg/hgtk/thgconfig.py:90
msgid "Username"
msgstr "Username"
-#: tortoisehg/hgqt/settings.py:467
+#: tortoisehg/hgqt/settings.py:522
msgid ""
"Name associated with commits. The common format is:<br>Full Name "
"<email@example.com>"
msgstr ""
-#: tortoisehg/hgqt/settings.py:469 tortoisehg/hgtk/thgconfig.py:92
+#: tortoisehg/hgqt/settings.py:524 tortoisehg/hgtk/thgconfig.py:92
msgid "Summary Line Length"
msgstr "Summary Line Length"
-#: tortoisehg/hgqt/settings.py:470
+#: tortoisehg/hgqt/settings.py:525
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:473 tortoisehg/hgtk/thgconfig.py:103
+#: tortoisehg/hgqt/settings.py:528 tortoisehg/hgtk/thgconfig.py:103
msgid "Close After Commit"
msgstr ""
-#: tortoisehg/hgqt/settings.py:474
+#: tortoisehg/hgqt/settings.py:529
msgid "Close the commit tool after every successful commit. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:476 tortoisehg/hgtk/thgconfig.py:106
+#: tortoisehg/hgqt/settings.py:531 tortoisehg/hgtk/thgconfig.py:106
msgid "Push After Commit"
msgstr "Push After Commit"
-#: tortoisehg/hgqt/settings.py:478
+#: tortoisehg/hgqt/settings.py:533
msgid ""
"Attempt to push to specified URL or alias after each successful commit. "
"Default: No push"
msgstr ""
-#: tortoisehg/hgqt/settings.py:480 tortoisehg/hgtk/thgconfig.py:109
+#: tortoisehg/hgqt/settings.py:535 tortoisehg/hgtk/thgconfig.py:109
msgid "Auto Commit List"
msgstr "Auto Commit List"
-#: tortoisehg/hgqt/settings.py:481 tortoisehg/hgtk/thgconfig.py:110
+#: tortoisehg/hgqt/settings.py:536 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:484 tortoisehg/hgtk/thgconfig.py:113
+#: tortoisehg/hgqt/settings.py:539 tortoisehg/hgtk/thgconfig.py:113
msgid "Auto Exclude List"
msgstr "Auto Exclude List"
-#: tortoisehg/hgqt/settings.py:485
+#: tortoisehg/hgqt/settings.py:540
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:488 tortoisehg/hgtk/thgconfig.py:117
+#: tortoisehg/hgqt/settings.py:543 tortoisehg/hgtk/thgconfig.py:117
msgid "English Messages"
msgstr ""
-#: tortoisehg/hgqt/settings.py:489 tortoisehg/hgtk/thgconfig.py:118
+#: tortoisehg/hgqt/settings.py:544 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:495 tortoisehg/hgtk/thgconfig.py:179
+#: tortoisehg/hgqt/settings.py:550 tortoisehg/hgtk/thgconfig.py:179
#: tortoisehg/util/menuthg.py:55
msgid "Web Server"
msgstr "Web Server"
-#: tortoisehg/hgqt/settings.py:496 tortoisehg/hgtk/thgconfig.py:180
+#: tortoisehg/hgqt/settings.py:551 tortoisehg/hgtk/thgconfig.py:180
#: tortoisehg/hgtk/thgpbranch.py:210
msgid "Name"
msgstr "Name"
-#: tortoisehg/hgqt/settings.py:497
+#: tortoisehg/hgqt/settings.py:552
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:499 tortoisehg/hgtk/thgconfig.py:183
+#: tortoisehg/hgqt/settings.py:554 tortoisehg/hgtk/thgconfig.py:183
#: tortoisehg/hgtk/thgconfig.py:745
msgid "Description"
msgstr "Description"
-#: tortoisehg/hgqt/settings.py:500 tortoisehg/hgtk/thgconfig.py:184
+#: tortoisehg/hgqt/settings.py:555 tortoisehg/hgtk/thgconfig.py:184
msgid "Textual description of the repository's purpose or contents."
msgstr "Textual description of the repository's purpose or contents."
-#: tortoisehg/hgqt/settings.py:502 tortoisehg/hgtk/thgconfig.py:186
+#: tortoisehg/hgqt/settings.py:557 tortoisehg/hgtk/thgconfig.py:186
msgid "Contact"
msgstr "Contact"
-#: tortoisehg/hgqt/settings.py:503 tortoisehg/hgtk/thgconfig.py:187
+#: tortoisehg/hgqt/settings.py:558 tortoisehg/hgtk/thgconfig.py:187
msgid "Name or email address of the person in charge of the repository."
msgstr "Name or e-mail address of the person in charge of the repository."
-#: tortoisehg/hgqt/settings.py:505 tortoisehg/hgtk/thgconfig.py:189
+#: tortoisehg/hgqt/settings.py:560 tortoisehg/hgtk/thgconfig.py:189
msgid "Style"
msgstr "Style"
-#: tortoisehg/hgqt/settings.py:507 tortoisehg/hgtk/thgconfig.py:191
+#: tortoisehg/hgqt/settings.py:562 tortoisehg/hgtk/thgconfig.py:191
msgid "Which template map style to use"
msgstr "Which template map style to use"
-#: tortoisehg/hgqt/settings.py:508 tortoisehg/hgtk/thgconfig.py:192
+#: tortoisehg/hgqt/settings.py:563 tortoisehg/hgtk/thgconfig.py:192
msgid "Archive Formats"
msgstr "Archive Formats"
-#: tortoisehg/hgqt/settings.py:510 tortoisehg/hgtk/thgconfig.py:193
+#: tortoisehg/hgqt/settings.py:565 tortoisehg/hgtk/thgconfig.py:193
msgid "Comma separated list of archive formats allowed for downloading"
msgstr "Comma-separated list of archive formats allowed for downloading"
-#: tortoisehg/hgqt/settings.py:512 tortoisehg/hgqt/sync.py:225
+#: tortoisehg/hgqt/settings.py:567 tortoisehg/hgqt/sync.py:225
#: tortoisehg/hgtk/thgconfig.py:195 tortoisehg/hgtk/thgconfig.py:368
msgid "Port"
msgstr "Port"
-#: tortoisehg/hgqt/settings.py:512 tortoisehg/hgtk/thgconfig.py:195
+#: tortoisehg/hgqt/settings.py:567 tortoisehg/hgtk/thgconfig.py:195
msgid "Port to listen on"
msgstr "Port to listen on"
-#: tortoisehg/hgqt/settings.py:513 tortoisehg/hgtk/thgconfig.py:196
+#: tortoisehg/hgqt/settings.py:568 tortoisehg/hgtk/thgconfig.py:196
msgid "Push Requires SSL"
msgstr "Push Requires SSL"
-#: tortoisehg/hgqt/settings.py:514 tortoisehg/hgtk/thgconfig.py:197
+#: tortoisehg/hgqt/settings.py:569 tortoisehg/hgtk/thgconfig.py:197
msgid ""
"Whether to require that inbound pushes be transported over SSL to prevent "
"password sniffing."
@@ -5711,11 +5743,11 @@"Whether to require that inbound pushes be transported over SSL to prevent "
"password sniffing."
-#: tortoisehg/hgqt/settings.py:516 tortoisehg/hgtk/thgconfig.py:199
+#: tortoisehg/hgqt/settings.py:571 tortoisehg/hgtk/thgconfig.py:199
msgid "Stripes"
msgstr "Stripes"
-#: tortoisehg/hgqt/settings.py:517 tortoisehg/hgtk/thgconfig.py:200
+#: tortoisehg/hgqt/settings.py:572 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."
@@ -5723,27 +5755,27 @@"How many lines a \"zebra stripe\" should span in multiline output. Default "
"is 1; set to 0 to disable."
-#: tortoisehg/hgqt/settings.py:519 tortoisehg/hgtk/thgconfig.py:202
+#: tortoisehg/hgqt/settings.py:574 tortoisehg/hgtk/thgconfig.py:202
msgid "Max Files"
msgstr "Max Files"
-#: tortoisehg/hgqt/settings.py:520
+#: tortoisehg/hgqt/settings.py:575
msgid "Maximum number of files to list per changeset. Default: 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:521 tortoisehg/hgtk/thgconfig.py:204
+#: tortoisehg/hgqt/settings.py:576 tortoisehg/hgtk/thgconfig.py:204
msgid "Max Changes"
msgstr "Max Changes"
-#: tortoisehg/hgqt/settings.py:522
+#: tortoisehg/hgqt/settings.py:577
msgid "Maximum number of changes to list on the changelog. Default: 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:524 tortoisehg/hgtk/thgconfig.py:206
+#: tortoisehg/hgqt/settings.py:579 tortoisehg/hgtk/thgconfig.py:206
msgid "Allow Push"
msgstr "Allow Push"
-#: tortoisehg/hgqt/settings.py:525 tortoisehg/hgtk/thgconfig.py:207
+#: tortoisehg/hgqt/settings.py:580 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 "
@@ -5759,11 +5791,11 @@"(separated by whitespace or \",\"). The contents of the allow_push list are "
"examined after the deny_push list."
-#: tortoisehg/hgqt/settings.py:532 tortoisehg/hgtk/thgconfig.py:214
+#: tortoisehg/hgqt/settings.py:587 tortoisehg/hgtk/thgconfig.py:214
msgid "Deny Push"
msgstr "Deny Push"
-#: tortoisehg/hgqt/settings.py:533 tortoisehg/hgtk/thgconfig.py:215
+#: tortoisehg/hgqt/settings.py:588 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. "
@@ -5777,91 +5809,91 @@"name present in this list (separated by whitespace or \",\") is also denied. "
"The contents of the deny_push list are examined before the allow_push list."
-#: tortoisehg/hgqt/settings.py:539 tortoisehg/hgtk/thgconfig.py:221
+#: tortoisehg/hgqt/settings.py:594 tortoisehg/hgtk/thgconfig.py:221
msgid "Encoding"
msgstr "Encoding"
-#: tortoisehg/hgqt/settings.py:540 tortoisehg/hgtk/thgconfig.py:222
+#: tortoisehg/hgqt/settings.py:595 tortoisehg/hgtk/thgconfig.py:222
msgid "Character encoding name"
msgstr "Character encoding name"
-#: tortoisehg/hgqt/settings.py:543 tortoisehg/hgtk/thgconfig.py:225
+#: tortoisehg/hgqt/settings.py:598 tortoisehg/hgtk/thgconfig.py:225
msgid "Proxy"
msgstr "Proxy"
-#: tortoisehg/hgqt/settings.py:544 tortoisehg/hgtk/thgconfig.py:226
+#: tortoisehg/hgqt/settings.py:599 tortoisehg/hgtk/thgconfig.py:226
#: tortoisehg/hgtk/thgconfig.py:369
msgid "Host"
msgstr "Host"
-#: tortoisehg/hgqt/settings.py:545 tortoisehg/hgtk/thgconfig.py:227
+#: tortoisehg/hgqt/settings.py:600 tortoisehg/hgtk/thgconfig.py:227
msgid ""
"Host name and (optional) port of proxy server, for example \"myproxy:8000\""
msgstr ""
"Host name and (optional) port of proxy server, for example \"myproxy:8000\""
-#: tortoisehg/hgqt/settings.py:547 tortoisehg/hgtk/thgconfig.py:229
+#: tortoisehg/hgqt/settings.py:602 tortoisehg/hgtk/thgconfig.py:229
msgid "Bypass List"
msgstr "Bypass List"
-#: tortoisehg/hgqt/settings.py:548 tortoisehg/hgtk/thgconfig.py:230
+#: tortoisehg/hgqt/settings.py:603 tortoisehg/hgtk/thgconfig.py:230
msgid ""
"Optional. Comma-separated list of host names that should bypass the proxy"
msgstr ""
"Optional. Comma-separated list of host names that should bypass the proxy"
-#: tortoisehg/hgqt/settings.py:551 tortoisehg/hgtk/thgconfig.py:233
+#: tortoisehg/hgqt/settings.py:606 tortoisehg/hgtk/thgconfig.py:233
msgid "Optional. User name to authenticate with at the proxy server"
msgstr "Optional. User name to authenticate with at the proxy server"
-#: tortoisehg/hgqt/settings.py:552 tortoisehg/hgqt/settings.py:672
-#: tortoisehg/hgqt/sync.py:1268 tortoisehg/hgtk/thgconfig.py:234
+#: tortoisehg/hgqt/settings.py:607 tortoisehg/hgqt/settings.py:727
+#: tortoisehg/hgqt/sync.py:1267 tortoisehg/hgtk/thgconfig.py:234
#: tortoisehg/hgtk/thgconfig.py:370
msgid "Password"
msgstr "Password"
-#: tortoisehg/hgqt/settings.py:553 tortoisehg/hgtk/thgconfig.py:235
+#: tortoisehg/hgqt/settings.py:608 tortoisehg/hgtk/thgconfig.py:235
msgid "Optional. Password to authenticate with at the proxy server"
msgstr "Optional. Password to authenticate with at the proxy server"
-#: tortoisehg/hgqt/settings.py:557 tortoisehg/hgtk/thgconfig.py:239
+#: tortoisehg/hgqt/settings.py:612 tortoisehg/hgtk/thgconfig.py:239
msgid "From"
msgstr "From"
-#: tortoisehg/hgqt/settings.py:558 tortoisehg/hgtk/thgconfig.py:240
+#: tortoisehg/hgqt/settings.py:613 tortoisehg/hgtk/thgconfig.py:240
msgid "Email address to use in the \"From\" header and for the SMTP envelope"
msgstr ""
"E-mail address to use in the \"From\" header and for the SMTP envelope"
-#: tortoisehg/hgqt/settings.py:560 tortoisehg/hgtk/thgconfig.py:242
+#: tortoisehg/hgqt/settings.py:615 tortoisehg/hgtk/thgconfig.py:242
msgid "To"
msgstr "To"
-#: tortoisehg/hgqt/settings.py:561 tortoisehg/hgtk/thgconfig.py:243
+#: tortoisehg/hgqt/settings.py:616 tortoisehg/hgtk/thgconfig.py:243
msgid "Comma-separated list of recipient email addresses"
msgstr "Comma-separated list of recipient e-mail addresses"
-#: tortoisehg/hgqt/settings.py:562 tortoisehg/hgtk/thgconfig.py:244
+#: tortoisehg/hgqt/settings.py:617 tortoisehg/hgtk/thgconfig.py:244
msgid "Cc"
msgstr "Cc"
-#: tortoisehg/hgqt/settings.py:563 tortoisehg/hgtk/thgconfig.py:245
+#: tortoisehg/hgqt/settings.py:618 tortoisehg/hgtk/thgconfig.py:245
msgid "Comma-separated list of carbon copy recipient email addresses"
msgstr "Comma-separated list of carbon copy recipient e-mail addresses"
-#: tortoisehg/hgqt/settings.py:564 tortoisehg/hgtk/thgconfig.py:246
+#: tortoisehg/hgqt/settings.py:619 tortoisehg/hgtk/thgconfig.py:246
msgid "Bcc"
msgstr "Bcc"
-#: tortoisehg/hgqt/settings.py:565 tortoisehg/hgtk/thgconfig.py:247
+#: tortoisehg/hgqt/settings.py:620 tortoisehg/hgtk/thgconfig.py:247
msgid "Comma-separated list of blind carbon copy recipient email addresses"
msgstr "Comma-separated list of blind carbon copy recipient e-mail addresses"
-#: tortoisehg/hgqt/settings.py:567 tortoisehg/hgtk/thgconfig.py:249
+#: tortoisehg/hgqt/settings.py:622 tortoisehg/hgtk/thgconfig.py:249
msgid "method"
msgstr "method"
-#: tortoisehg/hgqt/settings.py:568 tortoisehg/hgtk/thgconfig.py:250
+#: tortoisehg/hgqt/settings.py:623 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 "
@@ -5877,82 +5909,82 @@"\"sendmail\" or \"/usr/sbin/sendmail\" is enough to use sendmail to send "
"messages."
-#: tortoisehg/hgqt/settings.py:574 tortoisehg/hgtk/thgconfig.py:256
+#: tortoisehg/hgqt/settings.py:629 tortoisehg/hgtk/thgconfig.py:256
msgid "SMTP Host"
msgstr "SMTP Host"
-#: tortoisehg/hgqt/settings.py:575 tortoisehg/hgtk/thgconfig.py:256
+#: tortoisehg/hgqt/settings.py:630 tortoisehg/hgtk/thgconfig.py:256
msgid "Host name of mail server"
msgstr "Host name of mail server"
-#: tortoisehg/hgqt/settings.py:576 tortoisehg/hgtk/thgconfig.py:257
+#: tortoisehg/hgqt/settings.py:631 tortoisehg/hgtk/thgconfig.py:257
msgid "SMTP Port"
msgstr "SMTP Port"
-#: tortoisehg/hgqt/settings.py:577 tortoisehg/hgtk/thgconfig.py:258
+#: tortoisehg/hgqt/settings.py:632 tortoisehg/hgtk/thgconfig.py:258
msgid "Port to connect to on mail server. Default: 25"
msgstr "Port to connect to on mail server. Default: 25"
-#: tortoisehg/hgqt/settings.py:579 tortoisehg/hgtk/thgconfig.py:260
+#: tortoisehg/hgqt/settings.py:634 tortoisehg/hgtk/thgconfig.py:260
msgid "SMTP TLS"
msgstr "SMTP TLS"
-#: tortoisehg/hgqt/settings.py:580 tortoisehg/hgtk/thgconfig.py:261
+#: tortoisehg/hgqt/settings.py:635 tortoisehg/hgtk/thgconfig.py:261
msgid "Connect to mail server using TLS. Default: False"
msgstr "Connect to mail server using TLS. Default: False"
-#: tortoisehg/hgqt/settings.py:582 tortoisehg/hgtk/thgconfig.py:263
+#: tortoisehg/hgqt/settings.py:637 tortoisehg/hgtk/thgconfig.py:263
msgid "SMTP Username"
msgstr "SMTP Username"
-#: tortoisehg/hgqt/settings.py:583 tortoisehg/hgtk/thgconfig.py:264
+#: tortoisehg/hgqt/settings.py:638 tortoisehg/hgtk/thgconfig.py:264
msgid "Username to authenticate to mail server with"
msgstr "Username to authenticate to mail server with"
-#: tortoisehg/hgqt/settings.py:584 tortoisehg/hgtk/thgconfig.py:265
+#: tortoisehg/hgqt/settings.py:639 tortoisehg/hgtk/thgconfig.py:265
msgid "SMTP Password"
msgstr "SMTP Password"
-#: tortoisehg/hgqt/settings.py:585 tortoisehg/hgtk/thgconfig.py:266
+#: tortoisehg/hgqt/settings.py:640 tortoisehg/hgtk/thgconfig.py:266
msgid "Password to authenticate to mail server with"
msgstr "Password to authenticate to mail server with"
-#: tortoisehg/hgqt/settings.py:586 tortoisehg/hgtk/thgconfig.py:267
+#: tortoisehg/hgqt/settings.py:641 tortoisehg/hgtk/thgconfig.py:267
msgid "Local Hostname"
msgstr "Local Hostname"
-#: tortoisehg/hgqt/settings.py:587 tortoisehg/hgtk/thgconfig.py:268
+#: tortoisehg/hgqt/settings.py:642 tortoisehg/hgtk/thgconfig.py:268
msgid "Hostname the sender can use to identify itself to the mail server."
msgstr "Hostname the sender can use to identify itself to the mail server."
-#: tortoisehg/hgqt/settings.py:591 tortoisehg/hgtk/thgconfig.py:272
+#: tortoisehg/hgqt/settings.py:646 tortoisehg/hgtk/thgconfig.py:272
msgid "Diff"
msgstr "Diff"
-#: tortoisehg/hgqt/settings.py:593 tortoisehg/hgtk/thgconfig.py:273
+#: tortoisehg/hgqt/settings.py:648 tortoisehg/hgtk/thgconfig.py:273
msgid "Patch EOL"
msgstr "Patch EOL"
-#: tortoisehg/hgqt/settings.py:595 tortoisehg/hgtk/thgconfig.py:274
+#: tortoisehg/hgqt/settings.py:650 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:599 tortoisehg/hgtk/thgconfig.py:278
+#: tortoisehg/hgqt/settings.py:654 tortoisehg/hgtk/thgconfig.py:278
msgid "Git Format"
msgstr "Git Format"
-#: tortoisehg/hgqt/settings.py:600 tortoisehg/hgtk/thgconfig.py:279
+#: tortoisehg/hgqt/settings.py:655 tortoisehg/hgtk/thgconfig.py:279
msgid "Use git extended diff header format. Default: False"
msgstr "Use git extended diff header format. Default: False"
-#: tortoisehg/hgqt/settings.py:602
+#: tortoisehg/hgqt/settings.py:657
msgid "MQ Git Format"
msgstr ""
-#: tortoisehg/hgqt/settings.py:604
+#: tortoisehg/hgqt/settings.py:659
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 "
@@ -5960,112 +5992,112 @@"possibly losing data in the second case."
msgstr ""
-#: tortoisehg/hgqt/settings.py:608 tortoisehg/hgtk/thgconfig.py:281
+#: tortoisehg/hgqt/settings.py:663 tortoisehg/hgtk/thgconfig.py:281
msgid "No Dates"
msgstr "No Dates"
-#: tortoisehg/hgqt/settings.py:609 tortoisehg/hgtk/thgconfig.py:282
+#: tortoisehg/hgqt/settings.py:664 tortoisehg/hgtk/thgconfig.py:282
msgid "Do not include modification dates in diff headers. Default: False"
msgstr "Do not include modification dates in diff headers. Default: False"
-#: tortoisehg/hgqt/settings.py:611 tortoisehg/hgtk/thgconfig.py:284
+#: tortoisehg/hgqt/settings.py:666 tortoisehg/hgtk/thgconfig.py:284
msgid "Show Function"
msgstr "Show Function"
-#: tortoisehg/hgqt/settings.py:612 tortoisehg/hgtk/thgconfig.py:285
+#: tortoisehg/hgqt/settings.py:667 tortoisehg/hgtk/thgconfig.py:285
msgid "Show which function each change is in. Default: False"
msgstr "Show which function each change is in. Default: False"
-#: tortoisehg/hgqt/settings.py:614 tortoisehg/hgtk/thgconfig.py:287
+#: tortoisehg/hgqt/settings.py:669 tortoisehg/hgtk/thgconfig.py:287
msgid "Ignore White Space"
msgstr "Ignore White Space"
-#: tortoisehg/hgqt/settings.py:615 tortoisehg/hgtk/thgconfig.py:288
+#: tortoisehg/hgqt/settings.py:670 tortoisehg/hgtk/thgconfig.py:288
msgid "Ignore white space when comparing lines. Default: False"
msgstr "Ignore white space when comparing lines. Default: False"
-#: tortoisehg/hgqt/settings.py:617 tortoisehg/hgtk/thgconfig.py:290
+#: tortoisehg/hgqt/settings.py:672 tortoisehg/hgtk/thgconfig.py:290
msgid "Ignore WS Amount"
msgstr "Ignore White Space Amount"
-#: tortoisehg/hgqt/settings.py:618 tortoisehg/hgtk/thgconfig.py:291
+#: tortoisehg/hgqt/settings.py:673 tortoisehg/hgtk/thgconfig.py:291
msgid "Ignore changes in the amount of white space. Default: False"
msgstr "Ignore changes in the amount of white space. Default: False"
-#: tortoisehg/hgqt/settings.py:620 tortoisehg/hgtk/thgconfig.py:293
+#: tortoisehg/hgqt/settings.py:675 tortoisehg/hgtk/thgconfig.py:293
msgid "Ignore Blank Lines"
msgstr "Ignore Blank Lines"
-#: tortoisehg/hgqt/settings.py:621 tortoisehg/hgtk/thgconfig.py:294
+#: tortoisehg/hgqt/settings.py:676 tortoisehg/hgtk/thgconfig.py:294
msgid "Ignore changes whose lines are all blank. Default: False"
msgstr "Ignore changes whose lines are all blank. Default: False"
-#: tortoisehg/hgqt/settings.py:625
+#: tortoisehg/hgqt/settings.py:680
msgid "Fonts"
msgstr ""
-#: tortoisehg/hgqt/settings.py:626
+#: tortoisehg/hgqt/settings.py:681
msgid "Message Font"
msgstr ""
-#: tortoisehg/hgqt/settings.py:627
+#: tortoisehg/hgqt/settings.py:682
msgid "Font used to display commit messages. Default: monospace 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:629
+#: tortoisehg/hgqt/settings.py:684
msgid "Diff Font"
msgstr ""
-#: tortoisehg/hgqt/settings.py:630
+#: tortoisehg/hgqt/settings.py:685
msgid "Font used to display text differences. Default: monospace 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:632
+#: tortoisehg/hgqt/settings.py:687
msgid "List Font"
msgstr ""
-#: tortoisehg/hgqt/settings.py:633
+#: tortoisehg/hgqt/settings.py:688
msgid "Font used to display file lists. Default: sans 9"
msgstr ""
-#: tortoisehg/hgqt/settings.py:635
+#: tortoisehg/hgqt/settings.py:690
msgid "ChangeLog Font"
msgstr ""
-#: tortoisehg/hgqt/settings.py:636
+#: tortoisehg/hgqt/settings.py:691
msgid "Font used to display changelog data. Default: monospace 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:638
+#: tortoisehg/hgqt/settings.py:693
msgid "Output Font"
msgstr ""
-#: tortoisehg/hgqt/settings.py:639
+#: tortoisehg/hgqt/settings.py:694
msgid "Font used to display output messages. Default: sans 8"
msgstr ""
-#: tortoisehg/hgqt/settings.py:643 tortoisehg/hgqt/settings.py:1116
+#: tortoisehg/hgqt/settings.py:698 tortoisehg/hgqt/settings.py:1179
#: tortoisehg/hgtk/thgconfig.py:318
msgid "Extensions"
msgstr ""
-#: tortoisehg/hgqt/settings.py:646 tortoisehg/hgtk/thgconfig.py:321
+#: tortoisehg/hgqt/settings.py:701 tortoisehg/hgtk/thgconfig.py:321
msgid "Issue Tracking"
msgstr ""
-#: tortoisehg/hgqt/settings.py:647 tortoisehg/hgtk/thgconfig.py:323
+#: tortoisehg/hgqt/settings.py:702 tortoisehg/hgtk/thgconfig.py:323
msgid "Issue Regex"
msgstr ""
-#: tortoisehg/hgqt/settings.py:648 tortoisehg/hgtk/thgconfig.py:324
+#: tortoisehg/hgqt/settings.py:703 tortoisehg/hgtk/thgconfig.py:324
msgid "Defines the regex to match when picking up issue numbers."
msgstr ""
-#: tortoisehg/hgqt/settings.py:649 tortoisehg/hgtk/thgconfig.py:325
+#: tortoisehg/hgqt/settings.py:704 tortoisehg/hgtk/thgconfig.py:325
msgid "Issue Link"
msgstr ""
-#: tortoisehg/hgqt/settings.py:650 tortoisehg/hgtk/thgconfig.py:326
+#: tortoisehg/hgqt/settings.py:705 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 "
@@ -6074,145 +6106,145 @@"tokensare found in issue.link, the entire matched string is appended instead."
msgstr ""
-#: tortoisehg/hgqt/settings.py:657
+#: tortoisehg/hgqt/settings.py:712
msgid "Issue Tracker Plugin"
msgstr ""
-#: tortoisehg/hgqt/settings.py:659
+#: tortoisehg/hgqt/settings.py:714
msgid ""
"Configures a COM IBugTraqProvider or IBugTrackProvider2 issue tracking "
"plugin."
msgstr ""
-#: tortoisehg/hgqt/settings.py:661
+#: tortoisehg/hgqt/settings.py:716
msgid "Configure Issue Tracker"
msgstr ""
-#: tortoisehg/hgqt/settings.py:662
+#: tortoisehg/hgqt/settings.py:717
msgid "Configure the selected COM Bug Tracker plugin."
msgstr ""
-#: tortoisehg/hgqt/settings.py:667
+#: tortoisehg/hgqt/settings.py:722
msgid "Server"
msgstr ""
-#: tortoisehg/hgqt/settings.py:668
+#: tortoisehg/hgqt/settings.py:723
msgid "Path to review board example \"http://demo.reviewboard.org\""
msgstr ""
-#: tortoisehg/hgqt/settings.py:671
+#: tortoisehg/hgqt/settings.py:726
msgid "User name to authenticate with review board"
msgstr ""
-#: tortoisehg/hgqt/settings.py:673
+#: tortoisehg/hgqt/settings.py:728
msgid "Password to authenticate with review board"
msgstr ""
-#: tortoisehg/hgqt/settings.py:674
+#: tortoisehg/hgqt/settings.py:729
msgid "Server Repository ID"
msgstr ""
-#: tortoisehg/hgqt/settings.py:675
+#: tortoisehg/hgqt/settings.py:730
msgid "The default repository id for this repo on the review board server"
msgstr ""
-#: tortoisehg/hgqt/settings.py:676
+#: tortoisehg/hgqt/settings.py:731
msgid "Target Groups"
msgstr ""
-#: tortoisehg/hgqt/settings.py:677
+#: tortoisehg/hgqt/settings.py:732
msgid "A comma separated list of target groups"
msgstr ""
-#: tortoisehg/hgqt/settings.py:678
+#: tortoisehg/hgqt/settings.py:733
msgid "Target People"
msgstr ""
-#: tortoisehg/hgqt/settings.py:679
+#: tortoisehg/hgqt/settings.py:734
msgid "A comma separated list of target people"
msgstr ""
-#: tortoisehg/hgqt/settings.py:691
+#: tortoisehg/hgqt/settings.py:746
msgid "TortoiseHg Settings"
msgstr ""
-#: tortoisehg/hgqt/settings.py:696 tortoisehg/hgtk/thgconfig.py:648
+#: tortoisehg/hgqt/settings.py:751 tortoisehg/hgtk/thgconfig.py:648
msgid "Iniparse package not found"
msgstr "Iniparse package not found"
-#: tortoisehg/hgqt/settings.py:697 tortoisehg/hgtk/thgconfig.py:649
+#: tortoisehg/hgqt/settings.py:752 tortoisehg/hgtk/thgconfig.py:649
msgid "Can't change settings without iniparse package - view is readonly."
msgstr "Can't change settings without iniparse package - view is readonly."
-#: tortoisehg/hgqt/settings.py:721
+#: tortoisehg/hgqt/settings.py:776
#, python-format
msgid "%s's global settings"
msgstr ""
-#: tortoisehg/hgqt/settings.py:735 tortoisehg/hgtk/thgconfig.py:638
+#: tortoisehg/hgqt/settings.py:790 tortoisehg/hgtk/thgconfig.py:638
msgid "No repository found"
msgstr "No repository found"
-#: tortoisehg/hgqt/settings.py:736 tortoisehg/hgtk/thgconfig.py:639
+#: tortoisehg/hgqt/settings.py:791 tortoisehg/hgtk/thgconfig.py:639
msgid "no repo at "
msgstr "no repo at "
-#: tortoisehg/hgqt/settings.py:742 tortoisehg/hgtk/thgconfig.py:671
+#: tortoisehg/hgqt/settings.py:797 tortoisehg/hgtk/thgconfig.py:671
#, python-format
msgid "%s repository settings"
msgstr "%s repository settings"
-#: tortoisehg/hgqt/settings.py:769
+#: tortoisehg/hgqt/settings.py:824
msgid ""
"Restart all TortoiseHg applications for the following changes to take effect:"
msgstr ""
-#: tortoisehg/hgqt/settings.py:777
+#: tortoisehg/hgqt/settings.py:832
msgid "Apply changes before exit?"
msgstr ""
-#: tortoisehg/hgqt/settings.py:778 tortoisehg/hgtk/commit.py:324
+#: tortoisehg/hgqt/settings.py:833 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 "&Yes"
-#: tortoisehg/hgqt/settings.py:778 tortoisehg/hgtk/thgconfig.py:848
+#: tortoisehg/hgqt/settings.py:833 tortoisehg/hgtk/thgconfig.py:848
msgid "&No (discard changes)"
msgstr "&No (discard changes)"
-#: tortoisehg/hgqt/settings.py:832
+#: tortoisehg/hgqt/settings.py:887
msgid "Settings File:"
msgstr ""
-#: tortoisehg/hgqt/settings.py:890
+#: tortoisehg/hgqt/settings.py:945
msgid "Confirm Save"
msgstr ""
-#: tortoisehg/hgqt/settings.py:891
+#: tortoisehg/hgqt/settings.py:946
msgid "Save changes before editing?"
msgstr ""
-#: tortoisehg/hgqt/settings.py:892 tortoisehg/hgtk/thgconfig.py:775
+#: tortoisehg/hgqt/settings.py:947 tortoisehg/hgtk/thgconfig.py:775
msgid "&Save"
msgstr ""
-#: tortoisehg/hgqt/settings.py:954 tortoisehg/hgtk/thgconfig.py:822
+#: tortoisehg/hgqt/settings.py:1009 tortoisehg/hgtk/thgconfig.py:822
msgid "Confirm Reload"
msgstr ""
-#: tortoisehg/hgqt/settings.py:955 tortoisehg/hgtk/thgconfig.py:823
+#: tortoisehg/hgqt/settings.py:1010 tortoisehg/hgtk/thgconfig.py:823
msgid ""
"Unsaved changes will be lost.\n"
"Do you want to reload?"
msgstr ""
-#: tortoisehg/hgqt/settings.py:1066 tortoisehg/hgtk/thgconfig.py:1550
+#: tortoisehg/hgqt/settings.py:1129 tortoisehg/hgtk/thgconfig.py:1550
msgid "Unable to create a Mercurial.ini file"
msgstr "Unable to create a Mercurial.ini file"
-#: tortoisehg/hgqt/settings.py:1067
+#: tortoisehg/hgqt/settings.py:1130
msgid "Insufficient access rights, reverting to read-only mode."
msgstr ""
@@ -6349,8 +6381,8 @@msgid "Refresh Toolbar"
msgstr ""
-#: tortoisehg/hgqt/shelve.py:137 tortoisehg/hgqt/status.py:250
-#: tortoisehg/hgqt/status.py:263 tortoisehg/hgtk/commit.py:240
+#: tortoisehg/hgqt/shelve.py:137 tortoisehg/hgqt/status.py:254
+#: tortoisehg/hgqt/status.py:268 tortoisehg/hgtk/commit.py:240
#: tortoisehg/hgtk/hgignore.py:142 tortoisehg/hgtk/history.py:404
msgid "Refresh"
msgstr "Refresh"
@@ -6442,158 +6474,158 @@msgid "Patch: %s"
msgstr ""
-#: tortoisehg/hgqt/status.py:100
+#: tortoisehg/hgqt/status.py:101
msgid "### filter text ###"
msgstr ""
-#: tortoisehg/hgqt/status.py:102
+#: tortoisehg/hgqt/status.py:103
msgid "Filter:"
msgstr ""
-#: tortoisehg/hgqt/status.py:113
+#: tortoisehg/hgqt/status.py:115
msgid "Check all files"
msgstr ""
-#: tortoisehg/hgqt/status.py:114
+#: tortoisehg/hgqt/status.py:116
msgid "Uncheck all files"
msgstr ""
-#: tortoisehg/hgqt/status.py:119
+#: tortoisehg/hgqt/status.py:121
msgid "Status File List Toolbar"
msgstr ""
-#: tortoisehg/hgqt/status.py:143 tortoisehg/hgtk/status.py:330
+#: tortoisehg/hgqt/status.py:146 tortoisehg/hgtk/status.py:330
msgid "Remove filter, show root"
msgstr "Remove filter, show root"
-#: tortoisehg/hgqt/status.py:204
+#: tortoisehg/hgqt/status.py:207
#, python-format
msgid "%s - status (selection filtered)"
msgstr ""
-#: tortoisehg/hgqt/status.py:206
+#: tortoisehg/hgqt/status.py:209
#, python-format
msgid "%s - status"
msgstr ""
-#: tortoisehg/hgqt/status.py:250 tortoisehg/hgtk/browse.py:112
+#: tortoisehg/hgqt/status.py:254 tortoisehg/hgtk/browse.py:112
#: tortoisehg/hgtk/quickop.py:106 tortoisehg/hgtk/status.py:95
msgid "status"
msgstr "status"
-#: tortoisehg/hgqt/status.py:278 tortoisehg/hgtk/quickop.py:186
+#: tortoisehg/hgqt/status.py:283 tortoisehg/hgtk/quickop.py:186
msgid "No appropriate files"
msgstr "No appropriate files"
-#: tortoisehg/hgqt/status.py:279 tortoisehg/hgtk/quickop.py:187
+#: tortoisehg/hgqt/status.py:284 tortoisehg/hgtk/quickop.py:187
msgid "No files found for this operation"
msgstr "No files found for this operation"
-#: tortoisehg/hgqt/status.py:595
+#: tortoisehg/hgqt/status.py:602
msgid "Stat"
msgstr ""
-#: tortoisehg/hgqt/status.py:595
+#: tortoisehg/hgqt/status.py:602
msgid "M"
msgstr ""
-#: tortoisehg/hgqt/status.py:595 tortoisehg/hgtk/datamine.py:140
+#: tortoisehg/hgqt/status.py:602 tortoisehg/hgtk/datamine.py:140
msgid "Filename"
msgstr "Filename"
-#: tortoisehg/hgqt/status.py:596 tortoisehg/hgtk/thgconfig.py:414
+#: tortoisehg/hgqt/status.py:603 tortoisehg/hgtk/thgconfig.py:414
msgid "Type"
msgstr "Type"
-#: tortoisehg/hgqt/status.py:596
+#: tortoisehg/hgqt/status.py:603
msgid "Size (KB)"
msgstr ""
-#: tortoisehg/hgqt/status.py:632
+#: tortoisehg/hgqt/status.py:640
#, python-format
msgid "Checked count: %d"
msgstr ""
-#: tortoisehg/hgqt/status.py:781
+#: tortoisehg/hgqt/status.py:789
msgid ", resolved merge"
msgstr ""
-#: tortoisehg/hgqt/status.py:783
+#: tortoisehg/hgqt/status.py:791
msgid ", unresolved merge"
msgstr ""
-#: tortoisehg/hgqt/status.py:796
+#: tortoisehg/hgqt/status.py:804
#, python-format
msgid "%s is modified"
msgstr ""
-#: tortoisehg/hgqt/status.py:797 tortoisehg/hgtk/quickop.py:163
+#: tortoisehg/hgqt/status.py:805 tortoisehg/hgtk/quickop.py:163
msgid "modified"
msgstr "modified"
-#: tortoisehg/hgqt/status.py:798
+#: tortoisehg/hgqt/status.py:806
#, python-format
msgid "%s is added"
msgstr ""
-#: tortoisehg/hgqt/status.py:799 tortoisehg/hgtk/quickop.py:166
+#: tortoisehg/hgqt/status.py:807 tortoisehg/hgtk/quickop.py:166
msgid "added"
msgstr "added"
-#: tortoisehg/hgqt/status.py:800
+#: tortoisehg/hgqt/status.py:808
#, python-format
msgid "%s is removed"
msgstr ""
-#: tortoisehg/hgqt/status.py:801 tortoisehg/hgtk/quickop.py:169
+#: tortoisehg/hgqt/status.py:809 tortoisehg/hgtk/quickop.py:169
msgid "removed"
msgstr "removed"
-#: tortoisehg/hgqt/status.py:802
+#: tortoisehg/hgqt/status.py:810
#, python-format
msgid "%s is not tracked (unknown)"
msgstr ""
-#: tortoisehg/hgqt/status.py:803 tortoisehg/hgtk/quickop.py:175
+#: tortoisehg/hgqt/status.py:811 tortoisehg/hgtk/quickop.py:175
#: tortoisehg/hgtk/quickop.py:255 tortoisehg/hgtk/serve.py:127
#: tortoisehg/util/version.py:47 tortoisehg/util/version.py:73
msgid "unknown"
msgstr "unknown"
-#: tortoisehg/hgqt/status.py:804
+#: tortoisehg/hgqt/status.py:812
#, python-format
msgid "%s is missing!"
msgstr ""
-#: tortoisehg/hgqt/status.py:805
+#: tortoisehg/hgqt/status.py:813
msgid "deleted"
msgstr ""
-#: tortoisehg/hgqt/status.py:806
+#: tortoisehg/hgqt/status.py:814
#, python-format
msgid "%s is ignored"
msgstr ""
-#: tortoisehg/hgqt/status.py:807 tortoisehg/hgtk/quickop.py:179
+#: tortoisehg/hgqt/status.py:815 tortoisehg/hgtk/quickop.py:179
#: tortoisehg/hgtk/quickop.py:255
msgid "ignored"
msgstr "ignored"
-#: tortoisehg/hgqt/status.py:808
+#: tortoisehg/hgqt/status.py:816
#, python-format
msgid "%s is not modified (clean)"
msgstr ""
-#: tortoisehg/hgqt/status.py:809 tortoisehg/hgtk/quickop.py:183
+#: tortoisehg/hgqt/status.py:817 tortoisehg/hgtk/quickop.py:183
msgid "clean"
msgstr "clean"
-#: tortoisehg/hgqt/status.py:810
+#: tortoisehg/hgqt/status.py:818
#, python-format
msgid "%s is a dirty subrepo"
msgstr ""
-#: tortoisehg/hgqt/status.py:811
+#: tortoisehg/hgqt/status.py:819
msgid "subrepo"
msgstr ""
@@ -6666,204 +6698,204 @@msgid "Hostname"
msgstr ""
-#: tortoisehg/hgqt/sync.py:244 tortoisehg/hgqt/webconf_ui.py:77
+#: tortoisehg/hgqt/sync.py:245 tortoisehg/hgqt/webconf_ui.py:77
msgid "Save"
msgstr ""
-#: tortoisehg/hgqt/sync.py:245
+#: tortoisehg/hgqt/sync.py:246
msgid "Save current URL under an alias"
msgstr ""
-#: tortoisehg/hgqt/sync.py:259
+#: tortoisehg/hgqt/sync.py:260
msgid "Paths in Repository Settings:"
msgstr ""
-#: tortoisehg/hgqt/sync.py:274
+#: tortoisehg/hgqt/sync.py:275
msgid "Related Paths:"
msgstr ""
+#: tortoisehg/hgqt/sync.py:326
+#, python-format
+msgid "Preview incoming changesets from %s"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:327
#, python-format
-msgid "Preview incoming changesets from %s"
+msgid "Pull incoming changesets from %s"
msgstr ""
#: tortoisehg/hgqt/sync.py:328
#, python-format
-msgid "Pull incoming changesets from %s"
+msgid "Filter outgoing changesets to %s"
msgstr ""
#: tortoisehg/hgqt/sync.py:329
#, python-format
-msgid "Filter outgoing changesets to %s"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:330
-#, python-format
msgid "Push outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:337
+#: tortoisehg/hgqt/sync.py:336
#, python-format
msgid "rev: %d (%s)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:342 tortoisehg/hgtk/commit.py:791
+#: tortoisehg/hgqt/sync.py:341 tortoisehg/hgtk/commit.py:791
msgid "branch: "
msgstr "branch: "
-#: tortoisehg/hgqt/sync.py:348
+#: tortoisehg/hgqt/sync.py:347
msgid "bookmark: "
msgstr ""
-#: tortoisehg/hgqt/sync.py:394 tortoisehg/hgtk/synch.py:157
+#: tortoisehg/hgqt/sync.py:393 tortoisehg/hgtk/synch.py:157
msgid "Post Pull: "
msgstr "Post Pull: "
+#: tortoisehg/hgqt/sync.py:573
+msgid "Repository not local"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:574
-msgid "Repository not local"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:575
msgid "A terminal shell cannot be opened for remote"
msgstr ""
+#: tortoisehg/hgqt/sync.py:579 tortoisehg/hgqt/sync.py:1379
+msgid "Confirm path delete"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:580 tortoisehg/hgqt/sync.py:1380
-msgid "Confirm path delete"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:581 tortoisehg/hgqt/sync.py:1381
#, python-format
msgid "Delete %s from your repo configuration file?"
msgstr ""
+#: tortoisehg/hgqt/sync.py:669
+msgid "No URL selected"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:670
-msgid "No URL selected"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:671
msgid "An URL must be selected for this operation."
msgstr ""
+#: tortoisehg/hgqt/sync.py:685
+msgid "Redundant authentication info"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:686
-msgid "Redundant authentication info"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:687
msgid ""
"You have authentication info configured for this host and inside this URL. "
"Remove authentication info from this URL?"
msgstr ""
-#: tortoisehg/hgqt/sync.py:706 tortoisehg/hgqt/sync.py:712
-#: tortoisehg/hgqt/sync.py:718 tortoisehg/hgqt/sync.py:724
-#: tortoisehg/hgqt/sync.py:731
+#: tortoisehg/hgqt/sync.py:705 tortoisehg/hgqt/sync.py:711
+#: tortoisehg/hgqt/sync.py:717 tortoisehg/hgqt/sync.py:723
+#: tortoisehg/hgqt/sync.py:730
msgid "sync command already running"
msgstr ""
-#: tortoisehg/hgqt/sync.py:749
+#: tortoisehg/hgqt/sync.py:748
#, python-format
msgid "Getting incoming changesets from %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:754 tortoisehg/hgqt/sync.py:772
+#: tortoisehg/hgqt/sync.py:753 tortoisehg/hgqt/sync.py:771
#, python-format
msgid "Found incoming changesets from %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:757 tortoisehg/hgqt/sync.py:774
+#: tortoisehg/hgqt/sync.py:756 tortoisehg/hgqt/sync.py:773
#, python-format
msgid "No incoming changesets from %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:759 tortoisehg/hgqt/sync.py:776
+#: tortoisehg/hgqt/sync.py:758 tortoisehg/hgqt/sync.py:775
#, python-format
msgid "Incoming from %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:786
+#: tortoisehg/hgqt/sync.py:785
#, python-format
msgid "Pull from %s completed"
msgstr ""
-#: tortoisehg/hgqt/sync.py:788
+#: tortoisehg/hgqt/sync.py:787
#, python-format
msgid "Pull from %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:800 tortoisehg/hgqt/update.py:342
+#: tortoisehg/hgqt/sync.py:799 tortoisehg/hgqt/update.py:342
msgid "Merge caused file conflicts"
msgstr ""
-#: tortoisehg/hgqt/sync.py:801 tortoisehg/hgqt/update.py:343
+#: tortoisehg/hgqt/sync.py:800 tortoisehg/hgqt/update.py:343
msgid "File conflicts need to be resolved"
msgstr ""
-#: tortoisehg/hgqt/sync.py:807
+#: tortoisehg/hgqt/sync.py:806
#, python-format
msgid "Pulling from %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:822
+#: tortoisehg/hgqt/sync.py:821
#, python-format
msgid "Finding outgoing changesets to %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:834
+#: tortoisehg/hgqt/sync.py:833
#, python-format
msgid "%d outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:837
+#: tortoisehg/hgqt/sync.py:836
#, python-format
msgid "No outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:839
+#: tortoisehg/hgqt/sync.py:838
#, python-format
msgid "Outgoing to %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:864 tortoisehg/hgtk/history.py:584
+#: tortoisehg/hgqt/sync.py:863 tortoisehg/hgtk/history.py:584
#, python-format
msgid "%s (submitted)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:866 tortoisehg/hgtk/history.py:586
+#: tortoisehg/hgqt/sync.py:865 tortoisehg/hgtk/history.py:586
#: tortoisehg/hgtk/history.py:592
#, python-format
msgid "%s (pending)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:871 tortoisehg/hgtk/history.py:595
+#: tortoisehg/hgqt/sync.py:870 tortoisehg/hgtk/history.py:595
msgid "Unable to parse p4pending output"
msgstr "Unable to parse p4pending output"
-#: tortoisehg/hgqt/sync.py:873 tortoisehg/hgtk/history.py:597
+#: tortoisehg/hgqt/sync.py:872 tortoisehg/hgtk/history.py:597
#, python-format
msgid "%d pending changelists found"
msgstr "%d pending changelists found"
-#: tortoisehg/hgqt/sync.py:875 tortoisehg/hgtk/history.py:599
+#: tortoisehg/hgqt/sync.py:874 tortoisehg/hgtk/history.py:599
msgid "No pending Perforce changelists"
msgstr "No pending Perforce changelists"
-#: tortoisehg/hgqt/sync.py:877 tortoisehg/hgtk/history.py:601
+#: tortoisehg/hgqt/sync.py:876 tortoisehg/hgtk/history.py:601
msgid "Aborted p4pending"
msgstr "Aborted p4pending"
-#: tortoisehg/hgqt/sync.py:879 tortoisehg/hgtk/history.py:603
+#: tortoisehg/hgqt/sync.py:878 tortoisehg/hgtk/history.py:603
msgid "Unable to determine pending changesets"
msgstr "Unable to determine pending changesets"
-#: tortoisehg/hgqt/sync.py:889
+#: tortoisehg/hgqt/sync.py:888
msgid "Perforce pending..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:897 tortoisehg/hgtk/history.py:2623
+#: tortoisehg/hgqt/sync.py:896 tortoisehg/hgtk/history.py:2623
msgid "Confirm Push to remote Repository"
msgstr "Confirm Push to remote Repository"
-#: tortoisehg/hgqt/sync.py:898 tortoisehg/hgtk/history.py:2624
+#: tortoisehg/hgqt/sync.py:897 tortoisehg/hgtk/history.py:2624
#, python-format
msgid ""
"Push to remote repository\n"
@@ -6874,170 +6906,170 @@"%s\n"
"?"
-#: tortoisehg/hgqt/sync.py:901
+#: tortoisehg/hgqt/sync.py:900
#, python-format
msgid "Push to %s aborted"
msgstr ""
-#: tortoisehg/hgqt/sync.py:905
+#: tortoisehg/hgqt/sync.py:904
#, python-format
msgid "Pushing to %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:908
+#: tortoisehg/hgqt/sync.py:907
#, python-format
msgid "Push to %s completed"
msgstr ""
-#: tortoisehg/hgqt/sync.py:910
+#: tortoisehg/hgqt/sync.py:909
#, python-format
msgid "Push to %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:927
+#: tortoisehg/hgqt/sync.py:926
msgid "Determining outgoing changesets to email..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:941 tortoisehg/hgtk/history.py:2025
+#: tortoisehg/hgqt/sync.py:940 tortoisehg/hgtk/history.py:2025
msgid "No outgoing changesets"
msgstr "No outgoing changesets"
-#: tortoisehg/hgqt/sync.py:943
+#: tortoisehg/hgqt/sync.py:942
#, python-format
msgid "Outgoing aborted, ret %d"
msgstr ""
+#: tortoisehg/hgqt/sync.py:949
+msgid "Select bundle file"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:950
-msgid "Select bundle file"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:951
msgid "Bundle files (*.hg)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:970
+#: tortoisehg/hgqt/sync.py:969
msgid "Unable to remove URL"
msgstr ""
-#: tortoisehg/hgqt/sync.py:992
+#: tortoisehg/hgqt/sync.py:991
msgid "Post Pull Behavior"
msgstr ""
-#: tortoisehg/hgqt/sync.py:996
+#: tortoisehg/hgqt/sync.py:995
msgid "Select post-pull operation for this repository"
msgstr ""
+#: tortoisehg/hgqt/sync.py:998
+msgid "None - simply pull changesets"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:999
-msgid "None - simply pull changesets"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:1000
msgid "Update - pull, then try to update"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1006
+#: tortoisehg/hgqt/sync.py:1005
msgid "Fetch - use fetch (auto merge pulled changes)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1008
+#: tortoisehg/hgqt/sync.py:1007
msgid "Fetch - use fetch extension (fetch is not active!)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1015
+#: tortoisehg/hgqt/sync.py:1014
msgid "Rebase - rebase local commits above pulled changes"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1017
+#: tortoisehg/hgqt/sync.py:1016
msgid "Rebase - use rebase extension (rebase is not active!)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1035
+#: tortoisehg/hgqt/sync.py:1034
msgid "<a href=\"config\">Launch settings tool...</a>"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1068
+#: tortoisehg/hgqt/sync.py:1067
msgid "Unable to save post pull operation"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1092
+#: tortoisehg/hgqt/sync.py:1091
msgid "Save Path"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1102 tortoisehg/hgqt/sync.py:1424
+#: tortoisehg/hgqt/sync.py:1101 tortoisehg/hgqt/sync.py:1423
#: tortoisehg/hgtk/thgconfig.py:371 tortoisehg/hgtk/thgconfig.py:954
msgid "Alias"
msgstr "Alias"
-#: tortoisehg/hgqt/sync.py:1105 tortoisehg/hgqt/sync.py:1424
+#: tortoisehg/hgqt/sync.py:1104 tortoisehg/hgqt/sync.py:1423
#: tortoisehg/hgtk/thgconfig.py:368
msgid "URL"
msgstr "URL"
-#: tortoisehg/hgqt/sync.py:1114
+#: tortoisehg/hgqt/sync.py:1113
msgid "Remove authentication data from URL"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1116
+#: tortoisehg/hgqt/sync.py:1115
msgid ""
"User authentication data should be associated with the hostname using the "
"security dialog."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1138
+#: tortoisehg/hgqt/sync.py:1137
msgid "Unable to save an URL"
msgstr ""
+#: tortoisehg/hgqt/sync.py:1148
+msgid "Confirm URL replace"
+msgstr ""
+
#: tortoisehg/hgqt/sync.py:1149
-msgid "Confirm URL replace"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:1150
#, python-format
msgid "%s already exists, replace URL?"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1174
+#: tortoisehg/hgqt/sync.py:1173
msgid "Certificate Query Error"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1187
+#: tortoisehg/hgqt/sync.py:1186
msgid "Security: "
msgstr ""
-#: tortoisehg/hgqt/sync.py:1206
+#: tortoisehg/hgqt/sync.py:1205
#, python-format
msgid "<b>Host:</b> %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1208
+#: tortoisehg/hgqt/sync.py:1207
msgid "Secure HTTPS Connection"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1215
+#: tortoisehg/hgqt/sync.py:1214
msgid "Verify with Certificate Authority certificates (best)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1217
+#: tortoisehg/hgqt/sync.py:1216
msgid "Verify with stored host fingerprint (good)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1219
+#: tortoisehg/hgqt/sync.py:1218
msgid "No host validation, but still encrypted (bad)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1226
+#: tortoisehg/hgqt/sync.py:1225
msgid "### host certificate fingerprint ###"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1230
+#: tortoisehg/hgqt/sync.py:1229
msgid "Query"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1249
+#: tortoisehg/hgqt/sync.py:1248
msgid "User Authentication"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1256
+#: tortoisehg/hgqt/sync.py:1255
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"
@@ -7045,61 +7077,61 @@"foo.username = $USER."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1265
+#: tortoisehg/hgqt/sync.py:1264
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:1272
+#: tortoisehg/hgqt/sync.py:1271
msgid ""
"Mercurial keyring extension is enabled. Passwords will be stored in a "
"platform-native secure method."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1278
+#: tortoisehg/hgqt/sync.py:1277
msgid ""
"Optional. PEM encoded client certificate key file. Environment variables\n"
"are expanded in the filename."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1280
+#: tortoisehg/hgqt/sync.py:1279
msgid "User Certificate Key File"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1284
+#: tortoisehg/hgqt/sync.py:1283
msgid ""
"Optional. PEM encoded client certificate chain file. Environment variables\n"
"are expanded in the filename."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1286
+#: tortoisehg/hgqt/sync.py:1285
msgid "User Certificate Chain File"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1306
+#: tortoisehg/hgqt/sync.py:1305
msgid "Unable to save authentication"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1468
+#: tortoisehg/hgqt/sync.py:1467
#, python-format
msgid "%s - sync options"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1475
+#: tortoisehg/hgqt/sync.py:1474
msgid "Allow push of a new branch (--new-branch)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1480
+#: tortoisehg/hgqt/sync.py:1479
msgid "Force push or pull (override safety checks, --force)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1490
+#: tortoisehg/hgqt/sync.py:1489
msgid "Temporarily disable configured HTTP proxy"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1497
+#: tortoisehg/hgqt/sync.py:1496
msgid "Emit debugging output (--debug)"
msgstr ""
@@ -8065,7 +8097,7 @@msgid "Failed to open repository"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:900
+#: tortoisehg/hgqt/workbench.py:901
#, python-format
msgid "Hg file log viewer [%s] - %s"
msgstr ""
@@ -11880,6 +11912,10 @@msgid "no pending pmerges"
msgstr ""
+#: tortoisehg/hgtk/thgpbranch.py:432
+msgid "New Patch Name"
+msgstr ""
+
#: tortoisehg/hgtk/thgpbranch.py:488
msgid "Pending Pmerge"
msgstr ""
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
@@ -396,10 +396,10 @@ fullmsg = ''
def write(self, msg, *args, **opts):
self.fullmsg += msg
- if self.fullmsg.endswith('\0'):
+ if self.fullmsg.count('\0') >= 6:
try:
- fname, line, rev, addremove, user, text = \
- self.fullmsg.split('\0', 5)
+ fname, line, rev, addremove, user, text, tail = \
+ self.fullmsg.split('\0', 6)
text = hglib.tounicode(text)
text = Qt.escape(text)
text = '<b>%s</b> <span>%s</span>' % (
@@ -408,7 +408,7 @@ emitrow(row)
except ValueError:
pass
- self.fullmsg = ''
+ self.fullmsg = tail
def progress(topic, pos, item='', unit='', total=None):
emitprog(topic, pos, item, unit, total)
cwd = os.getcwd()
@@ -497,7 +497,8 @@ if pos:
self.hu.write(line[pos:], label='ui.status')
path = os.path.join(prefix, wfile)
- row = [path, i + 1, ctx.rev(), None, self.hu.getdata()[0]]
+ row = [path, i + 1, ctx.rev(), None,
+ hglib.tounicode(self.hu.getdata()[0])]
w = DataWrapper(row)
self.matchedRow.emit(w)
if self.once:
|
||
|
@@ -5,10 +5,9 @@ # This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-import os, time
+import os, cgi, time
from mercurial import ui
-from PyQt4 import QtCore
from tortoisehg.hgqt import qtlib
from tortoisehg.util import hglib
@@ -43,8 +42,7 @@
def style(self, msg, label):
'Escape message for safe HTML, then apply specified style'
- msg = QtCore.Qt.escape(msg)
- msg = msg.replace('\n', '<br />')
+ msg = cgi.escape(msg).replace('\n', '<br />')
style = qtlib.geteffect(label)
return '<span style="%s">%s</span>' % (style, msg)
|
||
|
@@ -779,8 +779,8 @@ self._closebutton.clicked.connect(self.close)
self.layout().addWidget(self._closebutton)
- def addWidget(self, w):
- self.layout().insertWidget(self.layout().count() - 2, w)
+ def addWidget(self, w, stretch=0):
+ self.layout().insertWidget(self.layout().count() - 2, w, stretch)
def addRightWidget(self, w):
self.layout().insertWidget(self.layout().count() - 1, w)
@@ -794,9 +794,9 @@ """Show status message"""
def __init__(self, message, parent=None):
super(StatusInfoBar, self).__init__(parent)
- self._msglabel = QLabel(message, self,
+ self._msglabel = QLabel(message, self, wordWrap=True,
textInteractionFlags=Qt.TextSelectableByMouse)
- self.addWidget(self._msglabel)
+ self.addWidget(self._msglabel, stretch=1)
class CommandErrorInfoBar(InfoBar):
"""Show command execution failure (with link to open log window)"""
@@ -805,9 +805,9 @@ def __init__(self, message, parent=None):
super(CommandErrorInfoBar, self).__init__(parent)
- self._msglabel = QLabel(message, self,
+ self._msglabel = QLabel(message, self, wordWrap=True,
textInteractionFlags=Qt.TextSelectableByMouse)
- self.addWidget(self._msglabel)
+ self.addWidget(self._msglabel, stretch=1)
self._loglabel = QLabel('<a href="log:">%s</a>' % _('Show Log'))
self._loglabel.linkActivated.connect(self.linkActivated)
@@ -822,6 +822,8 @@ def __init__(self, message, parent=None):
super(ConfirmInfoBar, self).__init__(parent)
+ # no wordWrap=True and stretch=1, which inserts unwanted space
+ # between _msglabel and _buttons.
self._msglabel = QLabel(message, self,
textInteractionFlags=Qt.TextSelectableByMouse)
self.addWidget(self._msglabel)
|
||
|
@@ -279,7 +279,6 @@ else:
idx = self.model().indexFromRev(rev)
if idx is not None:
- self.setCurrentIndex(idx)
self.scrollTo(idx)
def saveSettings(self, s = None):
|
||
|
@@ -493,6 +493,10 @@ 'Default: 0, Not expanded')),
_fi(_('Force Repo Tab'), 'tortoisehg.forcerepotab', genBoolRBGroup,
_('Always show repo tabs, even for a single repo. Default: False')),
+ _fi(_('Monitor Repo Changes'), 'tortoisehg.monitorrepo',
+ (genDefaultCombo, ['always', 'localonly']),
+ _('Specify the target filesystem where TortoiseHg monitors changes. '
+ 'Default: always')),
_fi(_('Max Diff Size'), 'tortoisehg.maxdiff', genIntEditCombo,
_('The maximum size file (in KB) that TortoiseHg will '
'show changes for in the changelog, status, and commit windows. '
|
||
|
@@ -21,7 +21,7 @@ from mercurial import ui as uimod
from mercurial.util import propertycache
-from tortoisehg.util import hglib
+from tortoisehg.util import hglib, paths
from tortoisehg.util.patchctx import patchctx
_repocache = {}
@@ -80,8 +80,12 @@ repo.workingDirectoryChanged = self.workingDirectoryChanged
repo.workingBranchChanged = self.workingBranchChanged
self.recordState()
+
+ monitorrepo = repo.ui.config('tortoisehg', 'monitorrepo', 'always')
if isinstance(repo, bundlerepo.bundlerepository):
dbgoutput('not watching F/S events for bundle repository')
+ elif monitorrepo == 'localonly' and paths.netdrive_status(repo.path):
+ dbgoutput('not watching F/S events for network drive')
else:
self.watcher = QFileSystemWatcher(self)
self.watcher.addPath(repo.path)
|
||
|
@@ -96,7 +96,7 @@ unc, rest = os.path.splitunc(drive)
if unc: # All UNC paths (\\host\mount) are considered nonlocal
return True
- letter = os.path.splitdrive(drive)[0]
+ letter = os.path.splitdrive(drive)[0].upper()
_drives, total, _ = win32net.NetUseEnum(None, 1, 0)
for drv in _drives:
if drv['local'] == letter:
|
||
Add a tag
Loading...