We are currently indexing your data, so search results may be incomplete until we finish.
Merge with stable
by
Changes to 27 files · Browse files at 49a85271499e Showing diff from parent 217007d01ff9 1b33a535b98b Diff from another changeset...
-
.hgtags
-
doc/source/conf.py
-
i18n/tortoisehg/en_AU.po
-
i18n/tortoisehg/en_GB.po
-
i18n/tortoisehg/es.po
-
i18n/tortoisehg/et.po
-
i18n/tortoisehg/fa.po
-
i18n/tortoisehg/fr.po
-
i18n/tortoisehg/he.po
-
i18n/tortoisehg/hr.po
-
i18n/tortoisehg/hu.po
-
i18n/tortoisehg/it.po
-
i18n/tortoisehg/ja.po
-
i18n/tortoisehg/ko.po
-
i18n/tortoisehg/nb.po
-
i18n/tortoisehg/nl.po
-
i18n/tortoisehg/nn.po
-
i18n/tortoisehg/oc.po
-
i18n/tortoisehg/pl.po
-
i18n/tortoisehg/pt.po
-
i18n/tortoisehg/pt_BR.po
-
i18n/tortoisehg/ru.po
-
i18n/tortoisehg/sv.po
-
i18n/tortoisehg/tr.po
-
i18n/tortoisehg/uk.po
-
i18n/tortoisehg/zh_CN.po
-
i18n/tortoisehg/zh_TW.po
|
@@ -44,3 +44,4 @@ b740366bf49f2ad67ff923fa30e875acfba05892 1.1.6.1
d5840485b34265572ffb4d5bb1226b1577163115 1.1.7
653ff9fb4ccf16833bab58fbc765ff8829dc1265 1.9
+edc8ec8b18a98abada33fb312e2c5cfb8e336eb4 1.1.8
|
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
|
@@ -7,811 +7,1035 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: Norwegian Nynorsk <nn@li.org>\n"
-"POT-Creation-Date: 2009-11-16 15:27+0000\n"
+"POT-Creation-Date: 2010-12-28 20:44+0000\n"
"PO-Revision-Date: 2009-11-23 16:59+0000\n"
"Last-Translator: Norwegian Nynorsk <nn@li.org>\n"
"Language-Team: Norwegian Nynorsk <nn@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-11-24 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: thgtaskbar.py:38
-msgid "TortoiseHg RPC server"
-msgstr ""
-
-#: thgtaskbar.py:115
-msgid "Options..."
-msgstr ""
-
-#: thgtaskbar.py:117
+#: TortoiseHgOverlayServer.py:36
+msgid "TortoiseHg Overlay Icon Server"
+msgstr ""
+
+#: TortoiseHgOverlayServer.py:117
msgid "Exit"
msgstr ""
-#: tortoisehg\hgtk\about.py:62
+#: tortoisehg\hgtk\about.py:42
msgid "Several icons are courtesy of the TortoiseSVN project"
msgstr ""
-#: tortoisehg\hgtk\about.py:66
+#: tortoisehg\hgtk\about.py:70
+msgid "A new version of TortoiseHg is ready for download!"
+msgstr ""
+
+#: tortoisehg\hgtk\about.py:76
msgid "(version %s)"
msgstr ""
-#: tortoisehg\hgtk\about.py:69
-msgid "Copyright 2009 TK Soh and others"
-msgstr ""
-
-#: tortoisehg\hgtk\about.py:85
+#: tortoisehg\hgtk\about.py:79
+msgid "Copyright 2008-2010 Steve Borho and others"
+msgstr ""
+
+#: tortoisehg\hgtk\about.py:95
msgid "with %s"
msgstr ""
-#: tortoisehg\hgtk\archive.py:20
+#: tortoisehg\hgtk\archive.py:18
msgid "= Working Directory Parent ="
msgstr ""
-#: tortoisehg\hgtk\archive.py:37
+#: tortoisehg\hgtk\archive.py:29
+msgid "Archive - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:59
+msgid "Archive revision:"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:62
+msgid "Only files modified/created in this revision"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:69 tortoisehg\hgtk\clone.py:70
+#: tortoisehg\hgtk\hginit.py:55 tortoisehg\hgtk\thgconfig.py:394
+#: tortoisehg\hgtk\thgimport.py:63
+msgid "Browse..."
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:72 tortoisehg\hgtk\clone.py:106
+msgid "Destination path:"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:75
+msgid "Directory of files"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:77
+msgid "Archive types:"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:83
+msgid "Uncompressed tar archive"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:84
+msgid "Tar archive compressed using bzip2"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:85
+msgid "Tar archive compressed using gzip"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:86
+msgid "Uncompressed zip archive"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:87
+msgid "Zip archive compressed using deflate"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:96
msgid "Archive"
msgstr ""
-#: tortoisehg\hgtk\archive.py:46
-msgid "Archive - %s"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:71
-msgid "Archive revision:"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:77 tortoisehg\hgtk\clone.py:74
-#: tortoisehg\hgtk\hginit.py:52 tortoisehg\hgtk\thgconfig.py:301
-msgid "Browse..."
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:80 tortoisehg\hgtk\clone.py:103
-msgid "Destination path:"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:83
-msgid "Directory of files"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:85
-msgid "Archive types:"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:91
-msgid "Uncompressed tar archive"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:92
-msgid "Tar archive compressed using bzip2"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:93
-msgid "Tar archive compressed using gzip"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:94
-msgid "Uncompressed zip archive"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:95
-msgid "Zip archive compressed using deflate"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:113 tortoisehg\hgtk\backout.py:114
-#: tortoisehg\hgtk\clone.py:165 tortoisehg\hgtk\merge.py:142
-#: tortoisehg\hgtk\quickop.py:182 tortoisehg\hgtk\thgstrip.py:182
-#: tortoisehg\hgtk\update.py:122
-msgid "Abort"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:127 tortoisehg\hgtk\backout.py:141
-#: tortoisehg\hgtk\clone.py:188 tortoisehg\hgtk\merge.py:162
-#: tortoisehg\hgtk\quickop.py:197 tortoisehg\hgtk\thgstrip.py:307
-#: tortoisehg\hgtk\update.py:137
-msgid "Confirm Abort"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:128 tortoisehg\hgtk\backout.py:142
-#: tortoisehg\hgtk\clone.py:189 tortoisehg\hgtk\merge.py:163
-#: tortoisehg\hgtk\quickop.py:198 tortoisehg\hgtk\thgstrip.py:308
-#: tortoisehg\hgtk\update.py:138
-msgid "Do you want to abort?"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:138 tortoisehg\hgtk\backout.py:153
-#: tortoisehg\hgtk\clone.py:199 tortoisehg\hgtk\merge.py:183
-#: tortoisehg\hgtk\quickop.py:207 tortoisehg\hgtk\thgstrip.py:318
-#: tortoisehg\hgtk\update.py:148
-msgid "unexpected response id: %s"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:194
+#: tortoisehg\hgtk\archive.py:111
+msgid "Archived successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:113
+msgid "Canceled archiving"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:115
+msgid "Failed to archive"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:171
msgid "Tar archives"
msgstr ""
-#: tortoisehg\hgtk\archive.py:197
+#: tortoisehg\hgtk\archive.py:174
msgid "Bzip2 tar archives"
msgstr ""
-#: tortoisehg\hgtk\archive.py:200
+#: tortoisehg\hgtk\archive.py:177
msgid "Gzip tar archives"
msgstr ""
-#: tortoisehg\hgtk\archive.py:206
+#: tortoisehg\hgtk\archive.py:183
msgid "Compressed zip archives"
msgstr ""
-#: tortoisehg\hgtk\archive.py:218 tortoisehg\hgtk\clone.py:104
-#: tortoisehg\hgtk\hginit.py:77
+#: tortoisehg\hgtk\archive.py:195 tortoisehg\hgtk\clone.py:107
+#: tortoisehg\hgtk\hginit.py:95
msgid "Select Destination Folder"
msgstr ""
-#: tortoisehg\hgtk\archive.py:224
+#: tortoisehg\hgtk\archive.py:201
msgid "Select Destination File"
msgstr ""
-#: tortoisehg\hgtk\archive.py:226
+#: tortoisehg\hgtk\archive.py:203
msgid "All Files (*.*)"
msgstr ""
-#: tortoisehg\hgtk\archive.py:238 tortoisehg\hgtk\backout.py:181
-#: tortoisehg\hgtk\clone.py:223 tortoisehg\hgtk\merge.py:198
-#: tortoisehg\hgtk\quickop.py:219 tortoisehg\hgtk\thgstrip.py:350
-#: tortoisehg\hgtk\update.py:160
-msgid "unknown mode name: %s"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:254 tortoisehg\hgtk\archive.py:260
-#: tortoisehg\hgtk\gtklib.py:245 tortoisehg\hgtk\thgconfig.py:481
-#: tortoisehg\hgtk\thgconfig.py:831
+#: tortoisehg\hgtk\archive.py:213 tortoisehg\hgtk\archive.py:219
+#: tortoisehg\hgtk\gtklib.py:580 tortoisehg\hgtk\thgconfig.py:574
+#: tortoisehg\hgtk\thgconfig.py:1077
msgid "Confirm Overwrite"
msgstr ""
-#: tortoisehg\hgtk\archive.py:255
+#: tortoisehg\hgtk\archive.py:214
msgid ""
"The destination \"%s\" already exists!\n"
"\n"
"Do you want to overwrite it?"
msgstr ""
-#: tortoisehg\hgtk\archive.py:261
+#: tortoisehg\hgtk\archive.py:220
msgid ""
"The directory \"%s\" isn't empty!\n"
"\n"
"Do you want to overwrite it?"
msgstr ""
-#: tortoisehg\hgtk\archive.py:280
-msgid "Archived successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:282
-msgid "Canceled archiving"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:284
-msgid "Failed to archive"
-msgstr ""
-
-#: tortoisehg\hgtk\backout.py:29
+#: tortoisehg\hgtk\backout.py:28
msgid "Backout changeset - %s"
msgstr ""
-#: tortoisehg\hgtk\backout.py:38
-msgid "Backout"
-msgstr ""
-
-#: tortoisehg\hgtk\backout.py:51
+#: tortoisehg\hgtk\backout.py:41
msgid "Backed out changeset: "
msgstr ""
-#: tortoisehg\hgtk\backout.py:56
+#: tortoisehg\hgtk\backout.py:46
msgid "Changeset Description"
msgstr ""
-#: tortoisehg\hgtk\backout.py:62
+#: tortoisehg\hgtk\backout.py:52
msgid "Backout commit message"
msgstr ""
-#: tortoisehg\hgtk\backout.py:85
+#: tortoisehg\hgtk\backout.py:78
msgid ""
"Commit message text for new changeset that reverses the effect of the "
"change being backed out."
msgstr ""
-#: tortoisehg\hgtk\backout.py:91
+#: tortoisehg\hgtk\backout.py:82
msgid "Use English backout message"
msgstr ""
-#: tortoisehg\hgtk\backout.py:97
-msgid "Merge with old dirstate parent after backout"
-msgstr ""
-
-#: tortoisehg\hgtk\backout.py:163 tortoisehg\hgtk\commit.py:438
+#: tortoisehg\hgtk\backout.py:90
+msgid "Commit backout before merging with current working parent"
+msgstr ""
+
+#: tortoisehg\hgtk\backout.py:95
+msgid "Backout"
+msgstr ""
+
+#: tortoisehg\hgtk\backout.py:114
+msgid "Backed out successfully, you must now commit the results"
+msgstr ""
+
+#: tortoisehg\hgtk\backout.py:118
+msgid "Canceled backout"
+msgstr ""
+
+#: tortoisehg\hgtk\backout.py:120
+msgid "Failed to backout"
+msgstr ""
+
+#: tortoisehg\hgtk\backout.py:139 tortoisehg\hgtk\commit.py:581
msgid "Confirm Discard Message"
msgstr ""
-#: tortoisehg\hgtk\backout.py:164
+#: tortoisehg\hgtk\backout.py:140
msgid "Discard current backout message?"
msgstr ""
-#: tortoisehg\hgtk\backout.py:205
-msgid "Backed out successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\backout.py:207
-msgid "Canceled backout"
-msgstr ""
-
-#: tortoisehg\hgtk\backout.py:209
-msgid "Failed to backout"
-msgstr ""
-
-#: tortoisehg\hgtk\bugreport.py:26
+#: tortoisehg\hgtk\bookmark.py:37
+msgid "Bookmark - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:48 tortoisehg\hgtk\hgignore.py:50
+#: tortoisehg\hgtk\hgignore.py:58 tortoisehg\hgtk\quickop.py:19
+#: tortoisehg\hgtk\tagadd.py:39
+msgid "Add"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:49 tortoisehg\hgtk\commit.py:262
+#: tortoisehg\hgtk\status.py:124
+msgid "Move"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:50 tortoisehg\hgtk\quickop.py:22
+#: tortoisehg\hgtk\tagadd.py:40
+msgid "Remove"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:52
+msgid "Rename"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:54
+msgid "Set Current"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:56 tortoisehg\hgtk\bookmark.py:182
+#: tortoisehg\hgtk\merge.py:178
+msgid "unexpected type: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:69
+msgid "Old name:"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:71
+msgid "Bookmark:"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:83 tortoisehg\hgtk\csinfo.py:211
+#: tortoisehg\hgtk\csinfo.py:212 tortoisehg\hgtk\cslist.py:142
+#: tortoisehg\hgtk\tagadd.py:66
+msgid "Revision:"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:86
+msgid "New Name:"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:92
+msgid "Make new/moved bookmark current"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:167 tortoisehg\hgtk\gdialog.py:918
+#: tortoisehg\hgtk\hginit.py:87 tortoisehg\hgtk\tagadd.py:203
+msgid "unexpected response id: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:208 tortoisehg\hgtk\bookmark.py:238
+#: tortoisehg\hgtk\bookmark.py:292 tortoisehg\hgtk\bookmark.py:324
+msgid "Bookmark input is empty"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:209 tortoisehg\hgtk\bookmark.py:239
+#: tortoisehg\hgtk\bookmark.py:293 tortoisehg\hgtk\bookmark.py:325
+msgid "Please enter bookmark name"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:216 tortoisehg\hgtk\bookmark.py:246
+#: tortoisehg\hgtk\bookmark.py:274 tortoisehg\hgtk\bookmark.py:306
+#: tortoisehg\hgtk\bookmark.py:332
+msgid "Bookmarking completed"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:217
+msgid "Bookmark \"%s\" has been added"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:224 tortoisehg\hgtk\bookmark.py:227
+#: tortoisehg\hgtk\bookmark.py:254 tortoisehg\hgtk\bookmark.py:257
+#: tortoisehg\hgtk\bookmark.py:278 tortoisehg\hgtk\bookmark.py:281
+#: tortoisehg\hgtk\bookmark.py:311 tortoisehg\hgtk\bookmark.py:314
+#: tortoisehg\hgtk\bookmark.py:337 tortoisehg\hgtk\bookmark.py:340
+msgid "Error in bookmarking"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:247
+msgid "Bookmark \"%s\" has been moved"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:267
+msgid "Bookmark name is empty"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:268
+msgid "Please select bookmark name to remove"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:275
+msgid "Bookmark \"%s\" has been removed"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:298
+msgid "Bookmark new name input is empty"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:299
+msgid "Please enter new bookmark name"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:307
+msgid "Bookmark \"%s\" has been renamed to \"%s\""
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:333
+msgid "Bookmark \"%s\" has been made current"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:346 tortoisehg\hgtk\bookmark.py:373
+msgid "a bookmark named \"%s\" already exists"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:355 tortoisehg\hgtk\bookmark.py:382
+msgid "No bookmark named \"%s\" exists"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:364
+msgid "Bookmark '%s' does not exist"
+msgstr ""
+
+#: tortoisehg\hgtk\browse.py:112 tortoisehg\hgtk\quickop.py:106
+#: tortoisehg\hgtk\status.py:95
+msgid "status"
+msgstr ""
+
+#: tortoisehg\hgtk\browse.py:136
+msgid "type"
+msgstr ""
+
+#: tortoisehg\hgtk\browse.py:142 tortoisehg\hgtk\quickop.py:109
+#: tortoisehg\hgtk\status.py:293
+msgid "path"
+msgstr ""
+
+#: tortoisehg\hgtk\browse.py:344 tortoisehg\hgtk\browse.py:346
+msgid "browser"
+msgstr ""
+
+#: tortoisehg\hgtk\bugreport.py:25
msgid "TortoiseHg Bug Report"
msgstr ""
-#: tortoisehg\hgtk\bugreport.py:46
+#: tortoisehg\hgtk\bugreport.py:45
msgid "Save as.."
msgstr ""
-#: tortoisehg\hgtk\bugreport.py:49 tortoisehg\hgtk\hgcmd.py:48
-#: tortoisehg\hgtk\taskbarui.py:33
+#: tortoisehg\hgtk\bugreport.py:48 tortoisehg\hgtk\hgcmd.py:50
+#: tortoisehg\hgtk\thgmq.py:142
msgid "Close"
msgstr ""
-#: tortoisehg\hgtk\bugreport.py:58
+#: tortoisehg\hgtk\bugreport.py:57
msgid ""
"** Please report this bug to http://bitbucket.org/tortoisehg/stable/issues "
"or tortoisehg-discuss@lists.sourceforge.net\n"
msgstr ""
-#: tortoisehg\hgtk\bugreport.py:74
+#: tortoisehg\hgtk\bugreport.py:88
msgid "Save error report to"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:30
+#: tortoisehg\hgtk\changeset.py:46
msgid "%s changeset "
msgstr ""
-#: tortoisehg\hgtk\changeset.py:142 tortoisehg\hgtk\changeset.py:170
+#: tortoisehg\hgtk\changeset.py:171 tortoisehg\hgtk\changeset.py:215
msgid "[All Files]"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:205
+#: tortoisehg\hgtk\changeset.py:254
msgid "unknown hunk type: %s"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:281
+#: tortoisehg\hgtk\changeset.py:362
msgid " %s is larger than the specified max diff size"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:290
+#: tortoisehg\hgtk\changeset.py:377
msgid "Repository Error: %s, refresh suggested"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:337
+#: tortoisehg\hgtk\changeset.py:423
msgid "[no hunks to display]"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:398 tortoisehg\hgtk\status.py:1505
+#: tortoisehg\hgtk\changeset.py:478 tortoisehg\hgtk\status.py:1242
msgid "_Visual Diff"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:399
+#: tortoisehg\hgtk\changeset.py:480
msgid "Diff to _local"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:401
+#: tortoisehg\hgtk\changeset.py:482
msgid "_View at Revision"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:402
+#: tortoisehg\hgtk\changeset.py:483
msgid "_Save at Revision..."
msgstr ""
-#: tortoisehg\hgtk\changeset.py:406
+#: tortoisehg\hgtk\changeset.py:486 tortoisehg\hgtk\datamine.py:153
+#: tortoisehg\hgtk\datamine.py:181
msgid "_File History"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:407
+#: tortoisehg\hgtk\changeset.py:487 tortoisehg\hgtk\datamine.py:152
msgid "_Annotate File"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:410
+#: tortoisehg\hgtk\changeset.py:490
msgid "_Revert File Contents"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:498
+#: tortoisehg\hgtk\changeset.py:579
msgid "Changeset:"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:500 tortoisehg\hgtk\update.py:102
+#: tortoisehg\hgtk\changeset.py:581 tortoisehg\hgtk\update.py:90
msgid "Parent:"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:502
+#: tortoisehg\hgtk\changeset.py:583
msgid "Child:"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:504
+#: tortoisehg\hgtk\changeset.py:585 tortoisehg\hgtk\cslist.py:143
msgid "Patch:"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:638
-msgid "Stat"
-msgstr ""
-
-#: tortoisehg\hgtk\changeset.py:640 tortoisehg\hgtk\hgignore.py:128
-msgid "Files"
-msgstr ""
-
-#: tortoisehg\hgtk\changeset.py:655
+#: tortoisehg\hgtk\changeset.py:782
msgid "Diff to second Parent"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:778
+#: tortoisehg\hgtk\changeset.py:958
msgid "Save file to"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:852
+#: tortoisehg\hgtk\changeset.py:969
+msgid "Unable to save file"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:1040
msgid "Confirm revert file to old revision"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:853
+#: tortoisehg\hgtk\changeset.py:1041
msgid "Revert %s to contents at revision %d?"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:865 tortoisehg\hgtk\synch.py:668
-msgid "Toggle _Wordwrap"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:28
+#: tortoisehg\hgtk\changeset.py:1054
+msgid "Enable _Wordwrap"
+msgstr ""
+
+#: tortoisehg\hgtk\chunks.py:73
+msgid "File is larger than the specified max size.\n"
+msgstr ""
+
+#: tortoisehg\hgtk\chunks.py:74 tortoisehg\hgtk\chunks.py:86
+msgid "Hunk selection is disabled for this file.\n"
+msgstr ""
+
+#: tortoisehg\hgtk\chunks.py:85
+msgid "File is binary.\n"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:37
msgid "TortoiseHg Clone"
msgstr ""
-#: tortoisehg\hgtk\clone.py:36
+#: tortoisehg\hgtk\clone.py:75
+msgid "Bundle..."
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:77
+msgid "Select a Mercurial Bundle"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:90
+msgid "Source path:"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:91
+msgid "Select Source Folder"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:117 tortoisehg\hgtk\tagadd.py:69
+msgid "Advanced options"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:127
+msgid "Clone to revision:"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:135
+msgid "Starting Revision:"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:141
+msgid "Do not update the new working directory"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:142
+msgid "Use pull protocol to copy metadata"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:143
+msgid "Use uncompressed transfer"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:149 tortoisehg\hgtk\history.py:467
+#: tortoisehg\hgtk\synch.py:179
+msgid "Use proxy server"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:159 tortoisehg\hgtk\synch.py:201
+msgid "Remote command:"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:165
msgid "Clone"
msgstr ""
-#: tortoisehg\hgtk\clone.py:87
-msgid "Source path:"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:88
-msgid "Select Source Folder"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:114 tortoisehg\hgtk\tagadd.py:68
-msgid "Advanced options"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:124
-msgid "Clone to revision:"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:129
-msgid "Do not update the new working directory"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:130
-msgid "Use pull protocol to copy metadata"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:131
-msgid "Use uncompressed transfer"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:137 tortoisehg\hgtk\history.py:231
-#: tortoisehg\hgtk\synch.py:184
-msgid "Use proxy server"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:147 tortoisehg\hgtk\synch.py:205
-msgid "Remote command:"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:276
+#: tortoisehg\hgtk\clone.py:191
+msgid "Cloned successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:193 tortoisehg\hgtk\update.py:154
+msgid "Canceled updating"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:195
+msgid "Failed to clone"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:226
+msgid "Mercurial bundles"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:288
msgid "Source path is empty"
msgstr ""
-#: tortoisehg\hgtk\clone.py:277
+#: tortoisehg\hgtk\clone.py:289
msgid "Please enter a valid source path"
msgstr ""
-#: tortoisehg\hgtk\clone.py:282
+#: tortoisehg\hgtk\clone.py:294
msgid "Source and destination are the same"
msgstr ""
-#: tortoisehg\hgtk\clone.py:283
+#: tortoisehg\hgtk\clone.py:295
msgid "Please specify different paths"
msgstr ""
-#: tortoisehg\hgtk\clone.py:331
-msgid "Cloned successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:333
-msgid "Canceled cloning"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:335
-msgid "Failed to clone"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:34
+#: tortoisehg\hgtk\commit.py:38
msgid "Branch Operations"
msgstr ""
-#: tortoisehg\hgtk\commit.py:39
+#: tortoisehg\hgtk\commit.py:48
msgid "Select branch of merge commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:51
+#: tortoisehg\hgtk\commit.py:60
+msgid "No branch changes"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:62
+msgid "Open a new named branch"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:70
+msgid "Close current named branch"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:77
msgid "Changes take effect on next commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:52
-msgid "No branch changes"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:54
-msgid "Open a new named branch"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:56
-msgid "Close current named branch"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:148
+#: tortoisehg\hgtk\commit.py:174
+msgid "merging "
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:180
msgid " - qnew"
msgstr ""
-#: tortoisehg\hgtk\commit.py:151
+#: tortoisehg\hgtk\commit.py:183
msgid " - qrefresh "
msgstr ""
-#: tortoisehg\hgtk\commit.py:152
+#: tortoisehg\hgtk\commit.py:184
msgid " - commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:183 tortoisehg\hgtk\history.py:169
+#: tortoisehg\hgtk\commit.py:227 tortoisehg\hgtk\commit.py:309
+#: tortoisehg\hgtk\history.py:258 tortoisehg\hgtk\history.py:368
+#: tortoisehg\hgtk\thgimport.py:111
+msgid "Patch Queue"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:232 tortoisehg\hgtk\history.py:391
msgid "_View"
msgstr ""
-#: tortoisehg\hgtk\commit.py:184
+#: tortoisehg\hgtk\commit.py:233 tortoisehg\hgtk\history.py:397
+msgid "Toolbar"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:235
msgid "Advanced"
msgstr ""
-#: tortoisehg\hgtk\commit.py:186 tortoisehg\hgtk\history.py:670
-#: tortoisehg\hgtk\history.py:1001
+#: tortoisehg\hgtk\commit.py:237 tortoisehg\hgtk\history.py:66
+#: tortoisehg\hgtk\history.py:481 tortoisehg\hgtk\history.py:1223
msgid "Parents"
msgstr ""
-#: tortoisehg\hgtk\commit.py:189 tortoisehg\hgtk\hgignore.py:138
-#: tortoisehg\hgtk\history.py:182
+#: tortoisehg\hgtk\commit.py:241 tortoisehg\hgtk\hgignore.py:142
+#: tortoisehg\hgtk\history.py:404
msgid "Refresh"
msgstr ""
-#: tortoisehg\hgtk\commit.py:190
+#: tortoisehg\hgtk\commit.py:243 tortoisehg\hgtk\history.py:418
+msgid "Ignore Max Diff Size"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:245 tortoisehg\hgtk\history.py:420
+msgid "Always Show Output"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:248
msgid "_Operations"
msgstr ""
-#: tortoisehg\hgtk\commit.py:191 tortoisehg\hgtk\commit.py:237
-#: tortoisehg\hgtk\commit.py:599
+#: tortoisehg\hgtk\commit.py:249 tortoisehg\hgtk\commit.py:303
+#: tortoisehg\hgtk\commit.py:778
msgid "_Commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:193 tortoisehg\hgtk\commit.py:235
+#: tortoisehg\hgtk\commit.py:251 tortoisehg\hgtk\commit.py:301
msgid "_Undo"
msgstr ""
-#: tortoisehg\hgtk\commit.py:196 tortoisehg\hgtk\status.py:158
+#: tortoisehg\hgtk\commit.py:254 tortoisehg\hgtk\status.py:115
msgid "_Diff"
msgstr ""
-#: tortoisehg\hgtk\commit.py:198 tortoisehg\hgtk\status.py:161
+#: tortoisehg\hgtk\commit.py:256 tortoisehg\hgtk\status.py:118
msgid "Re_vert"
msgstr ""
-#: tortoisehg\hgtk\commit.py:200 tortoisehg\hgtk\status.py:164
-#: tortoisehg\hgtk\status.py:1515 tortoisehg\hgtk\thgconfig.py:905
+#: tortoisehg\hgtk\commit.py:258 tortoisehg\hgtk\status.py:121
+#: tortoisehg\hgtk\status.py:1248 tortoisehg\hgtk\status.py:1254
+#: tortoisehg\hgtk\thgconfig.py:975
msgid "_Add"
msgstr ""
-#: tortoisehg\hgtk\commit.py:202 tortoisehg\hgtk\status.py:170
-#: tortoisehg\hgtk\thgconfig.py:915
+#: tortoisehg\hgtk\commit.py:260 tortoisehg\hgtk\status.py:127
+#: tortoisehg\hgtk\thgconfig.py:983
msgid "_Remove"
msgstr ""
-#: tortoisehg\hgtk\commit.py:204 tortoisehg\hgtk\status.py:167
-msgid "Move"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:206 tortoisehg\hgtk\status.py:173
-#: tortoisehg\hgtk\status.py:1514
+#: tortoisehg\hgtk\commit.py:264 tortoisehg\hgtk\status.py:130
+#: tortoisehg\hgtk\status.py:1253
msgid "_Forget"
msgstr ""
-#: tortoisehg\hgtk\commit.py:236
+#: tortoisehg\hgtk\commit.py:302
msgid "undo recent commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:238 tortoisehg\hgtk\commit.py:483
+#: tortoisehg\hgtk\commit.py:304 tortoisehg\hgtk\commit.py:655
msgid "commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:250 tortoisehg\hgtk\merge.py:169
-#: tortoisehg\hgtk\thgconfig.py:712
+#: tortoisehg\hgtk\commit.py:310 tortoisehg\hgtk\history.py:260
+msgid "Show/Hide Patch Queue"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:323 tortoisehg\hgtk\merge.py:190
+#: tortoisehg\hgtk\thgconfig.py:846
msgid "Confirm Exit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:251
+#: tortoisehg\hgtk\commit.py:324
msgid "Save commit message at exit?"
msgstr ""
-#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:968
-#: tortoisehg\hgtk\commit.py:972 tortoisehg\hgtk\history.py:81
-#: tortoisehg\hgtk\history.py:1394 tortoisehg\hgtk\status.py:1270
-#: tortoisehg\hgtk\status.py:1289 tortoisehg\hgtk\status.py:1582
-#: tortoisehg\hgtk\thgconfig.py:715 tortoisehg\hgtk\thgmq.py:328
-#: tortoisehg\hgtk\update.py:230
+#: tortoisehg\hgtk\commit.py:325 tortoisehg\hgtk\commit.py:1193
+#: tortoisehg\hgtk\commit.py:1200 tortoisehg\hgtk\history.py:220
+#: tortoisehg\hgtk\history.py:2652 tortoisehg\hgtk\status.py:1320
+#: tortoisehg\hgtk\statusact.py:127 tortoisehg\hgtk\statusact.py:148
+#: tortoisehg\hgtk\thgconfig.py:775 tortoisehg\hgtk\thgconfig.py:849
+#: tortoisehg\hgtk\thgmq.py:369 tortoisehg\hgtk\update.py:239
msgid "&Cancel"
msgstr ""
-#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:968
-#: tortoisehg\hgtk\commit.py:972 tortoisehg\hgtk\status.py:1582
-#: tortoisehg\hgtk\thgconfig.py:714 tortoisehg\hgtk\thgmq.py:327
+#: tortoisehg\hgtk\commit.py:325 tortoisehg\hgtk\commit.py:1193
+#: tortoisehg\hgtk\commit.py:1200 tortoisehg\hgtk\status.py:1320
+#: tortoisehg\hgtk\thgconfig.py:848 tortoisehg\hgtk\thgmq.py:369
msgid "&Yes"
msgstr ""
-#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:968
-#: tortoisehg\hgtk\commit.py:972 tortoisehg\hgtk\thgstrip.py:377
+#: tortoisehg\hgtk\commit.py:325 tortoisehg\hgtk\commit.py:1193
+#: tortoisehg\hgtk\commit.py:1200 tortoisehg\hgtk\thgstrip.py:217
msgid "&No"
msgstr ""
-#: tortoisehg\hgtk\commit.py:295
+#: tortoisehg\hgtk\commit.py:371
msgid "Committer:"
msgstr ""
-#: tortoisehg\hgtk\commit.py:309
+#: tortoisehg\hgtk\commit.py:385
msgid "Auto-includes:"
msgstr ""
-#: tortoisehg\hgtk\commit.py:312
+#: tortoisehg\hgtk\commit.py:388
msgid "Push after commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:346
+#: tortoisehg\hgtk\commit.py:429
msgid "Recent commit messages..."
msgstr ""
-#: tortoisehg\hgtk\commit.py:383
+#: tortoisehg\hgtk\commit.py:503
msgid "Parent: %(rev)s"
msgstr ""
-#: tortoisehg\hgtk\commit.py:392
-msgid "not at head revision"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:414 tortoisehg\hgtk\status.py:480
+#: tortoisehg\hgtk\commit.py:511
+msgid "Not at head"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:536 tortoisehg\hgtk\status.py:467
msgid "Patch Preview"
msgstr ""
-#: tortoisehg\hgtk\commit.py:416 tortoisehg\hgtk\status.py:484
+#: tortoisehg\hgtk\commit.py:538 tortoisehg\hgtk\status.py:471
msgid "Commit Preview"
msgstr ""
-#: tortoisehg\hgtk\commit.py:439
+#: tortoisehg\hgtk\commit.py:582
msgid "Discard current commit message?"
msgstr ""
-#: tortoisehg\hgtk\commit.py:482 tortoisehg\hgtk\commit.py:744
-#: tortoisehg\hgtk\commit.py:794 tortoisehg\hgtk\gdialog.py:473
-#: tortoisehg\hgtk\merge.py:94 tortoisehg\hgtk\thgconfig.py:600
+#: tortoisehg\hgtk\commit.py:654 tortoisehg\hgtk\commit.py:951
+#: tortoisehg\hgtk\commit.py:1015 tortoisehg\hgtk\commit.py:1264
+#: tortoisehg\hgtk\gdialog.py:485 tortoisehg\hgtk\history.py:279
+#: tortoisehg\hgtk\merge.py:130 tortoisehg\hgtk\thgconfig.py:89
msgid "Commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:486
+#: tortoisehg\hgtk\commit.py:658
msgid "QNew"
msgstr ""
-#: tortoisehg\hgtk\commit.py:487
+#: tortoisehg\hgtk\commit.py:659
msgid "create new MQ patch"
msgstr ""
-#: tortoisehg\hgtk\commit.py:489
+#: tortoisehg\hgtk\commit.py:661
msgid "QRefresh"
msgstr ""
-#: tortoisehg\hgtk\commit.py:490
+#: tortoisehg\hgtk\commit.py:662
msgid "refresh top MQ patch"
msgstr ""
-#: tortoisehg\hgtk\commit.py:492
+#: tortoisehg\hgtk\commit.py:664
msgid "_Commit (+1 head)"
msgstr ""
-#: tortoisehg\hgtk\commit.py:492
+#: tortoisehg\hgtk\commit.py:664
msgid "_Commit (-1 head)"
msgstr ""
-#: tortoisehg\hgtk\commit.py:497
+#: tortoisehg\hgtk\commit.py:670
+msgid "commit to merge one head"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:673
+msgid "neither parent is a head, commit to add a new head"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:678
msgid "parent is not a head, commit to add a new head"
msgstr ""
-#: tortoisehg\hgtk\commit.py:502
-msgid "commit to merge one head"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:505
-msgid "no parent is a head, commit to add a new head"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:609
+#: tortoisehg\hgtk\commit.py:788
msgid "new branch: "
msgstr ""
-#: tortoisehg\hgtk\commit.py:611
+#: tortoisehg\hgtk\commit.py:790
msgid "close branch: "
msgstr ""
-#: tortoisehg\hgtk\commit.py:613
+#: tortoisehg\hgtk\commit.py:792
msgid "branch: "
msgstr ""
-#: tortoisehg\hgtk\commit.py:632
+#: tortoisehg\hgtk\commit.py:823
msgid "Merge "
msgstr ""
-#: tortoisehg\hgtk\commit.py:668
+#: tortoisehg\hgtk\commit.py:859
msgid "Patch Contents"
msgstr ""
-#: tortoisehg\hgtk\commit.py:726 tortoisehg\hgtk\commit.py:879
+#: tortoisehg\hgtk\commit.py:904
+msgid "Bug Traq"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:935 tortoisehg\hgtk\commit.py:1079
+#: tortoisehg\hgtk\commit.py:1098
msgid "Nothing Commited"
msgstr ""
-#: tortoisehg\hgtk\commit.py:727
+#: tortoisehg\hgtk\commit.py:936
msgid "No committable files selected"
msgstr ""
-#: tortoisehg\hgtk\commit.py:745
+#: tortoisehg\hgtk\commit.py:952
msgid "Unable to create "
msgstr ""
-#: tortoisehg\hgtk\commit.py:795
+#: tortoisehg\hgtk\commit.py:1016
msgid "Unable to apply patch"
msgstr ""
-#: tortoisehg\hgtk\commit.py:824
+#: tortoisehg\hgtk\commit.py:1029
+msgid "Commit failed"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1034
msgid "Confirm Undo Commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:825
-msgid "Undo last commit"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:831 tortoisehg\hgtk\commit.py:846
+#: tortoisehg\hgtk\commit.py:1035
+msgid "Undo last commit?"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1041 tortoisehg\hgtk\commit.py:1056
msgid "Undo Commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:832
+#: tortoisehg\hgtk\commit.py:1042
msgid ""
"Unable to undo!\n"
"\n"
"Tip revision differs from last commit."
msgstr ""
-#: tortoisehg\hgtk\commit.py:847
+#: tortoisehg\hgtk\commit.py:1057
msgid "Errors during rollback!"
msgstr ""
-#: tortoisehg\hgtk\commit.py:860
+#: tortoisehg\hgtk\commit.py:1063
msgid "Confirm Add/Remove"
msgstr ""
-#: tortoisehg\hgtk\commit.py:861
+#: tortoisehg\hgtk\commit.py:1064
msgid "Add/Remove the following files?"
msgstr ""
-#: tortoisehg\hgtk\commit.py:880 tortoisehg\hgtk\tagadd.py:167
+#: tortoisehg\hgtk\commit.py:1080 tortoisehg\hgtk\tagadd.py:225
msgid "Please enter commit message"
msgstr ""
-#: tortoisehg\hgtk\commit.py:888
+#: tortoisehg\hgtk\commit.py:1099
+msgid ""
+"No issue link found in the commit message.The commit message should contain "
+"an issue link. Configure this in the 'Issue' section in the settings"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1108
msgid "Error"
msgstr ""
-#: tortoisehg\hgtk\commit.py:889
+#: tortoisehg\hgtk\commit.py:1109
msgid "Message format configuration error"
msgstr ""
-#: tortoisehg\hgtk\commit.py:898 tortoisehg\hgtk\commit.py:906
-#: tortoisehg\hgtk\commit.py:918
+#: tortoisehg\hgtk\commit.py:1118 tortoisehg\hgtk\commit.py:1126
+#: tortoisehg\hgtk\commit.py:1138
msgid "Confirm Commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:899
+#: tortoisehg\hgtk\commit.py:1119
msgid ""
"The summary line length of %i is greater than %i.\n"
"\n"
"Ignore format policy and continue commit?"
msgstr ""
-#: tortoisehg\hgtk\commit.py:907
+#: tortoisehg\hgtk\commit.py:1127
msgid ""
"The summary line is not followed by a blank line.\n"
"\n"
"Ignore format policy and continue commit?"
msgstr ""
-#: tortoisehg\hgtk\commit.py:919
+#: tortoisehg\hgtk\commit.py:1139
msgid ""
"The following lines are over the %i-character limit: %s.\n"
"\n"
"Ignore format policy and continue commit?"
msgstr ""
-#: tortoisehg\hgtk\commit.py:931
+#: tortoisehg\hgtk\commit.py:1151
msgid "Commit: Invalid username"
msgstr ""
-#: tortoisehg\hgtk\commit.py:932
+#: tortoisehg\hgtk\commit.py:1152
msgid ""
"Your username has not been configured.\n"
"\n"
"Please configure your username and try again"
msgstr ""
-#: tortoisehg\hgtk\commit.py:965
-msgid "Confirm Override Branch"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:966
+#: tortoisehg\hgtk\commit.py:1186
+msgid "Confirm Branch Change"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1187
msgid ""
-"A branch named \"%s\" already exists,\n"
-"override?"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:970
+"Named branch \"%s\" already exists, last used in revision %d\n"
+"Yes\t- Make commit restarting this named branch\n"
+"No\t- Make commit without changing branch\n"
+"Cancel - Cancel this commit"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1195
msgid "Confirm New Branch"
msgstr ""
-#: tortoisehg\hgtk\commit.py:971
-msgid "Create new named branch \"%s\"?"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:1046
+#: tortoisehg\hgtk\commit.py:1196
+msgid ""
+"Create new named branch \"%s\" with this commit?\n"
+"Yes\t- Start new branch with this commit\n"
+"No\t- Make commit without branch change\n"
+"Cancel - Cancel this commit"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1253
+msgid "Finished committing and pushing"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1255
+msgid "Finished committing"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1257
+msgid "Aborted committing"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1259
+msgid "Failed to commit"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1263
+msgid "Committing changes..."
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1265 tortoisehg\hgtk\history.py:613
+#: tortoisehg\hgtk\history.py:638 tortoisehg\hgtk\history.py:1786
+#: tortoisehg\hgtk\history.py:1868 tortoisehg\hgtk\history.py:1998
+#: tortoisehg\hgtk\history.py:2041 tortoisehg\hgtk\history.py:2081
+#: tortoisehg\hgtk\history.py:2425 tortoisehg\hgtk\history.py:2455
+#: tortoisehg\hgtk\history.py:2712 tortoisehg\hgtk\history.py:2743
+#: tortoisehg\hgtk\recovery.py:178 tortoisehg\hgtk\synch.py:549
+msgid "Cannot run now"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1266
+msgid "Please try again after the running operation is completed"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1292
msgid "Paste _Filenames"
msgstr ""
-#: tortoisehg\hgtk\commit.py:1047
+#: tortoisehg\hgtk\commit.py:1293
msgid "App_ly Format"
msgstr ""
-#: tortoisehg\hgtk\commit.py:1048
-msgid "C_onfigure Format"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:1074
+#: tortoisehg\hgtk\commit.py:1294
+msgid "C_onfigure Format..."
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1339
msgid "Info Required"
msgstr ""
-#: tortoisehg\hgtk\commit.py:1075
+#: tortoisehg\hgtk\commit.py:1340
msgid "Message format needs to be configured"
msgstr ""
-#: tortoisehg\hgtk\commit.py:1087 tortoisehg\hgtk\commit.py:1092
+#: tortoisehg\hgtk\commit.py:1352 tortoisehg\hgtk\commit.py:1357
msgid "Warning"
msgstr ""
-#: tortoisehg\hgtk\commit.py:1088
+#: tortoisehg\hgtk\commit.py:1353
msgid "The summary line length of %i is greater than %i"
msgstr ""
-#: tortoisehg\hgtk\commit.py:1093
+#: tortoisehg\hgtk\commit.py:1358
msgid "The summary line is not followed by a blank line"
msgstr ""
@@ -823,223 +1047,247 @@msgid "must be specified 'type' in style"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:197 tortoisehg\hgtk\csinfo.py:198
-#: tortoisehg\hgtk\tagadd.py:65
-msgid "Revision:"
-msgstr ""
-
-#: tortoisehg\hgtk\csinfo.py:198
+#: tortoisehg\hgtk\csinfo.py:212
msgid "Summary:"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:199
+#: tortoisehg\hgtk\csinfo.py:213
msgid "Age:"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:199
+#: tortoisehg\hgtk\csinfo.py:213 tortoisehg\hgtk\csinfo.py:214
+msgid "Date:"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:213 tortoisehg\hgtk\csinfo.py:218
msgid "User:"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:199 tortoisehg\hgtk\csinfo.py:200
-msgid "Date:"
-msgstr ""
-
-#: tortoisehg\hgtk\csinfo.py:200 tortoisehg\hgtk\csinfo.py:201
+#: tortoisehg\hgtk\csinfo.py:214 tortoisehg\hgtk\csinfo.py:215
msgid "Branch:"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:201 tortoisehg\hgtk\csinfo.py:202
+#: tortoisehg\hgtk\csinfo.py:215 tortoisehg\hgtk\csinfo.py:216
msgid "Tags:"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:202
+#: tortoisehg\hgtk\csinfo.py:216
msgid "Transplant:"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:47
+#: tortoisehg\hgtk\csinfo.py:217
+msgid "Perforce:"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:217
+msgid "Subversion:"
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:88
+msgid "Show all"
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:91
+msgid "Use compact view"
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:384
+msgid "No items to display"
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:397
+msgid "Updating..."
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:400
+msgid "Selecting %(sel)d of %(total)d, displaying all items"
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:403
+msgid "Selecting %(sel)d, displaying %(count)d of %(total)d items"
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:407
+msgid "Displaying all items"
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:409
+msgid "Displaying %(count)d of %(total)d items"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:45
msgid "%s - datamine"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:56 tortoisehg\hgtk\hgcmd.py:44
-#: tortoisehg\hgtk\recovery.py:46 tortoisehg\hgtk\serve.py:62
-#: tortoisehg\hgtk\synch.py:59
+#: tortoisehg\hgtk\datamine.py:54 tortoisehg\hgtk\hgcmd.py:46
+#: tortoisehg\hgtk\history.py:448 tortoisehg\hgtk\recovery.py:48
+#: tortoisehg\hgtk\serve.py:65 tortoisehg\hgtk\synch.py:53
msgid "Stop"
msgstr ""
+#: tortoisehg\hgtk\datamine.py:56
+msgid "Stop operation on current tab"
+msgstr ""
+
#: tortoisehg\hgtk\datamine.py:58
-msgid "Stop operation on current tab"
+msgid "New Search"
msgstr ""
#: tortoisehg\hgtk\datamine.py:60
-msgid "New Search"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:62
msgid "Open new search tab"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:73 tortoisehg\hgtk\thgconfig.py:1117
-msgid "Invalid path"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:74
-msgid "Cannot annotate directory: %s"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:128
+#: tortoisehg\hgtk\datamine.py:140
msgid "Filename"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:131 tortoisehg\hgtk\datamine.py:639
-#: tortoisehg\hgtk\history.py:315 tortoisehg\hgtk\history.py:1042
-#: tortoisehg\hgtk\logview\treeview.py:443 tortoisehg\hgtk\thgconfig.py:194
-#: tortoisehg\hgtk\thgconfig.py:277
+#: tortoisehg\hgtk\datamine.py:142 tortoisehg\hgtk\datamine.py:655
+#: tortoisehg\hgtk\history.py:101 tortoisehg\hgtk\history.py:502
+#: tortoisehg\hgtk\history.py:695 tortoisehg\hgtk\logview\treeview.py:512
+#: tortoisehg\hgtk\thgconfig.py:232 tortoisehg\hgtk\thgconfig.py:370
msgid "User"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:139 tortoisehg\hgtk\datamine.py:149
-msgid "di_splay change"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:140
-msgid "_annotate file"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:141 tortoisehg\hgtk\datamine.py:153
-msgid "_file history"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:142 tortoisehg\hgtk\datamine.py:152
-msgid "_view file at revision"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:148
-msgid "_zoom to change"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:150
-msgid "_annotate parent"
+#: tortoisehg\hgtk\datamine.py:150 tortoisehg\hgtk\datamine.py:163
+#: tortoisehg\hgtk\history.py:1270
+msgid "Di_splay Change"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:154 tortoisehg\hgtk\datamine.py:180
+msgid "_View File at Revision"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:161
+msgid "_Zoom to Change"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:173
+msgid "_Annotate Parent"
msgstr ""
#: tortoisehg\hgtk\datamine.py:176
-msgid "No parent file"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:177
-msgid "Unable to annotate"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:306
+msgid "_Annotate First Parent"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:178
+msgid "Annotate Second Parent"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:182
+msgid "_Diff to Local"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:310
msgid "Search"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:307 tortoisehg\hgtk\hgignore.py:61
+#: tortoisehg\hgtk\datamine.py:311 tortoisehg\hgtk\hgignore.py:60
msgid "Regexp:"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:309
+#: tortoisehg\hgtk\datamine.py:313
msgid "Includes:"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:311
+#: tortoisehg\hgtk\datamine.py:315
msgid "Excludes:"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:314
+#: tortoisehg\hgtk\datamine.py:318
msgid "Start this search"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:315
+#: tortoisehg\hgtk\datamine.py:319
msgid "Regular expression search pattern"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:316
+#: tortoisehg\hgtk\datamine.py:320
msgid ""
"Comma separated list of inclusion patterns. By default, the entire "
"repository is searched."
msgstr ""
-#: tortoisehg\hgtk\datamine.py:319
+#: tortoisehg\hgtk\datamine.py:323
msgid ""
"Comma separated list of exclusion patterns. Exclusion patterns are applied "
"after inclusion patterns."
msgstr ""
-#: tortoisehg\hgtk\datamine.py:325
+#: tortoisehg\hgtk\datamine.py:329
msgid "Follow copies and renames"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:326
+#: tortoisehg\hgtk\datamine.py:330
msgid "Ignore case"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:327
+#: tortoisehg\hgtk\datamine.py:331
msgid "Show line numbers"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:328
+#: tortoisehg\hgtk\datamine.py:332
msgid "Show all matching revisions"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:360 tortoisehg\hgtk\datamine.py:637
-#: tortoisehg\hgtk\logview\treeview.py:394
+#: tortoisehg\hgtk\datamine.py:363 tortoisehg\hgtk\datamine.py:653
+#: tortoisehg\hgtk\logview\treeview.py:441
msgid "Rev"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:361 tortoisehg\hgtk\datamine.py:638
+#: tortoisehg\hgtk\datamine.py:364 tortoisehg\hgtk\datamine.py:654
msgid "File"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:362
+#: tortoisehg\hgtk\datamine.py:365
msgid "Matches"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:384
+#: tortoisehg\hgtk\datamine.py:387
msgid "Search %d"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:427
+#: tortoisehg\hgtk\datamine.py:430
msgid "No regular expression given"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:428
+#: tortoisehg\hgtk\datamine.py:431
msgid "You must provide a search expression"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:434
+#: tortoisehg\hgtk\datamine.py:437
msgid "Invalid regular expression"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:435 tortoisehg\hgtk\thgshelve.py:210
+#: tortoisehg\hgtk\datamine.py:438 tortoisehg\hgtk\thgshelve.py:220
+#: tortoisehg\hgtk\thgshelve.py:233
msgid "Error: %s"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:457 tortoisehg\hgtk\datamine.py:756
-#: tortoisehg\hgtk\history.py:1320
+#: tortoisehg\hgtk\datamine.py:460 tortoisehg\hgtk\datamine.py:772
msgid "Abort: %s"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:469
+#: tortoisehg\hgtk\datamine.py:472
msgid "Search \"%s\""
msgstr ""
-#: tortoisehg\hgtk\datamine.py:584
+#: tortoisehg\hgtk\datamine.py:598
msgid "File is unrevisioned"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:585
+#: tortoisehg\hgtk\datamine.py:599
msgid "Unable to annotate "
msgstr ""
-#: tortoisehg\hgtk\datamine.py:636
+#: tortoisehg\hgtk\datamine.py:652
msgid "Line"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:640 tortoisehg\hgtk\guess.py:158
+#: tortoisehg\hgtk\datamine.py:656 tortoisehg\hgtk\guess.py:145
msgid "Source"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:698
+#: tortoisehg\hgtk\datamine.py:714
msgid "Loading history..."
msgstr ""
@@ -1047,116 +1295,143 @@msgid "TortoiseHg Prompt"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:470
+#: tortoisehg\hgtk\gdialog.py:482
msgid "_Tools"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:471 tortoisehg\hgtk\thgconfig.py:603
-msgid "Changelog"
-msgstr ""
-
-#: tortoisehg\hgtk\gdialog.py:475
+#: tortoisehg\hgtk\gdialog.py:483 tortoisehg\hgtk\history.py:230
+#: tortoisehg\hgtk\thgconfig.py:128 tortoisehg\util\menuthg.py:49
+msgid "Repository Explorer"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:487 tortoisehg\hgtk\history.py:282
msgid "Datamine"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:477
+#: tortoisehg\hgtk\gdialog.py:489 tortoisehg\hgtk\history.py:285
msgid "Recovery"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:479
+#: tortoisehg\hgtk\gdialog.py:491 tortoisehg\hgtk\history.py:288
msgid "Serve"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:481 tortoisehg\hgtk\synch.py:89
-#: tortoisehg\hgtk\thgshelve.py:71 tortoisehg\hgtk\thgshelve.py:139
-#: tortoisehg\hgtk\thgshelve.py:145 tortoisehg\hgtk\thgshelve.py:153
+#: tortoisehg\hgtk\gdialog.py:493 tortoisehg\hgtk\history.py:291
+#: tortoisehg\hgtk\synch.py:83 tortoisehg\hgtk\thgshelve.py:72
+#: tortoisehg\hgtk\thgshelve.py:145 tortoisehg\hgtk\thgshelve.py:151
+#: tortoisehg\hgtk\thgshelve.py:159
msgid "Shelve"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:483 tortoisehg\util\menuthg.py:71
+#: tortoisehg\hgtk\gdialog.py:495 tortoisehg\hgtk\thgconfig.py:170
+#: tortoisehg\util\menuthg.py:55
msgid "Synchronize"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:485
+#: tortoisehg\hgtk\gdialog.py:497
msgid "Settings"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:488
+#: tortoisehg\hgtk\gdialog.py:500
msgid "_Help"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:489
+#: tortoisehg\hgtk\gdialog.py:501
msgid "Contents"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:491 tortoisehg\hgtk\taskbarui.py:31
+#: tortoisehg\hgtk\gdialog.py:503 tortoisehg\hgtk\thgmq.py:861
+msgid "Index"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:505
msgid "About"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:592
+#: tortoisehg\hgtk\gdialog.py:582 tortoisehg\hgtk\gdialog.py:585
msgid " Aborted"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:603
+#: tortoisehg\hgtk\gdialog.py:586 tortoisehg\hgtk\status.py:168
+msgid ", please refresh"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:597
msgid " Messages and Errors"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:646
+#: tortoisehg\hgtk\gdialog.py:640
msgid "making snapshot of %d files from rev %s\n"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:681
+#: tortoisehg\hgtk\gdialog.py:674
msgid "edit failed"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:689 tortoisehg\hgtk\thgconfig.py:686
+#: tortoisehg\hgtk\gdialog.py:682 tortoisehg\hgtk\gtklib.py:392
msgid "No visual editor configured"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:690 tortoisehg\hgtk\thgconfig.py:687
+#: tortoisehg\hgtk\gdialog.py:683 tortoisehg\hgtk\gtklib.py:393
msgid "Please configure a visual editor."
msgstr ""
-#: tortoisehg\hgtk\gorev.py:26
+#: tortoisehg\hgtk\gdialog.py:823
+msgid "unknown mode name: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:863
+msgid "Abort"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:904
+msgid "Confirm Abort"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:905
+msgid "Do you want to abort?"
+msgstr ""
+
+#: tortoisehg\hgtk\gorev.py:27
msgid "Select"
msgstr ""
-#: tortoisehg\hgtk\gorev.py:30
+#: tortoisehg\hgtk\gorev.py:31
msgid "Select Revision"
msgstr ""
-#: tortoisehg\hgtk\gorev.py:43
+#: tortoisehg\hgtk\gorev.py:44
msgid "revision number, changeset ID, branch or tag"
msgstr ""
-#: tortoisehg\hgtk\gorev.py:58
+#: tortoisehg\hgtk\gorev.py:59
msgid "Ambiguous Revision"
msgstr ""
-#: tortoisehg\hgtk\gorev.py:62
+#: tortoisehg\hgtk\gorev.py:63
msgid "Invalid Revision"
msgstr ""
-#: tortoisehg\hgtk\gtklib.py:149
+#: tortoisehg\hgtk\gtklib.py:467
msgid "Save File"
msgstr ""
-#: tortoisehg\hgtk\gtklib.py:150
+#: tortoisehg\hgtk\gtklib.py:468
msgid "All files"
msgstr ""
-#: tortoisehg\hgtk\gtklib.py:246
+#: tortoisehg\hgtk\gtklib.py:581
msgid ""
"The file \"%s\" already exists!\n"
"\n"
"Do you want to overwrite it?"
msgstr ""
-#: tortoisehg\hgtk\gtklib.py:257
+#: tortoisehg\hgtk\gtklib.py:592
msgid "Select Folder"
msgstr ""
-#: tortoisehg\hgtk\gtklib.py:644
+#: tortoisehg\hgtk\gtklib.py:1081
msgid ""
"Select language for spell checking.\n"
"\n"
@@ -1167,242 +1442,246 @@"examples: en, en_GB, en_US"
msgstr ""
-#: tortoisehg\hgtk\gtklib.py:650
+#: tortoisehg\hgtk\gtklib.py:1087
msgid "Lang \"%s\" can not be set.\n"
msgstr ""
-#: tortoisehg\hgtk\gtklib.py:663 tortoisehg\hgtk\thgconfig.py:591
+#: tortoisehg\hgtk\gtklib.py:1100 tortoisehg\hgtk\thgconfig.py:85
msgid "Spell Check Language"
msgstr ""
-#: tortoisehg\hgtk\guess.py:53
+#: tortoisehg\hgtk\guess.py:40
msgid "Detect Copies/Renames in %s"
msgstr ""
-#: tortoisehg\hgtk\guess.py:73
+#: tortoisehg\hgtk\guess.py:60
msgid "Minimum Simularity Percentage"
msgstr ""
-#: tortoisehg\hgtk\guess.py:90
+#: tortoisehg\hgtk\guess.py:77
msgid "Unrevisioned Files"
msgstr ""
-#: tortoisehg\hgtk\guess.py:121
+#: tortoisehg\hgtk\guess.py:108
msgid "Find Renames"
msgstr ""
-#: tortoisehg\hgtk\guess.py:124
+#: tortoisehg\hgtk\guess.py:111
msgid "Find Copies"
msgstr ""
-#: tortoisehg\hgtk\guess.py:129
+#: tortoisehg\hgtk\guess.py:116
msgid "Candidate Matches"
msgstr ""
-#: tortoisehg\hgtk\guess.py:165
+#: tortoisehg\hgtk\guess.py:152
msgid "Dest"
msgstr ""
-#: tortoisehg\hgtk\guess.py:181
+#: tortoisehg\hgtk\guess.py:168
msgid "Accept Match"
msgstr ""
-#: tortoisehg\hgtk\guess.py:186
+#: tortoisehg\hgtk\guess.py:173
msgid "Differences from Source to Dest"
msgstr ""
-#: tortoisehg\hgtk\guess.py:273
+#: tortoisehg\hgtk\guess.py:262
msgid "finding source of "
msgstr ""
-#: tortoisehg\hgtk\guess.py:372
+#: tortoisehg\hgtk\guess.py:366
msgid ""
"== %s and %s have identical contents ==\n"
"\n"
msgstr ""
-#: tortoisehg\hgtk\hgcmd.py:179 tortoisehg\hgtk\hgcmd.py:514
+#: tortoisehg\hgtk\hgcmd.py:196 tortoisehg\hgtk\hgcmd.py:591
msgid ""
"\n"
"[command interrupted]"
msgstr ""
-#: tortoisehg\hgtk\hgcmd.py:265
+#: tortoisehg\hgtk\hgcmd.py:288
msgid "unknown CmdWidget style: %s"
msgstr ""
-#: tortoisehg\hgtk\hgcmd.py:278
+#: tortoisehg\hgtk\hgcmd.py:307
msgid "Toggle log window"
msgstr ""
-#: tortoisehg\hgtk\hgcmd.py:311
+#: tortoisehg\hgtk\hgcmd.py:347
msgid "Stop transaction"
msgstr ""
-#: tortoisehg\hgtk\hgcmd.py:313
+#: tortoisehg\hgtk\hgcmd.py:349
msgid "Close this"
msgstr ""
-#: tortoisehg\hgtk\hgcmd.py:449 tortoisehg\hgtk\hgcmd.py:466
+#: tortoisehg\hgtk\hgcmd.py:488 tortoisehg\hgtk\hgcmd.py:505
msgid "invalid state"
msgstr ""
-#: tortoisehg\hgtk\hgcmd.py:597
+#: tortoisehg\hgtk\hgcmd.py:546 tortoisehg\hgtk\recovery.py:287
+msgid "Status: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\hgcmd.py:676
msgid "Command Log"
msgstr ""
+#: tortoisehg\hgtk\hgemail.py:36
+msgid "Send"
+msgstr ""
+
#: tortoisehg\hgtk\hgemail.py:38
-msgid "Send"
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:40
msgid "Send emails"
msgstr ""
+#: tortoisehg\hgtk\hgemail.py:39
+msgid "Test"
+msgstr ""
+
#: tortoisehg\hgtk\hgemail.py:41
-msgid "Test"
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:43
msgid "Show emails which would be sent"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:45 tortoisehg\hgtk\serve.py:70
-#: tortoisehg\hgtk\synch.py:96
+#: tortoisehg\hgtk\hgemail.py:43 tortoisehg\hgtk\serve.py:73
+#: tortoisehg\hgtk\synch.py:90
msgid "Configure"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:47
+#: tortoisehg\hgtk\hgemail.py:45
msgid "Configure email settings"
msgstr ""
+#: tortoisehg\hgtk\hgemail.py:55
+msgid "Email outgoing changes"
+msgstr ""
+
#: tortoisehg\hgtk\hgemail.py:57
-msgid "Email outgoing changes"
+msgid "Email revisions "
msgstr ""
#: tortoisehg\hgtk\hgemail.py:59
-msgid "Email revisions "
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:61
msgid "Email Mercurial Patches"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:65
+#: tortoisehg\hgtk\hgemail.py:63
msgid "Envelope"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:66 tortoisehg\hgtk\taskbarui.py:47
+#: tortoisehg\hgtk\hgemail.py:64
msgid "Options"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:78
+#: tortoisehg\hgtk\hgemail.py:76
msgid "To:"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:89
+#: tortoisehg\hgtk\hgemail.py:81
msgid "Cc:"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:100
+#: tortoisehg\hgtk\hgemail.py:86
msgid "From:"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:109
+#: tortoisehg\hgtk\hgemail.py:90
msgid "In-Reply-To:"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:116
+#: tortoisehg\hgtk\hgemail.py:92
msgid "Message identifier to reply to, for threading"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:122
-msgid "Send changesets as HG patches"
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:125
+#: tortoisehg\hgtk\hgemail.py:98
+msgid "Send changesets as Hg patches"
+msgstr ""
+
+#: tortoisehg\hgtk\hgemail.py:101
msgid ""
-"HG patches (as generated by export command) are compatible with most patch "
+"Hg patches (as generated by export command) are compatible with most patch "
"programs. They include a header which contains the most important changeset "
"metadata."
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:130
+#: tortoisehg\hgtk\hgemail.py:106
msgid "Use extended (git) patch format"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:133
+#: tortoisehg\hgtk\hgemail.py:109
msgid ""
"Git patches can describe binary files, copies, and permission changes, but "
"recipients may not be able to use them if they are not using git or "
"Mercurial."
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:138
-msgid "Plain, do not prepend HG header"
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:141
+#: tortoisehg\hgtk\hgemail.py:114
+msgid "Plain, do not prepend Hg header"
+msgstr ""
+
+#: tortoisehg\hgtk\hgemail.py:117
msgid ""
"Stripping Mercurial header removes username and parent information. Only "
"useful if recipient is not using Mercurial (and does not like to see the "
"headers)."
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:146
+#: tortoisehg\hgtk\hgemail.py:122
msgid "Send single binary bundle, not patches"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:150
+#: tortoisehg\hgtk\hgemail.py:126
msgid ""
"Bundles store complete changesets in binary form. Upstream users can pull "
"from them. This is the safest way to send changes to recipient Mercurial "
"users."
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:156
+#: tortoisehg\hgtk\hgemail.py:132
msgid ""
"This feature is only available when sending outgoing changesets. It is not "
"applicable with revision ranges."
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:162
+#: tortoisehg\hgtk\hgemail.py:135
msgid "attach"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:164
+#: tortoisehg\hgtk\hgemail.py:137
msgid "send patches as attachments"
msgstr ""
+#: tortoisehg\hgtk\hgemail.py:138
+msgid "inline"
+msgstr ""
+
+#: tortoisehg\hgtk\hgemail.py:140
+msgid "send patches as inline attachments"
+msgstr ""
+
+#: tortoisehg\hgtk\hgemail.py:141
+msgid "diffstat"
+msgstr ""
+
+#: tortoisehg\hgtk\hgemail.py:143
+msgid "add diffstat output to messages"
+msgstr ""
+
+#: tortoisehg\hgtk\hgemail.py:151
+msgid "Subject:"
+msgstr ""
+
#: tortoisehg\hgtk\hgemail.py:165
-msgid "inline"
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:167
-msgid "send patches as inline attachments"
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:168
-msgid "diffstat"
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:170
-msgid "add diffstat output to messages"
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:179
-msgid "Subject:"
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:193
msgid "Flags:"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:205
+#: tortoisehg\hgtk\hgemail.py:181
msgid "Patch Series (Bundle) Description"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:246
+#: tortoisehg\hgtk\hgemail.py:232
msgid ""
"Patch series description is sent in initial summary email with [PATCH 0 of "
"N] subject. It should describe the effects of the entire patch series. "
@@ -1411,453 +1690,501 @@"subject prefix."
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:293 tortoisehg\hgtk\hgemail.py:298
-#: tortoisehg\hgtk\hgemail.py:307
+#: tortoisehg\hgtk\hgemail.py:278 tortoisehg\hgtk\hgemail.py:283
+#: tortoisehg\hgtk\hgemail.py:292
msgid "Info required"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:294
+#: tortoisehg\hgtk\hgemail.py:279
msgid "You must specify a recipient"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:299
+#: tortoisehg\hgtk\hgemail.py:284
msgid "You must specify a sender address"
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:308
+#: tortoisehg\hgtk\hgemail.py:293
msgid "You must configure SMTP"
msgstr ""
-#: tortoisehg\hgtk\hgignore.py:35
+#: tortoisehg\hgtk\hgignore.py:34
msgid "Ignore filter - %s"
msgstr ""
-#: tortoisehg\hgtk\hgignore.py:51 tortoisehg\hgtk\hgignore.py:59
-#: tortoisehg\hgtk\quickop.py:50 tortoisehg\hgtk\tagadd.py:37
-msgid "Add"
-msgstr ""
-
-#: tortoisehg\hgtk\hgignore.py:53
+#: tortoisehg\hgtk\hgignore.py:52
msgid "Glob:"
msgstr ""
-#: tortoisehg\hgtk\hgignore.py:76
+#: tortoisehg\hgtk\hgignore.py:77 tortoisehg\hgtk\thgconfig.py:676
+msgid "Edit File"
+msgstr ""
+
+#: tortoisehg\hgtk\hgignore.py:79
msgid "Apply to:"
msgstr ""
-#: tortoisehg\hgtk\hgignore.py:84
+#: tortoisehg\hgtk\hgignore.py:88
msgid "Filters"
msgstr ""
-#: tortoisehg\hgtk\hgignore.py:100
+#: tortoisehg\hgtk\hgignore.py:104
msgid "Patterns"
msgstr ""
-#: tortoisehg\hgtk\hgignore.py:108
+#: tortoisehg\hgtk\hgignore.py:112
msgid "Remove Selected"
msgstr ""
-#: tortoisehg\hgtk\hgignore.py:114
+#: tortoisehg\hgtk\hgignore.py:118
msgid "Unknown Files"
msgstr ""
-#: tortoisehg\hgtk\hgignore.py:190
+#: tortoisehg\hgtk\hgignore.py:132
+msgid "Files"
+msgstr ""
+
+#: tortoisehg\hgtk\hgignore.py:197
msgid "Invalid glob expression"
msgstr ""
-#: tortoisehg\hgtk\hgignore.py:206
+#: tortoisehg\hgtk\hgignore.py:213
msgid "Invalid regexp expression"
msgstr ""
-#: tortoisehg\hgtk\hginit.py:22 tortoisehg\util\menuthg.py:42
-msgid "Create a new repository"
-msgstr ""
-
-#: tortoisehg\hgtk\hginit.py:29
+#: tortoisehg\hgtk\hgignore.py:256
+msgid "Unable to write .hgignore file"
+msgstr ""
+
+#: tortoisehg\hgtk\hginit.py:22
+msgid "TortoiseHg Init"
+msgstr ""
+
+#: tortoisehg\hgtk\hginit.py:30
msgid "Create"
msgstr ""
-#: tortoisehg\hgtk\hginit.py:55
+#: tortoisehg\hgtk\hginit.py:58
msgid "Destination:"
msgstr ""
-#: tortoisehg\hgtk\hginit.py:59
+#: tortoisehg\hgtk\hginit.py:62
msgid "Add special files (.hgignore, ...)"
msgstr ""
-#: tortoisehg\hgtk\hginit.py:61
+#: tortoisehg\hgtk\hginit.py:64
msgid "Make repo compatible with Mercurial 1.0"
msgstr ""
-#: tortoisehg\hgtk\hginit.py:88
+#: tortoisehg\hgtk\hginit.py:65
+msgid "Run Commit after init"
+msgstr ""
+
+#: tortoisehg\hgtk\hginit.py:106
msgid "Destination path is empty"
msgstr ""
-#: tortoisehg\hgtk\hginit.py:89
+#: tortoisehg\hgtk\hginit.py:107
msgid "Please enter the directory path"
msgstr ""
-#: tortoisehg\hgtk\hginit.py:103
+#: tortoisehg\hgtk\hginit.py:121
msgid "Unable to create new repository"
msgstr ""
-#: tortoisehg\hgtk\hginit.py:107 tortoisehg\hgtk\hginit.py:112
+#: tortoisehg\hgtk\hginit.py:125 tortoisehg\hgtk\hginit.py:130
msgid "Error when creating repository"
msgstr ""
-#: tortoisehg\hgtk\hginit.py:129
-msgid "New repository created"
-msgstr ""
-
-#: tortoisehg\hgtk\hginit.py:130
-msgid "in directory %s"
-msgstr ""
-
-#: tortoisehg\hgtk\hgthread.py:70 tortoisehg\hgtk\hgthread.py:82
-#: tortoisehg\hgtk\hgthread.py:89
+#: tortoisehg\hgtk\hgthread.py:78 tortoisehg\hgtk\hgthread.py:90
+#: tortoisehg\hgtk\hgthread.py:97
msgid "response expected"
msgstr ""
-#: tortoisehg\hgtk\hgthread.py:86
+#: tortoisehg\hgtk\hgthread.py:94
msgid "password: "
msgstr ""
-#: tortoisehg\hgtk\hgthread.py:163
+#: tortoisehg\hgtk\hgthread.py:179
msgid "[command returned code %d "
msgstr ""
-#: tortoisehg\hgtk\hgthread.py:165
+#: tortoisehg\hgtk\hgthread.py:181
msgid "[command completed successfully "
msgstr ""
-#: tortoisehg\hgtk\hgthread.py:171
+#: tortoisehg\hgtk\hgthread.py:187
msgid "abort: "
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:61
+#: tortoisehg\hgtk\hgtk.py:78
msgid ""
"\n"
"Caught keyboard interrupt, aborting.\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:110
+#: tortoisehg\hgtk\hgtk.py:128
msgid "can not read file \"%s\". Ignored.\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:189
+#: tortoisehg\hgtk\hgtk.py:207
msgid "hgtk %s: %s\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:192
+#: tortoisehg\hgtk\hgtk.py:210
msgid "hgtk: %s\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:195
+#: tortoisehg\hgtk\hgtk.py:213
msgid ""
"hgtk: command '%s' is ambiguous:\n"
" %s\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:198
+#: tortoisehg\hgtk\hgtk.py:216
msgid "hgtk: unknown command '%s'\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:201
+#: tortoisehg\hgtk\hgtk.py:219
msgid "abort: %s!\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:248 tortoisehg\hgtk\hgtk.py:396
+#: tortoisehg\hgtk\hgtk.py:267 tortoisehg\hgtk\hgtk.py:466
msgid "There is no Mercurial repository here (.hg not found)"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:258
+#: tortoisehg\hgtk\hgtk.py:279
msgid "invalid arguments"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:336
+#: tortoisehg\hgtk\hgtk.py:285
+msgid "unrecognized profiling format '%s' - Ignored\n"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:300
+msgid ""
+"lsprof not available - install from "
+"http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:406
msgid "Rename error"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:337
+#: tortoisehg\hgtk\hgtk.py:407
msgid "rename takes one or two path arguments"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:447
+#: tortoisehg\hgtk\hgtk.py:514
+msgid "mpatch error"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:517
+msgid "mpatch expects *.rej file argument\n"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:519 tortoisehg\hgtk\hgtk.py:526
+msgid "%s does not exist\n"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:546
msgid "global options:"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:449
+#: tortoisehg\hgtk\hgtk.py:548
msgid "use \"hgtk help\" for the full list of commands"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:453
+#: tortoisehg\hgtk\hgtk.py:552
msgid ""
"use \"hgtk help\" for the full list of commands or \"hgtk -v\" for details"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:456
+#: tortoisehg\hgtk\hgtk.py:555
msgid "use \"hgtk -v help%s\" to show aliases and global options"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:459
+#: tortoisehg\hgtk\hgtk.py:558
msgid "use \"hgtk -v help %s\" to show global options"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:471 tortoisehg\hgtk\hgtk.py:573
+#: tortoisehg\hgtk\hgtk.py:570 tortoisehg\hgtk\hgtk.py:679
msgid ""
"list of commands:\n"
"\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:479
+#: tortoisehg\hgtk\hgtk.py:578
msgid ""
"\n"
"aliases: %s\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:484 tortoisehg\hgtk\hgtk.py:510
-#: tortoisehg\hgtk\hgtk.py:542
+#: tortoisehg\hgtk\hgtk.py:583 tortoisehg\hgtk\hgtk.py:648
msgid "(No help text available)"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:492
+#: tortoisehg\hgtk\hgtk.py:591
msgid "options:\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:515
+#: tortoisehg\hgtk\hgtk.py:615
+msgid "(no help text available)"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:620
msgid "no commands defined\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:566
+#: tortoisehg\hgtk\hgtk.py:672
msgid "Hgtk - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:571
+#: tortoisehg\hgtk\hgtk.py:677
msgid ""
"basic commands:\n"
"\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:587
+#: tortoisehg\hgtk\hgtk.py:693
msgid " (default: %s)"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:600
+#: tortoisehg\hgtk\hgtk.py:710
msgid "TortoiseHg Dialogs (version %s), Mercurial (version %s)\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:634
+#: tortoisehg\hgtk\hgtk.py:744
msgid "repository root directory or symbolic path name"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:635
+#: tortoisehg\hgtk\hgtk.py:745
msgid "enable additional output"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:636
+#: tortoisehg\hgtk\hgtk.py:746
msgid "suppress output"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:637
+#: tortoisehg\hgtk\hgtk.py:747
msgid "display help and exit"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:638
+#: tortoisehg\hgtk\hgtk.py:748
msgid "start debugger"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:639
+#: tortoisehg\hgtk\hgtk.py:749
+msgid "print command execution profile"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:750
msgid "do not fork GUI process"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:640
+#: tortoisehg\hgtk\hgtk.py:751
msgid "always fork GUI process"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:641
+#: tortoisehg\hgtk\hgtk.py:752
msgid "read file list from file"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:645
+#: tortoisehg\hgtk\hgtk.py:756
msgid "hgtk about"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:646
+#: tortoisehg\hgtk\hgtk.py:757
msgid "hgtk add [FILE]..."
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:647
+#: tortoisehg\hgtk\hgtk.py:758
msgid "hgtk clone SOURCE [DEST]"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:649
+#: tortoisehg\hgtk\hgtk.py:760
msgid "record user as committer"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:650
+#: tortoisehg\hgtk\hgtk.py:761
msgid "record datecode as commit date"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:651
+#: tortoisehg\hgtk\hgtk.py:762
msgid "hgtk commit [OPTIONS] [FILE]..."
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:652
+#: tortoisehg\hgtk\hgtk.py:763
msgid "hgtk datamine"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:653
+#: tortoisehg\hgtk\hgtk.py:764
msgid "hgtk hgignore [FILE]"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:654
+#: tortoisehg\hgtk\hgtk.py:765
msgid "hgtk init [DEST]"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:656
+#: tortoisehg\hgtk\hgtk.py:767
msgid "limit number of changes displayed"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:657
+#: tortoisehg\hgtk\hgtk.py:768
msgid "hgtk log [OPTIONS] [FILE]"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:659
+#: tortoisehg\hgtk\hgtk.py:770
msgid "revision to merge with"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:660
+#: tortoisehg\hgtk\hgtk.py:771
msgid "hgtk merge"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:661
+#: tortoisehg\hgtk\hgtk.py:772
msgid "hgtk recovery"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:662
+#: tortoisehg\hgtk\hgtk.py:773
msgid "hgtk shelve"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:663
+#: tortoisehg\hgtk\hgtk.py:774
msgid "hgtk synch"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:665
+#: tortoisehg\hgtk\hgtk.py:776
msgid "revisions to compare"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:666
+#: tortoisehg\hgtk\hgtk.py:777
msgid "hgtk status [FILE]..."
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:668 tortoisehg\hgtk\hgtk.py:671
+#: tortoisehg\hgtk\hgtk.py:779 tortoisehg\hgtk\hgtk.py:782
msgid "field to give initial focus"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:669
+#: tortoisehg\hgtk\hgtk.py:780
msgid "hgtk userconfig"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:672
+#: tortoisehg\hgtk\hgtk.py:783
msgid "hgtk repoconfig"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:673
+#: tortoisehg\hgtk\hgtk.py:784
msgid "hgtk guess"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:674
+#: tortoisehg\hgtk\hgtk.py:785
msgid "hgtk remove [FILE]..."
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:675
+#: tortoisehg\hgtk\hgtk.py:786
msgid "hgtk rename SOURCE [DEST]"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:676
+#: tortoisehg\hgtk\hgtk.py:787
msgid "hgtk revert [FILE]..."
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:677
+#: tortoisehg\hgtk\hgtk.py:788
msgid "hgtk forget [FILE]..."
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:680
-msgid "name of the webdir config file"
-msgstr ""
-
-#: tortoisehg\hgtk\hgtk.py:681
+#: tortoisehg\hgtk\hgtk.py:792 tortoisehg\hgtk\serve.py:367
+msgid "name of the hgweb config file (serve more than one repository)"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:794
+msgid "name of the hgweb config file (DEPRECATED)"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:795
msgid "hgtk serve [OPTION]..."
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:683
+#: tortoisehg\hgtk\hgtk.py:797
msgid "wait until the second ticks over"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:684
+#: tortoisehg\hgtk\hgtk.py:798
msgid "notify the shell for paths given"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:685
+#: tortoisehg\hgtk\hgtk.py:799
msgid "remove the status cache"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:686
+#: tortoisehg\hgtk\hgtk.py:800
msgid "show the contents of the status cache (no update)"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:688
+#: tortoisehg\hgtk\hgtk.py:802
msgid "udpate all repos in current dir"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:689
+#: tortoisehg\hgtk\hgtk.py:803
msgid "hgtk thgstatus [OPTION]"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:691 tortoisehg\hgtk\hgtk.py:707
+#: tortoisehg\hgtk\hgtk.py:805 tortoisehg\hgtk\hgtk.py:820
msgid "revision to update"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:694
+#: tortoisehg\hgtk\hgtk.py:808
msgid "changeset to view in diff tool"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:695
+#: tortoisehg\hgtk\hgtk.py:809
msgid "revisions to view in diff tool"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:696
+#: tortoisehg\hgtk\hgtk.py:810
msgid "bundle file to preview"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:697
-msgid "directly use raw extdiff command"
-msgstr ""
-
-#: tortoisehg\hgtk\hgtk.py:698
+#: tortoisehg\hgtk\hgtk.py:811
msgid "launch visual diff tool"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:700
+#: tortoisehg\hgtk\hgtk.py:813
msgid "print license"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:701
+#: tortoisehg\hgtk\hgtk.py:814
msgid "hgtk version [OPTION]"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:703
+#: tortoisehg\hgtk\hgtk.py:816
msgid "show the command options"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:704
+#: tortoisehg\hgtk\hgtk.py:817
msgid "[-o] CMD"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:705
+#: tortoisehg\hgtk\hgtk.py:818
msgid "hgtk help [COMMAND]"
msgstr ""
+#: tortoisehg\hgtk\hgtk.py:825
+msgid "import to the repository"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:826
+msgid "import to the patch queue (MQ)"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:827
+msgid "hgtk import [OPTION] [SOURCE]..."
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:832
+msgid "hgtk shellconfig"
+msgstr ""
+
#: tortoisehg\hgtk\histdetails.py:35
msgid "Log Details"
msgstr ""
@@ -1874,924 +2201,1356 @@msgid "Move Down"
msgstr ""
-#: tortoisehg\hgtk\history.py:75
+#: tortoisehg\hgtk\history.py:53 tortoisehg\hgtk\history.py:475
+msgid "All"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:58 tortoisehg\hgtk\history.py:477
+msgid "Tagged"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:62 tortoisehg\hgtk\history.py:479
+msgid "Ancestry"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:70 tortoisehg\hgtk\history.py:483
+#: tortoisehg\hgtk\history.py:1229
+msgid "Heads"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:74 tortoisehg\hgtk\history.py:485
+msgid "Merges"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:78 tortoisehg\hgtk\history.py:507
+msgid "Hide Merges"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:83
+msgid "Branch Filter"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:94
+msgid "Custom Filter"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:100
+msgid "Revision Set"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:100 tortoisehg\hgtk\history.py:496
+msgid "Keywords"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:101 tortoisehg\hgtk\history.py:105
+#: tortoisehg\hgtk\history.py:493
+msgid "File Patterns"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:101 tortoisehg\hgtk\history.py:499
+msgid "Date"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:158
+msgid "Branches..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:214
msgid ""
"New changesets from the preview bundle are still pending.\n"
"\n"
"Accept or reject the new changesets?"
msgstr ""
-#: tortoisehg\hgtk\history.py:78
+#: tortoisehg\hgtk\history.py:217
msgid "Accept new Changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:81
+#: tortoisehg\hgtk\history.py:220
msgid "&Accept"
msgstr ""
-#: tortoisehg\hgtk\history.py:81
+#: tortoisehg\hgtk\history.py:220
msgid "&Reject"
msgstr ""
-#: tortoisehg\hgtk\history.py:91
-msgid "%s - changelog"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:93
+#: tortoisehg\hgtk\history.py:232
msgid " (Bundle Preview)"
msgstr ""
-#: tortoisehg\hgtk\history.py:109 tortoisehg\hgtk\status.py:177
+#: tortoisehg\hgtk\history.py:248 tortoisehg\hgtk\status.py:134
msgid "Re_fresh"
msgstr ""
-#: tortoisehg\hgtk\history.py:111
+#: tortoisehg\hgtk\history.py:250 tortoisehg\hgtk\history.py:1538
msgid "Reload revision history"
msgstr ""
-#: tortoisehg\hgtk\history.py:115 tortoisehg\hgtk\history.py:164
-msgid "Patch Queue"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:117
-msgid "Show/Hide Patch Queue"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:160
+#: tortoisehg\hgtk\history.py:252
+msgid "Reset _Marks"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:254
+msgid "Reset revision marks"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:266 tortoisehg\hgtk\history.py:385
+msgid "Patch Branch"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:268
+msgid "Show/Hide Patch Branch"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:281
+msgid "Launch commit tool"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:284
+msgid "Launch data mining tool"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:287
+msgid "Launch recovery tool"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:290
+msgid "Launch web server"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:293
+msgid "Launch shelve tool"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:341
+msgid "Branches"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:355 tortoisehg\hgtk\history.py:699
+#: tortoisehg\hgtk\logview\treeview.py:559
+msgid "Tags"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:363
msgid "Sync Bar"
msgstr ""
-#: tortoisehg\hgtk\history.py:170
+#: tortoisehg\hgtk\history.py:375
+msgid "_Perforce"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:376
+msgid "Identify"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:378
+msgid "Pending"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:392 tortoisehg\hgtk\history.py:1462
msgid "Load more Revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:172
+#: tortoisehg\hgtk\history.py:394 tortoisehg\hgtk\history.py:1465
msgid "Load all Revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:175
-msgid "Toolbar"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:178
+#: tortoisehg\hgtk\history.py:400
msgid "Filter Bar"
msgstr ""
-#: tortoisehg\hgtk\history.py:184
+#: tortoisehg\hgtk\history.py:406
msgid "Reset Marks"
msgstr ""
-#: tortoisehg\hgtk\history.py:187
+#: tortoisehg\hgtk\history.py:409
msgid "Choose Details..."
msgstr ""
-#: tortoisehg\hgtk\history.py:190
+#: tortoisehg\hgtk\history.py:412
msgid "Compact Graph"
msgstr ""
-#: tortoisehg\hgtk\history.py:192
+#: tortoisehg\hgtk\history.py:415
msgid "Color by Branch"
msgstr ""
-#: tortoisehg\hgtk\history.py:195
-msgid "Ignore Max Diff Size"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:199
+#: tortoisehg\hgtk\history.py:425
msgid "_Navigate"
msgstr ""
-#: tortoisehg\hgtk\history.py:200
+#: tortoisehg\hgtk\history.py:426
msgid "Tip"
msgstr ""
-#: tortoisehg\hgtk\history.py:202
+#: tortoisehg\hgtk\history.py:428
msgid "Working Parent"
msgstr ""
-#: tortoisehg\hgtk\history.py:205
+#: tortoisehg\hgtk\history.py:430
+msgid "Previously Selected"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:433
msgid "Revision..."
msgstr ""
-#: tortoisehg\hgtk\history.py:209
+#: tortoisehg\hgtk\history.py:437
msgid "_Synchronize"
msgstr ""
-#: tortoisehg\hgtk\history.py:210 tortoisehg\hgtk\synch.py:63
+#: tortoisehg\hgtk\history.py:438 tortoisehg\hgtk\history.py:1867
+#: tortoisehg\hgtk\synch.py:57
msgid "Incoming"
msgstr ""
-#: tortoisehg\hgtk\history.py:212
+#: tortoisehg\hgtk\history.py:440 tortoisehg\hgtk\history.py:1997
msgid "Pull"
msgstr ""
-#: tortoisehg\hgtk\history.py:214 tortoisehg\hgtk\synch.py:74
+#: tortoisehg\hgtk\history.py:442 tortoisehg\hgtk\history.py:2040
+#: tortoisehg\hgtk\synch.py:68
msgid "Outgoing"
msgstr ""
-#: tortoisehg\hgtk\history.py:216 tortoisehg\hgtk\synch.py:79
+#: tortoisehg\hgtk\history.py:444 tortoisehg\hgtk\history.py:2080
+#: tortoisehg\hgtk\synch.py:73
msgid "Push"
msgstr ""
-#: tortoisehg\hgtk\history.py:218
+#: tortoisehg\hgtk\history.py:446
msgid "Email..."
msgstr ""
-#: tortoisehg\hgtk\history.py:221
+#: tortoisehg\hgtk\history.py:451
+msgid "Accept Bundle"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:454
+msgid "Reject Bundle"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:458
+msgid "Import..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:460
msgid "Add Bundle..."
msgstr ""
-#: tortoisehg\hgtk\history.py:224
-msgid "Accept Bundle"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:227
-msgid "Reject Bundle"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:233
-msgid "Force push"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:304 tortoisehg\hgtk\logview\treeview.py:380
+#: tortoisehg\hgtk\history.py:464
+msgid "Configure Paths..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:469 tortoisehg\hgtk\synch.py:174
+msgid "Force pull or push"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:470 tortoisehg\hgtk\synch.py:177
+msgid "Push new branch"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:474
+msgid "_Filter"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:487 tortoisehg\hgtk\logview\treeview.py:478
+msgid "Branch"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:489
+msgid "Custom"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:490
+msgid "Revision Range"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:584
+msgid "%s (submitted)"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:586 tortoisehg\hgtk\history.py:592
+msgid "%s (pending)"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:589
+msgid "Submitted"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:595
+msgid "Unable to parse p4pending output"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:597
+msgid "%d pending changelists found"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:599
+msgid "No pending Perforce changelists"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:601
+msgid "Aborted p4pending"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:603
+msgid "Unable to determine pending changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:611
+msgid "Finding pending Perforce changelists..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:612
+msgid "Pending Perforce changelists"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:614 tortoisehg\hgtk\history.py:639
+#: tortoisehg\hgtk\history.py:1787 tortoisehg\hgtk\history.py:1869
+#: tortoisehg\hgtk\history.py:1999 tortoisehg\hgtk\history.py:2042
+#: tortoisehg\hgtk\history.py:2082 tortoisehg\hgtk\history.py:2426
+#: tortoisehg\hgtk\history.py:2456 tortoisehg\hgtk\history.py:2713
+#: tortoisehg\hgtk\history.py:2744 tortoisehg\hgtk\recovery.py:179
+#: tortoisehg\hgtk\synch.py:550
+msgid "Please try again after the previous command has completed"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:624
+msgid "Perforce changelist %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:629
+msgid "Unable to find rev %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:631
+msgid "Aborted p4identify"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:633
+msgid "Unable to identify Perforce tip"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:636
+msgid "Finding tip Perforce changelist..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:637
+msgid "Identifying Perforce tip"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:682 tortoisehg\hgtk\logview\treeview.py:426
+#: tortoisehg\hgtk\thgpbranch.py:203
msgid "Graph"
msgstr ""
-#: tortoisehg\hgtk\history.py:311
+#: tortoisehg\hgtk\history.py:689
msgid "Revision Number"
msgstr ""
-#: tortoisehg\hgtk\history.py:312
+#: tortoisehg\hgtk\history.py:690
msgid "Changeset ID"
msgstr ""
-#: tortoisehg\hgtk\history.py:313
+#: tortoisehg\hgtk\history.py:691
+msgid "Revision Number/ID"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:692
msgid "Branch Name"
msgstr ""
-#: tortoisehg\hgtk\history.py:314 tortoisehg\hgtk\logview\treeview.py:432
-#: tortoisehg\hgtk\thgmq.py:187
+#: tortoisehg\hgtk\history.py:693 tortoisehg\hgtk\logview\treeview.py:490
+msgid "Changes"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:694 tortoisehg\hgtk\logview\treeview.py:501
+#: tortoisehg\hgtk\thgmq.py:215 tortoisehg\hgtk\thgmq.py:863
msgid "Summary"
msgstr ""
-#: tortoisehg\hgtk\history.py:316 tortoisehg\hgtk\logview\treeview.py:454
+#: tortoisehg\hgtk\history.py:696 tortoisehg\hgtk\logview\treeview.py:523
msgid "Local Date"
msgstr ""
-#: tortoisehg\hgtk\history.py:317
+#: tortoisehg\hgtk\history.py:697
msgid "UTC Date"
msgstr ""
-#: tortoisehg\hgtk\history.py:318 tortoisehg\hgtk\logview\treeview.py:478
+#: tortoisehg\hgtk\history.py:698 tortoisehg\hgtk\logview\treeview.py:547
msgid "Age"
msgstr ""
-#: tortoisehg\hgtk\history.py:319 tortoisehg\hgtk\logview\treeview.py:490
-msgid "Tags"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:368
-msgid "Invalid revision range"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:380
+#: tortoisehg\hgtk\history.py:700 tortoisehg\hgtk\logview\treeview.py:571
+msgid "Subversion"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:774
+msgid "No matches"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:775
+msgid "No revisions matched search"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:779
+msgid "Invalid revision set"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:785
msgid "Invalid date specification"
msgstr ""
-#: tortoisehg\hgtk\history.py:620
+#: tortoisehg\hgtk\history.py:792
+msgid "Invalid file pattern"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:848
+msgid "'%s' filter:"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1172
msgid "Filter"
msgstr ""
-#: tortoisehg\hgtk\history.py:625
+#: tortoisehg\hgtk\history.py:1177
msgid "%s branch"
msgstr ""
-#: tortoisehg\hgtk\history.py:626
+#: tortoisehg\hgtk\history.py:1178
msgid "Branch '%s'"
msgstr ""
-#: tortoisehg\hgtk\history.py:632
-msgid "file history: "
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:636
-msgid "custom filter"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:644
+#: tortoisehg\hgtk\history.py:1184
+msgid "file patterns \"%s\""
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1197
msgid "merges"
msgstr ""
-#: tortoisehg\hgtk\history.py:647
+#: tortoisehg\hgtk\history.py:1200
msgid "only Merges"
msgstr ""
-#: tortoisehg\hgtk\history.py:649
+#: tortoisehg\hgtk\history.py:1202
msgid "revision ancestry"
msgstr ""
-#: tortoisehg\hgtk\history.py:654
+#: tortoisehg\hgtk\history.py:1207
msgid "Ancestry of %s"
msgstr ""
-#: tortoisehg\hgtk\history.py:656
+#: tortoisehg\hgtk\history.py:1209
msgid "tagged revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:664
+#: tortoisehg\hgtk\history.py:1217
msgid "Tagged Revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:666
+#: tortoisehg\hgtk\history.py:1219
msgid "working parents"
msgstr ""
-#: tortoisehg\hgtk\history.py:672
+#: tortoisehg\hgtk\history.py:1225
msgid "heads"
msgstr ""
-#: tortoisehg\hgtk\history.py:676 tortoisehg\hgtk\history.py:1005
-msgid "Heads"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:678
+#: tortoisehg\hgtk\history.py:1231
msgid "no Merges"
msgstr ""
-#: tortoisehg\hgtk\history.py:696
+#: tortoisehg\hgtk\history.py:1250
+msgid "Current patch: %s, "
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1252
+msgid "%(count)d of %(total)d applied patches"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1268
msgid "Visualize Change"
msgstr ""
-#: tortoisehg\hgtk\history.py:697
-msgid "Di_splay Change"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:698
-msgid "Diff to local"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:700
-msgid "_Copy hash"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:704
-msgid "Pull to here"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:711
-msgid "Push to here"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:713
+#: tortoisehg\hgtk\history.py:1271
+msgid "Diff to Local"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1273
+msgid "_Copy Hash"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1277
+msgid "Pull to Here"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1285
+msgid "Push to Here"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1286
+msgid "Push this Branch"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1288
msgid "_Update..."
msgstr ""
-#: tortoisehg\hgtk\history.py:714 tortoisehg\hgtk\history.py:799
+#: tortoisehg\hgtk\history.py:1289 tortoisehg\hgtk\history.py:1409
msgid "_Merge with..."
msgstr ""
-#: tortoisehg\hgtk\history.py:717
+#: tortoisehg\hgtk\history.py:1290
+msgid "Backout..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1291 tortoisehg\hgtk\status.py:1247
+msgid "_Revert"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1293
+msgid "Export"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1295
+msgid "Tag"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1315
+msgid "Mercurial Queues"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1320
+msgid "Transp_lant to Local"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1324
+msgid "Bisect"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1332
msgid "_Export Patch..."
msgstr ""
-#: tortoisehg\hgtk\history.py:718
+#: tortoisehg\hgtk\history.py:1333
msgid "E_mail Patch..."
msgstr ""
-#: tortoisehg\hgtk\history.py:719
+#: tortoisehg\hgtk\history.py:1334
msgid "_Bundle rev:tip..."
msgstr ""
-#: tortoisehg\hgtk\history.py:721
+#: tortoisehg\hgtk\history.py:1336
+msgid "_Archive..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1341
msgid "Add/Remove _Tag..."
msgstr ""
-#: tortoisehg\hgtk\history.py:722
-msgid "Backout Revision..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:724 tortoisehg\hgtk\status.py:1510
-msgid "_Revert"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:725
-msgid "_Archive..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:743
-msgid "Transp_lant to local"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:748
-msgid "qimport"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:749
+#: tortoisehg\hgtk\history.py:1343
+msgid "Add/Move/Remove B_ookmark..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1344
+msgid "Rename Bookmark..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1347
+msgid "Set Current Bookmark..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1353
+msgid "Import Revision to MQ"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1355
msgid "Strip Revision..."
msgstr ""
-#: tortoisehg\hgtk\history.py:782
+#: tortoisehg\hgtk\history.py:1378
+msgid "Reset"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1379
+msgid "Mark as Good"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1380
+msgid "Mark as Bad"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1381
+msgid "Skip Testing"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1392
msgid "_Diff with selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:783
+#: tortoisehg\hgtk\history.py:1393
msgid "Visual Diff with selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:792
+#: tortoisehg\hgtk\history.py:1402
msgid "Email from here to selected..."
msgstr ""
-#: tortoisehg\hgtk\history.py:794
+#: tortoisehg\hgtk\history.py:1404
msgid "Bundle from here to selected..."
msgstr ""
-#: tortoisehg\hgtk\history.py:796
+#: tortoisehg\hgtk\history.py:1406
msgid "Export Patches from here to selected..."
msgstr ""
-#: tortoisehg\hgtk\history.py:815
+#: tortoisehg\hgtk\history.py:1424
msgid "Transplant Revision range to local"
msgstr ""
-#: tortoisehg\hgtk\history.py:820
+#: tortoisehg\hgtk\history.py:1429
msgid "Rebase on top of selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:825
-msgid "qimport from here to selected"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:829
+#: tortoisehg\hgtk\history.py:1434
+msgid "Import from here to selected to MQ"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1438
msgid "Select common ancestor revision"
msgstr ""
-#: tortoisehg\hgtk\history.py:860
+#: tortoisehg\hgtk\history.py:1493
msgid "Load more"
msgstr ""
-#: tortoisehg\hgtk\history.py:860
+#: tortoisehg\hgtk\history.py:1493
msgid "load more revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:863
+#: tortoisehg\hgtk\history.py:1496
msgid "Load all"
msgstr ""
-#: tortoisehg\hgtk\history.py:863
+#: tortoisehg\hgtk\history.py:1496
msgid "load all revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:905
+#: tortoisehg\hgtk\history.py:1541
msgid "Download and view incoming changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:907
+#: tortoisehg\hgtk\history.py:1543
msgid "Accept changes from Bundle preview"
msgstr ""
-#: tortoisehg\hgtk\history.py:909
+#: tortoisehg\hgtk\history.py:1546
msgid "Reject changes from Bundle preview"
msgstr ""
-#: tortoisehg\hgtk\history.py:911
+#: tortoisehg\hgtk\history.py:1549
msgid "Pull incoming changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:914
+#: tortoisehg\hgtk\history.py:1551
+msgid "Import patches"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1554
msgid "Determine and mark outgoing changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:916
+#: tortoisehg\hgtk\history.py:1556
msgid "Push outgoing changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:918
+#: tortoisehg\hgtk\history.py:1558
msgid "Email outgoing changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:921
+#: tortoisehg\hgtk\history.py:1561
msgid "Stop current transaction"
msgstr ""
-#: tortoisehg\hgtk\history.py:946
+#: tortoisehg\hgtk\history.py:1593
msgid "After Pull:"
msgstr ""
-#: tortoisehg\hgtk\history.py:947 tortoisehg\hgtk\synch.py:155
+#: tortoisehg\hgtk\history.py:1594 tortoisehg\hgtk\synch.py:148
msgid "Nothing"
msgstr ""
-#: tortoisehg\hgtk\history.py:947 tortoisehg\hgtk\synch.py:155
-#: tortoisehg\hgtk\update.py:44
+#: tortoisehg\hgtk\history.py:1594 tortoisehg\hgtk\synch.py:148
+#: tortoisehg\hgtk\update.py:128
msgid "Update"
msgstr ""
-#: tortoisehg\hgtk\history.py:950 tortoisehg\hgtk\synch.py:158
+#: tortoisehg\hgtk\history.py:1597 tortoisehg\hgtk\synch.py:151
msgid "Fetch"
msgstr ""
-#: tortoisehg\hgtk\history.py:952 tortoisehg\hgtk\synch.py:160
+#: tortoisehg\hgtk\history.py:1599 tortoisehg\hgtk\synch.py:153
msgid "Rebase"
msgstr ""
-#: tortoisehg\hgtk\history.py:971
+#: tortoisehg\hgtk\history.py:1618
msgid "Configure aliases and after pull behavior"
msgstr ""
-#: tortoisehg\hgtk\history.py:987
-msgid "All"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:992
-msgid "Tagged"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:996
-msgid "Ancestry"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1009
-msgid "Merges"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1013
-msgid "Hide Merges"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1020
-msgid "Branch Filter"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1026
-msgid "Branches..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1036
-msgid "Custom Filter"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1041
-msgid "File Patterns"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1041
-msgid "Rev Range"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1042
-msgid "Date"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1042
-msgid "Keywords"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1174 tortoisehg\hgtk\history.py:1284
-#: tortoisehg\hgtk\history.py:1306 tortoisehg\hgtk\history.py:1368
-#: tortoisehg\hgtk\history.py:1746
+#: tortoisehg\hgtk\history.py:1784
+msgid "Applying bundle..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1785
+msgid "Applying bundle"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1830 tortoisehg\hgtk\history.py:1972
+#: tortoisehg\hgtk\history.py:2005 tortoisehg\hgtk\history.py:2619
msgid "No remote path specified"
msgstr ""
-#: tortoisehg\hgtk\history.py:1175 tortoisehg\hgtk\history.py:1285
-#: tortoisehg\hgtk\history.py:1307 tortoisehg\hgtk\history.py:1369
-#: tortoisehg\hgtk\history.py:1747
+#: tortoisehg\hgtk\history.py:1831 tortoisehg\hgtk\history.py:1973
+#: tortoisehg\hgtk\history.py:2006 tortoisehg\hgtk\history.py:2620
msgid "Please enter or select a remote path"
msgstr ""
-#: tortoisehg\hgtk\history.py:1208
+#: tortoisehg\hgtk\history.py:1858
+msgid "%d incoming changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1860
+msgid "Aborted incoming"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1862
+msgid "No incoming changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1866
+msgid "Checking incoming changesets..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1885
msgid "Accept incoming previewed changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:1209
+#: tortoisehg\hgtk\history.py:1886
msgid "Accept"
msgstr ""
-#: tortoisehg\hgtk\history.py:1214
+#: tortoisehg\hgtk\history.py:1891
msgid "Reject incoming previewed changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:1215
+#: tortoisehg\hgtk\history.py:1892
msgid "Reject"
msgstr ""
-#: tortoisehg\hgtk\history.py:1256
+#: tortoisehg\hgtk\history.py:1934
msgid "Bundle Preview"
msgstr ""
-#: tortoisehg\hgtk\history.py:1261
+#: tortoisehg\hgtk\history.py:1939
+msgid "Failed to preview, a bundle file unrelated to this repository"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1944
+msgid "Failed to preview, not a Mercurial bundle file"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1948
msgid "Open Bundle"
msgstr ""
-#: tortoisehg\hgtk\history.py:1336
+#: tortoisehg\hgtk\history.py:1986
+msgid "Finished pull with rebase"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1989
+msgid "Finished pull"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1991
+msgid "No changesets to pull"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1993 tortoisehg\hgtk\history.py:2738
+msgid "Aborted pull"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1996
+msgid "Pulling changesets..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2032
msgid "%d outgoing changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:1355 tortoisehg\hgtk\synch.py:495
+#: tortoisehg\hgtk\history.py:2034
+msgid "Aborted outgoing"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2036
+msgid "No outgoing changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2039
+msgid "Checking outgoing changesets..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2048 tortoisehg\hgtk\synch.py:504
msgid "No repository selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:1356 tortoisehg\hgtk\synch.py:496
+#: tortoisehg\hgtk\history.py:2049 tortoisehg\hgtk\synch.py:505
msgid "Select a peer repository to compare with"
msgstr ""
-#: tortoisehg\hgtk\history.py:1377
+#: tortoisehg\hgtk\history.py:2074
+msgid "Finished push"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2076 tortoisehg\hgtk\history.py:2704
+msgid "Aborted push"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2079
+msgid "Pushing changesets..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2191
+msgid "unknown dnd dest: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2310
+msgid "Confirm Revert All Files"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2311
+msgid ""
+"Revert all files to revision %d?\n"
+"This will overwrite your local changes"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2361
+msgid "Save patches to"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2397
+msgid "Write bundle to"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2410
+msgid "Bundling from %(base)s to %(rev)s..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2412
+msgid "Bundling from %(base)s to tip..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2418
+msgid "Finish bundling"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2420
+msgid "Aborted bundling"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2422
+msgid "Failed to bundle"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2424
+msgid "Bundling"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2447
+msgid "Finish importing"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2449
+msgid "Aborted importing"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2451 tortoisehg\hgtk\thgimport.py:188
+msgid "Failed to import"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2453
+msgid "Importing"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2454
+msgid "Importing to Patch Queue..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2462
+msgid "Confirm Rebase Revision"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2463
+msgid "Rebase revision %d on top of %d?"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2628
msgid "Confirm Forced Push to Remote Repository"
msgstr ""
-#: tortoisehg\hgtk\history.py:1378
+#: tortoisehg\hgtk\history.py:2629
msgid ""
"Forced push to remote repository\n"
"%s\n"
"(creating new heads in remote if needed)?"
msgstr ""
-#: tortoisehg\hgtk\history.py:1380 tortoisehg\hgtk\history.py:1390
+#: tortoisehg\hgtk\history.py:2631 tortoisehg\hgtk\history.py:2647
msgid "Forced &Push"
msgstr ""
-#: tortoisehg\hgtk\history.py:1382
+#: tortoisehg\hgtk\history.py:2633
+msgid "Confirm Push of New Branches to Remote Repository"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2634
+msgid ""
+"Push to remote repository\n"
+"%s\n"
+"(creating new branches in remote if needed)?"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2636 tortoisehg\hgtk\history.py:2641
+msgid "&Push"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2639
msgid "Confirm Push to remote Repository"
msgstr ""
-#: tortoisehg\hgtk\history.py:1383
+#: tortoisehg\hgtk\history.py:2640
msgid ""
"Push to remote repository\n"
"%s\n"
"?"
msgstr ""
-#: tortoisehg\hgtk\history.py:1384
-msgid "&Push"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1387
+#: tortoisehg\hgtk\history.py:2644
msgid "Confirm Forced Push"
msgstr ""
-#: tortoisehg\hgtk\history.py:1388
+#: tortoisehg\hgtk\history.py:2645
msgid ""
"Forced push to repository\n"
"%s\n"
"(creating new heads if needed)?"
msgstr ""
-#: tortoisehg\hgtk\history.py:1562
-msgid "Confirm Revert All Files"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1563
-msgid ""
-"Revert all files to revision %d?\n"
-"This will overwrite your local changes"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1614
-msgid "Save patches to"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1637 tortoisehg\hgtk\history.py:1809
-msgid "Write bundle to"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1673
-msgid "Confirm Rebase Revision"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1674
-msgid "Rebase revision %d on top of %d?"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1788 tortoisehg\hgtk\status.py:1194
+#: tortoisehg\hgtk\history.py:2682
+msgid "Finished push to revision %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2690
+msgid "Finished pushing branch %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2707
+msgid "Pushing branch %s..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2709
+msgid "Pushing changesets to revision %s..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2711
+msgid "Push to %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2736
+msgid "Finished pull to revision %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2741
+msgid "Pulling changesets to revision %s..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2742
+msgid "Pull to %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2755 tortoisehg\hgtk\status.py:999
msgid "Save patch to"
msgstr ""
-#: tortoisehg\hgtk\logview\treeview.py:255
+#: tortoisehg\hgtk\history.py:2905 tortoisehg\hgtk\history.py:2915
+msgid "Refresh required"
+msgstr ""
+
+#: tortoisehg\hgtk\logview\treeview.py:275
msgid "%(count)d of %(total)d Revisions"
msgstr ""
-#: tortoisehg\hgtk\logview\treeview.py:362
+#: tortoisehg\hgtk\logview\treeview.py:383
+msgid "Changeset not found in current view"
+msgstr ""
+
+#: tortoisehg\hgtk\logview\treeview.py:388
+msgid "Null changeset is not viewable"
+msgstr ""
+
+#: tortoisehg\hgtk\logview\treeview.py:408
msgid "Repository is empty"
msgstr ""
-#: tortoisehg\hgtk\logview\treeview.py:407
+#: tortoisehg\hgtk\logview\treeview.py:454
msgid "ID"
msgstr ""
-#: tortoisehg\hgtk\logview\treeview.py:419
-msgid "Branch"
-msgstr ""
-
#: tortoisehg\hgtk\logview\treeview.py:466
+msgid "Rev/ID"
+msgstr ""
+
+#: tortoisehg\hgtk\logview\treeview.py:535
msgid "Universal Date"
msgstr ""
-#: tortoisehg\hgtk\merge.py:44
+#: tortoisehg\hgtk\merge.py:36
msgid "Merging in %s"
msgstr ""
-#: tortoisehg\hgtk\merge.py:50 tortoisehg\hgtk\merge.py:63
+#: tortoisehg\hgtk\merge.py:47 tortoisehg\hgtk\merge.py:60
msgid "Unable to merge"
msgstr ""
-#: tortoisehg\hgtk\merge.py:51
+#: tortoisehg\hgtk\merge.py:48
msgid "Must supply a target revision"
msgstr ""
-#: tortoisehg\hgtk\merge.py:64
+#: tortoisehg\hgtk\merge.py:61
msgid "Outstanding uncommitted changes"
msgstr ""
-#: tortoisehg\hgtk\merge.py:76
+#: tortoisehg\hgtk\merge.py:73
msgid "Not a head revision!"
msgstr ""
-#: tortoisehg\hgtk\merge.py:82
+#: tortoisehg\hgtk\merge.py:79
msgid "Merge target (other)"
msgstr ""
-#: tortoisehg\hgtk\merge.py:87
+#: tortoisehg\hgtk\merge.py:84
+msgid "Discard all changes from merge target (other) revision"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:89
msgid "Current revision (local)"
msgstr ""
-#: tortoisehg\hgtk\merge.py:93
+#: tortoisehg\hgtk\merge.py:100
+msgid "Merge tools:"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:129
msgid "Merge"
msgstr ""
-#: tortoisehg\hgtk\merge.py:95
+#: tortoisehg\hgtk\merge.py:131
msgid "Undo"
msgstr ""
-#: tortoisehg\hgtk\merge.py:104
-msgid "Merge tools:"
+#: tortoisehg\hgtk\merge.py:159
+msgid "Merged successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:161
+msgid "Canceled merging"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:163
+msgid "Failed to merge"
msgstr ""
#: tortoisehg\hgtk\merge.py:170
+msgid "Undo successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:172
+msgid "Canceled undo"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:174
+msgid "Failed to undo"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:191
msgid ""
"To complete merging, you need to commit merged files in working directory.\n"
"\n"
"Do you want to exit?"
msgstr ""
-#: tortoisehg\hgtk\merge.py:227
-msgid "Merged successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\merge.py:229
-msgid "Canceled merging"
-msgstr ""
-
-#: tortoisehg\hgtk\merge.py:231
-msgid "Failed to merge"
-msgstr ""
-
-#: tortoisehg\hgtk\merge.py:262
+#: tortoisehg\hgtk\merge.py:204
+msgid "Cannot merge"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:205
+msgid "Uncommitted local changes"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:240
msgid "Confirm undo merge"
msgstr ""
-#: tortoisehg\hgtk\merge.py:263
+#: tortoisehg\hgtk\merge.py:241
msgid "Clean checkout of original revision?"
msgstr ""
-#: tortoisehg\hgtk\merge.py:273
-msgid "Undo successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\merge.py:275
-msgid "Canceled undo"
-msgstr ""
-
-#: tortoisehg\hgtk\merge.py:277
-msgid "Failed to undo"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:50
+#: tortoisehg\hgtk\p4pending.py:30
+msgid "Pending Perforce Changelists - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\p4pending.py:43
+msgid "Changelist:"
+msgstr ""
+
+#: tortoisehg\hgtk\p4pending.py:66
+msgid "Submit"
+msgstr ""
+
+#: tortoisehg\hgtk\p4pending.py:67 tortoisehg\hgtk\quickop.py:21
+msgid "Revert"
+msgstr ""
+
+#: tortoisehg\hgtk\p4pending.py:101
+msgid "Finished"
+msgstr ""
+
+#: tortoisehg\hgtk\p4pending.py:103 tortoisehg\hgtk\quickop.py:213
+#: tortoisehg\hgtk\thgmq.py:898 tortoisehg\hgtk\thgpbranch.py:746
+msgid "Canceled"
+msgstr ""
+
+#: tortoisehg\hgtk\p4pending.py:105 tortoisehg\hgtk\quickop.py:215
+#: tortoisehg\hgtk\thgmq.py:900 tortoisehg\hgtk\thgpbranch.py:748
+msgid "Failed"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:19
msgid "Select files to add"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:51
+#: tortoisehg\hgtk\quickop.py:20
msgid "Forget"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:51
+#: tortoisehg\hgtk\quickop.py:20
msgid "Select files to forget"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:52
-msgid "Revert"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:52
+#: tortoisehg\hgtk\quickop.py:21
msgid "Select files to revert"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:53
+#: tortoisehg\hgtk\quickop.py:22
msgid "Select files to remove"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:53 tortoisehg\hgtk\tagadd.py:42
-msgid "Remove"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:100 tortoisehg\hgtk\status.py:138
-msgid "status"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:103 tortoisehg\hgtk\status.py:271
-msgid "path"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:116
+#: tortoisehg\hgtk\quickop.py:127
msgid "Toggle all selections"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:141
+#: tortoisehg\hgtk\quickop.py:133
+msgid "Do not save backup files (*.orig)"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:154
+msgid "Unable to determine repository status"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:163
msgid "modified"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:144
+#: tortoisehg\hgtk\quickop.py:166
msgid "added"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:147
+#: tortoisehg\hgtk\quickop.py:169
msgid "removed"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:150
+#: tortoisehg\hgtk\quickop.py:172
msgid "missing"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:153 tortoisehg\hgtk\quickop.py:236
-#: tortoisehg\hgtk\serve.py:126 tortoisehg\util\shlib.py:26
-#: tortoisehg\util\version.py:15
+#: tortoisehg\hgtk\quickop.py:175 tortoisehg\hgtk\quickop.py:255
+#: tortoisehg\hgtk\serve.py:127 tortoisehg\util\version.py:47
+#: tortoisehg\util\version.py:73
msgid "unknown"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:157 tortoisehg\hgtk\quickop.py:236
+#: tortoisehg\hgtk\quickop.py:179 tortoisehg\hgtk\quickop.py:255
msgid "ignored"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:161
+#: tortoisehg\hgtk\quickop.py:183
msgid "clean"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:164
+#: tortoisehg\hgtk\quickop.py:186
msgid "No appropriate files"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:165
+#: tortoisehg\hgtk\quickop.py:187
msgid "No files found for this operation"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:242
+#: tortoisehg\hgtk\quickop.py:211
+msgid "Successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:261
msgid "No files selected"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:243
+#: tortoisehg\hgtk\quickop.py:262
msgid "No operation to perform"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:264
-msgid "Successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:266 tortoisehg\hgtk\thgmq.py:644
-msgid "Canceled"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:268 tortoisehg\hgtk\thgmq.py:646
-msgid "Failed"
-msgstr ""
-
-#: tortoisehg\hgtk\recovery.py:40
+#: tortoisehg\hgtk\recovery.py:42
msgid "%s - recovery"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:46 tortoisehg\hgtk\synch.py:59
+#: tortoisehg\hgtk\recovery.py:48 tortoisehg\hgtk\synch.py:53
msgid "Stop the hg operation"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:50
+#: tortoisehg\hgtk\recovery.py:52
msgid "Clean"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:52
+#: tortoisehg\hgtk\recovery.py:54
msgid "Clean checkout, undo all changes"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:55
+#: tortoisehg\hgtk\recovery.py:57
msgid "Rollback"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:57
+#: tortoisehg\hgtk\recovery.py:59
msgid "Rollback (undo) last transaction to repository (pull, commit, etc)"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:61
+#: tortoisehg\hgtk\recovery.py:63
msgid "Recover"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:63
+#: tortoisehg\hgtk\recovery.py:65
msgid "Recover from interrupted operation"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:66
+#: tortoisehg\hgtk\recovery.py:68
msgid "Verify"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:68
+#: tortoisehg\hgtk\recovery.py:70
msgid "Validate repository consistency"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:102 tortoisehg\hgtk\synch.py:394
+#: tortoisehg\hgtk\recovery.py:110 tortoisehg\hgtk\synch.py:399
msgid "Cannot close now"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:103 tortoisehg\hgtk\synch.py:395
+#: tortoisehg\hgtk\recovery.py:111 tortoisehg\hgtk\synch.py:400
msgid "command is running"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:122
+#: tortoisehg\hgtk\recovery.py:130
msgid "Confirm clean repository"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:123
+#: tortoisehg\hgtk\recovery.py:131
msgid "Clean repository '%s' ?"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:135
+#: tortoisehg\hgtk\recovery.py:146
+msgid "Rollback repository '%s' to %d, undo %s from %s?"
+msgstr ""
+
+#: tortoisehg\hgtk\recovery.py:149
+msgid "Rollback repository '%s' to %d, undo %s?"
+msgstr ""
+
+#: tortoisehg\hgtk\recovery.py:152
+msgid "Rollback repository '%s' ?"
+msgstr ""
+
+#: tortoisehg\hgtk\recovery.py:153
msgid "Confirm rollback repository"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:136
-msgid "Rollback repository '%s' ?"
-msgstr ""
-
-#: tortoisehg\hgtk\recovery.py:157 tortoisehg\hgtk\synch.py:537
-msgid "Cannot run now"
-msgstr ""
-
-#: tortoisehg\hgtk\recovery.py:158 tortoisehg\hgtk\synch.py:538
-msgid "Please try again after the previous command is completed"
-msgstr ""
-
-#: tortoisehg\hgtk\recovery.py:220 tortoisehg\hgtk\synch.py:628
+#: tortoisehg\hgtk\recovery.py:249 tortoisehg\hgtk\synch.py:648
msgid "[command interrupted]"
msgstr ""
+#: tortoisehg\hgtk\rename.py:29 tortoisehg\hgtk\thgconfig.py:1621
+msgid "Invalid path"
+msgstr ""
+
#: tortoisehg\hgtk\rename.py:38
msgid "Rename "
msgstr ""
-#: tortoisehg\hgtk\rename.py:76 tortoisehg\hgtk\rename.py:83
+#: tortoisehg\hgtk\rename.py:79 tortoisehg\hgtk\rename.py:86
msgid "rename error"
msgstr ""
-#: tortoisehg\hgtk\serve.py:58
+#: tortoisehg\hgtk\serve.py:61
msgid "Start"
msgstr ""
-#: tortoisehg\hgtk\serve.py:60
+#: tortoisehg\hgtk\serve.py:63
msgid "Start server"
msgstr ""
-#: tortoisehg\hgtk\serve.py:64
+#: tortoisehg\hgtk\serve.py:67
msgid "Stop server"
msgstr ""
-#: tortoisehg\hgtk\serve.py:66
+#: tortoisehg\hgtk\serve.py:69
msgid "Browse"
msgstr ""
-#: tortoisehg\hgtk\serve.py:68
+#: tortoisehg\hgtk\serve.py:71
msgid "Launch browser to view repository"
msgstr ""
-#: tortoisehg\hgtk\serve.py:72
+#: tortoisehg\hgtk\serve.py:75
msgid "Configure web settings"
msgstr ""
-#: tortoisehg\hgtk\serve.py:91
+#: tortoisehg\hgtk\serve.py:96
msgid "HTTP Port:"
msgstr ""
-#: tortoisehg\hgtk\serve.py:127
+#: tortoisehg\hgtk\serve.py:128
msgid "%s - serve"
msgstr ""
-#: tortoisehg\hgtk\serve.py:130
+#: tortoisehg\hgtk\serve.py:131
msgid "%s serve - %s"
msgstr ""
-#: tortoisehg\hgtk\serve.py:133
+#: tortoisehg\hgtk\serve.py:134
msgid " - serve"
msgstr ""
-#: tortoisehg\hgtk\serve.py:164
+#: tortoisehg\hgtk\serve.py:165
msgid "Confirm Really Exit?"
msgstr ""
-#: tortoisehg\hgtk\serve.py:165
+#: tortoisehg\hgtk\serve.py:166
msgid ""
"Server process is still running\n"
"Exiting will stop the server."
@@ -2809,683 +3568,772 @@msgid "Defaulting to "
msgstr ""
-#: tortoisehg\hgtk\serve.py:316
+#: tortoisehg\hgtk\serve.py:321
msgid "cannot start server: "
msgstr ""
-#: tortoisehg\hgtk\serve.py:327
+#: tortoisehg\hgtk\serve.py:332
msgid "listening at http://%s%s/%s (%s:%d)\n"
msgstr ""
-#: tortoisehg\hgtk\serve.py:352
+#: tortoisehg\hgtk\serve.py:357
msgid "name of access log file to write to"
msgstr ""
-#: tortoisehg\hgtk\serve.py:353
+#: tortoisehg\hgtk\serve.py:358
msgid "run server in background"
msgstr ""
-#: tortoisehg\hgtk\serve.py:354
+#: tortoisehg\hgtk\serve.py:359
msgid "used internally by daemon mode"
msgstr ""
-#: tortoisehg\hgtk\serve.py:355
+#: tortoisehg\hgtk\serve.py:360
msgid "name of error log file to write to"
msgstr ""
-#: tortoisehg\hgtk\serve.py:356
+#: tortoisehg\hgtk\serve.py:361
msgid "port to use (default: 8000)"
msgstr ""
-#: tortoisehg\hgtk\serve.py:357
+#: tortoisehg\hgtk\serve.py:362
msgid "address to use"
msgstr ""
-#: tortoisehg\hgtk\serve.py:358
+#: tortoisehg\hgtk\serve.py:363
msgid "prefix path to serve from (default: server root)"
msgstr ""
-#: tortoisehg\hgtk\serve.py:360
+#: tortoisehg\hgtk\serve.py:365
msgid "name to show in web pages (default: working dir)"
msgstr ""
-#: tortoisehg\hgtk\serve.py:361
-msgid "name of the webdir config file (serve more than one repo)"
-msgstr ""
-
-#: tortoisehg\hgtk\serve.py:363
+#: tortoisehg\hgtk\serve.py:368
+msgid "name of the webdir config file (DEPRECATED)"
+msgstr ""
+
+#: tortoisehg\hgtk\serve.py:370
msgid "name of file to write process ID to"
msgstr ""
-#: tortoisehg\hgtk\serve.py:364
+#: tortoisehg\hgtk\serve.py:371
msgid "for remote clients"
msgstr ""
-#: tortoisehg\hgtk\serve.py:365
+#: tortoisehg\hgtk\serve.py:372
msgid "web templates to use"
msgstr ""
-#: tortoisehg\hgtk\serve.py:366
+#: tortoisehg\hgtk\serve.py:373
msgid "template style to use"
msgstr ""
-#: tortoisehg\hgtk\serve.py:367
+#: tortoisehg\hgtk\serve.py:374
msgid "use IPv6 in addition to IPv4"
msgstr ""
-#: tortoisehg\hgtk\serve.py:368
+#: tortoisehg\hgtk\serve.py:375
msgid "SSL certificate file"
msgstr ""
-#: tortoisehg\hgtk\serve.py:369
+#: tortoisehg\hgtk\serve.py:376
msgid "hg serve [OPTION]..."
msgstr ""
-#: tortoisehg\hgtk\status.py:138
+#: tortoisehg\hgtk\shellconf.py:25
+msgid "TortoiseHg Shell Configuration"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:27
+msgid "OK"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:28 tortoisehg\hgtk\thgshelve.py:163
+msgid "Cancel"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:29
+msgid "Apply"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:42
+msgid "Context Menu"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:47
+msgid "Menu Items"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:63
+msgid "Sub menu items:"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:82
+msgid "Top menu items:"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:104
+msgid "<- Top"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:107
+msgid "Sub ->"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:112
+msgid "Icons"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:117
+msgid "Overlays"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:124
+msgid "Enable overlays"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:126
+msgid "Local disks only"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:130
+msgid "Enabled Overlay Handlers"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:139
+msgid "Warning: affects all Tortoises, logoff required after change"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:147
+msgid "Added"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:149
+msgid "Unversioned"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:154
+msgid "Locked*"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:156
+msgid "Readonly*"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:161
+msgid "Ignored*"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:163
+msgid "Deleted*"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:178
+msgid "*: not used by TortoiseHg"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:182
+msgid "Taskbar"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:189
+msgid "Show Icon"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:191
+msgid "Highlight Icon"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:197
+msgid "Show overlay icons in Mercurial repositories"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:200
+msgid "Show overlays on local disks only"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:204
+msgid "Show the taskbar icon (restart needed)"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:207
+msgid "Highlight the taskbar icon during activity"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:95
msgid "filtered status"
msgstr ""
-#: tortoisehg\hgtk\status.py:154
+#: tortoisehg\hgtk\status.py:111
msgid "Save As"
msgstr ""
-#: tortoisehg\hgtk\status.py:155
+#: tortoisehg\hgtk\status.py:112
msgid "Save selected changes"
msgstr ""
-#: tortoisehg\hgtk\status.py:160
+#: tortoisehg\hgtk\status.py:117
msgid "Visual diff checked files"
msgstr ""
-#: tortoisehg\hgtk\status.py:163
+#: tortoisehg\hgtk\status.py:120
msgid "Revert checked files"
msgstr ""
-#: tortoisehg\hgtk\status.py:166
+#: tortoisehg\hgtk\status.py:123
msgid "Add checked files"
msgstr ""
-#: tortoisehg\hgtk\status.py:169
+#: tortoisehg\hgtk\status.py:126
msgid "Move checked files to other directory"
msgstr ""
-#: tortoisehg\hgtk\status.py:172
+#: tortoisehg\hgtk\status.py:129
msgid "Remove or delete checked files"
msgstr ""
-#: tortoisehg\hgtk\status.py:175
+#: tortoisehg\hgtk\status.py:132
msgid "Forget checked files on next commit"
msgstr ""
-#: tortoisehg\hgtk\status.py:179
+#: tortoisehg\hgtk\status.py:136
msgid "refresh"
msgstr ""
-#: tortoisehg\hgtk\status.py:255 tortoisehg\hgtk\thgmq.py:185
+#: tortoisehg\hgtk\status.py:277 tortoisehg\hgtk\thgmq.py:213
msgid "st"
msgstr ""
-#: tortoisehg\hgtk\status.py:263
+#: tortoisehg\hgtk\status.py:285
msgid "ms"
msgstr ""
-#: tortoisehg\hgtk\status.py:285
+#: tortoisehg\hgtk\status.py:307
msgid "View"
msgstr ""
-#: tortoisehg\hgtk\status.py:304
+#: tortoisehg\hgtk\status.py:330
msgid "Remove filter, show root"
msgstr ""
-#: tortoisehg\hgtk\status.py:330
+#: tortoisehg\hgtk\status.py:356
msgid "Text Diff"
msgstr ""
-#: tortoisehg\hgtk\status.py:383
+#: tortoisehg\hgtk\status.py:367
msgid "Hunk Selection"
msgstr ""
-#: tortoisehg\hgtk\status.py:456
+#: tortoisehg\hgtk\status.py:443
msgid "%d selected, %d total"
msgstr ""
-#: tortoisehg\hgtk\status.py:478
+#: tortoisehg\hgtk\status.py:465
msgid "Save Preview"
msgstr ""
-#: tortoisehg\hgtk\status.py:482
+#: tortoisehg\hgtk\status.py:469
msgid "Shelf Preview"
msgstr ""
-#: tortoisehg\hgtk\status.py:504
+#: tortoisehg\hgtk\status.py:491
msgid "?: unknown"
msgstr ""
-#: tortoisehg\hgtk\status.py:505
+#: tortoisehg\hgtk\status.py:492
msgid "M: modified"
msgstr ""
-#: tortoisehg\hgtk\status.py:506
+#: tortoisehg\hgtk\status.py:493
msgid "I: ignored"
msgstr ""
-#: tortoisehg\hgtk\status.py:507
+#: tortoisehg\hgtk\status.py:494
msgid "A: added"
msgstr ""
-#: tortoisehg\hgtk\status.py:508
+#: tortoisehg\hgtk\status.py:495
msgid "C: clean"
msgstr ""
-#: tortoisehg\hgtk\status.py:509
+#: tortoisehg\hgtk\status.py:496
msgid "R: removed"
msgstr ""
-#: tortoisehg\hgtk\status.py:510
+#: tortoisehg\hgtk\status.py:497
msgid "!: deleted"
msgstr ""
-#: tortoisehg\hgtk\status.py:801
+#: tortoisehg\hgtk\status.py:498
+msgid "S: subrepo"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:785
msgid "View '%s'"
msgstr ""
-#: tortoisehg\hgtk\status.py:846
-msgid "Rename file to:"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:855
-msgid "Copy file to"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:868 tortoisehg\hgtk\status.py:1332
-msgid "Nothing Removed"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:869
-msgid "Remove is not enabled when multiple revisions are specified."
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:886
-msgid "Move is not enabled when multiple revisions are specified."
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:886 tortoisehg\hgtk\status.py:1350
-#: tortoisehg\hgtk\status.py:1358
-msgid "Nothing Moved"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:904
-msgid "Copy is not enabled when multiple revisions are specified."
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:904
-msgid "Nothing Copied"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:963 tortoisehg\hgtk\status.py:1024
-msgid "===== Diff to first parent =====\n"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:968 tortoisehg\hgtk\status.py:1031
+#: tortoisehg\hgtk\status.py:881 tortoisehg\hgtk\status.py:953
+msgid "===== Diff to first parent %d:%s =====\n"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:886 tortoisehg\hgtk\status.py:959
msgid ""
"\n"
-"===== Diff to second parent =====\n"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1060
-msgid "File is larger than the specified max size.\n"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1061
-msgid "Hunk selection is disabled for this file.\n"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1232
+"===== Diff to second parent %d:%s =====\n"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1019
msgid "Nothing Diffed"
msgstr ""
-#: tortoisehg\hgtk\status.py:1233
+#: tortoisehg\hgtk\status.py:1020
msgid "No diffable files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1241 tortoisehg\hgtk\status.py:1249
+#: tortoisehg\hgtk\status.py:1028 tortoisehg\hgtk\statusact.py:106
msgid "Nothing Reverted"
msgstr ""
-#: tortoisehg\hgtk\status.py:1242
+#: tortoisehg\hgtk\status.py:1029
msgid "No revertable files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1250
-msgid "Revert not allowed when viewing revision range."
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1268
-msgid "Uncommited merge - please select a parent revision"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1269
-msgid "Revert files to local or other parent?"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1270
-msgid "&Local"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1270
-msgid "&Other"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1285
-msgid "Confirm Revert"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1286
-msgid ""
-"Revert files to revision %s?\n"
-"\n"
-"%s"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1287
-msgid "&Yes (backup changes)"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1288
-msgid "Yes (&discard changes)"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1308
+#: tortoisehg\hgtk\status.py:1037
msgid "Nothing Added"
msgstr ""
-#: tortoisehg\hgtk\status.py:1309
+#: tortoisehg\hgtk\status.py:1038
msgid "No addable files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1333
+#: tortoisehg\hgtk\status.py:1049 tortoisehg\hgtk\statusact.py:53
+msgid "Nothing Removed"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1050
msgid "No removable files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1341
+#: tortoisehg\hgtk\status.py:1058
msgid "Move files to directory..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1351
+#: tortoisehg\hgtk\status.py:1067 tortoisehg\hgtk\status.py:1075
+#: tortoisehg\hgtk\statusact.py:71
+msgid "Nothing Moved"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1068
msgid "Cannot move outside repo!"
msgstr ""
-#: tortoisehg\hgtk\status.py:1358
+#: tortoisehg\hgtk\status.py:1075
msgid ""
"No movable files selected\n"
"\n"
"Note: only clean files can be moved."
msgstr ""
-#: tortoisehg\hgtk\status.py:1367
+#: tortoisehg\hgtk\status.py:1084
msgid "Nothing Forgotten"
msgstr ""
-#: tortoisehg\hgtk\status.py:1368
+#: tortoisehg\hgtk\status.py:1085
msgid "No clean files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1371
-msgid "Confirm Delete Unrevisioned"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1372
-msgid "Delete the following unrevisioned files?"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1385
-msgid "Delete Errors"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1506
+#: tortoisehg\hgtk\status.py:1243
msgid "Edit"
msgstr ""
-#: tortoisehg\hgtk\status.py:1507
+#: tortoisehg\hgtk\status.py:1244
msgid "View missing"
msgstr ""
-#: tortoisehg\hgtk\status.py:1508
+#: tortoisehg\hgtk\status.py:1245
msgid "View other"
msgstr ""
-#: tortoisehg\hgtk\status.py:1512
-msgid "L_og"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1516
+#: tortoisehg\hgtk\status.py:1250 tortoisehg\util\menuthg.py:52
+msgid "File History"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1251
+msgid "Annotate"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1255
msgid "_Guess Rename..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1517
+#: tortoisehg\hgtk\status.py:1256
msgid "_Ignore"
msgstr ""
-#: tortoisehg\hgtk\status.py:1518
+#: tortoisehg\hgtk\status.py:1257
msgid "Remove versioned"
msgstr ""
-#: tortoisehg\hgtk\status.py:1519
+#: tortoisehg\hgtk\status.py:1258
msgid "_Delete unversioned"
msgstr ""
-#: tortoisehg\hgtk\status.py:1522
+#: tortoisehg\hgtk\status.py:1261
msgid "_Copy..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1523
+#: tortoisehg\hgtk\status.py:1262
msgid "Rename..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1525
+#: tortoisehg\hgtk\status.py:1264
msgid "Restart Merge..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1526
+#: tortoisehg\hgtk\status.py:1265
msgid "Mark unresolved"
msgstr ""
-#: tortoisehg\hgtk\status.py:1527
+#: tortoisehg\hgtk\status.py:1266
msgid "Mark resolved"
msgstr ""
-#: tortoisehg\hgtk\status.py:1535
+#: tortoisehg\hgtk\status.py:1274
msgid "Restart merge with"
msgstr ""
-#: tortoisehg\hgtk\status.py:1579
+#: tortoisehg\hgtk\status.py:1317
msgid "not up to date"
msgstr ""
-#: tortoisehg\hgtk\status.py:1580
+#: tortoisehg\hgtk\status.py:1318
msgid ""
"The parents have changed since the last refresh.\n"
"Continue anyway?"
msgstr ""
-#: tortoisehg\hgtk\status.py:1582
+#: tortoisehg\hgtk\status.py:1320
msgid "&Refresh"
msgstr ""
-#: tortoisehg\hgtk\statusbar.py:45
-msgid "Running"
-msgstr ""
-
-#: tortoisehg\hgtk\synch.py:51
+#: tortoisehg\hgtk\statusact.py:30
+msgid "Rename file to:"
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:40
+msgid "Copy file to"
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:54
+msgid "Remove is not enabled when multiple revisions are specified."
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:71
+msgid "Move is not enabled when multiple revisions are specified."
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:89
+msgid "Copy is not enabled when multiple revisions are specified."
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:89
+msgid "Nothing Copied"
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:107
+msgid "Revert not allowed when viewing revision range."
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:125
+msgid "Uncommited merge - please select a parent revision"
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:126
+msgid "Revert files to local or other parent?"
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:127
+msgid "&Local"
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:127
+msgid "&Other"
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:140
+msgid "Revert files to revision %s?"
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:143
+msgid "Revert files?"
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:146
+msgid "Confirm Revert"
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:147
+msgid "&Yes (backup changes)"
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:148
+msgid "Yes (&discard changes)"
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:178
+msgid "Confirm Delete Unrevisioned"
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:179
+msgid "Delete the following unrevisioned files?"
+msgstr ""
+
+#: tortoisehg\hgtk\statusact.py:192
+msgid "Delete Errors"
+msgstr ""
+
+#: tortoisehg\hgtk\statusbar.py:39
+msgid "Running..."
+msgstr ""
+
+#: tortoisehg\hgtk\statusbar.py:67
+msgid "unknown field name: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\statusbar.py:94
+msgid "invalid pack direction: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\statusbar.py:103
+msgid "invalid alignment value: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\synch.py:45
msgid "%s - synchronize"
msgstr ""
-#: tortoisehg\hgtk\synch.py:65
+#: tortoisehg\hgtk\synch.py:59
msgid "Display changes that can be pulled from selected repository"
msgstr ""
-#: tortoisehg\hgtk\synch.py:68
+#: tortoisehg\hgtk\synch.py:62
msgid " Pull "
msgstr ""
+#: tortoisehg\hgtk\synch.py:64
+msgid "Pull changes from selected repository"
+msgstr ""
+
#: tortoisehg\hgtk\synch.py:70
-msgid "Pull changes from selected repository"
-msgstr ""
-
-#: tortoisehg\hgtk\synch.py:76
msgid "Display local changes that will be pushed to selected repository"
msgstr ""
-#: tortoisehg\hgtk\synch.py:81
+#: tortoisehg\hgtk\synch.py:75
msgid "Push local changes to selected repository"
msgstr ""
-#: tortoisehg\hgtk\synch.py:84 tortoisehg\hgtk\thgconfig.py:616
+#: tortoisehg\hgtk\synch.py:78 tortoisehg\hgtk\thgconfig.py:238
msgid "Email"
msgstr ""
-#: tortoisehg\hgtk\synch.py:86
+#: tortoisehg\hgtk\synch.py:80
msgid "Email local outgoing changes to one or more recipients"
msgstr ""
-#: tortoisehg\hgtk\synch.py:91
+#: tortoisehg\hgtk\synch.py:85
msgid "Shelve uncommited changes"
msgstr ""
-#: tortoisehg\hgtk\synch.py:98
+#: tortoisehg\hgtk\synch.py:92
msgid "Configure peer repository paths"
msgstr ""
-#: tortoisehg\hgtk\synch.py:113
+#: tortoisehg\hgtk\synch.py:107
msgid "Repo:"
msgstr ""
-#: tortoisehg\hgtk\synch.py:118
+#: tortoisehg\hgtk\synch.py:112
msgid "Bundle:"
msgstr ""
-#: tortoisehg\hgtk\synch.py:164
+#: tortoisehg\hgtk\synch.py:157
msgid "Post Pull: "
msgstr ""
-#: tortoisehg\hgtk\synch.py:174
+#: tortoisehg\hgtk\synch.py:167
msgid "Advanced Options"
msgstr ""
-#: tortoisehg\hgtk\synch.py:181
-msgid "Force pull or push"
-msgstr ""
-
-#: tortoisehg\hgtk\synch.py:182
+#: tortoisehg\hgtk\synch.py:175
msgid "Run even when remote repository is unrelated."
msgstr ""
+#: tortoisehg\hgtk\synch.py:178
+msgid "Allow pushing a new branch"
+msgstr ""
+
+#: tortoisehg\hgtk\synch.py:191
+msgid "Target revision:"
+msgstr ""
+
#: tortoisehg\hgtk\synch.py:195
-msgid "Target revision:"
-msgstr ""
-
-#: tortoisehg\hgtk\synch.py:199
msgid "A specific revision up to which you would like to push or pull."
msgstr ""
-#: tortoisehg\hgtk\synch.py:209
+#: tortoisehg\hgtk\synch.py:205
msgid "Name of hg executable on remote machine."
msgstr ""
+#: tortoisehg\hgtk\synch.py:215
+msgid "Incoming/Outgoing"
+msgstr ""
+
+#: tortoisehg\hgtk\synch.py:218
+msgid "Show patches"
+msgstr ""
+
#: tortoisehg\hgtk\synch.py:219
-msgid "Incoming/Outgoing"
-msgstr ""
-
-#: tortoisehg\hgtk\synch.py:222
-msgid "Show patches"
-msgstr ""
-
-#: tortoisehg\hgtk\synch.py:223
msgid "Show newest first"
msgstr ""
-#: tortoisehg\hgtk\synch.py:224
+#: tortoisehg\hgtk\synch.py:220
msgid "Show no merges"
msgstr ""
-#: tortoisehg\hgtk\synch.py:268
+#: tortoisehg\hgtk\synch.py:266
msgid "Update to branch tip"
msgstr ""
-#: tortoisehg\hgtk\synch.py:367
+#: tortoisehg\hgtk\synch.py:372
msgid "unknown sort key '%s'"
msgstr ""
-#: tortoisehg\hgtk\synch.py:377
+#: tortoisehg\hgtk\synch.py:382
msgid "Select Repository"
msgstr ""
-#: tortoisehg\hgtk\synch.py:384
+#: tortoisehg\hgtk\synch.py:389
msgid "Select Bundle"
msgstr ""
-#: tortoisehg\hgtk\synch.py:386
+#: tortoisehg\hgtk\synch.py:391
msgid "Bundle (*.hg)"
msgstr ""
-#: tortoisehg\hgtk\synch.py:387
+#: tortoisehg\hgtk\synch.py:392
msgid "Bundle (*)"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:29
+#: tortoisehg\hgtk\synch.py:689
+msgid "Toggle _Wordwrap"
+msgstr ""
+
+#: tortoisehg\hgtk\tagadd.py:31
msgid "Tag - %s"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:59
+#: tortoisehg\hgtk\tagadd.py:57
msgid "Tag:"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:76
+#: tortoisehg\hgtk\tagadd.py:77
msgid "Tag is local"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:78
+#: tortoisehg\hgtk\tagadd.py:79
msgid "Replace existing tag"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:79
+#: tortoisehg\hgtk\tagadd.py:82
msgid "Use English commit message"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:85
+#: tortoisehg\hgtk\tagadd.py:90
msgid "Use custom commit message:"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:161
+#: tortoisehg\hgtk\tagadd.py:219
msgid "Tag input is empty"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:162
+#: tortoisehg\hgtk\tagadd.py:220
msgid "Please enter tag name"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:166
+#: tortoisehg\hgtk\tagadd.py:224
msgid "Custom commit message is empty"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:175 tortoisehg\hgtk\tagadd.py:207
+#: tortoisehg\hgtk\tagadd.py:233 tortoisehg\hgtk\tagadd.py:265
msgid "Tagging completed"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:176
+#: tortoisehg\hgtk\tagadd.py:234
msgid "Tag \"%s\" has been added"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:179 tortoisehg\hgtk\tagadd.py:182
-#: tortoisehg\hgtk\tagadd.py:211 tortoisehg\hgtk\tagadd.py:214
+#: tortoisehg\hgtk\tagadd.py:237 tortoisehg\hgtk\tagadd.py:240
+#: tortoisehg\hgtk\tagadd.py:269 tortoisehg\hgtk\tagadd.py:272
msgid "Error in tagging"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:195
+#: tortoisehg\hgtk\tagadd.py:253
msgid "Tag name is empty"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:196
+#: tortoisehg\hgtk\tagadd.py:254
msgid "Please select tag name to remove"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:208
+#: tortoisehg\hgtk\tagadd.py:266
msgid "Tag \"%s\" has been removed"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:222
+#: tortoisehg\hgtk\tagadd.py:279
msgid "a tag named \"%s\" already exists"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:228
+#: tortoisehg\hgtk\tagadd.py:285
msgid "Added tag %s for changeset %s"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:232
+#: tortoisehg\hgtk\tagadd.py:289
msgid "Tag '%s' already exist"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:239
-msgid "Tag '%s' does not exist"
-msgstr ""
-
-#: tortoisehg\hgtk\tagadd.py:242
+#: tortoisehg\hgtk\tagadd.py:300
+msgid "tag '%s' does not exist"
+msgstr ""
+
+#: tortoisehg\hgtk\tagadd.py:303
+msgid "tag '%s' is not a local tag"
+msgstr ""
+
+#: tortoisehg\hgtk\tagadd.py:306
+msgid "tag '%s' is not a global tag"
+msgstr ""
+
+#: tortoisehg\hgtk\tagadd.py:309
msgid "Removed tag %s"
msgstr ""
-#: tortoisehg\hgtk\taskbarui.py:29
-msgid "TortoiseHg Taskbar"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:32
-msgid "Apply"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:52
-msgid "Overlays"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:59
-msgid "Enable overlays"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:61
-msgid "Local disks only"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:65
-msgid "Context Menu"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:81
-msgid "Sub menu items:"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:100
-msgid "Top menu items:"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:122
-msgid "Top ->"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:125
-msgid "<- Sub"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:130
-msgid "Taskbar"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:137
-msgid "Highlight Icon"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:143
-msgid "Enable/Disable the overlay icons globally"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:146
-msgid "Only enable overlays on local disks"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:150
-msgid "Highlight the taskbar icon during activity"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:157
-msgid "Event Log"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:22
+#: tortoisehg\hgtk\thgconfig.py:33
msgid "<unspecified>"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:28
+#: tortoisehg\hgtk\thgconfig.py:43
+msgid "UI Language"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:44
+msgid "Specify your preferred user interface language (restart needed)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:45
msgid "Three-way Merge Tool"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:29
+#: tortoisehg\hgtk\thgconfig.py:46
msgid ""
"Graphical merge program for resolving merge conflicts. If left unspecified, "
"Mercurial will use the first applicable tool it finds on your system or use "
@@ -3495,348 +4343,382 @@"manual merging"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:35
-msgid "Visual Diff Command"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:36
-msgid "Specify visual diff tool; must be an extdiff command"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:37
-msgid "Skip Diff Window"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:38
+#: tortoisehg\hgtk\thgconfig.py:52
+msgid "Visual Diff Tool"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:53
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 ""
-
-#: tortoisehg\hgtk\thgconfig.py:42
+"Specify visual diff tool, as described in the [merge-tools] section of your "
+"Mercurial configuration files. If left unspecified, TortoiseHg will use the "
+"selected merge tool. Failing that it uses the first applicable tool it finds."
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:57
msgid "Visual Editor"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:43
+#: tortoisehg\hgtk\thgconfig.py:58
msgid "Specify the visual editor used to view files, etc"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:44
+#: tortoisehg\hgtk\thgconfig.py:59
msgid "CLI Editor"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:45
+#: tortoisehg\hgtk\thgconfig.py:60
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 ""
-
-#: tortoisehg\hgtk\thgconfig.py:48
+"multiline input from the user. Used by command line commands, including "
+"patch import."
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:63
msgid "Tab Width"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:49
+#: tortoisehg\hgtk\thgconfig.py:64
msgid ""
-"Specify the number of spaces that tabs expand to in various TortoiseHG "
+"Specify the number of spaces that tabs expand to in various TortoiseHg "
"windows. Default: Not expanded"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:52
+#: tortoisehg\hgtk\thgconfig.py:67
msgid "Max Diff Size"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:53
+#: tortoisehg\hgtk\thgconfig.py:68
msgid ""
"The maximum size file (in KB) that TortoiseHg will show changes for in the "
"changelog, status, and commit windows. A value of zero implies no limit. "
"Default: 1024 (1MB)"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:56
+#: tortoisehg\hgtk\thgconfig.py:71
msgid "Bottom Diffs"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:57
+#: tortoisehg\hgtk\thgconfig.py:72
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 ""
-#: tortoisehg\hgtk\thgconfig.py:60
-msgid "Capture Stderr"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:61
+#: tortoisehg\hgtk\thgconfig.py:75
+msgid "Capture stderr"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:76
msgid ""
"Redirect stderr to a buffer which is parsed at the end of the process for "
"runtime errors. Default: True"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:63
+#: tortoisehg\hgtk\thgconfig.py:78
msgid "Fork hgtk"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:64
+#: tortoisehg\hgtk\thgconfig.py:79
msgid ""
"When running hgtk from the command line, fork a background process to run "
"graphical dialogs. Default: True"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:66
-msgid "Full path title"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:67
+#: tortoisehg\hgtk\thgconfig.py:81
+msgid "Full Path Title"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:82
msgid ""
"Show a full directory path of the repository in the dialog title instead of "
"just the root directory name. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:71
+#: tortoisehg\hgtk\thgconfig.py:86
+msgid ""
+"Default language for spell check. System language is used if not specified. "
+"Examples: en, en_GB, en_US"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:90
msgid "Username"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:72
+#: tortoisehg\hgtk\thgconfig.py:91
msgid "Name associated with commits"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:73
+#: tortoisehg\hgtk\thgconfig.py:92
msgid "Summary Line Length"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:74
+#: tortoisehg\hgtk\thgconfig.py:93
msgid ""
-"Maximum length of the commit message summary line. If set, TortoiseHG will "
+"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 ""
-#: tortoisehg\hgtk\thgconfig.py:78
+#: tortoisehg\hgtk\thgconfig.py:97
msgid "Message Line Length"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:79
+#: tortoisehg\hgtk\thgconfig.py:98
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 ""
-#: tortoisehg\hgtk\thgconfig.py:84
+#: tortoisehg\hgtk\thgconfig.py:103
+msgid "Close After Commit"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:104
+msgid "Close the commit tool after every successful commit. Default: False"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:106
msgid "Push After Commit"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:85
+#: tortoisehg\hgtk\thgconfig.py:107
msgid ""
"Attempt to push to default push target after every successful commit. "
"Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:87
+#: tortoisehg\hgtk\thgconfig.py:109
msgid "Auto Commit List"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:88
+#: tortoisehg\hgtk\thgconfig.py:110
msgid ""
"Comma separated list of files that are automatically included in every "
-"commit. Intended for use only as a repository setting. Default: None"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:91
+"commit. Intended for use only as a repository setting. Default: None "
+"(leave blank)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:113
msgid "Auto Exclude List"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:92
+#: tortoisehg\hgtk\thgconfig.py:114
msgid ""
"Comma separated list of files that are automatically unchecked when the "
-"status, commit, and shelve dialogs are opened. Default: None"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:98
+"status, commit, and shelve dialogs are opened. Default: None (leave blank)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:117
+msgid "English Messages"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:118
+msgid ""
+"Generate English commit messages even if LANGUAGE or LANG environment "
+"variables are set to a non-English language. This setting is used by the "
+"Merge, Tag and Backout dialogs. Default: False"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:122
+msgid "Default Tab"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:123
+msgid ""
+"The tab on which the status and commit tools will open. 0 - TextDiff, 1 - "
+"Hunk Selection, 2 - Commit Preview. Default: 0"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:130
msgid "Author Coloring"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:99
+#: tortoisehg\hgtk\thgconfig.py:131
msgid ""
"Color changesets by author name. If not enabled, the changes are colored "
"green for merge, red for non-trivial parents, black for normal. Default: "
"False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:103
+#: tortoisehg\hgtk\thgconfig.py:135
msgid "Long Summary"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:104
+#: tortoisehg\hgtk\thgconfig.py:136
msgid ""
"If true, concatenate multiple lines of changeset summary until they reach 80 "
"characters. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:107
+#: tortoisehg\hgtk\thgconfig.py:139
msgid "Log Batch Size"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:108
+#: tortoisehg\hgtk\thgconfig.py:140
msgid ""
"The number of revisions to read and display in the changelog viewer in a "
"single batch. Default: 500"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:111
-msgid "Copy Hash"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:112
-msgid ""
-"Allow the changelog viewer to copy the changeset hash of the currently "
-"selected changeset into the clipboard. DEPRECATED. Default: False"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:115
+#: tortoisehg\hgtk\thgconfig.py:143
msgid "Dead Branches"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:116
+#: tortoisehg\hgtk\thgconfig.py:144
msgid ""
"Comma separated list of branch names that should be ignored when building a "
-"list of branch names for a repository. Default: None"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:119
+"list of branch names for a repository. Default: None (leave blank)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:147
msgid "Branch Colors"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:120
+#: tortoisehg\hgtk\thgconfig.py:148
msgid ""
"Space separated list of branch names and colors of the form branch:#XXXXXX. "
"Spaces and colons in the branch name must be escaped using a backslash (\\). "
"Likewise some other characters can be escaped in this way, e.g. \\u0040 will "
-"be decoded to the @ character, and \\n to a linefeed. Default: None"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:126
+"be decoded to the @ character, and \\n to a linefeed. Default: None (leave "
+"blank)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:154
msgid "Hide Tags"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:127
+#: tortoisehg\hgtk\thgconfig.py:155
msgid ""
"Space separated list of tags that will not be shown. Useful example: Specify "
"\"qbase qparent qtip\" to hide the standard tags inserted by the Mercurial "
-"Queues Extension. Default: None"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:131
+"Queues Extension. Default: None (leave blank)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:159
msgid "Use Expander"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:132
+#: tortoisehg\hgtk\thgconfig.py:160
msgid "Show changeset details with an expander"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:136
-msgid "After pull operation"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:138
+#: tortoisehg\hgtk\thgconfig.py:161
+msgid "Toolbar Style"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:163
+msgid ""
+"Adjust the display of the main toolbar in the Repository Explorer. Values: "
+"small, large, or theme. Default: theme"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:172
+msgid "After Pull Operation"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:174
msgid ""
"Operation which is performed directly after a successful pull. update "
"equates to pull --update, fetch equates to the fetch extension, rebase "
"equates to pull --rebase. Default: none"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:143 tortoisehg\hgtk\thgmq.py:186
+#: tortoisehg\hgtk\thgconfig.py:179 tortoisehg\util\menuthg.py:58
+msgid "Web Server"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:180 tortoisehg\hgtk\thgpbranch.py:210
msgid "Name"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:144
+#: tortoisehg\hgtk\thgconfig.py:181
msgid ""
"Repository name to use in the web interface. Default is the working "
"directory."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:146 tortoisehg\hgtk\thgconfig.py:939
+#: tortoisehg\hgtk\thgconfig.py:183 tortoisehg\hgtk\thgconfig.py:745
msgid "Description"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:147
+#: tortoisehg\hgtk\thgconfig.py:184
msgid "Textual description of the repository's purpose or contents."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:149
+#: tortoisehg\hgtk\thgconfig.py:186
msgid "Contact"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:150
+#: tortoisehg\hgtk\thgconfig.py:187
msgid "Name or email address of the person in charge of the repository."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:152
+#: tortoisehg\hgtk\thgconfig.py:189
msgid "Style"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:154
+#: tortoisehg\hgtk\thgconfig.py:191
msgid "Which template map style to use"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:155
+#: tortoisehg\hgtk\thgconfig.py:192
msgid "Archive Formats"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:156
+#: tortoisehg\hgtk\thgconfig.py:193
msgid "Comma separated list of archive formats allowed for downloading"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:158
+#: tortoisehg\hgtk\thgconfig.py:195
msgid "Port to listen on"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:158 tortoisehg\hgtk\thgconfig.py:275
+#: tortoisehg\hgtk\thgconfig.py:195 tortoisehg\hgtk\thgconfig.py:368
msgid "Port"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:159
+#: tortoisehg\hgtk\thgconfig.py:196
msgid "Push Requires SSL"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:160
+#: tortoisehg\hgtk\thgconfig.py:197
msgid ""
"Whether to require that inbound pushes be transported over SSL to prevent "
"password sniffing."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:162
+#: tortoisehg\hgtk\thgconfig.py:199
msgid "Stripes"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:163
+#: tortoisehg\hgtk\thgconfig.py:200
msgid ""
"How many lines a \"zebra stripe\" should span in multiline output. Default "
"is 1; set to 0 to disable."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:165
+#: tortoisehg\hgtk\thgconfig.py:202
msgid "Max Files"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:166
+#: tortoisehg\hgtk\thgconfig.py:203
msgid "Maximum number of files to list per changeset."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:167
+#: tortoisehg\hgtk\thgconfig.py:204
msgid "Max Changes"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:168
+#: tortoisehg\hgtk\thgconfig.py:205
msgid "Maximum number of changes to list on the changelog."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:169
+#: tortoisehg\hgtk\thgconfig.py:206
msgid "Allow Push"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:170
+#: tortoisehg\hgtk\thgconfig.py:207
msgid ""
"Whether to allow pushing to the repository. If empty or not set, push is not "
"allowed. If the special value \"*\", any remote user can push, including "
@@ -3846,11 +4728,11 @@"examined after the deny_push list."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:177
+#: tortoisehg\hgtk\thgconfig.py:214
msgid "Deny Push"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:178
+#: tortoisehg\hgtk\thgconfig.py:215
msgid ""
"Whether to deny pushing to the repository. If empty or not set, push is not "
"denied. If the special value \"*\", all remote users are denied push. "
@@ -3859,81 +4741,85 @@"The contents of the deny_push list are examined before the allow_push list."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:184
+#: tortoisehg\hgtk\thgconfig.py:221
msgid "Encoding"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:185
+#: tortoisehg\hgtk\thgconfig.py:222
msgid "Character encoding name"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:188 tortoisehg\hgtk\thgconfig.py:276
+#: tortoisehg\hgtk\thgconfig.py:225
+msgid "Proxy"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:226 tortoisehg\hgtk\thgconfig.py:369
msgid "Host"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:189
+#: tortoisehg\hgtk\thgconfig.py:227
msgid ""
"Host name and (optional) port of proxy server, for example \"myproxy:8000\""
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:191
+#: tortoisehg\hgtk\thgconfig.py:229
msgid "Bypass List"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:192
+#: tortoisehg\hgtk\thgconfig.py:230
msgid ""
"Optional. Comma-separated list of host names that should bypass the proxy"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:195
+#: tortoisehg\hgtk\thgconfig.py:233
msgid "Optional. User name to authenticate with at the proxy server"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:197 tortoisehg\hgtk\thgconfig.py:277
+#: tortoisehg\hgtk\thgconfig.py:234 tortoisehg\hgtk\thgconfig.py:370
msgid "Password"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:198
+#: tortoisehg\hgtk\thgconfig.py:235
msgid "Optional. Password to authenticate with at the proxy server"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:202
+#: tortoisehg\hgtk\thgconfig.py:239
msgid "From"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:203
+#: tortoisehg\hgtk\thgconfig.py:240
msgid "Email address to use in the \"From\" header and for the SMTP envelope"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:204
+#: tortoisehg\hgtk\thgconfig.py:242
msgid "To"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:205
+#: tortoisehg\hgtk\thgconfig.py:243
msgid "Comma-separated list of recipient email addresses"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:206
+#: tortoisehg\hgtk\thgconfig.py:244
msgid "Cc"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:207
+#: tortoisehg\hgtk\thgconfig.py:245
msgid "Comma-separated list of carbon copy recipient email addresses"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:209
+#: tortoisehg\hgtk\thgconfig.py:246
msgid "Bcc"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:210
+#: tortoisehg\hgtk\thgconfig.py:247
msgid "Comma-separated list of blind carbon copy recipient email addresses"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:212
+#: tortoisehg\hgtk\thgconfig.py:249
msgid "method"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:213
+#: tortoisehg\hgtk\thgconfig.py:250
msgid ""
"Optional. Method to use to send email messages. If value is \"smtp\" "
"(default), use SMTP (configured below). Otherwise, use as name of program "
@@ -3943,1036 +4829,1553 @@"messages."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:218
+#: tortoisehg\hgtk\thgconfig.py:256
msgid "Host name of mail server"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:218
+#: tortoisehg\hgtk\thgconfig.py:256
msgid "SMTP Host"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:219
+#: tortoisehg\hgtk\thgconfig.py:257
msgid "SMTP Port"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:220
+#: tortoisehg\hgtk\thgconfig.py:258
msgid "Port to connect to on mail server. Default: 25"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:222
+#: tortoisehg\hgtk\thgconfig.py:260
msgid "SMTP TLS"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:223
+#: tortoisehg\hgtk\thgconfig.py:261
msgid "Connect to mail server using TLS. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:225
+#: tortoisehg\hgtk\thgconfig.py:263
msgid "SMTP Username"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:226
+#: tortoisehg\hgtk\thgconfig.py:264
msgid "Username to authenticate to mail server with"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:227
+#: tortoisehg\hgtk\thgconfig.py:265
msgid "SMTP Password"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:228
+#: tortoisehg\hgtk\thgconfig.py:266
msgid "Password to authenticate to mail server with"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:229
+#: tortoisehg\hgtk\thgconfig.py:267
msgid "Local Hostname"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:230
+#: tortoisehg\hgtk\thgconfig.py:268
msgid "Hostname the sender can use to identify itself to the mail server."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:233
+#: tortoisehg\hgtk\thgconfig.py:272
+msgid "Diff"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:273
msgid "Patch EOL"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:234
+#: tortoisehg\hgtk\thgconfig.py:274
msgid ""
"Normalize file line endings during and after patch to lf or crlf. Strict "
-"does no normalization. Default: strict"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:237
+"does no normalization. Auto does per-file detection, and is the recommended "
+"setting. Default: strict"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:278
msgid "Git Format"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:238
+#: tortoisehg\hgtk\thgconfig.py:279
msgid "Use git extended diff header format. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:240
+#: tortoisehg\hgtk\thgconfig.py:281
msgid "No Dates"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:241
+#: tortoisehg\hgtk\thgconfig.py:282
msgid "Do not include modification dates in diff headers. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:243
+#: tortoisehg\hgtk\thgconfig.py:284
msgid "Show Function"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:244
+#: tortoisehg\hgtk\thgconfig.py:285
msgid "Show which function each change is in. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:246
+#: tortoisehg\hgtk\thgconfig.py:287
msgid "Ignore White Space"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:247
+#: tortoisehg\hgtk\thgconfig.py:288
msgid "Ignore white space when comparing lines. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:249
+#: tortoisehg\hgtk\thgconfig.py:290
msgid "Ignore WS Amount"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:250
+#: tortoisehg\hgtk\thgconfig.py:291
msgid "Ignore changes in the amount of white space. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:252
+#: tortoisehg\hgtk\thgconfig.py:293
msgid "Ignore Blank Lines"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:253
+#: tortoisehg\hgtk\thgconfig.py:294
msgid "Ignore changes whose lines are all blank. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:257
+#: tortoisehg\hgtk\thgconfig.py:296
+msgid "Coloring Style"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:298
+msgid ""
+"Adjust the coloring style of diff lines in the changeset viewer. Default: "
+"foreground"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:302
+msgid "Font"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:304
+msgid "Commit Message"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:305
+msgid ""
+"Font used in changeset viewer and commit log text. Default: monospace 10"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:307
+msgid "Diff Text"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:308
+msgid "Font used for diffs in status and commit tools. Default: monospace 10"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:310
+msgid "File List"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:311
+msgid "Font used in file lists in status and commit tools. Default: sans 9"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:313
+msgid "Command Output"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:314
+msgid "Font used in command output window. Default: monospace 10"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:318
+msgid "Extensions"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:321
+msgid "Issue Tracking"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:323
+msgid "Issue Regex"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:324
+msgid "Defines the regex to match when picking up issue numbers."
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:325
+msgid "Issue Link"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:326
+msgid ""
+"Defines the command to run when an issue number is recognized. You may "
+"include groups in issue.regex, and corresponding {n} tokens in issue.link "
+"(where n is a non-negative integer). {0} refers to the entire string matched "
+"by issue.regex, while {1} refers to the first group and so on. If no {n} "
+"tokensare found in issue.link, the entire matched string is appended instead."
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:333
+msgid "Mandatory Issue Reference"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:335
+msgid ""
+"When commiting an issue, force the user to specify a reference to an issue. "
+"If enabled, the regex configured in 'Issue Regex' must find a match in the "
+"commit message"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:343
+msgid "Japanese on Windows"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:350
msgid "http"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:257
+#: tortoisehg\hgtk\thgconfig.py:350
msgid "ssh"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:258
+#: tortoisehg\hgtk\thgconfig.py:351
msgid "https"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:258
+#: tortoisehg\hgtk\thgconfig.py:351
msgid "local"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:267
+#: tortoisehg\hgtk\thgconfig.py:360
msgid "Edit remote repository path"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:275
+#: tortoisehg\hgtk\thgconfig.py:368
msgid "URL"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:276
+#: tortoisehg\hgtk\thgconfig.py:369
msgid "Folder"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:278 tortoisehg\hgtk\thgconfig.py:892
+#: tortoisehg\hgtk\thgconfig.py:371 tortoisehg\hgtk\thgconfig.py:954
msgid "Alias"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:310
+#: tortoisehg\hgtk\thgconfig.py:403
msgid "URL Details"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:321
+#: tortoisehg\hgtk\thgconfig.py:414
msgid "Type"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:451
+#: tortoisehg\hgtk\thgconfig.py:544
msgid "Select Local Folder"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:476
+#: tortoisehg\hgtk\thgconfig.py:569
msgid "Alias name is empty"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:477
+#: tortoisehg\hgtk\thgconfig.py:570
msgid "Please enter alias name"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:482 tortoisehg\hgtk\thgconfig.py:832
+#: tortoisehg\hgtk\thgconfig.py:575 tortoisehg\hgtk\thgconfig.py:1078
msgid "Overwrite existing '%s' path?"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:540
+#: tortoisehg\hgtk\thgconfig.py:638
msgid "No repository found"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:541
+#: tortoisehg\hgtk\thgconfig.py:639
msgid "no repo at "
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:550
+#: tortoisehg\hgtk\thgconfig.py:648
msgid "Iniparse package not found"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:551
+#: tortoisehg\hgtk\thgconfig.py:649
+msgid "Can't change settings without iniparse package - view is readonly."
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:669
+msgid "User global settings"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:671
+msgid "%s repository settings"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:680
+msgid "Reload"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:773
+msgid "Confirm Switch"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:774
+msgid "Switch after saving changes?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:775
+msgid "&Save"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:775 tortoisehg\hgtk\update.py:233
+msgid "&Discard"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:793
+msgid "TortoiseHg Configure Repository - "
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:798
+msgid "TortoiseHg Configure User-Global Settings"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:822
+msgid "Confirm Reload"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:823
msgid ""
-"Please install iniparse package\n"
-"Settings are only shown, no changing is possible"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:562
-msgid "User global settings"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:564
-msgid "%s repository settings"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:569
-msgid "Edit File"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:592
+"Unsaved changes will be lost.\n"
+"Do you want to reload?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:847
+msgid "Exit after saving changes?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:848
+msgid "&No (discard changes)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:939
+msgid "Remote repository paths"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:958
+msgid "Repository Path"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:979
+msgid "_Edit"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:987
+msgid "_Test"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:991
+msgid "Set as _default"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1054
+msgid "No Repository Found"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1055
+msgid "Path testing cannot work without a repository"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1115
+msgid "Theme default fonts"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1116
+msgid "Preset fonts:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1117
+msgid "Custom fonts:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1125
+msgid " - Select Preset -"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1318
+msgid " - Select Issue Tracker -"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1329
msgid ""
-"Default language for spell check. System language is used if not specified. "
-"Examples: en, en_GB, en_US"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:606
-msgid "Sync"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:610
-msgid "Web"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:613
-msgid "Proxy"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:619
-msgid "Diff"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:632
-msgid "Unapplied changes"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:633
-msgid "Lose changes and switch files?."
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:652
-msgid "TortoiseHg Configure Repository - "
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:656
-msgid "TortoiseHg Configure User-Global Settings"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:713
-msgid "Exit after saving changes?"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:714
-msgid "&No (discard changes)"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:807
-msgid "No Repository Found"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:808
-msgid "Path testing cannot work without a repository"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:874
-msgid "Remote repository paths"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:896
-msgid "Repository Path"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:910
-msgid "_Edit"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:920
-msgid "_Test"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:925
-msgid "Set as _default"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:1011
+"Select issue tracker plugin to use. Links to plugins can be found at "
+"http://tortoisesvn.net/issuetrackerplugins"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1336
+msgid "Configure Plugin"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1461
msgid "Suggested"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:1021
+#: tortoisehg\hgtk\thgconfig.py:1471
msgid "History"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:1061
-msgid "# Generated by tortoisehg-config\n"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:1118
+#: tortoisehg\hgtk\thgconfig.py:1550
+msgid "Unable to create a Mercurial.ini file"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1551
+msgid "Insufficient access rights, reverting to read-onlymode."
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1573
+msgid "Unable to parse a config file"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1574
+msgid ""
+"%s\n"
+"Reverting to read-only mode."
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1622
msgid "Skipped saving path with no alias"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:1146
+#: tortoisehg\hgtk\thgconfig.py:1654
msgid "Unable to write configuration file"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:95
+#: tortoisehg\hgtk\thgimport.py:44
+msgid "Import - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:76
+msgid "Browse Directory..."
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:78
+msgid "Import from Clipboard"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:82
+msgid "Source:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:85
+msgid "Do not strip paths (-p0), required for SVN patches"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:105 tortoisehg\hgtk\thgstrip.py:76
+msgid "Preview:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:110
+msgid "Repository"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:164
+msgid "Import"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:184
+msgid "Imported successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:186
+msgid "Canceled importing"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:192
+msgid "Confirm Close"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:193
+msgid "Do you want to close?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:203
+msgid "Select Patches"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:214
+msgid "Select Directory contains patches:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:281
+msgid "%s patches"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:283
+msgid "%s will be imported to the"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:285
+msgid "%s will be imported to the repository"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:287
+msgid "Nothing to import"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:345
+msgid "unexpected destination name: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:110
msgid "Unapply all patches"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:100
+#: tortoisehg\hgtk\thgmq.py:115
msgid "Unapply last patch"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:106
+#: tortoisehg\hgtk\thgmq.py:120
msgid "Apply next patch"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:111
+#: tortoisehg\hgtk\thgmq.py:125
msgid "Apply all patches"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:184
+#: tortoisehg\hgtk\thgmq.py:212
msgid "#"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:268
-msgid "%(count)d of %(total)d Patches applied"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:272
-msgid "Patch '%s' applied"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:325
+#: tortoisehg\hgtk\thgmq.py:214
+msgid "Patch"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:369
+msgid "Yes (&keep)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:372 tortoisehg\hgtk\thgmq.py:376
+#: tortoisehg\hgtk\thgshelve.py:224
msgid "Confirm Delete"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:326
-msgid "Do you want to delete?"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:327
-msgid "Yes (&keep)"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:409
+#: tortoisehg\hgtk\thgmq.py:373
+msgid "Do you want to delete '%(name)s'?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:377
+msgid "Do you want to delete these patches?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:468 tortoisehg\hgtk\thgmq.py:472
msgid "Confirm Fold"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:410
+#: tortoisehg\hgtk\thgmq.py:469
msgid ""
"Do you want to fold un-applied patch '%(target)s' into current patch "
"'%(qtip)s'?"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:567
-msgid "_goto"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:569
+#: tortoisehg\hgtk\thgmq.py:473
+msgid ""
+"Do you want to fold following un-applied patches into the current patch "
+"'%(qtip)s'?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:530
+msgid "invalid reorder operation: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:578
+msgid "series become inconsistent during reorder"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:771
+msgid "Top"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:773
+msgid "Up"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:775
+msgid "Down"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:777
+msgid "Bottom"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:798
+msgid "_Goto"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:800
+msgid "_Rename"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:802
+msgid "_Finish Applied"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:805 tortoisehg\hgtk\thgmq.py:835
+msgid "_Delete"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:807 tortoisehg\hgtk\thgmq.py:838
+msgid "F_old"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:810 tortoisehg\hgtk\thgmq.py:842
+msgid "Reorder"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:862
+msgid "Status"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:869 tortoisehg\hgtk\thgpbranch.py:703
+msgid "Enable editable cells"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:872
+msgid "Show 'qparent'"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:876
+msgid "Force"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:896 tortoisehg\hgtk\thgpbranch.py:744
+msgid "Succeed"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:100
+msgid "Merge all pending dependencies"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:105
+msgid "Backout current patch branch"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:111
+msgid "Backport part of a changeset to a dependency"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:116
+msgid "Start a new patch branch"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:121
+msgid "Edit patch dependency graph"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:209
+msgid "St"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:211
+msgid "Title"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:212
+msgid "Message"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:329
+msgid "pending pmerges"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:330
+msgid "no pending pmerges"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:375
+msgid "needs merge of %i heads\n"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:378
+msgid "needs merge with %s (through %s)\n"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:381
+msgid "needs merge with %s\n"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:383
+msgid "needs update of diff base to tip of %s\n"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:432
+msgid "New Patch Name"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:488
+msgid "Pending Pmerge"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:489
+msgid ""
+"You cannot finish this patch branch unless you pmerge it first.\n"
+"pmerge will solve the following issues with %(patch)s:\n"
+"* %(issuelist)s"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:499
+msgid "Uncommitted Local Changes"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:500
+msgid ""
+"pfinish uses your working directory for temporary work.\n"
+"Please commit your local changes before issuing pfinish."
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:507
+msgid "Applied MQ patch"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:508
+msgid ""
+"pfinish must be able to commit, but this is not allowed\n"
+"as long as you have MQ patches applied."
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:551
+msgid "Patch branch finished"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:650
+msgid "_new"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:652
+msgid "_goto (update workdir)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:654
+msgid "_edit message"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:655
msgid "_rename"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:571
-msgid "_finish applied"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:573
+#: tortoisehg\hgtk\thgpbranch.py:656
msgid "_delete"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:574
-msgid "delete --keep"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:576
-msgid "f_old"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:578
-msgid "make it _next"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:612
-msgid "Show index"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:613
+#: tortoisehg\hgtk\thgpbranch.py:657
+msgid "_finish"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:693
+msgid "Show graph"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:694
msgid "Show status"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:614
+#: tortoisehg\hgtk\thgpbranch.py:695
msgid "Show name"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:615
-msgid "Show summary"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:621
-msgid "Enable editable cells"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:624
-msgid "Show 'qparent'"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:642
-msgid "Succeed"
-msgstr ""
-
-#: tortoisehg\hgtk\thgshelve.py:72
+#: tortoisehg\hgtk\thgpbranch.py:696
+msgid "Show title"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:697
+msgid "Show message"
+msgstr ""
+
+#: tortoisehg\hgtk\thgpbranch.py:706
+msgid "Show internal branches"
+msgstr ""
+
+#: tortoisehg\hgtk\thgshelve.py:73
msgid "set aside selected changes"
msgstr ""
-#: tortoisehg\hgtk\thgshelve.py:73
+#: tortoisehg\hgtk\thgshelve.py:74
msgid "Unshelve"
msgstr ""
-#: tortoisehg\hgtk\thgshelve.py:74
+#: tortoisehg\hgtk\thgshelve.py:75
msgid "restore shelved changes"
msgstr ""
-#: tortoisehg\hgtk\thgshelve.py:96
+#: tortoisehg\hgtk\thgshelve.py:76
+msgid "Abandon"
+msgstr ""
+
+#: tortoisehg\hgtk\thgshelve.py:77
+msgid "abandon shelved changes"
+msgstr ""
+
+#: tortoisehg\hgtk\thgshelve.py:100
msgid "Shelf Contents"
msgstr ""
-#: tortoisehg\hgtk\thgshelve.py:107
-msgid "_shelve"
-msgstr ""
-
-#: tortoisehg\hgtk\thgshelve.py:140
+#: tortoisehg\hgtk\thgshelve.py:111
+msgid "_Shelve"
+msgstr ""
+
+#: tortoisehg\hgtk\thgshelve.py:146
msgid "No changes to shelve"
msgstr ""
-#: tortoisehg\hgtk\thgshelve.py:146
+#: tortoisehg\hgtk\thgshelve.py:152
msgid "Please select diff chunks to shelve"
msgstr ""
-#: tortoisehg\hgtk\thgshelve.py:154
+#: tortoisehg\hgtk\thgshelve.py:160
msgid "<b>Shelve file exists!</b>"
msgstr ""
-#: tortoisehg\hgtk\thgshelve.py:155
+#: tortoisehg\hgtk\thgshelve.py:161
msgid "Overwrite"
msgstr ""
-#: tortoisehg\hgtk\thgshelve.py:156
+#: tortoisehg\hgtk\thgshelve.py:162
msgid "Append"
msgstr ""
-#: tortoisehg\hgtk\thgshelve.py:157
-msgid "Cancel"
-msgstr ""
-
-#: tortoisehg\hgtk\thgshelve.py:209
+#: tortoisehg\hgtk\thgshelve.py:216
+msgid "Unshelve Abort"
+msgstr ""
+
+#: tortoisehg\hgtk\thgshelve.py:219
msgid "Unshelve Error"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:39
+#: tortoisehg\hgtk\thgshelve.py:225
+msgid "Delete the shelf contents?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgshelve.py:232
+msgid "Abandon Error"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:36
+msgid "Strip - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:51
+msgid "Strip:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:85 tortoisehg\hgtk\update.py:94
+msgid "Options:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:89
+msgid "Discard local changes, no backup (-f/--force)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:111
+msgid "Backup all (default)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:112
+msgid "Backup unrelated changesets (-b/--backup)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:114
+msgid "No backup (-n/--nobackup)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:121
msgid "Strip"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:48
-msgid "Strip - %s"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:64
-msgid "Strip:"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:93
-msgid "Preview:"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:112
-msgid "Show all"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:115
-msgid "Use compact view"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:131
-msgid "Options:"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:135
-msgid "Discard local changes, no backup (-f/--force)"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:166
-msgid "Backup all (default)"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:167
-msgid "Backup unrelated changesets (-b/--backup)"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:169
-msgid "No backup (-n/--nobackup)"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:196
+#: tortoisehg\hgtk\thgstrip.py:140
+msgid "Stripped successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:143
+msgid "Canceled stripping"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:145
+msgid "Failed to strip"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:176
msgid "Unknown revision!"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:198
-msgid "<span weight=\"bold\">%s changesets</span> will be stripped"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:204
-msgid "No changesets to display"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:208
-msgid "Displaying all changesets"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:210
-msgid "Displaying %(count)d of %(total)d changesets"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:374
+#: tortoisehg\hgtk\thgstrip.py:179
+msgid "%s changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:180
+msgid "%s will be stripped"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:214
msgid "Confirm Strip"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:375
+#: tortoisehg\hgtk\thgstrip.py:215
msgid ""
"Detected uncommitted local changes.\n"
"Do you want to discard them and continue?"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:377
+#: tortoisehg\hgtk\thgstrip.py:217
msgid "&Yes (--force)"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:395
-msgid "Stripped successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:398
-msgid "Canceled stripping"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:400
-msgid "Failed to strip"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:419
+#: tortoisehg\hgtk\thgstrip.py:252
msgid "Saved at: %s"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:423
+#: tortoisehg\hgtk\thgstrip.py:256
msgid "Open..."
msgstr ""
-#: tortoisehg\hgtk\update.py:41
+#: tortoisehg\hgtk\update.py:27
msgid "Update - %s"
msgstr ""
-#: tortoisehg\hgtk\update.py:57
+#: tortoisehg\hgtk\update.py:46
msgid "Update to:"
msgstr ""
-#: tortoisehg\hgtk\update.py:60
+#: tortoisehg\hgtk\update.py:78
+msgid "Target:"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:86
+msgid "Parent 1:"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:88
+msgid "Parent 2:"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:98
msgid "Discard local changes, no backup (-C/--clean)"
msgstr ""
-#: tortoisehg\hgtk\update.py:90
-msgid "Target:"
-msgstr ""
-
-#: tortoisehg\hgtk\update.py:98
-msgid "Parent 1:"
-msgstr ""
-
-#: tortoisehg\hgtk\update.py:100
-msgid "Parent 2:"
-msgstr ""
-
-#: tortoisehg\hgtk\update.py:180
+#: tortoisehg\hgtk\update.py:104
+msgid "Always merge (when possible)"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:107
+msgid "Always show log"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:152
+msgid "Updated successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:156
+msgid "Failed to update"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:189
msgid "(same as parent)"
msgstr ""
-#: tortoisehg\hgtk\update.py:186
+#: tortoisehg\hgtk\update.py:196
msgid "unknown revision!"
msgstr ""
-#: tortoisehg\hgtk\update.py:222
+#: tortoisehg\hgtk\update.py:231
msgid ""
"Detected uncommitted local changes in working tree.\n"
"Please select to continue:\n"
"\n"
msgstr ""
-#: tortoisehg\hgtk\update.py:224
-msgid "&Discard"
-msgstr ""
-
-#: tortoisehg\hgtk\update.py:225
+#: tortoisehg\hgtk\update.py:234
msgid "Discard - discard local changes, no backup"
msgstr ""
-#: tortoisehg\hgtk\update.py:226
+#: tortoisehg\hgtk\update.py:235
msgid "&Shelve"
msgstr ""
-#: tortoisehg\hgtk\update.py:227
+#: tortoisehg\hgtk\update.py:236
msgid "Shelve - launch Shelve tool and continue"
msgstr ""
-#: tortoisehg\hgtk\update.py:228
+#: tortoisehg\hgtk\update.py:237
msgid "&Merge"
msgstr ""
-#: tortoisehg\hgtk\update.py:229
+#: tortoisehg\hgtk\update.py:238
msgid "Merge - allow to merge with local changes"
msgstr ""
-#: tortoisehg\hgtk\update.py:242
+#: tortoisehg\hgtk\update.py:251
msgid "Confirm Update"
msgstr ""
-#: tortoisehg\hgtk\update.py:268
+#: tortoisehg\hgtk\update.py:280
msgid "[canceled by user]\n"
msgstr ""
-#: tortoisehg\hgtk\update.py:273
+#: tortoisehg\hgtk\update.py:285
msgid "invalid dialog result: %s"
msgstr ""
-#: tortoisehg\hgtk\update.py:282
-msgid "Updated successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\update.py:284
-msgid "Canceled updating"
-msgstr ""
-
-#: tortoisehg\hgtk\update.py:286
-msgid "Failed to update"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:60
+#: tortoisehg\hgtk\visdiff.py:34
+msgid "[non-existant]"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:125
+msgid "Tool launch failure"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:126
+msgid "%s : %s"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:132 tortoisehg\hgtk\visdiff.py:201
+msgid "No diff tool found"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:133 tortoisehg\hgtk\visdiff.py:202
+msgid "No visual diff tools were detected"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:138
+msgid "[working copy]"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:140
+msgid "[original]"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:177
+msgid "Unable to find changeset"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:178
+msgid "You likely need to refresh this application"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:195
+msgid "No file changes"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:196
+msgid "There are no file changes to view"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:326
+msgid "cleaning up temp directory\n"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:331
+msgid "unable to clean temp directory: %s\n"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:347
msgid "Visual Diffs"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:68
+#: tortoisehg\hgtk\visdiff.py:352
+msgid "working changes"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:354
+msgid "changeset "
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:356
+msgid "revisions %d to %d"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:357
+msgid "Visual Diffs - "
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:359
+msgid " filtered"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:370
msgid "Temporary files are removed when this dialog is closed"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:86
-msgid "Always launch single files"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:101
-msgid "No repository"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:102 tortoisehg\hgtk\visdiff.py:373
+#: tortoisehg\hgtk\visdiff.py:424
+msgid "Dir diff to p1"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:426
+msgid "Dir diff to p2"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:428
+msgid "3-way dir diff"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:434
+msgid "Directory diff"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:530
+msgid "Unable to delete temp files"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:531
+msgid "Close diff tools and try again, or quit to leak files?"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:532
+msgid "&Quit"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:532
+msgid "Try &Again"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:631
msgid "No repository found here"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:109
-msgid "Select diff tool"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:148
-msgid "No visual diff tool"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:149
-msgid "No visual diff tool has been configured"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:177
-msgid "changeset "
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:183
-msgid "working changes"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:186
-msgid "revisions "
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:193
-msgid "Visual Diffs - "
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:207 tortoisehg\hgtk\visdiff.py:398
-msgid "No file changes"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:208 tortoisehg\hgtk\visdiff.py:399
-msgid "There are no file changes to view"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:277
-msgid "Unable to delete temp files"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:278
-msgid "Close diff tools and try again, or quit to leak files?"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:279
-msgid "&Quit"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:279
-msgid "Try &Again"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:340
-msgid "Tool launch failure"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:341
-msgid "%s : %s"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:380
-msgid "Extdiff command not recognized\n"
-msgstr ""
-
-#: tortoisehg\util\hgshelve.py:46
+#: tortoisehg\util\hglib.py:232
+msgid "inotify is not supported on this platform"
+msgstr ""
+
+#: tortoisehg\util\hglib.py:234
+msgid "eol is incompatible with win32text"
+msgstr ""
+
+#: tortoisehg\util\hglib.py:236
+msgid "win32text is incompatible with eol"
+msgstr ""
+
+#: tortoisehg\util\hgshelve.py:50
msgid "Unsupported line endings type: %s"
msgstr ""
-#: tortoisehg\util\hgshelve.py:97
+#: tortoisehg\util\hgshelve.py:104
msgid "unknown patch content: %r"
msgstr ""
-#: tortoisehg\util\hgshelve.py:118 tortoisehg\util\hgshelve.py:145
+#: tortoisehg\util\hgshelve.py:125 tortoisehg\util\hgshelve.py:152
msgid "this modifies a binary file (all or nothing)\n"
msgstr ""
-#: tortoisehg\util\hgshelve.py:123 tortoisehg\util\hgshelve.py:150
+#: tortoisehg\util\hgshelve.py:130 tortoisehg\util\hgshelve.py:157
msgid "this is a binary file\n"
msgstr ""
-#: tortoisehg\util\hgshelve.py:134
+#: tortoisehg\util\hgshelve.py:141
msgid ""
"total: %d hunks (%d changed lines); selected: %d hunks (%d changed lines)"
msgstr ""
-#: tortoisehg\util\hgshelve.py:153
+#: tortoisehg\util\hgshelve.py:160
msgid "%d hunks, %d lines changed\n"
msgstr ""
-#: tortoisehg\util\hgshelve.py:299
+#: tortoisehg\util\hgshelve.py:306
msgid "unhandled transition: %s -> %s"
msgstr ""
-#: tortoisehg\util\hgshelve.py:325
+#: tortoisehg\util\hgshelve.py:332
msgid " [Ynsfdaq?] "
msgstr ""
-#: tortoisehg\util\hgshelve.py:341
+#: tortoisehg\util\hgshelve.py:348
msgid "user quit"
msgstr ""
-#: tortoisehg\util\hgshelve.py:355
+#: tortoisehg\util\hgshelve.py:362
msgid "shelve changes to %s?"
msgstr ""
-#: tortoisehg\util\hgshelve.py:356
+#: tortoisehg\util\hgshelve.py:363
msgid " and "
msgstr ""
-#: tortoisehg\util\hgshelve.py:366
+#: tortoisehg\util\hgshelve.py:373
msgid "shelve this change to %r?"
msgstr ""
-#: tortoisehg\util\hgshelve.py:405
+#: tortoisehg\util\hgshelve.py:412
msgid "backup %r as %r\n"
msgstr ""
-#: tortoisehg\util\hgshelve.py:438
+#: tortoisehg\util\hgshelve.py:416
+msgid "file copy of %s failed\n"
+msgstr ""
+
+#: tortoisehg\util\hgshelve.py:435
+msgid "removing backup file : %r\n"
+msgstr ""
+
+#: tortoisehg\util\hgshelve.py:439
+msgid "delete of shelve backup failed"
+msgstr ""
+
+#: tortoisehg\util\hgshelve.py:442
+msgid "bad shelve backup directory name"
+msgstr ""
+
+#: tortoisehg\util\hgshelve.py:472
msgid "shelve can only be run interactively"
msgstr ""
-#: tortoisehg\util\hgshelve.py:442
+#: tortoisehg\util\hgshelve.py:476
msgid "shelve data already exists"
msgstr ""
-#: tortoisehg\util\hgshelve.py:473
+#: tortoisehg\util\hgshelve.py:507
msgid "no changes to shelve\n"
msgstr ""
-#: tortoisehg\util\hgshelve.py:507
+#: tortoisehg\util\hgshelve.py:541
msgid "applying patch\n"
msgstr ""
-#: tortoisehg\util\hgshelve.py:514
+#: tortoisehg\util\hgshelve.py:548
msgid "saving patch to shelve\n"
msgstr ""
-#: tortoisehg\util\hgshelve.py:525 tortoisehg\util\hgshelve.py:576
+#: tortoisehg\util\hgshelve.py:559 tortoisehg\util\hgshelve.py:614
msgid "restoring %r to %r\n"
msgstr ""
-#: tortoisehg\util\hgshelve.py:527
+#: tortoisehg\util\hgshelve.py:561
msgid "removing shelve file\n"
msgstr ""
-#: tortoisehg\util\hgshelve.py:536
-msgid "removing backup for %r : %r\n"
-msgstr ""
-
-#: tortoisehg\util\hgshelve.py:561
+#: tortoisehg\util\hgshelve.py:564
+msgid "abort: backup restore failed, %s\n"
+msgstr ""
+
+#: tortoisehg\util\hgshelve.py:581
+msgid "nothing to unshelve\n"
+msgstr ""
+
+#: tortoisehg\util\hgshelve.py:595
+msgid "unshelve backup aborted\n"
+msgstr ""
+
+#: tortoisehg\util\hgshelve.py:599
msgid "applying shelved patch\n"
msgstr ""
-#: tortoisehg\util\hgshelve.py:574
+#: tortoisehg\util\hgshelve.py:612
msgid "restoring backup files\n"
msgstr ""
-#: tortoisehg\util\hgshelve.py:581
-msgid "removing backup files\n"
-msgstr ""
-
-#: tortoisehg\util\hgshelve.py:587
+#: tortoisehg\util\hgshelve.py:621
msgid "removing shelved patches\n"
msgstr ""
-#: tortoisehg\util\hgshelve.py:589
+#: tortoisehg\util\hgshelve.py:623
msgid "unshelve completed\n"
msgstr ""
-#: tortoisehg\util\hgshelve.py:591
-msgid "nothing to unshelve\n"
-msgstr ""
-
-#: tortoisehg\util\hgshelve.py:597
+#: tortoisehg\util\hgshelve.py:632
+msgid "abandoning shelved file\n"
+msgstr ""
+
+#: tortoisehg\util\hgshelve.py:634
+msgid "shelved file abandoned\n"
+msgstr ""
+
+#: tortoisehg\util\hgshelve.py:636
+msgid "nothing to abandon\n"
+msgstr ""
+
+#: tortoisehg\util\hgshelve.py:638
+msgid "abandon failed\n"
+msgstr ""
+
+#: tortoisehg\util\hgshelve.py:645
msgid "mark new/missing files as added/removed before shelving"
msgstr ""
-#: tortoisehg\util\hgshelve.py:599
+#: tortoisehg\util\hgshelve.py:647
msgid "overwrite existing shelve data"
msgstr ""
-#: tortoisehg\util\hgshelve.py:601
+#: tortoisehg\util\hgshelve.py:649
msgid "append to existing shelve data"
msgstr ""
-#: tortoisehg\util\hgshelve.py:603
+#: tortoisehg\util\hgshelve.py:651
msgid "hg shelve [OPTION]... [FILE]..."
msgstr ""
-#: tortoisehg\util\hgshelve.py:606
+#: tortoisehg\util\hgshelve.py:654
msgid "inspect shelved changes only"
msgstr ""
-#: tortoisehg\util\hgshelve.py:608
+#: tortoisehg\util\hgshelve.py:656
msgid "proceed even if patches do not unshelve cleanly"
msgstr ""
-#: tortoisehg\util\hgshelve.py:610
+#: tortoisehg\util\hgshelve.py:658
msgid "hg unshelve [OPTION]... [FILE]..."
msgstr ""
+#: tortoisehg\util\menuthg.py:19
+msgid "Commit..."
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:20
+msgid "Commit changes in repository"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:22
+msgid "Create Repository Here"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:23
+msgid "Create a new repository"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:25
+msgid "Clone..."
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:26
+msgid "Create clone here from source"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:28
+msgid "File Status"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:29
+msgid "Repository status & changes"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:31
+msgid "Shelve Changes"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:32
+msgid "Shelve or unshelve file changes"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:34
+msgid "Add Files..."
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:35
+msgid "Add files to version control"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:37
+msgid "Revert Files..."
+msgstr ""
+
#: tortoisehg\util\menuthg.py:38
-msgid "Commit..."
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:39
-msgid "Commit changes in repository"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:41
-msgid "Create Repository Here"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:44
-msgid "Clone..."
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:45
-msgid "Create clone here from source"
+msgid "Revert file changes"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:40
+msgid "Forget Files..."
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:41 tortoisehg\util\menuthg.py:44
+msgid "Remove files from version control"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:43
+msgid "Remove Files..."
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:46
+msgid "Rename File"
msgstr ""
#: tortoisehg\util\menuthg.py:47
-msgid "File Status"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:48
-msgid "Repository status & changes"
+msgid "Rename file or directory"
msgstr ""
#: tortoisehg\util\menuthg.py:50
-msgid "Shelve Changes"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:51
-msgid "Shelve or unshelve file changes"
+msgid "View change history in repository"
msgstr ""
#: tortoisehg\util\menuthg.py:53
-msgid "Add Files..."
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:54
-msgid "Add files to version control"
+msgid "View change history of selected files"
msgstr ""
#: tortoisehg\util\menuthg.py:56
-msgid "Revert Files..."
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:57
-msgid "Revert file changes"
+msgid "Synchronize with remote repository"
msgstr ""
#: tortoisehg\util\menuthg.py:59
-msgid "Forget Files..."
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:60 tortoisehg\util\menuthg.py:63
-msgid "Remove files from version control"
+msgid "Start web server for this repository"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:61
+msgid "Update..."
msgstr ""
#: tortoisehg\util\menuthg.py:62
-msgid "Remove Files..."
+msgid "Update working directory"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:64
+msgid "Recovery..."
msgstr ""
#: tortoisehg\util\menuthg.py:65
-msgid "Rename File"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:66
-msgid "Rename file or directory"
+msgid "Repair and recovery of repository"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:67
+msgid "Update Icons"
msgstr ""
#: tortoisehg\util\menuthg.py:68
-msgid "Repository Explorer"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:69
-msgid "View change history in repository"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:72
-msgid "Synchronize with remote repository"
+msgid "Update icons for this repository"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:70
+msgid "Global Settings"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:71
+msgid "Configure user wide settings"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:73
+msgid "Repository Settings"
msgstr ""
#: tortoisehg\util\menuthg.py:74
-msgid "Web Server"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:75
-msgid "Start web server for this repository"
+msgid "Configure repository settings"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:76
+msgid "Explorer Extension Settings"
msgstr ""
#: tortoisehg\util\menuthg.py:77
-msgid "Update..."
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:78
-msgid "Update working directory"
+msgid "Configure Explorer extension"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:79
+msgid "About TortoiseHg"
msgstr ""
#: tortoisehg\util\menuthg.py:80
-msgid "Recovery..."
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:81
-msgid "Repair and recovery of repository"
+msgid "Show About Dialog"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:82
+msgid "Annotate Files"
msgstr ""
#: tortoisehg\util\menuthg.py:83
-msgid "Update Icons"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:84
-msgid "Update icons for this repository"
+msgid "Changeset information per file line"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:85
+msgid "Visual Diff"
msgstr ""
#: tortoisehg\util\menuthg.py:86
-msgid "Global Settings"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:87
-msgid "Configure user wide settings"
+msgid "View changes using GUI diff tool"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:88
+msgid "Edit Ignore Filter"
msgstr ""
#: tortoisehg\util\menuthg.py:89
-msgid "Repository Settings"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:90
-msgid "Configure repository settings"
+msgid "Edit repository ignore filter"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:91
+msgid "Guess Renames"
msgstr ""
#: tortoisehg\util\menuthg.py:92
-msgid "About TortoiseHg"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:93
-msgid "Show About Dialog"
+msgid "Detect renames and copies"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:94
+msgid "Search History"
msgstr ""
#: tortoisehg\util\menuthg.py:95
-msgid "Annotate Files"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:96
-msgid "Changeset information per file line"
+msgid "Search file revisions for patterns"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:97
+msgid "DnD Synchronize"
msgstr ""
#: tortoisehg\util\menuthg.py:98
-msgid "Visual Diff"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:99
-msgid "View changes using GUI diff tool"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:101
-msgid "Edit Ignore Filter"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:102
-msgid "Edit repository ignore filter"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:104
-msgid "Guess Renames"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:105
-msgid "Detect renames and copies"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:107
-msgid "Search History"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:108
-msgid "Search file revisions for patterns"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:110
-msgid "DnD Synchronize"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:111
msgid "Synchronize with dragged repository"
msgstr ""
+
+#: tortoisehg\util\prej.py:143
+msgid "patching file %s\n"
+msgstr ""
+
+#: tortoisehg\util\prej.py:190
+msgid "%d out of %d hunk%s FAILED -- saving rejects to file %s\n"
+msgstr ""
+
+#: tortoisehg\util\prej.py:226
+msgid "bad hunk #%d %s (%d %d %d %d)"
+msgstr ""
+
+#: tortoisehg\util\prej.py:235
+msgid "file %s already exists\n"
+msgstr ""
+
+#: tortoisehg\util\prej.py:287
+msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"
+msgstr ""
+
+#: tortoisehg\util\prej.py:294
+msgid "Hunk #%d succeeded at %d (offset %d lines).\n"
+msgstr ""
+
+#: tortoisehg\util\prej.py:299
+msgid "Hunk #%d FAILED at %d\n"
+msgstr ""
+
+#: tortoisehg\util\prej.py:318 tortoisehg\util\prej.py:344
+#: tortoisehg\util\prej.py:376
+msgid "bad hunk #%d"
+msgstr ""
+
+#: tortoisehg\util\prej.py:363 tortoisehg\util\prej.py:405
+msgid "bad hunk #%d old text line %d"
+msgstr ""
+
+#: tortoisehg\util\prej.py:550
+msgid "could not extract binary patch"
+msgstr ""
+
+#: tortoisehg\util\prej.py:566
+msgid "binary patch is %d bytes, not %d"
+msgstr ""
+
+#: tortoisehg\util\prej.py:591
+msgid "unable to strip away %d dirs from %s"
+msgstr ""
+
+#: tortoisehg\util\prej.py:613
+msgid "unable to find %s or %s for patching"
+msgstr ""
+
+#: tortoisehg\util\prej.py:792
+msgid "malformed patch %s %s"
+msgstr ""
+
+#: tortoisehg\util\prej.py:803
+msgid "No valid hunks found"
+msgstr ""
+
+#: tortoisehg\util\version.py:17
+msgid "repository %s not found"
+msgstr ""
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
Add a tag
Loading...