We are currently indexing your data, so search results may be incomplete until we finish.
merge translations
by
Changes to 13 files · Browse files at b5c317e3927b Showing diff from parent 1e401643bca9 398e5ff836a6 Diff from another changeset...
|
|
|
@@ -7,17 +7,17 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-06-15 05:36+0000\n"
+"POT-Creation-Date: 2009-06-23 04:45+0000\n"
"PO-Revision-Date: 2009-02-27 11:13+0000\n"
"Last-Translator: Martin Kolařík <Unknown>\n"
"Language-Team: Czech <cs@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-23 03:52+0000\n"
+"X-Launchpad-Export-Date: 2009-06-25 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: hggtk\changeset.py:145
+#: hggtk\changeset.py:147
msgid "changeset:"
msgstr "sada změny:"
@@ -33,15 +33,15 @@msgid " and "
msgstr " a "
-#: hggtk\hgshelve.py:520 hggtk\hgshelve.py:571
+#: hggtk\hgshelve.py:525 hggtk\hgshelve.py:576
msgid "restoring %r to %r\n"
msgstr "%r se obnovuje do %r\n"
-#: hggtk\hgshelve.py:598
+#: hggtk\hgshelve.py:603
msgid "hg shelve [OPTION]... [FILE]..."
msgstr "hg shelve [OPTION]... [FILE]..."
-#: hggtk\hgshelve.py:605
+#: hggtk\hgshelve.py:610
msgid "hg unshelve [OPTION]... [FILE]..."
msgstr "hg unshelve [OPTION]... [FILE]..."
@@ -65,7 +65,7 @@msgid "invalid arguments"
msgstr "neplatné parametry"
-#: hggtk\hgtk.py:601
+#: hggtk\hgtk.py:602
msgid "limit number of changes displayed"
msgstr "omezit počet zobrazených změn"
@@ -205,6 +205,30 @@msgid "Backout"
msgstr ""
+#: hggtk\backout.py:95 hggtk\merge.py:104
+msgid "rev"
+msgstr ""
+
+#: hggtk\backout.py:96 hggtk\merge.py:105
+msgid "summary"
+msgstr ""
+
+#: hggtk\backout.py:97 hggtk\merge.py:106
+msgid "user"
+msgstr ""
+
+#: hggtk\backout.py:98 hggtk\merge.py:107
+msgid "date"
+msgstr ""
+
+#: hggtk\backout.py:101 hggtk\merge.py:111
+msgid "branch"
+msgstr ""
+
+#: hggtk\backout.py:103 hggtk\merge.py:113
+msgid "tags"
+msgstr ""
+
#: hggtk\bugreport.py:23
msgid "TortoiseHg Bug Report"
msgstr ""
@@ -227,79 +251,79 @@msgid "[All Files]"
msgstr ""
-#: hggtk\changeset.py:147
+#: hggtk\changeset.py:149
msgid "branch:"
msgstr ""
-#: hggtk\changeset.py:148
+#: hggtk\changeset.py:150
msgid "user/date:"
msgstr ""
-#: hggtk\changeset.py:156
+#: hggtk\changeset.py:158
msgid "parent:"
msgstr ""
-#: hggtk\changeset.py:169
+#: hggtk\changeset.py:171
msgid "child:"
msgstr ""
-#: hggtk\changeset.py:175
+#: hggtk\changeset.py:177
msgid "tags:"
msgstr ""
-#: hggtk\changeset.py:195
+#: hggtk\changeset.py:197
msgid " %s is larger than the specified max diff size"
msgstr ""
-#: hggtk\changeset.py:290
+#: hggtk\changeset.py:292
msgid "_visual diff"
msgstr ""
-#: hggtk\changeset.py:291
+#: hggtk\changeset.py:293
msgid "diff to _local"
msgstr ""
-#: hggtk\changeset.py:292
+#: hggtk\changeset.py:294
msgid "_view at revision"
msgstr ""
-#: hggtk\changeset.py:293
+#: hggtk\changeset.py:295
msgid "_save at revision"
msgstr ""
-#: hggtk\changeset.py:295 hggtk\datamine.py:117
+#: hggtk\changeset.py:297 hggtk\datamine.py:117
msgid "_file history"
msgstr ""
-#: hggtk\changeset.py:296 hggtk\datamine.py:116
+#: hggtk\changeset.py:298 hggtk\datamine.py:116
msgid "_annotate file"
msgstr ""
-#: hggtk\changeset.py:298
+#: hggtk\changeset.py:300
msgid "_revert file contents"
msgstr ""
-#: hggtk\changeset.py:356
+#: hggtk\changeset.py:358
msgid "Stat"
msgstr ""
-#: hggtk\changeset.py:358 hggtk\hgignore.py:109
+#: hggtk\changeset.py:360 hggtk\hgignore.py:109
msgid "Files"
msgstr ""
-#: hggtk\changeset.py:480
+#: hggtk\changeset.py:482
msgid "Save file to"
msgstr ""
-#: hggtk\changeset.py:545
+#: hggtk\changeset.py:547
msgid "Confirm revert file to old revision"
msgstr ""
-#: hggtk\changeset.py:546
+#: hggtk\changeset.py:548
msgid "Revert %s to contents at revision %d?"
msgstr ""
-#: hggtk\changeset.py:558 hggtk\synch.py:649
+#: hggtk\changeset.py:560 hggtk\synch.py:635
msgid "Toggle _Wordwrap"
msgstr ""
@@ -335,7 +359,7 @@msgid "use uncompressed transfer"
msgstr ""
-#: hggtk\clone.py:130 hggtk\synch.py:148
+#: hggtk\clone.py:130 hggtk\synch.py:149
msgid "use proxy server"
msgstr ""
@@ -383,257 +407,257 @@msgid "Clone error"
msgstr ""
-#: hggtk\commit.py:32
+#: hggtk\commit.py:33
msgid "Branch Operations"
msgstr ""
-#: hggtk\commit.py:36
+#: hggtk\commit.py:37
msgid "Changes take effect on next commit"
msgstr ""
-#: hggtk\commit.py:37
+#: hggtk\commit.py:38
msgid "No branch changes"
msgstr ""
-#: hggtk\commit.py:39
+#: hggtk\commit.py:40
msgid "Open a new named branch"
msgstr ""
-#: hggtk\commit.py:41
+#: hggtk\commit.py:42
msgid "Close current named branch"
msgstr ""
-#: hggtk\commit.py:153
+#: hggtk\commit.py:154
msgid "_Undo"
msgstr ""
-#: hggtk\commit.py:154
+#: hggtk\commit.py:155
msgid "undo recent commit"
msgstr ""
-#: hggtk\commit.py:155 hggtk\commit.py:363 hggtk\commit.py:372
-#: hggtk\commit.py:380 hggtk\commit.py:381
+#: hggtk\commit.py:156 hggtk\commit.py:364 hggtk\commit.py:373
+#: hggtk\commit.py:381 hggtk\commit.py:382
msgid "_Commit"
msgstr ""
-#: hggtk\commit.py:156 hggtk\commit.py:382
+#: hggtk\commit.py:157 hggtk\commit.py:383
msgid "commit"
msgstr ""
-#: hggtk\commit.py:168
+#: hggtk\commit.py:169
msgid "Confirm Discard Message"
msgstr ""
-#: hggtk\commit.py:169
+#: hggtk\commit.py:170
msgid "Discard current commit message?"
msgstr ""
-#: hggtk\commit.py:229
+#: hggtk\commit.py:230
msgid "Recent Commit Messages..."
msgstr ""
-#: hggtk\commit.py:268 hggtk\commit.py:269 hggtk\commit.py:270
-#: hggtk\commit.py:273
+#: hggtk\commit.py:269 hggtk\commit.py:270 hggtk\commit.py:271
+#: hggtk\commit.py:274
msgid "_commit"
msgstr ""
-#: hggtk\commit.py:291
+#: hggtk\commit.py:292
msgid "Confirm Exit"
msgstr ""
-#: hggtk\commit.py:292
+#: hggtk\commit.py:293
msgid "Save commit message at exit?"
msgstr ""
-#: hggtk\commit.py:319
+#: hggtk\commit.py:320
msgid "new branch: "
msgstr ""
-#: hggtk\commit.py:321
+#: hggtk\commit.py:322
msgid "close branch: "
msgstr ""
-#: hggtk\commit.py:323
+#: hggtk\commit.py:324
msgid "branch: "
msgstr ""
-#: hggtk\commit.py:333 hggtk\status.py:204
+#: hggtk\commit.py:334 hggtk\status.py:204
msgid "Re_vert"
msgstr ""
-#: hggtk\commit.py:334 hggtk\status.py:206 hggtk\thgconfig.py:742
+#: hggtk\commit.py:335 hggtk\status.py:206 hggtk\thgconfig.py:744
msgid "_Add"
msgstr ""
-#: hggtk\commit.py:335 hggtk\status.py:211 hggtk\thgconfig.py:752
+#: hggtk\commit.py:336 hggtk\status.py:211 hggtk\thgconfig.py:754
msgid "_Remove"
msgstr ""
-#: hggtk\commit.py:336 hggtk\status.py:208
+#: hggtk\commit.py:337 hggtk\status.py:208
msgid "Move"
msgstr ""
-#: hggtk\commit.py:347
+#: hggtk\commit.py:348
msgid "merge"
msgstr ""
-#: hggtk\commit.py:365 hggtk\commit.py:366 hggtk\commit.py:373
-#: hggtk\commit.py:374
+#: hggtk\commit.py:366 hggtk\commit.py:367 hggtk\commit.py:374
+#: hggtk\commit.py:375
msgid "QNew"
msgstr ""
-#: hggtk\commit.py:369 hggtk\commit.py:370
+#: hggtk\commit.py:370 hggtk\commit.py:371
msgid "QRefresh"
msgstr ""
-#: hggtk\commit.py:405 hggtk\commit.py:550
+#: hggtk\commit.py:406 hggtk\commit.py:561
msgid "Nothing Commited"
msgstr ""
-#: hggtk\commit.py:406
+#: hggtk\commit.py:407
msgid "No committable files selected"
msgstr ""
-#: hggtk\commit.py:423 hggtk\commit.py:472 hggtk\merge.py:83
-#: hggtk\thgconfig.py:463
+#: hggtk\commit.py:424 hggtk\commit.py:479 hggtk\merge.py:83
+#: hggtk\thgconfig.py:465
msgid "Commit"
msgstr ""
-#: hggtk\commit.py:424
+#: hggtk\commit.py:425
msgid "Unable to create "
msgstr ""
-#: hggtk\commit.py:473
+#: hggtk\commit.py:480
msgid "Unable to apply patch"
msgstr ""
-#: hggtk\commit.py:511
+#: hggtk\commit.py:518
msgid "Confirm Undo commit"
msgstr ""
-#: hggtk\commit.py:512
+#: hggtk\commit.py:519
msgid "Undo last commit"
msgstr ""
-#: hggtk\commit.py:518 hggtk\commit.py:529
+#: hggtk\commit.py:525 hggtk\commit.py:540
msgid "Undo commit"
msgstr ""
-#: hggtk\commit.py:519
+#: hggtk\commit.py:526
msgid ""
"Unable to undo!\n"
"\n"
"Tip revision differs from last commit."
msgstr ""
-#: hggtk\commit.py:530
+#: hggtk\commit.py:541
msgid "Errors during rollback!"
msgstr ""
-#: hggtk\commit.py:537
+#: hggtk\commit.py:548
msgid "Confirm Add/Remove"
msgstr ""
-#: hggtk\commit.py:538
+#: hggtk\commit.py:549
msgid "Add/Remove the following files?"
msgstr ""
-#: hggtk\commit.py:551 hggtk\tagadd.py:174
+#: hggtk\commit.py:562 hggtk\tagadd.py:174
msgid "Please enter commit message"
msgstr ""
-#: hggtk\commit.py:559
+#: hggtk\commit.py:570
msgid "Error"
msgstr ""
-#: hggtk\commit.py:560
+#: hggtk\commit.py:571
msgid "Message format configuration error"
msgstr ""
-#: hggtk\commit.py:569 hggtk\commit.py:577 hggtk\commit.py:589
+#: hggtk\commit.py:580 hggtk\commit.py:588 hggtk\commit.py:600
msgid "Confirm Commit"
msgstr ""
-#: hggtk\commit.py:570
+#: hggtk\commit.py:581
msgid ""
"The summary line length of %i is greater than %i.\n"
"\n"
"Ignore format policy and continue commit?"
msgstr ""
-#: hggtk\commit.py:578
+#: hggtk\commit.py:589
msgid ""
"The summary line is not followed by a blank line.\n"
"\n"
"Ignore format policy and continue commit?"
msgstr ""
-#: hggtk\commit.py:590
+#: hggtk\commit.py:601
msgid ""
"The following lines are over the %i-character limit: %s.\n"
"\n"
"Ignore format policy and continue commit?"
msgstr ""
-#: hggtk\commit.py:604
+#: hggtk\commit.py:615
msgid "Commit: Invalid username"
msgstr ""
-#: hggtk\commit.py:605
+#: hggtk\commit.py:616
msgid ""
"Your username has not been configured.\n"
"\n"
"Please configure your username and try again"
msgstr ""
-#: hggtk\commit.py:627
+#: hggtk\commit.py:638
msgid "Confirm Override Branch"
msgstr ""
-#: hggtk\commit.py:628
+#: hggtk\commit.py:639
msgid ""
"A branch named \"%s\" already exists,\n"
"override?"
msgstr ""
-#: hggtk\commit.py:633
+#: hggtk\commit.py:644
msgid "Confirm New Branch"
msgstr ""
-#: hggtk\commit.py:634
+#: hggtk\commit.py:645
msgid "Create new named branch \"%s\"?"
msgstr ""
-#: hggtk\commit.py:704
+#: hggtk\commit.py:715
msgid "Paste _Filenames"
msgstr ""
-#: hggtk\commit.py:705
+#: hggtk\commit.py:716
msgid "App_ly Format"
msgstr ""
-#: hggtk\commit.py:706
+#: hggtk\commit.py:717
msgid "C_onfigure Format"
msgstr ""
-#: hggtk\commit.py:732 hggtk\hgemail.py:307 hggtk\hgemail.py:312
+#: hggtk\commit.py:743 hggtk\hgemail.py:307 hggtk\hgemail.py:312
#: hggtk\hgemail.py:321
msgid "Info required"
msgstr ""
-#: hggtk\commit.py:733
+#: hggtk\commit.py:744
msgid "Message format needs to be configured"
msgstr ""
-#: hggtk\commit.py:745 hggtk\commit.py:750
+#: hggtk\commit.py:756 hggtk\commit.py:761
msgid "Warning"
msgstr ""
-#: hggtk\commit.py:746
+#: hggtk\commit.py:757
msgid "The summary line length of %i is greater than %i"
msgstr ""
-#: hggtk\commit.py:751
+#: hggtk\commit.py:762
msgid "The summary line is not followed by a blank line"
msgstr ""
@@ -642,7 +666,7 @@msgstr ""
#: hggtk\datamine.py:44 hggtk\hgcmd.py:37 hggtk\recovery.py:43
-#: hggtk\serve.py:61 hggtk\synch.py:59
+#: hggtk\serve.py:61 hggtk\synch.py:60
msgid "Stop"
msgstr ""
@@ -658,7 +682,7 @@msgid "Open new search tab"
msgstr ""
-#: hggtk\datamine.py:61 hggtk\thgconfig.py:943
+#: hggtk\datamine.py:61 hggtk\thgconfig.py:947
msgid "Invalid path"
msgstr ""
@@ -670,12 +694,12 @@msgid "Filename"
msgstr ""
-#: hggtk\datamine.py:107 hggtk\datamine.py:524 hggtk\logview\treeview.py:423
-#: hggtk\thgconfig.py:158 hggtk\thgconfig.py:231
+#: hggtk\datamine.py:107 hggtk\datamine.py:525 hggtk\logview\treeview.py:423
+#: hggtk\thgconfig.py:160 hggtk\thgconfig.py:233
msgid "User"
msgstr ""
-#: hggtk\datamine.py:115 hggtk\datamine.py:124
+#: hggtk\datamine.py:115 hggtk\datamine.py:124 hggtk\history.py:391
msgid "di_splay change"
msgstr ""
@@ -687,107 +711,107 @@msgid "_annotate parent"
msgstr ""
-#: hggtk\datamine.py:215
+#: hggtk\datamine.py:216
msgid "Search"
msgstr ""
-#: hggtk\datamine.py:216 hggtk\hgignore.py:49
+#: hggtk\datamine.py:217 hggtk\hgignore.py:49
msgid "Regexp:"
msgstr ""
-#: hggtk\datamine.py:218
+#: hggtk\datamine.py:219
msgid "Includes:"
msgstr ""
-#: hggtk\datamine.py:220
+#: hggtk\datamine.py:221
msgid "Excludes:"
msgstr ""
-#: hggtk\datamine.py:223
+#: hggtk\datamine.py:224
msgid "Start this search"
msgstr ""
-#: hggtk\datamine.py:224
+#: hggtk\datamine.py:225
msgid "Regular expression search pattern"
msgstr ""
-#: hggtk\datamine.py:225
+#: hggtk\datamine.py:226
msgid ""
"Comma separated list of inclusion patterns. By default, the entire "
"repository is searched."
msgstr ""
-#: hggtk\datamine.py:228
+#: hggtk\datamine.py:229
msgid ""
"Comma separated list of exclusion patterns. Exclusion patterns are applied "
"after inclusion patterns."
msgstr ""
-#: hggtk\datamine.py:234
+#: hggtk\datamine.py:235
msgid "Follow copies and renames"
msgstr ""
-#: hggtk\datamine.py:235
+#: hggtk\datamine.py:236
msgid "Ignore case"
msgstr ""
-#: hggtk\datamine.py:236
+#: hggtk\datamine.py:237
msgid "Show line numbers"
msgstr ""
-#: hggtk\datamine.py:237
+#: hggtk\datamine.py:238
msgid "Show all matching revisions"
msgstr ""
-#: hggtk\datamine.py:265 hggtk\datamine.py:522 hggtk\logview\treeview.py:372
+#: hggtk\datamine.py:266 hggtk\datamine.py:523 hggtk\logview\treeview.py:372
msgid "Rev"
msgstr ""
-#: hggtk\datamine.py:266 hggtk\datamine.py:523
+#: hggtk\datamine.py:267 hggtk\datamine.py:524
msgid "File"
msgstr ""
-#: hggtk\datamine.py:267
+#: hggtk\datamine.py:268
msgid "Matches"
msgstr ""
-#: hggtk\datamine.py:289
+#: hggtk\datamine.py:290
msgid "Search %d"
msgstr ""
-#: hggtk\datamine.py:331
+#: hggtk\datamine.py:332
msgid "No regular expression given"
msgstr ""
-#: hggtk\datamine.py:332
+#: hggtk\datamine.py:333
msgid "You must provide a search expression"
msgstr ""
-#: hggtk\datamine.py:360
+#: hggtk\datamine.py:361
msgid "Search \"%s\""
msgstr ""
-#: hggtk\datamine.py:472
+#: hggtk\datamine.py:473
msgid "File is unrevisioned"
msgstr ""
-#: hggtk\datamine.py:473
+#: hggtk\datamine.py:474
msgid "Unable to annotate "
msgstr ""
-#: hggtk\datamine.py:493
+#: hggtk\datamine.py:494
msgid "Follow"
msgstr ""
-#: hggtk\datamine.py:521
+#: hggtk\datamine.py:522
msgid "Line"
msgstr ""
-#: hggtk\datamine.py:525 hggtk\guess.py:100
+#: hggtk\datamine.py:526 hggtk\guess.py:100
msgid "Source"
msgstr ""
-#: hggtk\datamine.py:617
+#: hggtk\datamine.py:618
msgid "Follow Rename:"
msgstr ""
@@ -819,11 +843,11 @@msgid "edit failed"
msgstr ""
-#: hggtk\gdialog.py:500 hggtk\thgconfig.py:541
+#: hggtk\gdialog.py:500 hggtk\thgconfig.py:543
msgid "No visual editor configured"
msgstr ""
-#: hggtk\gdialog.py:501 hggtk\thgconfig.py:542
+#: hggtk\gdialog.py:501 hggtk\thgconfig.py:544
msgid "Please configure a visual editor."
msgstr ""
@@ -843,7 +867,7 @@msgid "All files"
msgstr ""
-#: hggtk\gtklib.py:240
+#: hggtk\gtklib.py:254
msgid "Select Folder"
msgstr ""
@@ -1110,27 +1134,27 @@msgid "Create"
msgstr ""
-#: hggtk\hginit.py:121
+#: hggtk\hginit.py:116
msgid "Destination path is empty"
msgstr ""
-#: hggtk\hginit.py:122
+#: hggtk\hginit.py:117
msgid "Please enter the directory path"
msgstr ""
-#: hggtk\hginit.py:136
+#: hggtk\hginit.py:131
msgid "Unable to create new repository"
msgstr ""
-#: hggtk\hginit.py:140 hggtk\hginit.py:145
+#: hggtk\hginit.py:135 hggtk\hginit.py:140
msgid "Error when creating repository"
msgstr ""
-#: hggtk\hginit.py:162
+#: hggtk\hginit.py:157
msgid "New repository created"
msgstr ""
-#: hggtk\hginit.py:163
+#: hggtk\hginit.py:158
msgid "in directory %s"
msgstr ""
@@ -1191,59 +1215,59 @@msgid "applying patch\n"
msgstr ""
-#: hggtk\hgshelve.py:509
+#: hggtk\hgshelve.py:514
msgid "saving patch to shelve\n"
msgstr ""
-#: hggtk\hgshelve.py:522
+#: hggtk\hgshelve.py:527
msgid "removing shelve file\n"
msgstr ""
-#: hggtk\hgshelve.py:531
+#: hggtk\hgshelve.py:536
msgid "removing backup for %r : %r\n"
msgstr ""
-#: hggtk\hgshelve.py:556
+#: hggtk\hgshelve.py:561
msgid "applying shelved patch\n"
msgstr ""
-#: hggtk\hgshelve.py:569
+#: hggtk\hgshelve.py:574
msgid "restoring backup files\n"
msgstr ""
-#: hggtk\hgshelve.py:576
+#: hggtk\hgshelve.py:581
msgid "removing backup files\n"
msgstr ""
-#: hggtk\hgshelve.py:582
+#: hggtk\hgshelve.py:587
msgid "removing shelved patches\n"
msgstr ""
-#: hggtk\hgshelve.py:584
+#: hggtk\hgshelve.py:589
msgid "unshelve completed\n"
msgstr ""
-#: hggtk\hgshelve.py:586
+#: hggtk\hgshelve.py:591
msgid "nothing to unshelve\n"
msgstr ""
-#: hggtk\hgshelve.py:592
+#: hggtk\hgshelve.py:597
msgid "mark new/missing files as added/removed before shelving"
msgstr ""
-#: hggtk\hgshelve.py:594
+#: hggtk\hgshelve.py:599
msgid "overwrite existing shelve data"
msgstr ""
-#: hggtk\hgshelve.py:596
+#: hggtk\hgshelve.py:601
msgid "append to existing shelve data"
msgstr ""
-#: hggtk\hgshelve.py:601
+#: hggtk\hgshelve.py:606
msgid "inspect shelved changes only"
msgstr ""
-#: hggtk\hgshelve.py:603
+#: hggtk\hgshelve.py:608
msgid "proceed even if patches do not unshelve cleanly"
msgstr ""
@@ -1373,162 +1397,166 @@msgstr ""
#: hggtk\hgtk.py:586
+msgid "do not fork GUI process"
+msgstr ""
+
+#: hggtk\hgtk.py:587
msgid "read file list from file"
msgstr ""
-#: hggtk\hgtk.py:590
+#: hggtk\hgtk.py:591
msgid "hgtk about"
msgstr ""
-#: hggtk\hgtk.py:591
+#: hggtk\hgtk.py:592
msgid "hgtk add [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:592
+#: hggtk\hgtk.py:593
msgid "hgtk clone SOURCE [DEST]"
msgstr ""
-#: hggtk\hgtk.py:594
+#: hggtk\hgtk.py:595
msgid "record user as committer"
msgstr ""
-#: hggtk\hgtk.py:595
+#: hggtk\hgtk.py:596
msgid "record datecode as commit date"
msgstr ""
-#: hggtk\hgtk.py:596
+#: hggtk\hgtk.py:597
msgid "hgtk commit [OPTIONS] [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:597
+#: hggtk\hgtk.py:598
msgid "hgtk datamine"
msgstr ""
-#: hggtk\hgtk.py:598
+#: hggtk\hgtk.py:599
msgid "hgtk hgignore [FILE]"
msgstr ""
-#: hggtk\hgtk.py:599
+#: hggtk\hgtk.py:600
msgid "hgtk init [DEST]"
msgstr ""
-#: hggtk\hgtk.py:602
+#: hggtk\hgtk.py:603
msgid "hgtk log [OPTIONS] [FILE]"
msgstr ""
-#: hggtk\hgtk.py:604 hggtk\hgtk.py:631
+#: hggtk\hgtk.py:605 hggtk\hgtk.py:632
msgid "revision to update"
msgstr ""
-#: hggtk\hgtk.py:605
+#: hggtk\hgtk.py:606
msgid "hgtk merge"
msgstr ""
-#: hggtk\hgtk.py:606
+#: hggtk\hgtk.py:607
msgid "hgtk recovery"
msgstr ""
-#: hggtk\hgtk.py:607
+#: hggtk\hgtk.py:608
msgid "hgtk shelve"
msgstr ""
-#: hggtk\hgtk.py:608
+#: hggtk\hgtk.py:609
msgid "hgtk synch"
msgstr ""
-#: hggtk\hgtk.py:610
+#: hggtk\hgtk.py:611
msgid "revisions to compare"
msgstr ""
-#: hggtk\hgtk.py:611
+#: hggtk\hgtk.py:612
msgid "hgtk status [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:612
+#: hggtk\hgtk.py:613
msgid "hgtk userconfig"
msgstr ""
-#: hggtk\hgtk.py:613
+#: hggtk\hgtk.py:614
msgid "hgtk repoconfig"
msgstr ""
-#: hggtk\hgtk.py:614
+#: hggtk\hgtk.py:615
msgid "hgtk guess"
msgstr ""
-#: hggtk\hgtk.py:615
+#: hggtk\hgtk.py:616
msgid "hgtk remove [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:616
+#: hggtk\hgtk.py:617
msgid "hgtk rename SOURCE [DEST]"
msgstr ""
-#: hggtk\hgtk.py:617
+#: hggtk\hgtk.py:618
msgid "hgtk revert [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:620
+#: hggtk\hgtk.py:621
msgid "name of the webdir config file"
msgstr ""
-#: hggtk\hgtk.py:621
+#: hggtk\hgtk.py:622
msgid "hgtk serve [OPTION]..."
msgstr ""
-#: hggtk\hgtk.py:623
+#: hggtk\hgtk.py:624
msgid "wait until the second ticks over"
msgstr ""
-#: hggtk\hgtk.py:624
+#: hggtk\hgtk.py:625
msgid "notify the shell for path(s) given"
msgstr ""
-#: hggtk\hgtk.py:625
+#: hggtk\hgtk.py:626
msgid "remove the status cache"
msgstr ""
-#: hggtk\hgtk.py:626
+#: hggtk\hgtk.py:627
msgid "show the contents of the status cache (no update)"
msgstr ""
-#: hggtk\hgtk.py:628
+#: hggtk\hgtk.py:629
msgid "udpate all repos in current dir"
msgstr ""
-#: hggtk\hgtk.py:629
+#: hggtk\hgtk.py:630
msgid "hgtk thgstatus [OPTION]"
msgstr ""
-#: hggtk\hgtk.py:634
+#: hggtk\hgtk.py:635
msgid "changeset to view in diff tool"
msgstr ""
-#: hggtk\hgtk.py:635
+#: hggtk\hgtk.py:636
msgid "revisions to view in diff tool"
msgstr ""
-#: hggtk\hgtk.py:636
+#: hggtk\hgtk.py:637
msgid "launch visual diff tool"
msgstr ""
-#: hggtk\hgtk.py:638
+#: hggtk\hgtk.py:639
msgid "print license"
msgstr ""
-#: hggtk\hgtk.py:639
+#: hggtk\hgtk.py:640
msgid "hgtk version [OPTION]"
msgstr ""
-#: hggtk\hgtk.py:641
+#: hggtk\hgtk.py:642
msgid "show the command options"
msgstr ""
-#: hggtk\hgtk.py:642
+#: hggtk\hgtk.py:643
msgid "[-o] CMD"
msgstr ""
-#: hggtk\hgtk.py:643
+#: hggtk\hgtk.py:644
msgid "hgtk help [COMMAND]"
msgstr ""
@@ -1617,10 +1645,6 @@msgstr ""
#: hggtk\history.py:390
-msgid "di_splay"
-msgstr ""
-
-#: hggtk\history.py:391
msgid "visualize change"
msgstr ""
@@ -1715,22 +1739,23 @@msgid "Write bundle to"
msgstr ""
-#: hggtk\history.py:660 hggtk\status.py:1051
+#: hggtk\history.py:660 hggtk\status.py:1045
msgid "Save patch to"
msgstr ""
-#: hggtk\history.py:667 hggtk\thgconfig.py:366 hggtk\thgconfig.py:668
+#: hggtk\history.py:667 hggtk\history.py:696 hggtk\thgconfig.py:368
+#: hggtk\thgconfig.py:670
msgid "Confirm Overwrite"
msgstr ""
-#: hggtk\history.py:668
+#: hggtk\history.py:668 hggtk\history.py:697
msgid ""
"The file \"%s\" already exists!\n"
"\n"
"Do you want to overwrite it?"
msgstr ""
-#: hggtk\logfilter.py:27 hggtk\taskbarui.py:31 hggtk\thgconfig.py:450
+#: hggtk\logfilter.py:27 hggtk\taskbarui.py:31 hggtk\thgconfig.py:452
msgid "Apply"
msgstr ""
@@ -1848,30 +1873,6 @@msgid "Merge"
msgstr ""
-#: hggtk\merge.py:104
-msgid "rev"
-msgstr ""
-
-#: hggtk\merge.py:105
-msgid "summary"
-msgstr ""
-
-#: hggtk\merge.py:106
-msgid "user"
-msgstr ""
-
-#: hggtk\merge.py:107
-msgid "date"
-msgstr ""
-
-#: hggtk\merge.py:111
-msgid "branch"
-msgstr ""
-
-#: hggtk\merge.py:113
-msgid "tags"
-msgstr ""
-
#: hggtk\merge.py:116
msgid "Not a head revision!"
msgstr ""
@@ -1888,7 +1889,7 @@msgid "TortoiseHg Recovery - "
msgstr ""
-#: hggtk\recovery.py:43 hggtk\synch.py:59
+#: hggtk\recovery.py:43 hggtk\synch.py:60
msgid "Stop the hg operation"
msgstr ""
@@ -1924,11 +1925,11 @@msgid "Validate repository consistency"
msgstr ""
-#: hggtk\recovery.py:99 hggtk\synch.py:381
+#: hggtk\recovery.py:99 hggtk\synch.py:367
msgid "Cannot close now"
msgstr ""
-#: hggtk\recovery.py:100 hggtk\synch.py:382
+#: hggtk\recovery.py:100 hggtk\synch.py:368
msgid "command is running"
msgstr ""
@@ -1952,15 +1953,15 @@msgid "Rollback repository '%s' ?"
msgstr ""
-#: hggtk\recovery.py:159 hggtk\synch.py:521
+#: hggtk\recovery.py:159 hggtk\synch.py:507
msgid "Cannot run now"
msgstr ""
-#: hggtk\recovery.py:160 hggtk\synch.py:522
+#: hggtk\recovery.py:160 hggtk\synch.py:508
msgid "Please try again after the previous command is completed"
msgstr ""
-#: hggtk\recovery.py:222 hggtk\synch.py:615
+#: hggtk\recovery.py:222 hggtk\synch.py:601
msgid "[command interrupted]"
msgstr ""
@@ -1988,7 +1989,7 @@msgid "Launch browser to view repository"
msgstr ""
-#: hggtk\serve.py:69 hggtk\synch.py:92
+#: hggtk\serve.py:69 hggtk\synch.py:93
msgid "Configure"
msgstr ""
@@ -2229,288 +2230,288 @@msgid "Copy file to"
msgstr ""
-#: hggtk\status.py:797 hggtk\status.py:1183
+#: hggtk\status.py:790 hggtk\status.py:1178
msgid "Nothing Removed"
msgstr ""
-#: hggtk\status.py:798
+#: hggtk\status.py:791
msgid "Remove is not enabled when multiple revisions are specified."
msgstr ""
-#: hggtk\status.py:815
+#: hggtk\status.py:808
msgid "Move is not enabled when multiple revisions are specified."
msgstr ""
-#: hggtk\status.py:815 hggtk\status.py:1207 hggtk\status.py:1215
+#: hggtk\status.py:808 hggtk\status.py:1196 hggtk\status.py:1204
msgid "Nothing Moved"
msgstr ""
-#: hggtk\status.py:833
+#: hggtk\status.py:826
msgid "Copy is not enabled when multiple revisions are specified."
msgstr ""
-#: hggtk\status.py:833
+#: hggtk\status.py:826
msgid "Nothing Copied"
msgstr ""
-#: hggtk\status.py:853
+#: hggtk\status.py:846
msgid "===== Diff to first parent =====\n"
msgstr ""
-#: hggtk\status.py:862
+#: hggtk\status.py:855
msgid ""
"\n"
"===== Diff to second parent =====\n"
msgstr ""
-#: hggtk\status.py:917
+#: hggtk\status.py:910
msgid "File is larger than the specified max size.\n"
msgstr ""
-#: hggtk\status.py:918
+#: hggtk\status.py:911
msgid "Hunk selection is disabled for this file.\n"
msgstr ""
-#: hggtk\status.py:1086 hggtk\status.py:1107
+#: hggtk\status.py:1081 hggtk\status.py:1102
msgid "Nothing Reverted"
msgstr ""
-#: hggtk\status.py:1087
+#: hggtk\status.py:1082
msgid "No revertable files selected"
msgstr ""
-#: hggtk\status.py:1108
+#: hggtk\status.py:1103
msgid "Revert not allowed when viewing revision range."
msgstr ""
-#: hggtk\status.py:1123 hggtk\status.py:1140
+#: hggtk\status.py:1118 hggtk\status.py:1135
msgid "Confirm Revert"
msgstr ""
-#: hggtk\status.py:1124
+#: hggtk\status.py:1119
msgid "Revert files to revision %s?"
msgstr ""
+#: hggtk\status.py:1121
+msgid "Which parent to revert to?"
+msgstr ""
+
+#: hggtk\status.py:1122
+msgid "Revert file(s) to local or other parent?"
+msgstr ""
+
+#: hggtk\status.py:1123
+msgid "&local"
+msgstr ""
+
+#: hggtk\status.py:1123
+msgid "&other"
+msgstr ""
+
+#: hggtk\status.py:1123 hggtk\status.py:1124
+msgid "l"
+msgstr ""
+
#: hggtk\status.py:1126
-msgid "Which parent to revert to?"
-msgstr ""
-
-#: hggtk\status.py:1127
-msgid "Revert file(s) to local or other parent?"
-msgstr ""
-
-#: hggtk\status.py:1128
-msgid "&local"
-msgstr ""
-
-#: hggtk\status.py:1128
-msgid "&other"
-msgstr ""
-
-#: hggtk\status.py:1128 hggtk\status.py:1129
-msgid "l"
-msgstr ""
-
-#: hggtk\status.py:1131
msgid "o"
msgstr ""
-#: hggtk\status.py:1141
+#: hggtk\status.py:1136
msgid "Revert the following files?"
msgstr ""
-#: hggtk\status.py:1153
+#: hggtk\status.py:1148
msgid "Nothing Added"
msgstr ""
-#: hggtk\status.py:1154
+#: hggtk\status.py:1149
msgid "No addable files selected"
msgstr ""
-#: hggtk\status.py:1184
+#: hggtk\status.py:1179
msgid "No removable files selected"
msgstr ""
-#: hggtk\status.py:1191
-msgid "Move files to diretory..."
-msgstr ""
-
-#: hggtk\status.py:1208
+#: hggtk\status.py:1187
+msgid "Move files to directory..."
+msgstr ""
+
+#: hggtk\status.py:1197
msgid "Cannot move outside repo!"
msgstr ""
-#: hggtk\status.py:1215
+#: hggtk\status.py:1204
msgid ""
"No movable files selected\n"
"\n"
"Note: only clean files can be moved."
msgstr ""
-#: hggtk\status.py:1223
+#: hggtk\status.py:1212
msgid "Confirm Delete Unrevisioned"
msgstr ""
-#: hggtk\status.py:1224
+#: hggtk\status.py:1213
msgid "Delete the following unrevisioned files?"
msgstr ""
-#: hggtk\status.py:1237
+#: hggtk\status.py:1226
msgid "Delete Errors"
msgstr ""
-#: hggtk\synch.py:51
+#: hggtk\synch.py:52
msgid "TortoiseHg Synchronize - "
msgstr ""
-#: hggtk\synch.py:63
+#: hggtk\synch.py:64
msgid "Incoming"
msgstr ""
-#: hggtk\synch.py:65
+#: hggtk\synch.py:66
msgid "Display changes that can be pulled from selected repository"
msgstr ""
-#: hggtk\synch.py:68
+#: hggtk\synch.py:69
msgid " Pull "
msgstr ""
-#: hggtk\synch.py:70
+#: hggtk\synch.py:71
msgid "Pull changes from selected repository"
msgstr ""
-#: hggtk\synch.py:74
+#: hggtk\synch.py:75
msgid "Outgoing"
msgstr ""
-#: hggtk\synch.py:76
+#: hggtk\synch.py:77
msgid "Display local changes that will be pushed to selected repository"
msgstr ""
-#: hggtk\synch.py:79
+#: hggtk\synch.py:80
msgid "Push"
msgstr ""
-#: hggtk\synch.py:81
+#: hggtk\synch.py:82
msgid "Push local changes to selected repository"
msgstr ""
-#: hggtk\synch.py:84 hggtk\thgconfig.py:479
+#: hggtk\synch.py:85 hggtk\thgconfig.py:481
msgid "Email"
msgstr ""
-#: hggtk\synch.py:86
+#: hggtk\synch.py:87
msgid "Email local outgoing changes to one or more recipients"
msgstr ""
-#: hggtk\synch.py:94
+#: hggtk\synch.py:95
msgid "Configure peer repository paths"
msgstr ""
-#: hggtk\synch.py:105
+#: hggtk\synch.py:106
msgid "Repo:"
msgstr ""
-#: hggtk\synch.py:110
+#: hggtk\synch.py:111
msgid "Bundle:"
msgstr ""
-#: hggtk\synch.py:154
+#: hggtk\synch.py:155
msgid "Post pull operation"
msgstr ""
-#: hggtk\synch.py:156
+#: hggtk\synch.py:157
msgid "Nothing"
msgstr ""
-#: hggtk\synch.py:157 hggtk\update.py:80
+#: hggtk\synch.py:158 hggtk\update.py:80
msgid "Update"
msgstr ""
-#: hggtk\synch.py:158
+#: hggtk\synch.py:159
msgid "Fetch"
msgstr ""
-#: hggtk\synch.py:159
+#: hggtk\synch.py:160
msgid "Rebase"
msgstr ""
-#: hggtk\synch.py:167
+#: hggtk\synch.py:168
msgid "Advanced Options"
msgstr ""
-#: hggtk\synch.py:189
+#: hggtk\synch.py:190
msgid "Force pull or push"
msgstr ""
-#: hggtk\synch.py:190
+#: hggtk\synch.py:191
msgid "Run even when remote repository is unrelated."
msgstr ""
-#: hggtk\synch.py:194
+#: hggtk\synch.py:195
msgid "Target Revision:"
msgstr ""
-#: hggtk\synch.py:198
+#: hggtk\synch.py:199
msgid "A specific revision up to which you would like to push or pull."
msgstr ""
-#: hggtk\synch.py:202
+#: hggtk\synch.py:203
msgid "Remote Command:"
msgstr ""
-#: hggtk\synch.py:206
+#: hggtk\synch.py:207
msgid "Name of hg executable on remote machine."
msgstr ""
-#: hggtk\synch.py:214
+#: hggtk\synch.py:215
msgid "Incoming/Outgoing"
msgstr ""
-#: hggtk\synch.py:217
+#: hggtk\synch.py:218
msgid "Show Patches"
msgstr ""
-#: hggtk\synch.py:218
+#: hggtk\synch.py:219
msgid "Show Newest First"
msgstr ""
-#: hggtk\synch.py:219
+#: hggtk\synch.py:220
msgid "Show No Merges"
msgstr ""
-#: hggtk\synch.py:242
+#: hggtk\synch.py:243
msgid "View pulled revisions"
msgstr ""
-#: hggtk\synch.py:244
+#: hggtk\synch.py:245
msgid "Update to branch tip"
msgstr ""
-#: hggtk\synch.py:339
+#: hggtk\synch.py:340
msgid "unknown sort key '%s'"
msgstr ""
-#: hggtk\synch.py:347
+#: hggtk\synch.py:350
msgid "Select Repository"
msgstr ""
+#: hggtk\synch.py:358
+msgid "Select Bundle"
+msgstr ""
+
+#: hggtk\synch.py:359
+msgid "Bundle (*.hg)"
+msgstr ""
+
#: hggtk\synch.py:360
-msgid "Select Bundle"
-msgstr ""
-
-#: hggtk\synch.py:367
-msgid "Bundle (*.hg)"
-msgstr ""
-
-#: hggtk\synch.py:371
msgid "Bundle (*)"
msgstr ""
-#: hggtk\synch.py:480
+#: hggtk\synch.py:466
msgid "No repository selected"
msgstr ""
-#: hggtk\synch.py:481
+#: hggtk\synch.py:467
msgid "Select a peer repository to compare with"
msgstr ""
@@ -2664,260 +2665,262 @@"Graphical merge program for resolving merge conflicts. If left unspecified, "
"Mercurial will use the first applicable tool it finds on your system or use "
"its internal merge tool that leaves conflict markers in place. Chose "
-"internal:merge to force conflict markers."
-msgstr ""
-
-#: hggtk\thgconfig.py:32
+"internal:merge to force conflict markers, internal:prompt to always select "
+"local or other, or internal:dump to leave files in the working directory for "
+"manual merging"
+msgstr ""
+
+#: hggtk\thgconfig.py:34
msgid "Visual Diff Command"
msgstr ""
-#: hggtk\thgconfig.py:33
+#: hggtk\thgconfig.py:35
msgid "Specify visual diff tool; must be an extdiff command"
msgstr ""
-#: hggtk\thgconfig.py:34
+#: hggtk\thgconfig.py:36
msgid "Skip Diff Window"
msgstr ""
-#: hggtk\thgconfig.py:35
+#: hggtk\thgconfig.py:37
msgid ""
"Bypass the builtin visual diff dialog and directly use your visual diff "
"tool's directory diff feature. Only enable this feature if you know your "
"diff tool has a valid extdiff configuration. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:39
+#: hggtk\thgconfig.py:41
msgid "Visual Editor"
msgstr ""
-#: hggtk\thgconfig.py:40
+#: hggtk\thgconfig.py:42
msgid "Specify the visual editor used to view files, etc"
msgstr ""
-#: hggtk\thgconfig.py:41
+#: hggtk\thgconfig.py:43
msgid "CLI Editor"
msgstr ""
-#: hggtk\thgconfig.py:42
+#: hggtk\thgconfig.py:44
msgid ""
"The editor to use during a commit and other instances where Mercurial needs "
"multiline input from the user. Only used by command line interface commands."
msgstr ""
-#: hggtk\thgconfig.py:45
+#: hggtk\thgconfig.py:47
msgid "Tab Width"
msgstr ""
-#: hggtk\thgconfig.py:46
+#: hggtk\thgconfig.py:48
msgid ""
"Specify the number of spaces that tabs expand to in various TortoiseHG "
"windows. Default: Not expanded"
msgstr ""
-#: hggtk\thgconfig.py:49
+#: hggtk\thgconfig.py:51
msgid "Max Diff Size"
msgstr ""
-#: hggtk\thgconfig.py:50
+#: hggtk\thgconfig.py:52
msgid ""
"The maximum size file (in KB) that TortoiseHg will show changes for in the "
"changelog, status, and commit windows. A value of zero implies no limit. "
"Default: 1024 (1MB)"
msgstr ""
-#: hggtk\thgconfig.py:53
+#: hggtk\thgconfig.py:55
msgid "Bottom Diffs"
msgstr ""
-#: hggtk\thgconfig.py:54
+#: hggtk\thgconfig.py:56
msgid ""
"Show the diff panel below the file list in status, shelve, and commit "
"dialogs. Default: False (show diffs to right of file list)"
msgstr ""
-#: hggtk\thgconfig.py:59
+#: hggtk\thgconfig.py:61
msgid "Username"
msgstr ""
-#: hggtk\thgconfig.py:60
+#: hggtk\thgconfig.py:62
msgid "Name associated with commits"
msgstr ""
-#: hggtk\thgconfig.py:61
+#: hggtk\thgconfig.py:63
msgid "External Commit Tool"
msgstr ""
-#: hggtk\thgconfig.py:62
+#: hggtk\thgconfig.py:64
msgid ""
"Select commit tool launched by TortoiseHg. (Qct is no longer distributed as "
"part of TortoiseHG.) Default: None (use the builtin tool)"
msgstr ""
-#: hggtk\thgconfig.py:65
+#: hggtk\thgconfig.py:67
msgid "Summary Line Length"
msgstr ""
-#: hggtk\thgconfig.py:66
+#: hggtk\thgconfig.py:68
msgid ""
"Maximum length of the commit message summary line. If set, TortoiseHG will "
"issue a warning if the summary line is too long or not separated by a blank "
"line. Default: 0 (unenforced)"
msgstr ""
-#: hggtk\thgconfig.py:70
+#: hggtk\thgconfig.py:72
msgid "Message Line Length"
msgstr ""
-#: hggtk\thgconfig.py:71
+#: hggtk\thgconfig.py:73
msgid ""
"Word wrap length of the commit message. If set, the popup menu can be used "
"to format the message and a warning will be issued if any lines are too long "
"at commit. Default: 0 (unenforced)"
msgstr ""
-#: hggtk\thgconfig.py:78
+#: hggtk\thgconfig.py:80
msgid "Author Coloring"
msgstr ""
-#: hggtk\thgconfig.py:79
+#: hggtk\thgconfig.py:81
msgid ""
"Color changesets by author name. If not enabled, the changes are colored "
"green for merge, red for non-trivial parents, black for normal. Default: "
"False"
msgstr ""
-#: hggtk\thgconfig.py:83
+#: hggtk\thgconfig.py:85
msgid "Long Summary"
msgstr ""
-#: hggtk\thgconfig.py:84
+#: hggtk\thgconfig.py:86
msgid ""
"If true, concatenate multiple lines of changeset summary until they reach 80 "
"characters. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:87
+#: hggtk\thgconfig.py:89
msgid "Log Batch Size"
msgstr ""
-#: hggtk\thgconfig.py:88
+#: hggtk\thgconfig.py:90
msgid ""
"The number of revisions to read and display in the changelog viewer in a "
"single batch. Default: 500"
msgstr ""
-#: hggtk\thgconfig.py:91
+#: hggtk\thgconfig.py:93
msgid "Copy Hash"
msgstr ""
-#: hggtk\thgconfig.py:92
+#: hggtk\thgconfig.py:94
msgid ""
"Allow the changelog viewer to copy the changeset hash of the currently "
"selected changeset into the clipboard. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:97
+#: hggtk\thgconfig.py:99
msgid "After pull operation"
msgstr ""
-#: hggtk\thgconfig.py:99
+#: hggtk\thgconfig.py:101
msgid ""
"Operation which is performed directly after a successful pull. update "
"equates to pull --update, fetch equates to the fetch extension, rebase "
"equates to pull --rebase. Default: none"
msgstr ""
-#: hggtk\thgconfig.py:104
+#: hggtk\thgconfig.py:106
msgid "Name"
msgstr ""
-#: hggtk\thgconfig.py:105
+#: hggtk\thgconfig.py:107
msgid ""
"Repository name to use in the web interface. Default is the working "
"directory."
msgstr ""
-#: hggtk\thgconfig.py:107 hggtk\thgconfig.py:776
+#: hggtk\thgconfig.py:109 hggtk\thgconfig.py:778
msgid "Description"
msgstr ""
-#: hggtk\thgconfig.py:108
+#: hggtk\thgconfig.py:110
msgid "Textual description of the repository's purpose or contents."
msgstr ""
-#: hggtk\thgconfig.py:110
+#: hggtk\thgconfig.py:112
msgid "Contact"
msgstr ""
-#: hggtk\thgconfig.py:111
+#: hggtk\thgconfig.py:113
msgid "Name or email address of the person in charge of the repository."
msgstr ""
-#: hggtk\thgconfig.py:113
+#: hggtk\thgconfig.py:115
msgid "Style"
msgstr ""
-#: hggtk\thgconfig.py:115
+#: hggtk\thgconfig.py:117
msgid "Which template map style to use"
msgstr ""
-#: hggtk\thgconfig.py:116
+#: hggtk\thgconfig.py:118
msgid "Archive Formats"
msgstr ""
-#: hggtk\thgconfig.py:117
+#: hggtk\thgconfig.py:119
msgid "Comma separated list of archive formats allowed for downloading"
msgstr ""
-#: hggtk\thgconfig.py:119
+#: hggtk\thgconfig.py:121
msgid "Port to listen on"
msgstr ""
-#: hggtk\thgconfig.py:119 hggtk\thgconfig.py:229
+#: hggtk\thgconfig.py:121 hggtk\thgconfig.py:231
msgid "Port"
msgstr ""
-#: hggtk\thgconfig.py:120
+#: hggtk\thgconfig.py:122
msgid "Push Requires SSL"
msgstr ""
-#: hggtk\thgconfig.py:121
+#: hggtk\thgconfig.py:123
msgid ""
"Whether to require that inbound pushes be transported over SSL to prevent "
"password sniffing."
msgstr ""
-#: hggtk\thgconfig.py:123
+#: hggtk\thgconfig.py:125
msgid "Stripes"
msgstr ""
-#: hggtk\thgconfig.py:124
+#: hggtk\thgconfig.py:126
msgid ""
"How many lines a \"zebra stripe\" should span in multiline output. Default "
"is 1; set to 0 to disable."
msgstr ""
-#: hggtk\thgconfig.py:126
+#: hggtk\thgconfig.py:128
msgid "Max Files"
msgstr ""
-#: hggtk\thgconfig.py:127
+#: hggtk\thgconfig.py:129
msgid "Maximum number of files to list per changeset."
msgstr ""
-#: hggtk\thgconfig.py:128
+#: hggtk\thgconfig.py:130
msgid "Max Changes"
msgstr ""
-#: hggtk\thgconfig.py:129
+#: hggtk\thgconfig.py:131
msgid "Maximum number of changes to list on the changelog."
msgstr ""
-#: hggtk\thgconfig.py:130
+#: hggtk\thgconfig.py:132
msgid "Allow Push"
msgstr ""
-#: hggtk\thgconfig.py:131
+#: hggtk\thgconfig.py:133
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 "
@@ -2927,11 +2930,11 @@"examined after the deny_push list."
msgstr ""
-#: hggtk\thgconfig.py:138
+#: hggtk\thgconfig.py:140
msgid "Deny Push"
msgstr ""
-#: hggtk\thgconfig.py:139
+#: hggtk\thgconfig.py:141
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. "
@@ -2940,81 +2943,81 @@"The contents of the deny_push list are examined before the allow_push list."
msgstr ""
-#: hggtk\thgconfig.py:145
+#: hggtk\thgconfig.py:147
msgid "Encoding"
msgstr ""
-#: hggtk\thgconfig.py:146
+#: hggtk\thgconfig.py:148
msgid "Character encoding name"
msgstr ""
-#: hggtk\thgconfig.py:149 hggtk\thgconfig.py:230
+#: hggtk\thgconfig.py:151 hggtk\thgconfig.py:232
msgid "Host"
msgstr ""
-#: hggtk\thgconfig.py:150
+#: hggtk\thgconfig.py:152
msgid ""
"Host name and (optional) port of proxy server, for example \"myproxy:8000\""
msgstr ""
-#: hggtk\thgconfig.py:152
+#: hggtk\thgconfig.py:154
msgid "Bypass List"
msgstr ""
-#: hggtk\thgconfig.py:153
+#: hggtk\thgconfig.py:155
msgid ""
"Optional. Comma-separated list of host names that should bypass the proxy"
msgstr ""
-#: hggtk\thgconfig.py:155 hggtk\thgconfig.py:231
+#: hggtk\thgconfig.py:157 hggtk\thgconfig.py:233
msgid "Password"
msgstr ""
-#: hggtk\thgconfig.py:156
+#: hggtk\thgconfig.py:158
msgid "Optional. Password to authenticate with at the proxy server"
msgstr ""
-#: hggtk\thgconfig.py:159
+#: hggtk\thgconfig.py:161
msgid "Optional. User name to authenticate with at the proxy server"
msgstr ""
-#: hggtk\thgconfig.py:163
+#: hggtk\thgconfig.py:165
msgid "From"
msgstr ""
-#: hggtk\thgconfig.py:164
+#: hggtk\thgconfig.py:166
msgid "Email address to use in the \"From\" header and for the SMTP envelope"
msgstr ""
-#: hggtk\thgconfig.py:165
+#: hggtk\thgconfig.py:167
msgid "To"
msgstr ""
-#: hggtk\thgconfig.py:166
+#: hggtk\thgconfig.py:168
msgid "Comma-separated list of recipient email addresses"
msgstr ""
-#: hggtk\thgconfig.py:167
+#: hggtk\thgconfig.py:169
msgid "Cc"
msgstr ""
-#: hggtk\thgconfig.py:168
+#: hggtk\thgconfig.py:170
msgid "Comma-separated list of carbon copy recipient email addresses"
msgstr ""
-#: hggtk\thgconfig.py:170
+#: hggtk\thgconfig.py:172
msgid "Bcc"
msgstr ""
-#: hggtk\thgconfig.py:171
+#: hggtk\thgconfig.py:173
msgid "Comma-separated list of blind carbon copy recipient email addresses"
msgstr ""
-#: hggtk\thgconfig.py:173
+#: hggtk\thgconfig.py:175
msgid "method"
msgstr ""
-#: hggtk\thgconfig.py:174
+#: hggtk\thgconfig.py:176
msgid ""
"Optional. Method to use to send email messages. If value is \"smtp\" "
"(default), use SMTP (configured below). Otherwise, use as name of program "
@@ -3024,231 +3027,231 @@"messages."
msgstr ""
-#: hggtk\thgconfig.py:179
+#: hggtk\thgconfig.py:181
msgid "Host name of mail server"
msgstr ""
-#: hggtk\thgconfig.py:179
+#: hggtk\thgconfig.py:181
msgid "SMTP Host"
msgstr ""
-#: hggtk\thgconfig.py:180
+#: hggtk\thgconfig.py:182
msgid "SMTP Port"
msgstr ""
-#: hggtk\thgconfig.py:181
+#: hggtk\thgconfig.py:183
msgid "Port to connect to on mail server. Default: 25"
msgstr ""
-#: hggtk\thgconfig.py:183
+#: hggtk\thgconfig.py:185
msgid "SMTP TLS"
msgstr ""
-#: hggtk\thgconfig.py:184
+#: hggtk\thgconfig.py:186
msgid "Connect to mail server using TLS. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:186
+#: hggtk\thgconfig.py:188
msgid "SMTP Username"
msgstr ""
-#: hggtk\thgconfig.py:187
+#: hggtk\thgconfig.py:189
msgid "Username to authenticate to mail server with"
msgstr ""
-#: hggtk\thgconfig.py:188
+#: hggtk\thgconfig.py:190
msgid "SMTP Password"
msgstr ""
-#: hggtk\thgconfig.py:189
+#: hggtk\thgconfig.py:191
msgid "Password to authenticate to mail server with"
msgstr ""
-#: hggtk\thgconfig.py:190
+#: hggtk\thgconfig.py:192
msgid "Local Hostname"
msgstr ""
-#: hggtk\thgconfig.py:191
+#: hggtk\thgconfig.py:193
msgid "Hostname the sender can use to identify itself to the mail server."
msgstr ""
-#: hggtk\thgconfig.py:194
+#: hggtk\thgconfig.py:196
msgid "Git Format"
msgstr ""
-#: hggtk\thgconfig.py:195
+#: hggtk\thgconfig.py:197
msgid "Use git extended diff header format. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:197
+#: hggtk\thgconfig.py:199
msgid "No Dates"
msgstr ""
-#: hggtk\thgconfig.py:198
+#: hggtk\thgconfig.py:200
msgid "Do not include modification dates in diff headers. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:200
+#: hggtk\thgconfig.py:202
msgid "Show Function"
msgstr ""
-#: hggtk\thgconfig.py:201
+#: hggtk\thgconfig.py:203
msgid "Show which function each change is in. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:203
+#: hggtk\thgconfig.py:205
msgid "Ignore White Space"
msgstr ""
-#: hggtk\thgconfig.py:204
+#: hggtk\thgconfig.py:206
msgid "Ignore white space when comparing lines. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:206
+#: hggtk\thgconfig.py:208
msgid "Ignore WS Amount"
msgstr ""
-#: hggtk\thgconfig.py:207
+#: hggtk\thgconfig.py:209
msgid "Ignore changes in the amount of white space. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:209
+#: hggtk\thgconfig.py:211
msgid "Ignore Blank Lines"
msgstr ""
-#: hggtk\thgconfig.py:210
+#: hggtk\thgconfig.py:212
msgid "Ignore changes whose lines are all blank. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:223
+#: hggtk\thgconfig.py:225
msgid "Edit remote repository path"
msgstr ""
-#: hggtk\thgconfig.py:229
+#: hggtk\thgconfig.py:231
msgid "URL"
msgstr ""
-#: hggtk\thgconfig.py:230
+#: hggtk\thgconfig.py:232
msgid "Folder"
msgstr ""
-#: hggtk\thgconfig.py:232 hggtk\thgconfig.py:729
+#: hggtk\thgconfig.py:234 hggtk\thgconfig.py:731
msgid "Alias"
msgstr ""
-#: hggtk\thgconfig.py:367 hggtk\thgconfig.py:669
+#: hggtk\thgconfig.py:369 hggtk\thgconfig.py:671
msgid "Overwrite existing '%s' path?"
msgstr ""
-#: hggtk\thgconfig.py:421
+#: hggtk\thgconfig.py:423
msgid "No repository found"
msgstr ""
-#: hggtk\thgconfig.py:422
+#: hggtk\thgconfig.py:424
msgid "no repo at "
msgstr ""
-#: hggtk\thgconfig.py:430
+#: hggtk\thgconfig.py:432
msgid "User global settings"
msgstr ""
-#: hggtk\thgconfig.py:432
+#: hggtk\thgconfig.py:434
msgid "%s repository settings"
msgstr ""
-#: hggtk\thgconfig.py:437
+#: hggtk\thgconfig.py:439
msgid "Edit File"
msgstr ""
-#: hggtk\thgconfig.py:466
+#: hggtk\thgconfig.py:468
msgid "Changelog"
msgstr ""
-#: hggtk\thgconfig.py:469
+#: hggtk\thgconfig.py:471
msgid "Sync"
msgstr ""
-#: hggtk\thgconfig.py:473
+#: hggtk\thgconfig.py:475
msgid "Web"
msgstr ""
-#: hggtk\thgconfig.py:476
+#: hggtk\thgconfig.py:478
msgid "Proxy"
msgstr ""
-#: hggtk\thgconfig.py:482
+#: hggtk\thgconfig.py:484
msgid "Diff"
msgstr ""
-#: hggtk\thgconfig.py:495
+#: hggtk\thgconfig.py:497
msgid "Unapplied changes"
msgstr ""
-#: hggtk\thgconfig.py:496
+#: hggtk\thgconfig.py:498
msgid "Lose changes and switch files?."
msgstr ""
-#: hggtk\thgconfig.py:507
+#: hggtk\thgconfig.py:509
msgid "TortoiseHg Configure Repository - "
msgstr ""
-#: hggtk\thgconfig.py:511
+#: hggtk\thgconfig.py:513
msgid "TortoiseHg Configure User-Global Settings"
msgstr ""
-#: hggtk\thgconfig.py:555
+#: hggtk\thgconfig.py:557
msgid "Confirm quit without saving?"
msgstr ""
-#: hggtk\thgconfig.py:556
+#: hggtk\thgconfig.py:558
msgid "Yes to abandon changes, No to continue"
msgstr ""
-#: hggtk\thgconfig.py:644
+#: hggtk\thgconfig.py:646
msgid "No Repository Found"
msgstr ""
-#: hggtk\thgconfig.py:645
+#: hggtk\thgconfig.py:647
msgid "Path testing cannot work without a repository"
msgstr ""
-#: hggtk\thgconfig.py:711
+#: hggtk\thgconfig.py:713
msgid "Remote repository paths"
msgstr ""
-#: hggtk\thgconfig.py:733
+#: hggtk\thgconfig.py:735
msgid "Repository Path"
msgstr ""
-#: hggtk\thgconfig.py:747
+#: hggtk\thgconfig.py:749
msgid "_Edit"
msgstr ""
-#: hggtk\thgconfig.py:757
+#: hggtk\thgconfig.py:759
msgid "_Test"
msgstr ""
-#: hggtk\thgconfig.py:762
+#: hggtk\thgconfig.py:764
msgid "Set as _default"
msgstr ""
-#: hggtk\thgconfig.py:859
+#: hggtk\thgconfig.py:863
msgid "Suggested"
msgstr ""
-#: hggtk\thgconfig.py:869
+#: hggtk\thgconfig.py:873
msgid "History"
msgstr ""
-#: hggtk\thgconfig.py:907
+#: hggtk\thgconfig.py:911
msgid "# Generated by tortoisehg-config\n"
msgstr ""
-#: hggtk\thgconfig.py:944
+#: hggtk\thgconfig.py:948
msgid "Skipped saving path with no alias"
msgstr ""
-#: hggtk\thgconfig.py:972
+#: hggtk\thgconfig.py:976
msgid "Unable to write configuration file"
msgstr ""
@@ -3366,11 +3369,11 @@msgid "There are no file changes to view"
msgstr ""
-#: hggtk\visdiff.py:241
+#: hggtk\visdiff.py:242
msgid "Tool launch failure"
msgstr ""
-#: hggtk\visdiff.py:242
+#: hggtk\visdiff.py:243
msgid "%s : %s"
msgstr ""
|
|
@@ -14,7 +14,7 @@ "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-24 04:32+0000\n"
+"X-Launchpad-Export-Date: 2009-06-25 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: hggtk\about.py:52
|
||
|
This file's diff was not loaded because this changeset is very large. Load changes  Loading... |
||
|
@@ -14,7 +14,7 @@ "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-24 04:32+0000\n"
+"X-Launchpad-Export-Date: 2009-06-25 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: hggtk\about.py:52
|
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
@@ -14,7 +14,7 @@ "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-24 04:32+0000\n"
+"X-Launchpad-Export-Date: 2009-06-25 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: hggtk\about.py:52
|
||
|
@@ -14,7 +14,7 @@ "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-24 04:32+0000\n"
+"X-Launchpad-Export-Date: 2009-06-25 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: hggtk\about.py:52
|
||
|
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... |
||
|
@@ -14,7 +14,7 @@ "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-24 04:32+0000\n"
+"X-Launchpad-Export-Date: 2009-06-25 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: hggtk\about.py:52
|
||
|
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,14 +7,14 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-06-15 05:36+0000\n"
+"POT-Creation-Date: 2009-06-23 04:45+0000\n"
"PO-Revision-Date: 2009-06-19 07:08+0000\n"
"Last-Translator: willie <willie.tw@gmail.com>\n"
"Language-Team: Traditional Chinese <zh_TW@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-23 03:52+0000\n"
+"X-Launchpad-Export-Date: 2009-06-25 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: hggtk\gdialog.py:492
@@ -61,6 +61,30 @@msgid "Backout"
msgstr "Backout"
+#: hggtk\backout.py:95 hggtk\merge.py:104
+msgid "rev"
+msgstr ""
+
+#: hggtk\backout.py:96 hggtk\merge.py:105
+msgid "summary"
+msgstr ""
+
+#: hggtk\backout.py:97 hggtk\merge.py:106
+msgid "user"
+msgstr ""
+
+#: hggtk\backout.py:98 hggtk\merge.py:107
+msgid "date"
+msgstr ""
+
+#: hggtk\backout.py:101 hggtk\merge.py:111
+msgid "branch"
+msgstr ""
+
+#: hggtk\backout.py:103 hggtk\merge.py:113
+msgid "tags"
+msgstr ""
+
#: hggtk\bugreport.py:23
msgid "TortoiseHg Bug Report"
msgstr "回報 TortoiseHg 的問題"
@@ -85,83 +109,83 @@msgid "[All Files]"
msgstr "[全部的檔案]"
-#: hggtk\changeset.py:145
+#: hggtk\changeset.py:147
msgid "changeset:"
msgstr "changeset:"
-#: hggtk\changeset.py:147
+#: hggtk\changeset.py:149
msgid "branch:"
msgstr "branch:"
-#: hggtk\changeset.py:148
+#: hggtk\changeset.py:150
msgid "user/date:"
msgstr "使用者/日期:"
-#: hggtk\changeset.py:156
+#: hggtk\changeset.py:158
msgid "parent:"
msgstr "parent:"
-#: hggtk\changeset.py:169
+#: hggtk\changeset.py:171
msgid "child:"
msgstr "child:"
-#: hggtk\changeset.py:175
+#: hggtk\changeset.py:177
msgid "tags:"
msgstr "tags:"
-#: hggtk\changeset.py:195
+#: hggtk\changeset.py:197
msgid " %s is larger than the specified max diff size"
msgstr " %s 大於指定的 diff 大小上限"
-#: hggtk\changeset.py:290
+#: hggtk\changeset.py:292
msgid "_visual diff"
msgstr ""
-#: hggtk\changeset.py:291
+#: hggtk\changeset.py:293
msgid "diff to _local"
msgstr ""
-#: hggtk\changeset.py:292
+#: hggtk\changeset.py:294
msgid "_view at revision"
msgstr ""
-#: hggtk\changeset.py:293
+#: hggtk\changeset.py:295
msgid "_save at revision"
msgstr ""
-#: hggtk\changeset.py:295 hggtk\datamine.py:117
+#: hggtk\changeset.py:297 hggtk\datamine.py:117
msgid "_file history"
msgstr "檔案歷史(_f)"
-#: hggtk\changeset.py:296 hggtk\datamine.py:116
+#: hggtk\changeset.py:298 hggtk\datamine.py:116
msgid "_annotate file"
msgstr ""
-#: hggtk\changeset.py:298
+#: hggtk\changeset.py:300
msgid "_revert file contents"
msgstr "回復檔案內容(_r)"
-#: hggtk\changeset.py:356
+#: hggtk\changeset.py:358
msgid "Stat"
msgstr "狀態"
-#: hggtk\changeset.py:358 hggtk\hgignore.py:109
+#: hggtk\changeset.py:360 hggtk\hgignore.py:109
msgid "Files"
msgstr "檔案"
-#: hggtk\changeset.py:480
+#: hggtk\changeset.py:482
msgid "Save file to"
msgstr "儲存檔案至"
-#: hggtk\changeset.py:545
+#: hggtk\changeset.py:547
msgid "Confirm revert file to old revision"
msgstr "確認回復檔案至舊的 revision"
-#: hggtk\changeset.py:546
+#: hggtk\changeset.py:548
msgid "Revert %s to contents at revision %d?"
msgstr ""
-#: hggtk\changeset.py:558 hggtk\synch.py:649
+#: hggtk\changeset.py:560 hggtk\synch.py:635
msgid "Toggle _Wordwrap"
msgstr ""
@@ -197,7 +221,7 @@msgid "use uncompressed transfer"
msgstr "使用不壓縮傳送"
-#: hggtk\clone.py:130 hggtk\synch.py:148
+#: hggtk\clone.py:130 hggtk\synch.py:149
msgid "use proxy server"
msgstr "使用代理伺服器"
@@ -245,203 +269,203 @@msgid "Clone error"
msgstr "Clone 錯誤"
-#: hggtk\commit.py:32
+#: hggtk\commit.py:33
msgid "Branch Operations"
msgstr "Branch 操作"
-#: hggtk\commit.py:36
+#: hggtk\commit.py:37
msgid "Changes take effect on next commit"
msgstr "變更將於下次 commit 時發生效用"
-#: hggtk\commit.py:37
+#: hggtk\commit.py:38
msgid "No branch changes"
msgstr ""
-#: hggtk\commit.py:39
+#: hggtk\commit.py:40
msgid "Open a new named branch"
msgstr ""
-#: hggtk\commit.py:41
+#: hggtk\commit.py:42
msgid "Close current named branch"
msgstr "關閉目前的 named branch"
-#: hggtk\commit.py:153
+#: hggtk\commit.py:154
msgid "_Undo"
msgstr ""
-#: hggtk\commit.py:154
+#: hggtk\commit.py:155
msgid "undo recent commit"
msgstr "復原最近的 commit"
-#: hggtk\commit.py:155 hggtk\commit.py:363 hggtk\commit.py:372
-#: hggtk\commit.py:380 hggtk\commit.py:381
+#: hggtk\commit.py:156 hggtk\commit.py:364 hggtk\commit.py:373
+#: hggtk\commit.py:381 hggtk\commit.py:382
msgid "_Commit"
msgstr ""
-#: hggtk\commit.py:156 hggtk\commit.py:382
+#: hggtk\commit.py:157 hggtk\commit.py:383
msgid "commit"
msgstr "commit"
-#: hggtk\commit.py:168
+#: hggtk\commit.py:169
msgid "Confirm Discard Message"
msgstr "確認丟棄 Message"
-#: hggtk\commit.py:169
+#: hggtk\commit.py:170
msgid "Discard current commit message?"
msgstr "丟棄目前的 commit message？"
-#: hggtk\commit.py:229
+#: hggtk\commit.py:230
msgid "Recent Commit Messages..."
msgstr "最近的 Commit Messages..."
-#: hggtk\commit.py:268 hggtk\commit.py:269 hggtk\commit.py:270
-#: hggtk\commit.py:273
+#: hggtk\commit.py:269 hggtk\commit.py:270 hggtk\commit.py:271
+#: hggtk\commit.py:274
msgid "_commit"
msgstr ""
-#: hggtk\commit.py:291
+#: hggtk\commit.py:292
msgid "Confirm Exit"
msgstr "確認離開"
-#: hggtk\commit.py:292
+#: hggtk\commit.py:293
msgid "Save commit message at exit?"
msgstr "離開前儲存 commit message?"
-#: hggtk\commit.py:319
+#: hggtk\commit.py:320
msgid "new branch: "
msgstr "新 branch: "
-#: hggtk\commit.py:321
+#: hggtk\commit.py:322
msgid "close branch: "
msgstr "關閉 branch: "
-#: hggtk\commit.py:323
+#: hggtk\commit.py:324
msgid "branch: "
msgstr "branch: "
-#: hggtk\commit.py:333 hggtk\status.py:204
+#: hggtk\commit.py:334 hggtk\status.py:204
msgid "Re_vert"
msgstr "回復(_v)"
-#: hggtk\commit.py:334 hggtk\status.py:206 hggtk\thgconfig.py:742
+#: hggtk\commit.py:335 hggtk\status.py:206 hggtk\thgconfig.py:744
msgid "_Add"
msgstr "加入(_A)"
-#: hggtk\commit.py:335 hggtk\status.py:211 hggtk\thgconfig.py:752
+#: hggtk\commit.py:336 hggtk\status.py:211 hggtk\thgconfig.py:754
msgid "_Remove"
msgstr "移除(_R)"
-#: hggtk\commit.py:336 hggtk\status.py:208
+#: hggtk\commit.py:337 hggtk\status.py:208
msgid "Move"
msgstr "移動"
-#: hggtk\commit.py:347
+#: hggtk\commit.py:348
msgid "merge"
msgstr "merge"
-#: hggtk\commit.py:365 hggtk\commit.py:366 hggtk\commit.py:373
-#: hggtk\commit.py:374
+#: hggtk\commit.py:366 hggtk\commit.py:367 hggtk\commit.py:374
+#: hggtk\commit.py:375
msgid "QNew"
msgstr "QNew"
-#: hggtk\commit.py:369 hggtk\commit.py:370
+#: hggtk\commit.py:370 hggtk\commit.py:371
msgid "QRefresh"
msgstr "QRefresh"
-#: hggtk\commit.py:405 hggtk\commit.py:550
+#: hggtk\commit.py:406 hggtk\commit.py:561
msgid "Nothing Commited"
msgstr "沒有變更已被 commit"
-#: hggtk\commit.py:406
+#: hggtk\commit.py:407
msgid "No committable files selected"
msgstr "沒有選取任何可被 commit 的檔案"
-#: hggtk\commit.py:423 hggtk\commit.py:472 hggtk\merge.py:83
-#: hggtk\thgconfig.py:463
+#: hggtk\commit.py:424 hggtk\commit.py:479 hggtk\merge.py:83
+#: hggtk\thgconfig.py:465
msgid "Commit"
msgstr "Commit"
-#: hggtk\commit.py:424
+#: hggtk\commit.py:425
msgid "Unable to create "
msgstr "無法建立 "
-#: hggtk\commit.py:473
+#: hggtk\commit.py:480
msgid "Unable to apply patch"
msgstr "無法套用 patch"
-#: hggtk\commit.py:511
+#: hggtk\commit.py:518
msgid "Confirm Undo commit"
msgstr "確認復原 commit"
-#: hggtk\commit.py:512
+#: hggtk\commit.py:519
msgid "Undo last commit"
msgstr "復原最後一次的 commit"
-#: hggtk\commit.py:518 hggtk\commit.py:529
+#: hggtk\commit.py:525 hggtk\commit.py:540
msgid "Undo commit"
msgstr "復原 commit"
-#: hggtk\commit.py:519
+#: hggtk\commit.py:526
msgid ""
"Unable to undo!\n"
"\n"
"Tip revision differs from last commit."
msgstr "無法復原！"
-#: hggtk\commit.py:530
+#: hggtk\commit.py:541
msgid "Errors during rollback!"
msgstr "於 rollback 時發生錯誤！"
-#: hggtk\commit.py:537
+#: hggtk\commit.py:548
msgid "Confirm Add/Remove"
msgstr "確認 Add/Remove"
-#: hggtk\commit.py:538
+#: hggtk\commit.py:549
msgid "Add/Remove the following files?"
msgstr "Add/Remove 下列的檔案？"
-#: hggtk\commit.py:551 hggtk\tagadd.py:174
+#: hggtk\commit.py:562 hggtk\tagadd.py:174
msgid "Please enter commit message"
msgstr "請輸入 commit message"
-#: hggtk\commit.py:559
+#: hggtk\commit.py:570
msgid "Error"
msgstr "錯誤"
-#: hggtk\commit.py:560
+#: hggtk\commit.py:571
msgid "Message format configuration error"
msgstr "Message 格式設定錯誤"
-#: hggtk\commit.py:569 hggtk\commit.py:577 hggtk\commit.py:589
+#: hggtk\commit.py:580 hggtk\commit.py:588 hggtk\commit.py:600
msgid "Confirm Commit"
msgstr "確認 Commit"
-#: hggtk\commit.py:570
+#: hggtk\commit.py:581
msgid ""
"The summary line length of %i is greater than %i.\n"
"\n"
"Ignore format policy and continue commit?"
msgstr ""
-#: hggtk\commit.py:578
+#: hggtk\commit.py:589
msgid ""
"The summary line is not followed by a blank line.\n"
"\n"
"Ignore format policy and continue commit?"
msgstr ""
-#: hggtk\commit.py:590
+#: hggtk\commit.py:601
msgid ""
"The following lines are over the %i-character limit: %s.\n"
"\n"
"Ignore format policy and continue commit?"
msgstr ""
-#: hggtk\commit.py:604
+#: hggtk\commit.py:615
msgid "Commit: Invalid username"
msgstr "Commit: 不合法的使用者名稱"
-#: hggtk\commit.py:605
+#: hggtk\commit.py:616
msgid ""
"Your username has not been configured.\n"
"\n"
@@ -451,54 +475,54 @@"\n"
"請設定您的使用者名稱並重試"
-#: hggtk\commit.py:627
+#: hggtk\commit.py:638
msgid "Confirm Override Branch"
msgstr "確認 Override Branch"
-#: hggtk\commit.py:628
+#: hggtk\commit.py:639
msgid ""
"A branch named \"%s\" already exists,\n"
"override?"
msgstr ""
-#: hggtk\commit.py:633
+#: hggtk\commit.py:644
msgid "Confirm New Branch"
msgstr ""
-#: hggtk\commit.py:634
+#: hggtk\commit.py:645
msgid "Create new named branch \"%s\"?"
msgstr ""
-#: hggtk\commit.py:704
+#: hggtk\commit.py:715
msgid "Paste _Filenames"
msgstr ""
-#: hggtk\commit.py:705
+#: hggtk\commit.py:716
msgid "App_ly Format"
msgstr ""
-#: hggtk\commit.py:706
+#: hggtk\commit.py:717
msgid "C_onfigure Format"
msgstr ""
-#: hggtk\commit.py:732 hggtk\hgemail.py:307 hggtk\hgemail.py:312
+#: hggtk\commit.py:743 hggtk\hgemail.py:307 hggtk\hgemail.py:312
#: hggtk\hgemail.py:321
msgid "Info required"
msgstr ""
-#: hggtk\commit.py:733
+#: hggtk\commit.py:744
msgid "Message format needs to be configured"
msgstr ""
-#: hggtk\commit.py:745 hggtk\commit.py:750
+#: hggtk\commit.py:756 hggtk\commit.py:761
msgid "Warning"
msgstr ""
-#: hggtk\commit.py:746
+#: hggtk\commit.py:757
msgid "The summary line length of %i is greater than %i"
msgstr ""
-#: hggtk\commit.py:751
+#: hggtk\commit.py:762
msgid "The summary line is not followed by a blank line"
msgstr ""
@@ -507,7 +531,7 @@msgstr ""
#: hggtk\datamine.py:44 hggtk\hgcmd.py:37 hggtk\recovery.py:43
-#: hggtk\serve.py:61 hggtk\synch.py:59
+#: hggtk\serve.py:61 hggtk\synch.py:60
msgid "Stop"
msgstr ""
@@ -523,7 +547,7 @@msgid "Open new search tab"
msgstr ""
-#: hggtk\datamine.py:61 hggtk\thgconfig.py:943
+#: hggtk\datamine.py:61 hggtk\thgconfig.py:947
msgid "Invalid path"
msgstr ""
@@ -535,12 +559,12 @@msgid "Filename"
msgstr ""
-#: hggtk\datamine.py:107 hggtk\datamine.py:524 hggtk\logview\treeview.py:423
-#: hggtk\thgconfig.py:158 hggtk\thgconfig.py:231
+#: hggtk\datamine.py:107 hggtk\datamine.py:525 hggtk\logview\treeview.py:423
+#: hggtk\thgconfig.py:160 hggtk\thgconfig.py:233
msgid "User"
msgstr ""
-#: hggtk\datamine.py:115 hggtk\datamine.py:124
+#: hggtk\datamine.py:115 hggtk\datamine.py:124 hggtk\history.py:391
msgid "di_splay change"
msgstr ""
@@ -552,107 +576,107 @@msgid "_annotate parent"
msgstr ""
-#: hggtk\datamine.py:215
+#: hggtk\datamine.py:216
msgid "Search"
msgstr ""
-#: hggtk\datamine.py:216 hggtk\hgignore.py:49
+#: hggtk\datamine.py:217 hggtk\hgignore.py:49
msgid "Regexp:"
msgstr ""
-#: hggtk\datamine.py:218
+#: hggtk\datamine.py:219
msgid "Includes:"
msgstr ""
-#: hggtk\datamine.py:220
+#: hggtk\datamine.py:221
msgid "Excludes:"
msgstr ""
-#: hggtk\datamine.py:223
+#: hggtk\datamine.py:224
msgid "Start this search"
msgstr ""
-#: hggtk\datamine.py:224
+#: hggtk\datamine.py:225
msgid "Regular expression search pattern"
msgstr ""
-#: hggtk\datamine.py:225
+#: hggtk\datamine.py:226
msgid ""
"Comma separated list of inclusion patterns. By default, the entire "
"repository is searched."
msgstr ""
-#: hggtk\datamine.py:228
+#: hggtk\datamine.py:229
msgid ""
"Comma separated list of exclusion patterns. Exclusion patterns are applied "
"after inclusion patterns."
msgstr ""
-#: hggtk\datamine.py:234
+#: hggtk\datamine.py:235
msgid "Follow copies and renames"
msgstr ""
-#: hggtk\datamine.py:235
+#: hggtk\datamine.py:236
msgid "Ignore case"
msgstr ""
-#: hggtk\datamine.py:236
+#: hggtk\datamine.py:237
msgid "Show line numbers"
msgstr ""
-#: hggtk\datamine.py:237
+#: hggtk\datamine.py:238
msgid "Show all matching revisions"
msgstr ""
-#: hggtk\datamine.py:265 hggtk\datamine.py:522 hggtk\logview\treeview.py:372
+#: hggtk\datamine.py:266 hggtk\datamine.py:523 hggtk\logview\treeview.py:372
msgid "Rev"
msgstr ""
-#: hggtk\datamine.py:266 hggtk\datamine.py:523
+#: hggtk\datamine.py:267 hggtk\datamine.py:524
msgid "File"
msgstr ""
-#: hggtk\datamine.py:267
+#: hggtk\datamine.py:268
msgid "Matches"
msgstr ""
-#: hggtk\datamine.py:289
+#: hggtk\datamine.py:290
msgid "Search %d"
msgstr ""
-#: hggtk\datamine.py:331
+#: hggtk\datamine.py:332
msgid "No regular expression given"
msgstr ""
-#: hggtk\datamine.py:332
+#: hggtk\datamine.py:333
msgid "You must provide a search expression"
msgstr ""
-#: hggtk\datamine.py:360
+#: hggtk\datamine.py:361
msgid "Search \"%s\""
msgstr ""
-#: hggtk\datamine.py:472
+#: hggtk\datamine.py:473
msgid "File is unrevisioned"
msgstr ""
-#: hggtk\datamine.py:473
+#: hggtk\datamine.py:474
msgid "Unable to annotate "
msgstr ""
-#: hggtk\datamine.py:493
+#: hggtk\datamine.py:494
msgid "Follow"
msgstr ""
-#: hggtk\datamine.py:521
+#: hggtk\datamine.py:522
msgid "Line"
msgstr ""
-#: hggtk\datamine.py:525 hggtk\guess.py:100
+#: hggtk\datamine.py:526 hggtk\guess.py:100
msgid "Source"
msgstr ""
-#: hggtk\datamine.py:617
+#: hggtk\datamine.py:618
msgid "Follow Rename:"
msgstr ""
@@ -680,11 +704,11 @@msgid "making snapshot of %d files from rev %s\n"
msgstr ""
-#: hggtk\gdialog.py:500 hggtk\thgconfig.py:541
+#: hggtk\gdialog.py:500 hggtk\thgconfig.py:543
msgid "No visual editor configured"
msgstr ""
-#: hggtk\gdialog.py:501 hggtk\thgconfig.py:542
+#: hggtk\gdialog.py:501 hggtk\thgconfig.py:544
msgid "Please configure a visual editor."
msgstr ""
@@ -704,7 +728,7 @@msgid "All files"
msgstr ""
-#: hggtk\gtklib.py:240
+#: hggtk\gtklib.py:254
msgid "Select Folder"
msgstr ""
@@ -975,27 +999,27 @@msgid "Create"
msgstr ""
-#: hggtk\hginit.py:121
+#: hggtk\hginit.py:116
msgid "Destination path is empty"
msgstr ""
-#: hggtk\hginit.py:122
+#: hggtk\hginit.py:117
msgid "Please enter the directory path"
msgstr ""
-#: hggtk\hginit.py:136
+#: hggtk\hginit.py:131
msgid "Unable to create new repository"
msgstr ""
-#: hggtk\hginit.py:140 hggtk\hginit.py:145
+#: hggtk\hginit.py:135 hggtk\hginit.py:140
msgid "Error when creating repository"
msgstr ""
-#: hggtk\hginit.py:162
+#: hggtk\hginit.py:157
msgid "New repository created"
msgstr ""
-#: hggtk\hginit.py:163
+#: hggtk\hginit.py:158
msgid "in directory %s"
msgstr ""
@@ -1064,71 +1088,71 @@msgid "applying patch\n"
msgstr ""
-#: hggtk\hgshelve.py:509
+#: hggtk\hgshelve.py:514
msgid "saving patch to shelve\n"
msgstr ""
-#: hggtk\hgshelve.py:520 hggtk\hgshelve.py:571
+#: hggtk\hgshelve.py:525 hggtk\hgshelve.py:576
msgid "restoring %r to %r\n"
msgstr ""
-#: hggtk\hgshelve.py:522
+#: hggtk\hgshelve.py:527
msgid "removing shelve file\n"
msgstr ""
-#: hggtk\hgshelve.py:531
+#: hggtk\hgshelve.py:536
msgid "removing backup for %r : %r\n"
msgstr ""
-#: hggtk\hgshelve.py:556
+#: hggtk\hgshelve.py:561
msgid "applying shelved patch\n"
msgstr ""
-#: hggtk\hgshelve.py:569
+#: hggtk\hgshelve.py:574
msgid "restoring backup files\n"
msgstr ""
-#: hggtk\hgshelve.py:576
+#: hggtk\hgshelve.py:581
msgid "removing backup files\n"
msgstr ""
-#: hggtk\hgshelve.py:582
+#: hggtk\hgshelve.py:587
msgid "removing shelved patches\n"
msgstr ""
-#: hggtk\hgshelve.py:584
+#: hggtk\hgshelve.py:589
msgid "unshelve completed\n"
msgstr ""
-#: hggtk\hgshelve.py:586
+#: hggtk\hgshelve.py:591
msgid "nothing to unshelve\n"
msgstr ""
-#: hggtk\hgshelve.py:592
+#: hggtk\hgshelve.py:597
msgid "mark new/missing files as added/removed before shelving"
msgstr ""
-#: hggtk\hgshelve.py:594
+#: hggtk\hgshelve.py:599
msgid "overwrite existing shelve data"
msgstr ""
-#: hggtk\hgshelve.py:596
+#: hggtk\hgshelve.py:601
msgid "append to existing shelve data"
msgstr ""
-#: hggtk\hgshelve.py:598
+#: hggtk\hgshelve.py:603
msgid "hg shelve [OPTION]... [FILE]..."
msgstr ""
-#: hggtk\hgshelve.py:601
+#: hggtk\hgshelve.py:606
msgid "inspect shelved changes only"
msgstr ""
-#: hggtk\hgshelve.py:603
+#: hggtk\hgshelve.py:608
msgid "proceed even if patches do not unshelve cleanly"
msgstr ""
-#: hggtk\hgshelve.py:605
+#: hggtk\hgshelve.py:610
msgid "hg unshelve [OPTION]... [FILE]..."
msgstr ""
@@ -1278,166 +1302,170 @@msgstr ""
#: hggtk\hgtk.py:586
+msgid "do not fork GUI process"
+msgstr ""
+
+#: hggtk\hgtk.py:587
msgid "read file list from file"
msgstr ""
-#: hggtk\hgtk.py:590
+#: hggtk\hgtk.py:591
msgid "hgtk about"
msgstr ""
-#: hggtk\hgtk.py:591
+#: hggtk\hgtk.py:592
msgid "hgtk add [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:592
+#: hggtk\hgtk.py:593
msgid "hgtk clone SOURCE [DEST]"
msgstr ""
-#: hggtk\hgtk.py:594
+#: hggtk\hgtk.py:595
msgid "record user as committer"
msgstr ""
-#: hggtk\hgtk.py:595
+#: hggtk\hgtk.py:596
msgid "record datecode as commit date"
msgstr ""
-#: hggtk\hgtk.py:596
+#: hggtk\hgtk.py:597
msgid "hgtk commit [OPTIONS] [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:597
+#: hggtk\hgtk.py:598
msgid "hgtk datamine"
msgstr ""
-#: hggtk\hgtk.py:598
+#: hggtk\hgtk.py:599
msgid "hgtk hgignore [FILE]"
msgstr ""
-#: hggtk\hgtk.py:599
+#: hggtk\hgtk.py:600
msgid "hgtk init [DEST]"
msgstr ""
-#: hggtk\hgtk.py:601
+#: hggtk\hgtk.py:602
msgid "limit number of changes displayed"
msgstr ""
-#: hggtk\hgtk.py:602
+#: hggtk\hgtk.py:603
msgid "hgtk log [OPTIONS] [FILE]"
msgstr ""
-#: hggtk\hgtk.py:604 hggtk\hgtk.py:631
+#: hggtk\hgtk.py:605 hggtk\hgtk.py:632
msgid "revision to update"
msgstr ""
-#: hggtk\hgtk.py:605
+#: hggtk\hgtk.py:606
msgid "hgtk merge"
msgstr ""
-#: hggtk\hgtk.py:606
+#: hggtk\hgtk.py:607
msgid "hgtk recovery"
msgstr ""
-#: hggtk\hgtk.py:607
+#: hggtk\hgtk.py:608
msgid "hgtk shelve"
msgstr ""
-#: hggtk\hgtk.py:608
+#: hggtk\hgtk.py:609
msgid "hgtk synch"
msgstr ""
-#: hggtk\hgtk.py:610
+#: hggtk\hgtk.py:611
msgid "revisions to compare"
msgstr ""
-#: hggtk\hgtk.py:611
+#: hggtk\hgtk.py:612
msgid "hgtk status [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:612
+#: hggtk\hgtk.py:613
msgid "hgtk userconfig"
msgstr ""
-#: hggtk\hgtk.py:613
+#: hggtk\hgtk.py:614
msgid "hgtk repoconfig"
msgstr ""
-#: hggtk\hgtk.py:614
+#: hggtk\hgtk.py:615
msgid "hgtk guess"
msgstr ""
-#: hggtk\hgtk.py:615
+#: hggtk\hgtk.py:616
msgid "hgtk remove [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:616
+#: hggtk\hgtk.py:617
msgid "hgtk rename SOURCE [DEST]"
msgstr ""
-#: hggtk\hgtk.py:617
+#: hggtk\hgtk.py:618
msgid "hgtk revert [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:620
+#: hggtk\hgtk.py:621
msgid "name of the webdir config file"
msgstr ""
-#: hggtk\hgtk.py:621
+#: hggtk\hgtk.py:622
msgid "hgtk serve [OPTION]..."
msgstr ""
-#: hggtk\hgtk.py:623
+#: hggtk\hgtk.py:624
msgid "wait until the second ticks over"
msgstr ""
-#: hggtk\hgtk.py:624
+#: hggtk\hgtk.py:625
msgid "notify the shell for path(s) given"
msgstr ""
-#: hggtk\hgtk.py:625
+#: hggtk\hgtk.py:626
msgid "remove the status cache"
msgstr ""
-#: hggtk\hgtk.py:626
+#: hggtk\hgtk.py:627
msgid "show the contents of the status cache (no update)"
msgstr ""
-#: hggtk\hgtk.py:628
+#: hggtk\hgtk.py:629
msgid "udpate all repos in current dir"
msgstr ""
-#: hggtk\hgtk.py:629
+#: hggtk\hgtk.py:630
msgid "hgtk thgstatus [OPTION]"
msgstr ""
-#: hggtk\hgtk.py:634
+#: hggtk\hgtk.py:635
msgid "changeset to view in diff tool"
msgstr ""
-#: hggtk\hgtk.py:635
+#: hggtk\hgtk.py:636
msgid "revisions to view in diff tool"
msgstr ""
-#: hggtk\hgtk.py:636
+#: hggtk\hgtk.py:637
msgid "launch visual diff tool"
msgstr ""
-#: hggtk\hgtk.py:638
+#: hggtk\hgtk.py:639
msgid "print license"
msgstr ""
-#: hggtk\hgtk.py:639
+#: hggtk\hgtk.py:640
msgid "hgtk version [OPTION]"
msgstr ""
-#: hggtk\hgtk.py:641
+#: hggtk\hgtk.py:642
msgid "show the command options"
msgstr ""
-#: hggtk\hgtk.py:642
+#: hggtk\hgtk.py:643
msgid "[-o] CMD"
msgstr ""
-#: hggtk\hgtk.py:643
+#: hggtk\hgtk.py:644
msgid "hgtk help [COMMAND]"
msgstr ""
@@ -1530,10 +1558,6 @@msgstr ""
#: hggtk\history.py:390
-msgid "di_splay"
-msgstr ""
-
-#: hggtk\history.py:391
msgid "visualize change"
msgstr ""
@@ -1628,22 +1652,23 @@msgid "Write bundle to"
msgstr ""
-#: hggtk\history.py:660 hggtk\status.py:1051
+#: hggtk\history.py:660 hggtk\status.py:1045
msgid "Save patch to"
msgstr ""
-#: hggtk\history.py:667 hggtk\thgconfig.py:366 hggtk\thgconfig.py:668
+#: hggtk\history.py:667 hggtk\history.py:696 hggtk\thgconfig.py:368
+#: hggtk\thgconfig.py:670
msgid "Confirm Overwrite"
msgstr ""
-#: hggtk\history.py:668
+#: hggtk\history.py:668 hggtk\history.py:697
msgid ""
"The file \"%s\" already exists!\n"
"\n"
"Do you want to overwrite it?"
msgstr ""
-#: hggtk\logfilter.py:27 hggtk\taskbarui.py:31 hggtk\thgconfig.py:450
+#: hggtk\logfilter.py:27 hggtk\taskbarui.py:31 hggtk\thgconfig.py:452
msgid "Apply"
msgstr ""
@@ -1761,30 +1786,6 @@msgid "Merge"
msgstr ""
-#: hggtk\merge.py:104
-msgid "rev"
-msgstr ""
-
-#: hggtk\merge.py:105
-msgid "summary"
-msgstr ""
-
-#: hggtk\merge.py:106
-msgid "user"
-msgstr ""
-
-#: hggtk\merge.py:107
-msgid "date"
-msgstr ""
-
-#: hggtk\merge.py:111
-msgid "branch"
-msgstr ""
-
-#: hggtk\merge.py:113
-msgid "tags"
-msgstr ""
-
#: hggtk\merge.py:116
msgid "Not a head revision!"
msgstr ""
@@ -1801,7 +1802,7 @@msgid "TortoiseHg Recovery - "
msgstr ""
-#: hggtk\recovery.py:43 hggtk\synch.py:59
+#: hggtk\recovery.py:43 hggtk\synch.py:60
msgid "Stop the hg operation"
msgstr ""
@@ -1837,11 +1838,11 @@msgid "Validate repository consistency"
msgstr ""
-#: hggtk\recovery.py:99 hggtk\synch.py:381
+#: hggtk\recovery.py:99 hggtk\synch.py:367
msgid "Cannot close now"
msgstr ""
-#: hggtk\recovery.py:100 hggtk\synch.py:382
+#: hggtk\recovery.py:100 hggtk\synch.py:368
msgid "command is running"
msgstr ""
@@ -1865,15 +1866,15 @@msgid "Rollback repository '%s' ?"
msgstr ""
-#: hggtk\recovery.py:159 hggtk\synch.py:521
+#: hggtk\recovery.py:159 hggtk\synch.py:507
msgid "Cannot run now"
msgstr ""
-#: hggtk\recovery.py:160 hggtk\synch.py:522
+#: hggtk\recovery.py:160 hggtk\synch.py:508
msgid "Please try again after the previous command is completed"
msgstr ""
-#: hggtk\recovery.py:222 hggtk\synch.py:615
+#: hggtk\recovery.py:222 hggtk\synch.py:601
msgid "[command interrupted]"
msgstr ""
@@ -1901,7 +1902,7 @@msgid "Launch browser to view repository"
msgstr ""
-#: hggtk\serve.py:69 hggtk\synch.py:92
+#: hggtk\serve.py:69 hggtk\synch.py:93
msgid "Configure"
msgstr ""
@@ -2166,288 +2167,288 @@msgid "Copy file to"
msgstr ""
-#: hggtk\status.py:797 hggtk\status.py:1183
+#: hggtk\status.py:790 hggtk\status.py:1178
msgid "Nothing Removed"
msgstr ""
-#: hggtk\status.py:798
+#: hggtk\status.py:791
msgid "Remove is not enabled when multiple revisions are specified."
msgstr ""
-#: hggtk\status.py:815
+#: hggtk\status.py:808
msgid "Move is not enabled when multiple revisions are specified."
msgstr ""
-#: hggtk\status.py:815 hggtk\status.py:1207 hggtk\status.py:1215
+#: hggtk\status.py:808 hggtk\status.py:1196 hggtk\status.py:1204
msgid "Nothing Moved"
msgstr ""
-#: hggtk\status.py:833
+#: hggtk\status.py:826
msgid "Copy is not enabled when multiple revisions are specified."
msgstr ""
-#: hggtk\status.py:833
+#: hggtk\status.py:826
msgid "Nothing Copied"
msgstr ""
-#: hggtk\status.py:853
+#: hggtk\status.py:846
msgid "===== Diff to first parent =====\n"
msgstr ""
-#: hggtk\status.py:862
+#: hggtk\status.py:855
msgid ""
"\n"
"===== Diff to second parent =====\n"
msgstr ""
-#: hggtk\status.py:917
+#: hggtk\status.py:910
msgid "File is larger than the specified max size.\n"
msgstr ""
-#: hggtk\status.py:918
+#: hggtk\status.py:911
msgid "Hunk selection is disabled for this file.\n"
msgstr ""
-#: hggtk\status.py:1086 hggtk\status.py:1107
+#: hggtk\status.py:1081 hggtk\status.py:1102
msgid "Nothing Reverted"
msgstr ""
-#: hggtk\status.py:1087
+#: hggtk\status.py:1082
msgid "No revertable files selected"
msgstr ""
-#: hggtk\status.py:1108
+#: hggtk\status.py:1103
msgid "Revert not allowed when viewing revision range."
msgstr ""
-#: hggtk\status.py:1123 hggtk\status.py:1140
+#: hggtk\status.py:1118 hggtk\status.py:1135
msgid "Confirm Revert"
msgstr ""
-#: hggtk\status.py:1124
+#: hggtk\status.py:1119
msgid "Revert files to revision %s?"
msgstr ""
+#: hggtk\status.py:1121
+msgid "Which parent to revert to?"
+msgstr ""
+
+#: hggtk\status.py:1122
+msgid "Revert file(s) to local or other parent?"
+msgstr ""
+
+#: hggtk\status.py:1123
+msgid "&local"
+msgstr ""
+
+#: hggtk\status.py:1123
+msgid "&other"
+msgstr ""
+
+#: hggtk\status.py:1123 hggtk\status.py:1124
+msgid "l"
+msgstr ""
+
#: hggtk\status.py:1126
-msgid "Which parent to revert to?"
-msgstr ""
-
-#: hggtk\status.py:1127
-msgid "Revert file(s) to local or other parent?"
-msgstr ""
-
-#: hggtk\status.py:1128
-msgid "&local"
-msgstr ""
-
-#: hggtk\status.py:1128
-msgid "&other"
-msgstr ""
-
-#: hggtk\status.py:1128 hggtk\status.py:1129
-msgid "l"
-msgstr ""
-
-#: hggtk\status.py:1131
msgid "o"
msgstr ""
-#: hggtk\status.py:1141
+#: hggtk\status.py:1136
msgid "Revert the following files?"
msgstr ""
-#: hggtk\status.py:1153
+#: hggtk\status.py:1148
msgid "Nothing Added"
msgstr ""
-#: hggtk\status.py:1154
+#: hggtk\status.py:1149
msgid "No addable files selected"
msgstr ""
-#: hggtk\status.py:1184
+#: hggtk\status.py:1179
msgid "No removable files selected"
msgstr ""
-#: hggtk\status.py:1191
-msgid "Move files to diretory..."
-msgstr ""
-
-#: hggtk\status.py:1208
+#: hggtk\status.py:1187
+msgid "Move files to directory..."
+msgstr ""
+
+#: hggtk\status.py:1197
msgid "Cannot move outside repo!"
msgstr ""
-#: hggtk\status.py:1215
+#: hggtk\status.py:1204
msgid ""
"No movable files selected\n"
"\n"
"Note: only clean files can be moved."
msgstr ""
-#: hggtk\status.py:1223
+#: hggtk\status.py:1212
msgid "Confirm Delete Unrevisioned"
msgstr ""
-#: hggtk\status.py:1224
+#: hggtk\status.py:1213
msgid "Delete the following unrevisioned files?"
msgstr ""
-#: hggtk\status.py:1237
+#: hggtk\status.py:1226
msgid "Delete Errors"
msgstr ""
-#: hggtk\synch.py:51
+#: hggtk\synch.py:52
msgid "TortoiseHg Synchronize - "
msgstr ""
-#: hggtk\synch.py:63
+#: hggtk\synch.py:64
msgid "Incoming"
msgstr ""
-#: hggtk\synch.py:65
+#: hggtk\synch.py:66
msgid "Display changes that can be pulled from selected repository"
msgstr ""
-#: hggtk\synch.py:68
+#: hggtk\synch.py:69
msgid " Pull "
msgstr ""
-#: hggtk\synch.py:70
+#: hggtk\synch.py:71
msgid "Pull changes from selected repository"
msgstr ""
-#: hggtk\synch.py:74
+#: hggtk\synch.py:75
msgid "Outgoing"
msgstr ""
-#: hggtk\synch.py:76
+#: hggtk\synch.py:77
msgid "Display local changes that will be pushed to selected repository"
msgstr ""
-#: hggtk\synch.py:79
+#: hggtk\synch.py:80
msgid "Push"
msgstr ""
-#: hggtk\synch.py:81
+#: hggtk\synch.py:82
msgid "Push local changes to selected repository"
msgstr ""
-#: hggtk\synch.py:84 hggtk\thgconfig.py:479
+#: hggtk\synch.py:85 hggtk\thgconfig.py:481
msgid "Email"
msgstr ""
-#: hggtk\synch.py:86
+#: hggtk\synch.py:87
msgid "Email local outgoing changes to one or more recipients"
msgstr ""
-#: hggtk\synch.py:94
+#: hggtk\synch.py:95
msgid "Configure peer repository paths"
msgstr ""
-#: hggtk\synch.py:105
+#: hggtk\synch.py:106
msgid "Repo:"
msgstr ""
-#: hggtk\synch.py:110
+#: hggtk\synch.py:111
msgid "Bundle:"
msgstr ""
-#: hggtk\synch.py:154
+#: hggtk\synch.py:155
msgid "Post pull operation"
msgstr ""
-#: hggtk\synch.py:156
+#: hggtk\synch.py:157
msgid "Nothing"
msgstr ""
-#: hggtk\synch.py:157 hggtk\update.py:80
+#: hggtk\synch.py:158 hggtk\update.py:80
msgid "Update"
msgstr ""
-#: hggtk\synch.py:158
+#: hggtk\synch.py:159
msgid "Fetch"
msgstr ""
-#: hggtk\synch.py:159
+#: hggtk\synch.py:160
msgid "Rebase"
msgstr ""
-#: hggtk\synch.py:167
+#: hggtk\synch.py:168
msgid "Advanced Options"
msgstr ""
-#: hggtk\synch.py:189
+#: hggtk\synch.py:190
msgid "Force pull or push"
msgstr ""
-#: hggtk\synch.py:190
+#: hggtk\synch.py:191
msgid "Run even when remote repository is unrelated."
msgstr ""
-#: hggtk\synch.py:194
+#: hggtk\synch.py:195
msgid "Target Revision:"
msgstr ""
-#: hggtk\synch.py:198
+#: hggtk\synch.py:199
msgid "A specific revision up to which you would like to push or pull."
msgstr ""
-#: hggtk\synch.py:202
+#: hggtk\synch.py:203
msgid "Remote Command:"
msgstr ""
-#: hggtk\synch.py:206
+#: hggtk\synch.py:207
msgid "Name of hg executable on remote machine."
msgstr ""
-#: hggtk\synch.py:214
+#: hggtk\synch.py:215
msgid "Incoming/Outgoing"
msgstr ""
-#: hggtk\synch.py:217
+#: hggtk\synch.py:218
msgid "Show Patches"
msgstr ""
-#: hggtk\synch.py:218
+#: hggtk\synch.py:219
msgid "Show Newest First"
msgstr ""
-#: hggtk\synch.py:219
+#: hggtk\synch.py:220
msgid "Show No Merges"
msgstr ""
-#: hggtk\synch.py:242
+#: hggtk\synch.py:243
msgid "View pulled revisions"
msgstr ""
-#: hggtk\synch.py:244
+#: hggtk\synch.py:245
msgid "Update to branch tip"
msgstr ""
-#: hggtk\synch.py:339
+#: hggtk\synch.py:340
msgid "unknown sort key '%s'"
msgstr ""
-#: hggtk\synch.py:347
+#: hggtk\synch.py:350
msgid "Select Repository"
msgstr ""
+#: hggtk\synch.py:358
+msgid "Select Bundle"
+msgstr ""
+
+#: hggtk\synch.py:359
+msgid "Bundle (*.hg)"
+msgstr ""
+
#: hggtk\synch.py:360
-msgid "Select Bundle"
-msgstr ""
-
-#: hggtk\synch.py:367
-msgid "Bundle (*.hg)"
-msgstr ""
-
-#: hggtk\synch.py:371
msgid "Bundle (*)"
msgstr ""
-#: hggtk\synch.py:480
+#: hggtk\synch.py:466
msgid "No repository selected"
msgstr ""
-#: hggtk\synch.py:481
+#: hggtk\synch.py:467
msgid "Select a peer repository to compare with"
msgstr ""
@@ -2617,260 +2618,262 @@"Graphical merge program for resolving merge conflicts. If left unspecified, "
"Mercurial will use the first applicable tool it finds on your system or use "
"its internal merge tool that leaves conflict markers in place. Chose "
-"internal:merge to force conflict markers."
-msgstr ""
-
-#: hggtk\thgconfig.py:32
+"internal:merge to force conflict markers, internal:prompt to always select "
+"local or other, or internal:dump to leave files in the working directory for "
+"manual merging"
+msgstr ""
+
+#: hggtk\thgconfig.py:34
msgid "Visual Diff Command"
msgstr ""
-#: hggtk\thgconfig.py:33
+#: hggtk\thgconfig.py:35
msgid "Specify visual diff tool; must be an extdiff command"
msgstr ""
-#: hggtk\thgconfig.py:34
+#: hggtk\thgconfig.py:36
msgid "Skip Diff Window"
msgstr ""
-#: hggtk\thgconfig.py:35
+#: hggtk\thgconfig.py:37
msgid ""
"Bypass the builtin visual diff dialog and directly use your visual diff "
"tool's directory diff feature. Only enable this feature if you know your "
"diff tool has a valid extdiff configuration. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:39
+#: hggtk\thgconfig.py:41
msgid "Visual Editor"
msgstr ""
-#: hggtk\thgconfig.py:40
+#: hggtk\thgconfig.py:42
msgid "Specify the visual editor used to view files, etc"
msgstr ""
-#: hggtk\thgconfig.py:41
+#: hggtk\thgconfig.py:43
msgid "CLI Editor"
msgstr ""
-#: hggtk\thgconfig.py:42
+#: hggtk\thgconfig.py:44
msgid ""
"The editor to use during a commit and other instances where Mercurial needs "
"multiline input from the user. Only used by command line interface commands."
msgstr ""
-#: hggtk\thgconfig.py:45
+#: hggtk\thgconfig.py:47
msgid "Tab Width"
msgstr ""
-#: hggtk\thgconfig.py:46
+#: hggtk\thgconfig.py:48
msgid ""
"Specify the number of spaces that tabs expand to in various TortoiseHG "
"windows. Default: Not expanded"
msgstr ""
-#: hggtk\thgconfig.py:49
+#: hggtk\thgconfig.py:51
msgid "Max Diff Size"
msgstr ""
-#: hggtk\thgconfig.py:50
+#: hggtk\thgconfig.py:52
msgid ""
"The maximum size file (in KB) that TortoiseHg will show changes for in the "
"changelog, status, and commit windows. A value of zero implies no limit. "
"Default: 1024 (1MB)"
msgstr ""
-#: hggtk\thgconfig.py:53
+#: hggtk\thgconfig.py:55
msgid "Bottom Diffs"
msgstr ""
-#: hggtk\thgconfig.py:54
+#: hggtk\thgconfig.py:56
msgid ""
"Show the diff panel below the file list in status, shelve, and commit "
"dialogs. Default: False (show diffs to right of file list)"
msgstr ""
-#: hggtk\thgconfig.py:59
+#: hggtk\thgconfig.py:61
msgid "Username"
msgstr ""
-#: hggtk\thgconfig.py:60
+#: hggtk\thgconfig.py:62
msgid "Name associated with commits"
msgstr ""
-#: hggtk\thgconfig.py:61
+#: hggtk\thgconfig.py:63
msgid "External Commit Tool"
msgstr ""
-#: hggtk\thgconfig.py:62
+#: hggtk\thgconfig.py:64
msgid ""
"Select commit tool launched by TortoiseHg. (Qct is no longer distributed as "
"part of TortoiseHG.) Default: None (use the builtin tool)"
msgstr ""
-#: hggtk\thgconfig.py:65
+#: hggtk\thgconfig.py:67
msgid "Summary Line Length"
msgstr ""
-#: hggtk\thgconfig.py:66
+#: hggtk\thgconfig.py:68
msgid ""
"Maximum length of the commit message summary line. If set, TortoiseHG will "
"issue a warning if the summary line is too long or not separated by a blank "
"line. Default: 0 (unenforced)"
msgstr ""
-#: hggtk\thgconfig.py:70
+#: hggtk\thgconfig.py:72
msgid "Message Line Length"
msgstr ""
-#: hggtk\thgconfig.py:71
+#: hggtk\thgconfig.py:73
msgid ""
"Word wrap length of the commit message. If set, the popup menu can be used "
"to format the message and a warning will be issued if any lines are too long "
"at commit. Default: 0 (unenforced)"
msgstr ""
-#: hggtk\thgconfig.py:78
+#: hggtk\thgconfig.py:80
msgid "Author Coloring"
msgstr ""
-#: hggtk\thgconfig.py:79
+#: hggtk\thgconfig.py:81
msgid ""
"Color changesets by author name. If not enabled, the changes are colored "
"green for merge, red for non-trivial parents, black for normal. Default: "
"False"
msgstr ""
-#: hggtk\thgconfig.py:83
+#: hggtk\thgconfig.py:85
msgid "Long Summary"
msgstr ""
-#: hggtk\thgconfig.py:84
+#: hggtk\thgconfig.py:86
msgid ""
"If true, concatenate multiple lines of changeset summary until they reach 80 "
"characters. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:87
+#: hggtk\thgconfig.py:89
msgid "Log Batch Size"
msgstr ""
-#: hggtk\thgconfig.py:88
+#: hggtk\thgconfig.py:90
msgid ""
"The number of revisions to read and display in the changelog viewer in a "
"single batch. Default: 500"
msgstr ""
-#: hggtk\thgconfig.py:91
+#: hggtk\thgconfig.py:93
msgid "Copy Hash"
msgstr ""
-#: hggtk\thgconfig.py:92
+#: hggtk\thgconfig.py:94
msgid ""
"Allow the changelog viewer to copy the changeset hash of the currently "
"selected changeset into the clipboard. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:97
+#: hggtk\thgconfig.py:99
msgid "After pull operation"
msgstr ""
-#: hggtk\thgconfig.py:99
+#: hggtk\thgconfig.py:101
msgid ""
"Operation which is performed directly after a successful pull. update "
"equates to pull --update, fetch equates to the fetch extension, rebase "
"equates to pull --rebase. Default: none"
msgstr ""
-#: hggtk\thgconfig.py:104
+#: hggtk\thgconfig.py:106
msgid "Name"
msgstr ""
-#: hggtk\thgconfig.py:105
+#: hggtk\thgconfig.py:107
msgid ""
"Repository name to use in the web interface. Default is the working "
"directory."
msgstr ""
-#: hggtk\thgconfig.py:107 hggtk\thgconfig.py:776
+#: hggtk\thgconfig.py:109 hggtk\thgconfig.py:778
msgid "Description"
msgstr ""
-#: hggtk\thgconfig.py:108
+#: hggtk\thgconfig.py:110
msgid "Textual description of the repository's purpose or contents."
msgstr ""
-#: hggtk\thgconfig.py:110
+#: hggtk\thgconfig.py:112
msgid "Contact"
msgstr ""
-#: hggtk\thgconfig.py:111
+#: hggtk\thgconfig.py:113
msgid "Name or email address of the person in charge of the repository."
msgstr ""
-#: hggtk\thgconfig.py:113
+#: hggtk\thgconfig.py:115
msgid "Style"
msgstr ""
-#: hggtk\thgconfig.py:115
+#: hggtk\thgconfig.py:117
msgid "Which template map style to use"
msgstr ""
-#: hggtk\thgconfig.py:116
+#: hggtk\thgconfig.py:118
msgid "Archive Formats"
msgstr ""
-#: hggtk\thgconfig.py:117
+#: hggtk\thgconfig.py:119
msgid "Comma separated list of archive formats allowed for downloading"
msgstr ""
-#: hggtk\thgconfig.py:119
+#: hggtk\thgconfig.py:121
msgid "Port to listen on"
msgstr ""
-#: hggtk\thgconfig.py:119 hggtk\thgconfig.py:229
+#: hggtk\thgconfig.py:121 hggtk\thgconfig.py:231
msgid "Port"
msgstr ""
-#: hggtk\thgconfig.py:120
+#: hggtk\thgconfig.py:122
msgid "Push Requires SSL"
msgstr ""
-#: hggtk\thgconfig.py:121
+#: hggtk\thgconfig.py:123
msgid ""
"Whether to require that inbound pushes be transported over SSL to prevent "
"password sniffing."
msgstr ""
-#: hggtk\thgconfig.py:123
+#: hggtk\thgconfig.py:125
msgid "Stripes"
msgstr ""
-#: hggtk\thgconfig.py:124
+#: hggtk\thgconfig.py:126
msgid ""
"How many lines a \"zebra stripe\" should span in multiline output. Default "
"is 1; set to 0 to disable."
msgstr ""
-#: hggtk\thgconfig.py:126
+#: hggtk\thgconfig.py:128
msgid "Max Files"
msgstr ""
-#: hggtk\thgconfig.py:127
+#: hggtk\thgconfig.py:129
msgid "Maximum number of files to list per changeset."
msgstr ""
-#: hggtk\thgconfig.py:128
+#: hggtk\thgconfig.py:130
msgid "Max Changes"
msgstr ""
-#: hggtk\thgconfig.py:129
+#: hggtk\thgconfig.py:131
msgid "Maximum number of changes to list on the changelog."
msgstr ""
-#: hggtk\thgconfig.py:130
+#: hggtk\thgconfig.py:132
msgid "Allow Push"
msgstr ""
-#: hggtk\thgconfig.py:131
+#: hggtk\thgconfig.py:133
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 "
@@ -2880,11 +2883,11 @@"examined after the deny_push list."
msgstr ""
-#: hggtk\thgconfig.py:138
+#: hggtk\thgconfig.py:140
msgid "Deny Push"
msgstr ""
-#: hggtk\thgconfig.py:139
+#: hggtk\thgconfig.py:141
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. "
@@ -2893,81 +2896,81 @@"The contents of the deny_push list are examined before the allow_push list."
msgstr ""
-#: hggtk\thgconfig.py:145
+#: hggtk\thgconfig.py:147
msgid "Encoding"
msgstr ""
-#: hggtk\thgconfig.py:146
+#: hggtk\thgconfig.py:148
msgid "Character encoding name"
msgstr ""
-#: hggtk\thgconfig.py:149 hggtk\thgconfig.py:230
+#: hggtk\thgconfig.py:151 hggtk\thgconfig.py:232
msgid "Host"
msgstr ""
-#: hggtk\thgconfig.py:150
+#: hggtk\thgconfig.py:152
msgid ""
"Host name and (optional) port of proxy server, for example \"myproxy:8000\""
msgstr ""
-#: hggtk\thgconfig.py:152
+#: hggtk\thgconfig.py:154
msgid "Bypass List"
msgstr ""
-#: hggtk\thgconfig.py:153
+#: hggtk\thgconfig.py:155
msgid ""
"Optional. Comma-separated list of host names that should bypass the proxy"
msgstr ""
-#: hggtk\thgconfig.py:155 hggtk\thgconfig.py:231
+#: hggtk\thgconfig.py:157 hggtk\thgconfig.py:233
msgid "Password"
msgstr ""
-#: hggtk\thgconfig.py:156
+#: hggtk\thgconfig.py:158
msgid "Optional. Password to authenticate with at the proxy server"
msgstr ""
-#: hggtk\thgconfig.py:159
+#: hggtk\thgconfig.py:161
msgid "Optional. User name to authenticate with at the proxy server"
msgstr ""
-#: hggtk\thgconfig.py:163
+#: hggtk\thgconfig.py:165
msgid "From"
msgstr ""
-#: hggtk\thgconfig.py:164
+#: hggtk\thgconfig.py:166
msgid "Email address to use in the \"From\" header and for the SMTP envelope"
msgstr ""
-#: hggtk\thgconfig.py:165
+#: hggtk\thgconfig.py:167
msgid "To"
msgstr ""
-#: hggtk\thgconfig.py:166
+#: hggtk\thgconfig.py:168
msgid "Comma-separated list of recipient email addresses"
msgstr ""
-#: hggtk\thgconfig.py:167
+#: hggtk\thgconfig.py:169
msgid "Cc"
msgstr ""
-#: hggtk\thgconfig.py:168
+#: hggtk\thgconfig.py:170
msgid "Comma-separated list of carbon copy recipient email addresses"
msgstr ""
-#: hggtk\thgconfig.py:170
+#: hggtk\thgconfig.py:172
msgid "Bcc"
msgstr ""
-#: hggtk\thgconfig.py:171
+#: hggtk\thgconfig.py:173
msgid "Comma-separated list of blind carbon copy recipient email addresses"
msgstr ""
-#: hggtk\thgconfig.py:173
+#: hggtk\thgconfig.py:175
msgid "method"
msgstr ""
-#: hggtk\thgconfig.py:174
+#: hggtk\thgconfig.py:176
msgid ""
"Optional. Method to use to send email messages. If value is \"smtp\" "
"(default), use SMTP (configured below). Otherwise, use as name of program "
@@ -2977,231 +2980,231 @@"messages."
msgstr ""
-#: hggtk\thgconfig.py:179
+#: hggtk\thgconfig.py:181
msgid "Host name of mail server"
msgstr ""
-#: hggtk\thgconfig.py:179
+#: hggtk\thgconfig.py:181
msgid "SMTP Host"
msgstr ""
-#: hggtk\thgconfig.py:180
+#: hggtk\thgconfig.py:182
msgid "SMTP Port"
msgstr ""
-#: hggtk\thgconfig.py:181
+#: hggtk\thgconfig.py:183
msgid "Port to connect to on mail server. Default: 25"
msgstr ""
-#: hggtk\thgconfig.py:183
+#: hggtk\thgconfig.py:185
msgid "SMTP TLS"
msgstr ""
-#: hggtk\thgconfig.py:184
+#: hggtk\thgconfig.py:186
msgid "Connect to mail server using TLS. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:186
+#: hggtk\thgconfig.py:188
msgid "SMTP Username"
msgstr ""
-#: hggtk\thgconfig.py:187
+#: hggtk\thgconfig.py:189
msgid "Username to authenticate to mail server with"
msgstr ""
-#: hggtk\thgconfig.py:188
+#: hggtk\thgconfig.py:190
msgid "SMTP Password"
msgstr ""
-#: hggtk\thgconfig.py:189
+#: hggtk\thgconfig.py:191
msgid "Password to authenticate to mail server with"
msgstr ""
-#: hggtk\thgconfig.py:190
+#: hggtk\thgconfig.py:192
msgid "Local Hostname"
msgstr ""
-#: hggtk\thgconfig.py:191
+#: hggtk\thgconfig.py:193
msgid "Hostname the sender can use to identify itself to the mail server."
msgstr ""
-#: hggtk\thgconfig.py:194
+#: hggtk\thgconfig.py:196
msgid "Git Format"
msgstr ""
-#: hggtk\thgconfig.py:195
+#: hggtk\thgconfig.py:197
msgid "Use git extended diff header format. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:197
+#: hggtk\thgconfig.py:199
msgid "No Dates"
msgstr ""
-#: hggtk\thgconfig.py:198
+#: hggtk\thgconfig.py:200
msgid "Do not include modification dates in diff headers. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:200
+#: hggtk\thgconfig.py:202
msgid "Show Function"
msgstr ""
-#: hggtk\thgconfig.py:201
+#: hggtk\thgconfig.py:203
msgid "Show which function each change is in. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:203
+#: hggtk\thgconfig.py:205
msgid "Ignore White Space"
msgstr ""
-#: hggtk\thgconfig.py:204
+#: hggtk\thgconfig.py:206
msgid "Ignore white space when comparing lines. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:206
+#: hggtk\thgconfig.py:208
msgid "Ignore WS Amount"
msgstr ""
-#: hggtk\thgconfig.py:207
+#: hggtk\thgconfig.py:209
msgid "Ignore changes in the amount of white space. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:209
+#: hggtk\thgconfig.py:211
msgid "Ignore Blank Lines"
msgstr ""
-#: hggtk\thgconfig.py:210
+#: hggtk\thgconfig.py:212
msgid "Ignore changes whose lines are all blank. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:223
+#: hggtk\thgconfig.py:225
msgid "Edit remote repository path"
msgstr ""
-#: hggtk\thgconfig.py:229
+#: hggtk\thgconfig.py:231
msgid "URL"
msgstr ""
-#: hggtk\thgconfig.py:230
+#: hggtk\thgconfig.py:232
msgid "Folder"
msgstr ""
-#: hggtk\thgconfig.py:232 hggtk\thgconfig.py:729
+#: hggtk\thgconfig.py:234 hggtk\thgconfig.py:731
msgid "Alias"
msgstr ""
-#: hggtk\thgconfig.py:367 hggtk\thgconfig.py:669
+#: hggtk\thgconfig.py:369 hggtk\thgconfig.py:671
msgid "Overwrite existing '%s' path?"
msgstr ""
-#: hggtk\thgconfig.py:421
+#: hggtk\thgconfig.py:423
msgid "No repository found"
msgstr ""
-#: hggtk\thgconfig.py:422
+#: hggtk\thgconfig.py:424
msgid "no repo at "
msgstr ""
-#: hggtk\thgconfig.py:430
+#: hggtk\thgconfig.py:432
msgid "User global settings"
msgstr ""
-#: hggtk\thgconfig.py:432
+#: hggtk\thgconfig.py:434
msgid "%s repository settings"
msgstr ""
-#: hggtk\thgconfig.py:437
+#: hggtk\thgconfig.py:439
msgid "Edit File"
msgstr ""
-#: hggtk\thgconfig.py:466
+#: hggtk\thgconfig.py:468
msgid "Changelog"
msgstr ""
-#: hggtk\thgconfig.py:469
+#: hggtk\thgconfig.py:471
msgid "Sync"
msgstr ""
-#: hggtk\thgconfig.py:473
+#: hggtk\thgconfig.py:475
msgid "Web"
msgstr ""
-#: hggtk\thgconfig.py:476
+#: hggtk\thgconfig.py:478
msgid "Proxy"
msgstr ""
-#: hggtk\thgconfig.py:482
+#: hggtk\thgconfig.py:484
msgid "Diff"
msgstr ""
-#: hggtk\thgconfig.py:495
+#: hggtk\thgconfig.py:497
msgid "Unapplied changes"
msgstr ""
-#: hggtk\thgconfig.py:496
+#: hggtk\thgconfig.py:498
msgid "Lose changes and switch files?."
msgstr ""
-#: hggtk\thgconfig.py:507
+#: hggtk\thgconfig.py:509
msgid "TortoiseHg Configure Repository - "
msgstr ""
-#: hggtk\thgconfig.py:511
+#: hggtk\thgconfig.py:513
msgid "TortoiseHg Configure User-Global Settings"
msgstr ""
-#: hggtk\thgconfig.py:555
+#: hggtk\thgconfig.py:557
msgid "Confirm quit without saving?"
msgstr ""
-#: hggtk\thgconfig.py:556
+#: hggtk\thgconfig.py:558
msgid "Yes to abandon changes, No to continue"
msgstr ""
-#: hggtk\thgconfig.py:644
+#: hggtk\thgconfig.py:646
msgid "No Repository Found"
msgstr ""
-#: hggtk\thgconfig.py:645
+#: hggtk\thgconfig.py:647
msgid "Path testing cannot work without a repository"
msgstr ""
-#: hggtk\thgconfig.py:711
+#: hggtk\thgconfig.py:713
msgid "Remote repository paths"
msgstr ""
-#: hggtk\thgconfig.py:733
+#: hggtk\thgconfig.py:735
msgid "Repository Path"
msgstr ""
-#: hggtk\thgconfig.py:747
+#: hggtk\thgconfig.py:749
msgid "_Edit"
msgstr ""
-#: hggtk\thgconfig.py:757
+#: hggtk\thgconfig.py:759
msgid "_Test"
msgstr ""
-#: hggtk\thgconfig.py:762
+#: hggtk\thgconfig.py:764
msgid "Set as _default"
msgstr ""
-#: hggtk\thgconfig.py:859
+#: hggtk\thgconfig.py:863
msgid "Suggested"
msgstr ""
-#: hggtk\thgconfig.py:869
+#: hggtk\thgconfig.py:873
msgid "History"
msgstr ""
-#: hggtk\thgconfig.py:907
+#: hggtk\thgconfig.py:911
msgid "# Generated by tortoisehg-config\n"
msgstr ""
-#: hggtk\thgconfig.py:944
+#: hggtk\thgconfig.py:948
msgid "Skipped saving path with no alias"
msgstr ""
-#: hggtk\thgconfig.py:972
+#: hggtk\thgconfig.py:976
msgid "Unable to write configuration file"
msgstr ""
@@ -3319,11 +3322,11 @@msgid "There are no file changes to view"
msgstr ""
-#: hggtk\visdiff.py:241
+#: hggtk\visdiff.py:242
msgid "Tool launch failure"
msgstr ""
-#: hggtk\visdiff.py:242
+#: hggtk\visdiff.py:243
msgid "%s : %s"
msgstr ""
|
Add a tag
Loading...