Commits

Steve Borho committed 49a8527 Merge

Merge with stable

Comments (0)

Files changed (27)

 b740366bf49f2ad67ff923fa30e875acfba05892 1.1.6.1
 d5840485b34265572ffb4d5bb1226b1577163115 1.1.7
 653ff9fb4ccf16833bab58fbc765ff8829dc1265 1.9
+edc8ec8b18a98abada33fb312e2c5cfb8e336eb4 1.1.8

doc/source/conf.py

File contents unchanged.

i18n/tortoisehg/en_AU.po

 msgstr ""
 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-01 05:09+0000\n"
+"POT-Creation-Date: 2010-12-28 20:44+0000\n"
 "PO-Revision-Date: 2010-04-22 09:01+0000\n"
-"Last-Translator: English (Australia) <en_AU@li.org>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (Australia) <en_AU@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: 2010-04-23 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: TortoiseHgOverlayServer.py:36
 msgid "Archive revision:"
 msgstr "Archive revision:"
 
-#: tortoisehg\hgtk\archive.py:65 tortoisehg\hgtk\clone.py:70
-#: tortoisehg\hgtk\hginit.py:55 tortoisehg\hgtk\thgconfig.py:324
+#: 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 "Browse..."
 
-#: tortoisehg\hgtk\archive.py:68 tortoisehg\hgtk\clone.py:106
+#: tortoisehg\hgtk\archive.py:72 tortoisehg\hgtk\clone.py:106
 msgid "Destination path:"
 msgstr "Destination path:"
 
-#: tortoisehg\hgtk\archive.py:71
+#: tortoisehg\hgtk\archive.py:75
 msgid "Directory of files"
 msgstr "Directory of files"
 
-#: tortoisehg\hgtk\archive.py:73
+#: tortoisehg\hgtk\archive.py:77
 msgid "Archive types:"
 msgstr "Archive types:"
 
-#: tortoisehg\hgtk\archive.py:79
+#: tortoisehg\hgtk\archive.py:83
 msgid "Uncompressed tar archive"
 msgstr "Uncompressed tar archive"
 
-#: tortoisehg\hgtk\archive.py:80
+#: tortoisehg\hgtk\archive.py:84
 msgid "Tar archive compressed using bzip2"
 msgstr "Tar archive compressed using bzip2"
 
-#: tortoisehg\hgtk\archive.py:81
+#: tortoisehg\hgtk\archive.py:85
 msgid "Tar archive compressed using gzip"
 msgstr "Tar archive compressed using gzip"
 
-#: tortoisehg\hgtk\archive.py:82
+#: tortoisehg\hgtk\archive.py:86
 msgid "Uncompressed zip archive"
 msgstr "Uncompressed zip archive"
 
-#: tortoisehg\hgtk\archive.py:83
+#: tortoisehg\hgtk\archive.py:87
 msgid "Zip archive compressed using deflate"
 msgstr "Zip archive compressed using deflate"
 
-#: tortoisehg\hgtk\archive.py:92
+#: tortoisehg\hgtk\archive.py:96
 msgid "Archive"
 msgstr "Archive"
 
-#: tortoisehg\hgtk\archive.py:107
+#: tortoisehg\hgtk\archive.py:111
 msgid "Archived successfully"
 msgstr "Archived successfully"
 
-#: tortoisehg\hgtk\archive.py:109
+#: tortoisehg\hgtk\archive.py:113
 msgid "Canceled archiving"
 msgstr "Cancelled archiving"
 
-#: tortoisehg\hgtk\archive.py:111
+#: tortoisehg\hgtk\archive.py:115
 msgid "Failed to archive"
 msgstr "Failed to archive"
 
-#: tortoisehg\hgtk\archive.py:167
+#: tortoisehg\hgtk\archive.py:171
 msgid "Tar archives"
 msgstr "Tar archives"
 
-#: tortoisehg\hgtk\archive.py:170
+#: tortoisehg\hgtk\archive.py:174
 msgid "Bzip2 tar archives"
 msgstr "Bzip2 tar archives"
 
-#: tortoisehg\hgtk\archive.py:173
+#: tortoisehg\hgtk\archive.py:177
 msgid "Gzip tar archives"
 msgstr "Gzip tar archives"
 
-#: tortoisehg\hgtk\archive.py:179
+#: tortoisehg\hgtk\archive.py:183
 msgid "Compressed zip archives"
 msgstr "Compressed zip archives"
 
-#: tortoisehg\hgtk\archive.py:191 tortoisehg\hgtk\clone.py:107
-#: tortoisehg\hgtk\hginit.py:92
+#: tortoisehg\hgtk\archive.py:195 tortoisehg\hgtk\clone.py:107
+#: tortoisehg\hgtk\hginit.py:95
 msgid "Select Destination Folder"
 msgstr "Select Destination Folder"
 
-#: tortoisehg\hgtk\archive.py:197
+#: tortoisehg\hgtk\archive.py:201
 msgid "Select Destination File"
 msgstr "Select Destination File"
 
-#: tortoisehg\hgtk\archive.py:199
+#: tortoisehg\hgtk\archive.py:203
 msgid "All Files (*.*)"
 msgstr "All Files (*.*)"
 
-#: tortoisehg\hgtk\archive.py:209 tortoisehg\hgtk\archive.py:215
-#: tortoisehg\hgtk\gtklib.py:360 tortoisehg\hgtk\thgconfig.py:504
-#: tortoisehg\hgtk\thgconfig.py:955
+#: 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 "Confirm Overwrite"
 
-#: tortoisehg\hgtk\archive.py:210
+#: tortoisehg\hgtk\archive.py:214
 msgid ""
 "The destination \"%s\" already exists!\n"
 "\n"
 "\n"
 "Do you want to overwrite it?"
 
-#: tortoisehg\hgtk\archive.py:216
+#: tortoisehg\hgtk\archive.py:220
 msgid ""
 "The directory \"%s\" isn't empty!\n"
 "\n"
 msgid "Backout commit message"
 msgstr "Backout commit message"
 
-#: tortoisehg\hgtk\backout.py:76
+#: tortoisehg\hgtk\backout.py:78
 msgid ""
 "Commit message text for new changeset that reverses the  effect of the "
 "change being backed out."
 msgid "Use English backout message"
 msgstr "Use English backout message"
 
-#: tortoisehg\hgtk\backout.py:88
-msgid "Merge with old dirstate parent after backout"
-msgstr "Merge with old dirstate parent after backout"
-
-#: tortoisehg\hgtk\backout.py:93
+#: tortoisehg\hgtk\backout.py:90
+msgid "Commit backout before merging with current working parent"
+msgstr ""
+
+#: tortoisehg\hgtk\backout.py:95
 msgid "Backout"
 msgstr "Backout"
 
-#: tortoisehg\hgtk\backout.py:112
-msgid "Backed out successfully"
-msgstr "Backed out successfully"
-
 #: 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 "Cancelled backout"
 
-#: tortoisehg\hgtk\backout.py:116
+#: tortoisehg\hgtk\backout.py:120
 msgid "Failed to backout"
 msgstr "Failed to backout"
 
-#: tortoisehg\hgtk\backout.py:139 tortoisehg\hgtk\commit.py:564
+#: tortoisehg\hgtk\backout.py:139 tortoisehg\hgtk\commit.py:581
 msgid "Confirm Discard Message"
 msgstr "Confirm Discard Message"
 
 msgid "Add"
 msgstr "Add"
 
-#: tortoisehg\hgtk\bookmark.py:49 tortoisehg\hgtk\commit.py:252
-#: tortoisehg\hgtk\status.py:159
+#: tortoisehg\hgtk\bookmark.py:49 tortoisehg\hgtk\commit.py:262
+#: tortoisehg\hgtk\status.py:124
 msgid "Move"
 msgstr "Move"
 
 msgid "Bookmark:"
 msgstr "Bookmark:"
 
-#: tortoisehg\hgtk\bookmark.py:83 tortoisehg\hgtk\csinfo.py:198
-#: tortoisehg\hgtk\csinfo.py:199 tortoisehg\hgtk\cslist.py:142
+#: 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 "Revision:"
 msgid "Make new/moved bookmark current"
 msgstr "Make new/moved bookmark current"
 
-#: tortoisehg\hgtk\bookmark.py:167 tortoisehg\hgtk\gdialog.py:903
-#: tortoisehg\hgtk\hginit.py:84 tortoisehg\hgtk\tagadd.py:205
+#: 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 "unexpected response id: %s"
 
 msgid "Bookmark '%s' does not exist"
 msgstr "Bookmark '%s' does not exist"
 
-#: tortoisehg\hgtk\browse.py:112 tortoisehg\hgtk\quickop.py:100
-#: tortoisehg\hgtk\status.py:130
+#: tortoisehg\hgtk\browse.py:112 tortoisehg\hgtk\quickop.py:106
+#: tortoisehg\hgtk\status.py:95
 msgid "status"
 msgstr "status"
 
 msgid "type"
 msgstr "type"
 
-#: tortoisehg\hgtk\browse.py:142 tortoisehg\hgtk\quickop.py:103
-#: tortoisehg\hgtk\status.py:318
+#: tortoisehg\hgtk\browse.py:142 tortoisehg\hgtk\quickop.py:109
+#: tortoisehg\hgtk\status.py:293
 msgid "path"
 msgstr "path"
 
 msgid "Save as.."
 msgstr "Save as.."
 
-#: tortoisehg\hgtk\bugreport.py:48 tortoisehg\hgtk\hgcmd.py:48
+#: tortoisehg\hgtk\bugreport.py:48 tortoisehg\hgtk\hgcmd.py:50
+#: tortoisehg\hgtk\thgmq.py:142
 msgid "Close"
 msgstr "Close"
 
 "** Please report this bug to http://bitbucket.org/tortoisehg/stable/issues "
 "or tortoisehg-discuss@lists.sourceforge.net\n"
 
-#: tortoisehg\hgtk\bugreport.py:87
+#: tortoisehg\hgtk\bugreport.py:88
 msgid "Save error report to"
 msgstr "Save error report to"
 
-#: tortoisehg\hgtk\changeset.py:43
+#: tortoisehg\hgtk\changeset.py:46
 msgid "%s changeset "
 msgstr "%s changeset "
 
-#: tortoisehg\hgtk\changeset.py:168 tortoisehg\hgtk\changeset.py:198
+#: tortoisehg\hgtk\changeset.py:171 tortoisehg\hgtk\changeset.py:215
 msgid "[All Files]"
 msgstr "[All Files]"
 
-#: tortoisehg\hgtk\changeset.py:233
+#: tortoisehg\hgtk\changeset.py:254
 msgid "unknown hunk type: %s"
 msgstr "unknown hunk type: %s"
 
-#: tortoisehg\hgtk\changeset.py:332
+#: tortoisehg\hgtk\changeset.py:362
 msgid " %s is larger than the specified max diff size"
 msgstr " %s is larger than the specified max diff size"
 
-#: tortoisehg\hgtk\changeset.py:341
+#: tortoisehg\hgtk\changeset.py:377
 msgid "Repository Error:  %s, refresh suggested"
 msgstr "Repository Error:  %s, refresh suggested"
 
-#: tortoisehg\hgtk\changeset.py:388
+#: tortoisehg\hgtk\changeset.py:423
 msgid "[no hunks to display]"
 msgstr "[no hunks to display]"
 
-#: tortoisehg\hgtk\changeset.py:443 tortoisehg\hgtk\status.py:1643
+#: tortoisehg\hgtk\changeset.py:478 tortoisehg\hgtk\status.py:1242
 msgid "_Visual Diff"
 msgstr "_Visual Diff"
 
-#: tortoisehg\hgtk\changeset.py:445
+#: tortoisehg\hgtk\changeset.py:480
 msgid "Diff to _local"
 msgstr "Diff to _local"
 
-#: tortoisehg\hgtk\changeset.py:447
+#: tortoisehg\hgtk\changeset.py:482
 msgid "_View at Revision"
 msgstr "_View at Revision"
 
-#: tortoisehg\hgtk\changeset.py:448
+#: tortoisehg\hgtk\changeset.py:483
 msgid "_Save at Revision..."
 msgstr "_Save at Revision..."
 
-#: tortoisehg\hgtk\changeset.py:451 tortoisehg\hgtk\datamine.py:147
-#: tortoisehg\hgtk\datamine.py:162
+#: tortoisehg\hgtk\changeset.py:486 tortoisehg\hgtk\datamine.py:153
+#: tortoisehg\hgtk\datamine.py:181
 msgid "_File History"
 msgstr "_File History"
 
-#: tortoisehg\hgtk\changeset.py:452 tortoisehg\hgtk\datamine.py:146
+#: tortoisehg\hgtk\changeset.py:487 tortoisehg\hgtk\datamine.py:152
 msgid "_Annotate File"
 msgstr "_Annotate File"
 
-#: tortoisehg\hgtk\changeset.py:455
+#: tortoisehg\hgtk\changeset.py:490
 msgid "_Revert File Contents"
 msgstr "_Revert File Contents"
 
-#: tortoisehg\hgtk\changeset.py:544
+#: tortoisehg\hgtk\changeset.py:579
 msgid "Changeset:"
 msgstr "Changeset:"
 
-#: tortoisehg\hgtk\changeset.py:546 tortoisehg\hgtk\update.py:90
+#: tortoisehg\hgtk\changeset.py:581 tortoisehg\hgtk\update.py:90
 msgid "Parent:"
 msgstr "Parent:"
 
-#: tortoisehg\hgtk\changeset.py:548
+#: tortoisehg\hgtk\changeset.py:583
 msgid "Child:"
 msgstr "Child:"
 
-#: tortoisehg\hgtk\changeset.py:550 tortoisehg\hgtk\cslist.py:143
+#: tortoisehg\hgtk\changeset.py:585 tortoisehg\hgtk\cslist.py:143
 msgid "Patch:"
 msgstr "Patch:"
 
-#: tortoisehg\hgtk\changeset.py:747
+#: tortoisehg\hgtk\changeset.py:782
 msgid "Diff to second Parent"
 msgstr "Diff to second Parent"
 
-#: tortoisehg\hgtk\changeset.py:923
+#: tortoisehg\hgtk\changeset.py:958
 msgid "Save file to"
 msgstr "Save file to"
 
-#: tortoisehg\hgtk\changeset.py:933
+#: tortoisehg\hgtk\changeset.py:969
 msgid "Unable to save file"
 msgstr ""
 
-#: tortoisehg\hgtk\changeset.py:1005
+#: tortoisehg\hgtk\changeset.py:1040
 msgid "Confirm revert file to old revision"
 msgstr "Confirm revert file to old revision"
 
-#: tortoisehg\hgtk\changeset.py:1006
+#: tortoisehg\hgtk\changeset.py:1041
 msgid "Revert %s to contents at revision %d?"
 msgstr "Revert %s to contents at revision %d?"
 
-#: tortoisehg\hgtk\changeset.py:1019
+#: tortoisehg\hgtk\changeset.py:1054
 msgid "Enable _Wordwrap"
 msgstr "Enable _Wordwrap"
 
+#: tortoisehg\hgtk\chunks.py:73
+msgid "File is larger than the specified max size.\n"
+msgstr "File is larger than the specified max size.\n"
+
+#: tortoisehg\hgtk\chunks.py:74 tortoisehg\hgtk\chunks.py:86
+msgid "Hunk selection is disabled for this file.\n"
+msgstr "Hunk selection is disabled for this file.\n"
+
+#: tortoisehg\hgtk\chunks.py:85
+msgid "File is binary.\n"
+msgstr ""
+
 #: tortoisehg\hgtk\clone.py:37
 msgid "TortoiseHg Clone"
 msgstr "TortoiseHg Clone"
 msgstr "Clone to revision:"
 
 #: tortoisehg\hgtk\clone.py:135
-msgid "Starting P4 Changelist:"
-msgstr "Starting P4 Changelist:"
+msgid "Starting Revision:"
+msgstr ""
 
 #: tortoisehg\hgtk\clone.py:141
 msgid "Do not update the new working directory"
 msgid "Use uncompressed transfer"
 msgstr "Use uncompressed transfer"
 
-#: tortoisehg\hgtk\clone.py:149 tortoisehg\hgtk\history.py:440
-#: tortoisehg\hgtk\synch.py:183
+#: tortoisehg\hgtk\clone.py:149 tortoisehg\hgtk\history.py:467
+#: tortoisehg\hgtk\synch.py:179
 msgid "Use proxy server"
 msgstr "Use proxy server"
 
-#: tortoisehg\hgtk\clone.py:159 tortoisehg\hgtk\synch.py:204
+#: tortoisehg\hgtk\clone.py:159 tortoisehg\hgtk\synch.py:201
 msgid "Remote command:"
 msgstr "Remote command:"
 
 msgid "Failed to clone"
 msgstr "Failed to clone"
 
-#: tortoisehg\hgtk\clone.py:224
+#: tortoisehg\hgtk\clone.py:226
 msgid "Mercurial bundles"
 msgstr "Mercurial bundles"
 
-#: tortoisehg\hgtk\clone.py:286
+#: tortoisehg\hgtk\clone.py:288
 msgid "Source path is empty"
 msgstr "Source path is empty"
 
-#: tortoisehg\hgtk\clone.py:287
+#: tortoisehg\hgtk\clone.py:289
 msgid "Please enter a valid source path"
 msgstr "Please enter a valid source path"
 
-#: tortoisehg\hgtk\clone.py:292
+#: tortoisehg\hgtk\clone.py:294
 msgid "Source and destination are the same"
 msgstr "Source and destination are the same"
 
-#: tortoisehg\hgtk\clone.py:293
+#: tortoisehg\hgtk\clone.py:295
 msgid "Please specify different paths"
 msgstr "Please specify different paths"
 
-#: tortoisehg\hgtk\commit.py:33
+#: tortoisehg\hgtk\commit.py:38
 msgid "Branch Operations"
 msgstr "Branch Operations"
 
-#: tortoisehg\hgtk\commit.py:43
+#: tortoisehg\hgtk\commit.py:48
 msgid "Select branch of merge commit"
 msgstr "Select branch of merge commit"
 
-#: tortoisehg\hgtk\commit.py:55
+#: tortoisehg\hgtk\commit.py:60
 msgid "No branch changes"
 msgstr "No branch changes"
 
-#: tortoisehg\hgtk\commit.py:57
+#: tortoisehg\hgtk\commit.py:62
 msgid "Open a new named branch"
 msgstr "Open a new named branch"
 
-#: tortoisehg\hgtk\commit.py:65
+#: tortoisehg\hgtk\commit.py:70
 msgid "Close current named branch"
 msgstr "Close current named branch"
 
-#: tortoisehg\hgtk\commit.py:72
+#: tortoisehg\hgtk\commit.py:77
 msgid "Changes take effect on next commit"
 msgstr "Changes take effect on next commit"
 
-#: tortoisehg\hgtk\commit.py:164
+#: tortoisehg\hgtk\commit.py:174
 msgid "merging "
 msgstr "merging "
 
-#: tortoisehg\hgtk\commit.py:170
+#: tortoisehg\hgtk\commit.py:180
 msgid " - qnew"
 msgstr " - qnew"
 
-#: tortoisehg\hgtk\commit.py:173
+#: tortoisehg\hgtk\commit.py:183
 msgid " - qrefresh "
 msgstr " - qrefresh "
 
-#: tortoisehg\hgtk\commit.py:174
+#: tortoisehg\hgtk\commit.py:184
 msgid " - commit"
 msgstr " - commit"
 
-#: tortoisehg\hgtk\commit.py:217 tortoisehg\hgtk\commit.py:299
-#: tortoisehg\hgtk\history.py:249 tortoisehg\hgtk\history.py:347
-#: tortoisehg\hgtk\thgimport.py:107
+#: 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 "Patch Queue"
 
-#: tortoisehg\hgtk\commit.py:222 tortoisehg\hgtk\history.py:364
+#: tortoisehg\hgtk\commit.py:232 tortoisehg\hgtk\history.py:391
 msgid "_View"
 msgstr "_View"
 
-#: tortoisehg\hgtk\commit.py:223 tortoisehg\hgtk\history.py:370
+#: tortoisehg\hgtk\commit.py:233 tortoisehg\hgtk\history.py:397
 msgid "Toolbar"
 msgstr "Toolbar"
 
-#: tortoisehg\hgtk\commit.py:225
+#: tortoisehg\hgtk\commit.py:235
 msgid "Advanced"
 msgstr "Advanced"
 
-#: tortoisehg\hgtk\commit.py:227 tortoisehg\hgtk\history.py:65
-#: tortoisehg\hgtk\history.py:452 tortoisehg\hgtk\history.py:1136
+#: tortoisehg\hgtk\commit.py:237 tortoisehg\hgtk\history.py:66
+#: tortoisehg\hgtk\history.py:481 tortoisehg\hgtk\history.py:1223
 msgid "Parents"
 msgstr "Parents"
 
-#: tortoisehg\hgtk\commit.py:231 tortoisehg\hgtk\hgignore.py:142
-#: tortoisehg\hgtk\history.py:377
+#: tortoisehg\hgtk\commit.py:241 tortoisehg\hgtk\hgignore.py:142
+#: tortoisehg\hgtk\history.py:404
 msgid "Refresh"
 msgstr "Refresh"
 
-#: tortoisehg\hgtk\commit.py:233 tortoisehg\hgtk\history.py:391
+#: tortoisehg\hgtk\commit.py:243 tortoisehg\hgtk\history.py:418
 msgid "Ignore Max Diff Size"
 msgstr "Ignore Max Diff Size"
 
-#: tortoisehg\hgtk\commit.py:235 tortoisehg\hgtk\history.py:393
+#: tortoisehg\hgtk\commit.py:245 tortoisehg\hgtk\history.py:420
 msgid "Always Show Output"
 msgstr "Always Show Output"
 
-#: tortoisehg\hgtk\commit.py:238
+#: tortoisehg\hgtk\commit.py:248
 msgid "_Operations"
 msgstr "_Operations"
 
-#: tortoisehg\hgtk\commit.py:239 tortoisehg\hgtk\commit.py:293
-#: tortoisehg\hgtk\commit.py:753
+#: tortoisehg\hgtk\commit.py:249 tortoisehg\hgtk\commit.py:303
+#: tortoisehg\hgtk\commit.py:778
 msgid "_Commit"
 msgstr "_Commit"
 
-#: tortoisehg\hgtk\commit.py:241 tortoisehg\hgtk\commit.py:291
+#: tortoisehg\hgtk\commit.py:251 tortoisehg\hgtk\commit.py:301
 msgid "_Undo"
 msgstr "_Undo"
 
-#: tortoisehg\hgtk\commit.py:244 tortoisehg\hgtk\status.py:150
+#: tortoisehg\hgtk\commit.py:254 tortoisehg\hgtk\status.py:115
 msgid "_Diff"
 msgstr "_Diff"
 
-#: tortoisehg\hgtk\commit.py:246 tortoisehg\hgtk\status.py:153
+#: tortoisehg\hgtk\commit.py:256 tortoisehg\hgtk\status.py:118
 msgid "Re_vert"
 msgstr "Re_vert"
 
-#: tortoisehg\hgtk\commit.py:248 tortoisehg\hgtk\status.py:156
-#: tortoisehg\hgtk\status.py:1653 tortoisehg\hgtk\thgconfig.py:1043
+#: 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 "_Add"
 
-#: tortoisehg\hgtk\commit.py:250 tortoisehg\hgtk\status.py:162
-#: tortoisehg\hgtk\thgconfig.py:1053
+#: tortoisehg\hgtk\commit.py:260 tortoisehg\hgtk\status.py:127
+#: tortoisehg\hgtk\thgconfig.py:983
 msgid "_Remove"
 msgstr "_Remove"
 
-#: tortoisehg\hgtk\commit.py:254 tortoisehg\hgtk\status.py:165
-#: tortoisehg\hgtk\status.py:1652
+#: tortoisehg\hgtk\commit.py:264 tortoisehg\hgtk\status.py:130
+#: tortoisehg\hgtk\status.py:1253
 msgid "_Forget"
 msgstr "_Forget"
 
-#: tortoisehg\hgtk\commit.py:292
+#: tortoisehg\hgtk\commit.py:302
 msgid "undo recent commit"
 msgstr "undo recent commit"
 
-#: tortoisehg\hgtk\commit.py:294 tortoisehg\hgtk\commit.py:630
+#: tortoisehg\hgtk\commit.py:304 tortoisehg\hgtk\commit.py:655
 msgid "commit"
 msgstr "commit"
 
-#: tortoisehg\hgtk\commit.py:300 tortoisehg\hgtk\history.py:251
+#: tortoisehg\hgtk\commit.py:310 tortoisehg\hgtk\history.py:260
 msgid "Show/Hide Patch Queue"
 msgstr "Show/Hide Patch Queue"
 
-#: tortoisehg\hgtk\commit.py:313 tortoisehg\hgtk\merge.py:190
-#: tortoisehg\hgtk\thgconfig.py:822
+#: tortoisehg\hgtk\commit.py:323 tortoisehg\hgtk\merge.py:190
+#: tortoisehg\hgtk\thgconfig.py:846
 msgid "Confirm Exit"
 msgstr "Confirm Exit"
 
-#: tortoisehg\hgtk\commit.py:314
+#: tortoisehg\hgtk\commit.py:324
 msgid "Save commit message at exit?"
 msgstr "Save commit message at exit?"
 
-#: tortoisehg\hgtk\commit.py:315 tortoisehg\hgtk\commit.py:1116
-#: tortoisehg\hgtk\commit.py:1120 tortoisehg\hgtk\history.py:211
-#: tortoisehg\hgtk\history.py:2514 tortoisehg\hgtk\status.py:1376
-#: tortoisehg\hgtk\status.py:1395 tortoisehg\hgtk\status.py:1719
-#: tortoisehg\hgtk\thgconfig.py:717 tortoisehg\hgtk\thgconfig.py:825
-#: tortoisehg\hgtk\thgmq.py:345 tortoisehg\hgtk\update.py:239
+#: 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 "&Cancel"
 
-#: tortoisehg\hgtk\commit.py:315 tortoisehg\hgtk\commit.py:1116
-#: tortoisehg\hgtk\commit.py:1120 tortoisehg\hgtk\status.py:1719
-#: tortoisehg\hgtk\thgconfig.py:824 tortoisehg\hgtk\thgmq.py:345
+#: 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 "&Yes"
 
-#: tortoisehg\hgtk\commit.py:315 tortoisehg\hgtk\commit.py:1116
-#: tortoisehg\hgtk\commit.py:1120 tortoisehg\hgtk\thgstrip.py:217
+#: tortoisehg\hgtk\commit.py:325 tortoisehg\hgtk\commit.py:1193
+#: tortoisehg\hgtk\commit.py:1200 tortoisehg\hgtk\thgstrip.py:217
 msgid "&No"
 msgstr "&No"
 
-#: tortoisehg\hgtk\commit.py:361
+#: tortoisehg\hgtk\commit.py:371
 msgid "Committer:"
 msgstr "Committer:"
 
-#: tortoisehg\hgtk\commit.py:375
+#: tortoisehg\hgtk\commit.py:385
 msgid "Auto-includes:"
 msgstr "Auto-includes:"
 
-#: tortoisehg\hgtk\commit.py:378
+#: tortoisehg\hgtk\commit.py:388
 msgid "Push after commit"
 msgstr "Push after commit"
 
-#: tortoisehg\hgtk\commit.py:413
+#: tortoisehg\hgtk\commit.py:429
 msgid "Recent commit messages..."
 msgstr "Recent commit messages..."
 
-#: tortoisehg\hgtk\commit.py:486
+#: tortoisehg\hgtk\commit.py:503
 msgid "Parent: %(rev)s"
 msgstr "Parent: %(rev)s"
 
-#: tortoisehg\hgtk\commit.py:494
+#: tortoisehg\hgtk\commit.py:511
 msgid "Not at head"
 msgstr "Not at head"
 
-#: tortoisehg\hgtk\commit.py:519 tortoisehg\hgtk\status.py:530
+#: tortoisehg\hgtk\commit.py:536 tortoisehg\hgtk\status.py:467
 msgid "Patch Preview"
 msgstr "Patch Preview"
 
-#: tortoisehg\hgtk\commit.py:521 tortoisehg\hgtk\status.py:534
+#: tortoisehg\hgtk\commit.py:538 tortoisehg\hgtk\status.py:471
 msgid "Commit Preview"
 msgstr "Commit Preview"
 
-#: tortoisehg\hgtk\commit.py:565
+#: tortoisehg\hgtk\commit.py:582
 msgid "Discard current commit message?"
 msgstr "Discard current commit message?"
 
-#: tortoisehg\hgtk\commit.py:629 tortoisehg\hgtk\commit.py:902
-#: tortoisehg\hgtk\commit.py:953 tortoisehg\hgtk\commit.py:1185
-#: tortoisehg\hgtk\gdialog.py:485 tortoisehg\hgtk\history.py:260
-#: tortoisehg\hgtk\merge.py:130 tortoisehg\hgtk\thgconfig.py:674
+#: 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 "Commit"
 
-#: tortoisehg\hgtk\commit.py:633
+#: tortoisehg\hgtk\commit.py:658
 msgid "QNew"
 msgstr "QNew"
 
-#: tortoisehg\hgtk\commit.py:634
+#: tortoisehg\hgtk\commit.py:659
 msgid "create new MQ patch"
 msgstr "create new MQ patch"
 
-#: tortoisehg\hgtk\commit.py:636
+#: tortoisehg\hgtk\commit.py:661
 msgid "QRefresh"
 msgstr "QRefresh"
 
-#: tortoisehg\hgtk\commit.py:637
+#: tortoisehg\hgtk\commit.py:662
 msgid "refresh top MQ patch"
 msgstr "refresh top MQ patch"
 
-#: tortoisehg\hgtk\commit.py:639
+#: tortoisehg\hgtk\commit.py:664
 msgid "_Commit (+1 head)"
 msgstr "_Commit (+1 head)"
 
-#: tortoisehg\hgtk\commit.py:639
+#: tortoisehg\hgtk\commit.py:664
 msgid "_Commit (-1 head)"
 msgstr "_Commit (-1 head)"
 
-#: tortoisehg\hgtk\commit.py:645
+#: tortoisehg\hgtk\commit.py:670
 msgid "commit to merge one head"
 msgstr "commit to merge one head"
 
-#: tortoisehg\hgtk\commit.py:648
+#: tortoisehg\hgtk\commit.py:673
 msgid "neither parent is a head, commit to add a new head"
 msgstr ""
 
-#: tortoisehg\hgtk\commit.py:653
+#: tortoisehg\hgtk\commit.py:678
 msgid "parent is not a head, commit to add a new head"
 msgstr "parent is not a head, commit to add a new head"
 
-#: tortoisehg\hgtk\commit.py:763
+#: tortoisehg\hgtk\commit.py:788
 msgid "new branch: "
 msgstr "new branch: "
 
-#: tortoisehg\hgtk\commit.py:765
+#: tortoisehg\hgtk\commit.py:790
 msgid "close branch: "
 msgstr "close branch: "
 
-#: tortoisehg\hgtk\commit.py:767
+#: tortoisehg\hgtk\commit.py:792
 msgid "branch: "
 msgstr "branch: "
 
-#: tortoisehg\hgtk\commit.py:786
+#: tortoisehg\hgtk\commit.py:823
 msgid "Merge "
 msgstr "Merge "
 
-#: tortoisehg\hgtk\commit.py:822
+#: tortoisehg\hgtk\commit.py:859
 msgid "Patch Contents"
 msgstr "Patch Contents"
 
-#: tortoisehg\hgtk\commit.py:886 tortoisehg\hgtk\commit.py:1028
+#: 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 "Nothing Committed"
 
-#: tortoisehg\hgtk\commit.py:887
+#: tortoisehg\hgtk\commit.py:936
 msgid "No committable files selected"
 msgstr "No committable files selected"
 
-#: tortoisehg\hgtk\commit.py:903
+#: tortoisehg\hgtk\commit.py:952
 msgid "Unable to create "
 msgstr "Unable to create "
 
-#: tortoisehg\hgtk\commit.py:954
+#: tortoisehg\hgtk\commit.py:1016
 msgid "Unable to apply patch"
 msgstr "Unable to apply patch"
 
-#: tortoisehg\hgtk\commit.py:983
+#: tortoisehg\hgtk\commit.py:1029
+msgid "Commit failed"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1034
 msgid "Confirm Undo Commit"
 msgstr "Confirm Undo Commit"
 
-#: tortoisehg\hgtk\commit.py:984
+#: tortoisehg\hgtk\commit.py:1035
 msgid "Undo last commit?"
 msgstr ""
 
-#: tortoisehg\hgtk\commit.py:990 tortoisehg\hgtk\commit.py:1005
+#: tortoisehg\hgtk\commit.py:1041 tortoisehg\hgtk\commit.py:1056
 msgid "Undo Commit"
 msgstr "Undo Commit"
 
-#: tortoisehg\hgtk\commit.py:991
+#: tortoisehg\hgtk\commit.py:1042
 msgid ""
 "Unable to undo!\n"
 "\n"
 "\n"
 "Tip revision differs from last commit."
 
-#: tortoisehg\hgtk\commit.py:1006
+#: tortoisehg\hgtk\commit.py:1057
 msgid "Errors during rollback!"
 msgstr "Errors during rollback!"
 
-#: tortoisehg\hgtk\commit.py:1012
+#: tortoisehg\hgtk\commit.py:1063
 msgid "Confirm Add/Remove"
 msgstr "Confirm Add/Remove"
 
-#: tortoisehg\hgtk\commit.py:1013
+#: tortoisehg\hgtk\commit.py:1064
 msgid "Add/Remove the following files?"
 msgstr "Add/Remove the following files?"
 
-#: tortoisehg\hgtk\commit.py:1029 tortoisehg\hgtk\tagadd.py:227
+#: tortoisehg\hgtk\commit.py:1080 tortoisehg\hgtk\tagadd.py:225
 msgid "Please enter commit message"
 msgstr "Please enter commit message"
 
-#: tortoisehg\hgtk\commit.py:1036
+#: 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 "Error"
 
-#: tortoisehg\hgtk\commit.py:1037
+#: tortoisehg\hgtk\commit.py:1109
 msgid "Message format configuration error"
 msgstr "Message format configuration error"
 
-#: tortoisehg\hgtk\commit.py:1046 tortoisehg\hgtk\commit.py:1054
-#: tortoisehg\hgtk\commit.py:1066
+#: tortoisehg\hgtk\commit.py:1118 tortoisehg\hgtk\commit.py:1126
+#: tortoisehg\hgtk\commit.py:1138
 msgid "Confirm Commit"
 msgstr "Confirm Commit"
 
-#: tortoisehg\hgtk\commit.py:1047
+#: tortoisehg\hgtk\commit.py:1119
 msgid ""
 "The summary line length of %i is greater than %i.\n"
 "\n"
 "\n"
 "Ignore format policy and continue commit?"
 
-#: tortoisehg\hgtk\commit.py:1055
+#: tortoisehg\hgtk\commit.py:1127
 msgid ""
 "The summary line is not followed by a blank line.\n"
 "\n"
 "\n"
 "Ignore format policy and continue commit?"
 
-#: tortoisehg\hgtk\commit.py:1067
+#: tortoisehg\hgtk\commit.py:1139
 msgid ""
 "The following lines are over the %i-character limit: %s.\n"
 "\n"
 "\n"
 "Ignore format policy and continue commit?"
 
-#: tortoisehg\hgtk\commit.py:1079
+#: tortoisehg\hgtk\commit.py:1151
 msgid "Commit: Invalid username"
 msgstr "Commit: Invalid username"
 
-#: tortoisehg\hgtk\commit.py:1080
+#: tortoisehg\hgtk\commit.py:1152
 msgid ""
 "Your username has not been configured.\n"
 "\n"
 "\n"
 "Please configure your username and try again"
 
-#: tortoisehg\hgtk\commit.py:1113
-msgid "Confirm Override Branch"
-msgstr "Confirm Override Branch"
-
-#: tortoisehg\hgtk\commit.py:1114
+#: 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 ""
-"A branch named \"%s\" already exists,\n"
-"override?"
-
-#: tortoisehg\hgtk\commit.py:1118
+"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 "Confirm New Branch"
 
-#: tortoisehg\hgtk\commit.py:1119
-msgid "Create new named branch \"%s\"?"
-msgstr "Create new named branch \"%s\"?"
-
-#: tortoisehg\hgtk\commit.py:1174
-msgid "Finish committing and pushing"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:1176
-msgid "Finish committing"
-msgstr "Finish committing"
-
-#: tortoisehg\hgtk\commit.py:1178
+#: 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 "Aborted committing"
 
-#: tortoisehg\hgtk\commit.py:1180
+#: tortoisehg\hgtk\commit.py:1259
 msgid "Failed to commit"
 msgstr "Failed to commit"
 
-#: tortoisehg\hgtk\commit.py:1184
+#: tortoisehg\hgtk\commit.py:1263
 msgid "Committing changes..."
 msgstr "Committing changes..."
 
-#: tortoisehg\hgtk\commit.py:1186 tortoisehg\hgtk\history.py:584
-#: tortoisehg\hgtk\history.py:609 tortoisehg\hgtk\history.py:1671
-#: tortoisehg\hgtk\history.py:1750 tortoisehg\hgtk\history.py:1880
-#: tortoisehg\hgtk\history.py:1920 tortoisehg\hgtk\history.py:1958
-#: tortoisehg\hgtk\history.py:2299 tortoisehg\hgtk\history.py:2329
-#: tortoisehg\hgtk\history.py:2554 tortoisehg\hgtk\history.py:2582
-#: tortoisehg\hgtk\recovery.py:161 tortoisehg\hgtk\synch.py:540
+#: 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 "Cannot run now"
 
-#: tortoisehg\hgtk\commit.py:1187 tortoisehg\hgtk\history.py:585
-#: tortoisehg\hgtk\history.py:610 tortoisehg\hgtk\history.py:1672
-#: tortoisehg\hgtk\history.py:1751 tortoisehg\hgtk\history.py:1881
-#: tortoisehg\hgtk\history.py:1921 tortoisehg\hgtk\history.py:1959
-#: tortoisehg\hgtk\history.py:2300 tortoisehg\hgtk\history.py:2330
-#: tortoisehg\hgtk\history.py:2555 tortoisehg\hgtk\history.py:2583
-msgid "Please try again after running operation is completed"
-msgstr "Please try again after currently running operation is completed"
-
-#: tortoisehg\hgtk\commit.py:1213
+#: 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 "Paste _Filenames"
 
-#: tortoisehg\hgtk\commit.py:1214
+#: tortoisehg\hgtk\commit.py:1293
 msgid "App_ly Format"
 msgstr "App_ly Format"
 
-#: tortoisehg\hgtk\commit.py:1215
+#: tortoisehg\hgtk\commit.py:1294
 msgid "C_onfigure Format..."
 msgstr "C_onfigure Format..."
 
-#: tortoisehg\hgtk\commit.py:1260
+#: tortoisehg\hgtk\commit.py:1339
 msgid "Info Required"
 msgstr "Info Required"
 
-#: tortoisehg\hgtk\commit.py:1261
+#: tortoisehg\hgtk\commit.py:1340
 msgid "Message format needs to be configured"
 msgstr "Message format needs to be configured"
 
-#: tortoisehg\hgtk\commit.py:1273 tortoisehg\hgtk\commit.py:1278
+#: tortoisehg\hgtk\commit.py:1352 tortoisehg\hgtk\commit.py:1357
 msgid "Warning"
 msgstr "Warning"
 
-#: tortoisehg\hgtk\commit.py:1274
+#: tortoisehg\hgtk\commit.py:1353
 msgid "The summary line length of %i is greater than %i"
 msgstr "The summary line length of %i is greater than %i"
 
-#: tortoisehg\hgtk\commit.py:1279
+#: tortoisehg\hgtk\commit.py:1358
 msgid "The summary line is not followed by a blank line"
 msgstr "The summary line is not followed by a blank line"
 
 msgid "must be specified 'type' in style"
 msgstr "must be specified 'type' in style"
 
-#: tortoisehg\hgtk\csinfo.py:199
+#: tortoisehg\hgtk\csinfo.py:212
 msgid "Summary:"
 msgstr "Summary:"
 
-#: tortoisehg\hgtk\csinfo.py:200
+#: tortoisehg\hgtk\csinfo.py:213
 msgid "Age:"
 msgstr "Age:"
 
-#: tortoisehg\hgtk\csinfo.py:200 tortoisehg\hgtk\csinfo.py:201
+#: tortoisehg\hgtk\csinfo.py:213 tortoisehg\hgtk\csinfo.py:214
 msgid "Date:"
 msgstr "Date:"
 
-#: tortoisehg\hgtk\csinfo.py:200 tortoisehg\hgtk\csinfo.py:205
+#: tortoisehg\hgtk\csinfo.py:213 tortoisehg\hgtk\csinfo.py:218
 msgid "User:"
 msgstr "User:"
 
-#: tortoisehg\hgtk\csinfo.py:201 tortoisehg\hgtk\csinfo.py:202
+#: tortoisehg\hgtk\csinfo.py:214 tortoisehg\hgtk\csinfo.py:215
 msgid "Branch:"
 msgstr "Branch:"
 
-#: tortoisehg\hgtk\csinfo.py:202 tortoisehg\hgtk\csinfo.py:203
+#: tortoisehg\hgtk\csinfo.py:215 tortoisehg\hgtk\csinfo.py:216
 msgid "Tags:"
 msgstr "Tags:"
 
-#: tortoisehg\hgtk\csinfo.py:203
+#: tortoisehg\hgtk\csinfo.py:216
 msgid "Transplant:"
 msgstr "Transplant:"
 
-#: tortoisehg\hgtk\csinfo.py:204
+#: tortoisehg\hgtk\csinfo.py:217
 msgid "Perforce:"
 msgstr "Perforce:"
 
-#: tortoisehg\hgtk\csinfo.py:204
+#: tortoisehg\hgtk\csinfo.py:217
 msgid "Subversion:"
 msgstr "Subversion:"
 
 msgid "%s - datamine"
 msgstr "%s - datamine"
 
-#: tortoisehg\hgtk\datamine.py:54 tortoisehg\hgtk\hgcmd.py:44
-#: tortoisehg\hgtk\history.py:421 tortoisehg\hgtk\recovery.py:46
-#: tortoisehg\hgtk\serve.py:65 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 "Stop"
 
 msgid "Open new search tab"
 msgstr "Open new search tab"
 
-#: tortoisehg\hgtk\datamine.py:71 tortoisehg\hgtk\rename.py:29
-#: tortoisehg\hgtk\thgconfig.py:1331
-msgid "Invalid path"
-msgstr "Invalid path"
-
-#: tortoisehg\hgtk\datamine.py:72
-msgid "Cannot annotate directory: %s"
-msgstr "Cannot annotate directory: %s"
-
-#: tortoisehg\hgtk\datamine.py:134
+#: tortoisehg\hgtk\datamine.py:140
 msgid "Filename"
 msgstr "Filename"
 
-#: tortoisehg\hgtk\datamine.py:136 tortoisehg\hgtk\datamine.py:654
-#: tortoisehg\hgtk\history.py:100 tortoisehg\hgtk\history.py:473
-#: tortoisehg\hgtk\history.py:666 tortoisehg\hgtk\logview\treeview.py:506
-#: tortoisehg\hgtk\thgconfig.py:191 tortoisehg\hgtk\thgconfig.py:300
+#: 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 "User"
 
-#: tortoisehg\hgtk\datamine.py:144 tortoisehg\hgtk\datamine.py:157
-#: tortoisehg\hgtk\history.py:1179
+#: tortoisehg\hgtk\datamine.py:150 tortoisehg\hgtk\datamine.py:163
+#: tortoisehg\hgtk\history.py:1270
 msgid "Di_splay Change"
 msgstr "Di_splay Change"
 
-#: tortoisehg\hgtk\datamine.py:148 tortoisehg\hgtk\datamine.py:161
+#: tortoisehg\hgtk\datamine.py:154 tortoisehg\hgtk\datamine.py:180
 msgid "_View File at Revision"
 msgstr "_View File at Revision"
 
-#: tortoisehg\hgtk\datamine.py:155
+#: tortoisehg\hgtk\datamine.py:161
 msgid "_Zoom to Change"
 msgstr "_Zoom to Change"
 
-#: tortoisehg\hgtk\datamine.py:159
+#: tortoisehg\hgtk\datamine.py:173
 msgid "_Annotate Parent"
 msgstr "_Annotate Parent"
 
-#: tortoisehg\hgtk\datamine.py:186
-msgid "No parent file"
-msgstr "No parent file"
-
-#: tortoisehg\hgtk\datamine.py:187
-msgid "Unable to annotate"
-msgstr "Unable to annotate"
-
-#: tortoisehg\hgtk\datamine.py:316
+#: tortoisehg\hgtk\datamine.py:176
+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 "Search"
 
-#: tortoisehg\hgtk\datamine.py:317 tortoisehg\hgtk\hgignore.py:60
+#: tortoisehg\hgtk\datamine.py:311 tortoisehg\hgtk\hgignore.py:60
 msgid "Regexp:"
 msgstr "Regexp:"
 
-#: tortoisehg\hgtk\datamine.py:319
+#: tortoisehg\hgtk\datamine.py:313
 msgid "Includes:"
 msgstr "Includes:"
 
-#: tortoisehg\hgtk\datamine.py:321
+#: tortoisehg\hgtk\datamine.py:315
 msgid "Excludes:"
 msgstr "Excludes:"
 
-#: tortoisehg\hgtk\datamine.py:324
+#: tortoisehg\hgtk\datamine.py:318
 msgid "Start this search"
 msgstr "Start this search"
 
-#: tortoisehg\hgtk\datamine.py:325
+#: tortoisehg\hgtk\datamine.py:319
 msgid "Regular expression search pattern"
 msgstr "Regular expression search pattern"
 
-#: tortoisehg\hgtk\datamine.py:326
+#: tortoisehg\hgtk\datamine.py:320
 msgid ""
 "Comma separated list of inclusion patterns.  By default, the entire "
 "repository is searched."
 "Comma separated list of inclusion patterns.  By default, the entire "
 "repository is searched."
 
-#: tortoisehg\hgtk\datamine.py:329
+#: tortoisehg\hgtk\datamine.py:323
 msgid ""
 "Comma separated list of exclusion patterns.  Exclusion patterns are applied "
 "after inclusion patterns."
 "Comma separated list of exclusion patterns.  Exclusion patterns are applied "
 "after inclusion patterns."
 
-#: tortoisehg\hgtk\datamine.py:335
+#: tortoisehg\hgtk\datamine.py:329
 msgid "Follow copies and renames"
 msgstr "Follow copies and renames"
 
-#: tortoisehg\hgtk\datamine.py:336
+#: tortoisehg\hgtk\datamine.py:330
 msgid "Ignore case"
 msgstr "Ignore case"
 
-#: tortoisehg\hgtk\datamine.py:337
+#: tortoisehg\hgtk\datamine.py:331
 msgid "Show line numbers"
 msgstr "Show line numbers"
 
-#: tortoisehg\hgtk\datamine.py:338
+#: tortoisehg\hgtk\datamine.py:332
 msgid "Show all matching revisions"
 msgstr "Show all matching revisions"
 
-#: tortoisehg\hgtk\datamine.py:369 tortoisehg\hgtk\datamine.py:652
-#: tortoisehg\hgtk\logview\treeview.py:435
+#: tortoisehg\hgtk\datamine.py:363 tortoisehg\hgtk\datamine.py:653
+#: tortoisehg\hgtk\logview\treeview.py:441
 msgid "Rev"
 msgstr "Rev"
 
-#: tortoisehg\hgtk\datamine.py:370 tortoisehg\hgtk\datamine.py:653
+#: tortoisehg\hgtk\datamine.py:364 tortoisehg\hgtk\datamine.py:654
 msgid "File"
 msgstr "File"
 
-#: tortoisehg\hgtk\datamine.py:371
+#: tortoisehg\hgtk\datamine.py:365
 msgid "Matches"
 msgstr "Matches"
 
-#: tortoisehg\hgtk\datamine.py:393
+#: tortoisehg\hgtk\datamine.py:387
 msgid "Search %d"
 msgstr "Search %d"
 
-#: tortoisehg\hgtk\datamine.py:436
+#: tortoisehg\hgtk\datamine.py:430
 msgid "No regular expression given"
 msgstr "No regular expression given"
 
-#: tortoisehg\hgtk\datamine.py:437
+#: tortoisehg\hgtk\datamine.py:431
 msgid "You must provide a search expression"
 msgstr "You must provide a search expression"
 
-#: tortoisehg\hgtk\datamine.py:443
+#: tortoisehg\hgtk\datamine.py:437
 msgid "Invalid regular expression"
 msgstr "Invalid regular expression"
 
-#: tortoisehg\hgtk\datamine.py:444 tortoisehg\hgtk\thgshelve.py:210
+#: tortoisehg\hgtk\datamine.py:438 tortoisehg\hgtk\thgshelve.py:220
+#: tortoisehg\hgtk\thgshelve.py:233
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: tortoisehg\hgtk\datamine.py:466 tortoisehg\hgtk\datamine.py:771
+#: tortoisehg\hgtk\datamine.py:460 tortoisehg\hgtk\datamine.py:772
 msgid "Abort: %s"
 msgstr "Abort: %s"
 
-#: tortoisehg\hgtk\datamine.py:478
+#: tortoisehg\hgtk\datamine.py:472
 msgid "Search \"%s\""
 msgstr "Search \"%s\""
 
-#: tortoisehg\hgtk\datamine.py:597
+#: tortoisehg\hgtk\datamine.py:598
 msgid "File is unrevisioned"
 msgstr "File is unrevisioned"
 
-#: tortoisehg\hgtk\datamine.py:598
+#: tortoisehg\hgtk\datamine.py:599
 msgid "Unable to annotate "
 msgstr "Unable to annotate "
 
-#: tortoisehg\hgtk\datamine.py:651
+#: tortoisehg\hgtk\datamine.py:652
 msgid "Line"
 msgstr "Line"
 
-#: tortoisehg\hgtk\datamine.py:655 tortoisehg\hgtk\guess.py:158
+#: tortoisehg\hgtk\datamine.py:656 tortoisehg\hgtk\guess.py:145
 msgid "Source"
 msgstr "Source"
 
-#: tortoisehg\hgtk\datamine.py:713
+#: tortoisehg\hgtk\datamine.py:714
 msgid "Loading history..."
 msgstr "Loading history..."
 
 msgid "_Tools"
 msgstr "_Tools"
 
-#: tortoisehg\hgtk\gdialog.py:483 tortoisehg\hgtk\history.py:221
-#: tortoisehg\hgtk\thgconfig.py:675 tortoisehg\util\menuthg.py:49
+#: tortoisehg\hgtk\gdialog.py:483 tortoisehg\hgtk\history.py:230
+#: tortoisehg\hgtk\thgconfig.py:128 tortoisehg\util\menuthg.py:49
 msgid "Repository Explorer"
 msgstr "Repository Explorer"
 
-#: tortoisehg\hgtk\gdialog.py:487 tortoisehg\hgtk\history.py:263
+#: tortoisehg\hgtk\gdialog.py:487 tortoisehg\hgtk\history.py:282
 msgid "Datamine"
 msgstr "Datamine"
 
-#: tortoisehg\hgtk\gdialog.py:489 tortoisehg\hgtk\history.py:266
+#: tortoisehg\hgtk\gdialog.py:489 tortoisehg\hgtk\history.py:285
 msgid "Recovery"
 msgstr "Recovery"
 
-#: tortoisehg\hgtk\gdialog.py:491 tortoisehg\hgtk\history.py:269
+#: tortoisehg\hgtk\gdialog.py:491 tortoisehg\hgtk\history.py:288
 msgid "Serve"
 msgstr "Serve"
 
-#: tortoisehg\hgtk\gdialog.py:493 tortoisehg\hgtk\history.py:272
-#: 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 "Shelve"
 
-#: tortoisehg\hgtk\gdialog.py:495 tortoisehg\hgtk\thgconfig.py:677
+#: tortoisehg\hgtk\gdialog.py:495 tortoisehg\hgtk\thgconfig.py:170
 #: tortoisehg\util\menuthg.py:55
 msgid "Synchronize"
 msgstr "Synchronise"
 msgid "Contents"
 msgstr "Contents"
 
-#: tortoisehg\hgtk\gdialog.py:503 tortoisehg\hgtk\thgmq.py:835
+#: tortoisehg\hgtk\gdialog.py:503 tortoisehg\hgtk\thgmq.py:861
 msgid "Index"
 msgstr "Index"
 
 msgid "About"
 msgstr "About"
 
-#: tortoisehg\hgtk\gdialog.py:582
+#: tortoisehg\hgtk\gdialog.py:582 tortoisehg\hgtk\gdialog.py:585
 msgid " Aborted"
 msgstr " Aborted"
 
-#: tortoisehg\hgtk\gdialog.py:593
+#: tortoisehg\hgtk\gdialog.py:586 tortoisehg\hgtk\status.py:168
+msgid ", please refresh"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:597
 msgid " Messages and Errors"
 msgstr " Messages and Errors"
 
-#: tortoisehg\hgtk\gdialog.py:636
+#: tortoisehg\hgtk\gdialog.py:640
 msgid "making snapshot of %d files from rev %s\n"
 msgstr "making snapshot of %d files from rev %s\n"
 
-#: tortoisehg\hgtk\gdialog.py:670
+#: tortoisehg\hgtk\gdialog.py:674
 msgid "edit failed"
 msgstr "edit failed"
 
-#: tortoisehg\hgtk\gdialog.py:678 tortoisehg\hgtk\gtklib.py:172
+#: tortoisehg\hgtk\gdialog.py:682 tortoisehg\hgtk\gtklib.py:392
 msgid "No visual editor configured"
 msgstr "No visual editor configured"
 
-#: tortoisehg\hgtk\gdialog.py:679 tortoisehg\hgtk\gtklib.py:173
+#: tortoisehg\hgtk\gdialog.py:683 tortoisehg\hgtk\gtklib.py:393
 msgid "Please configure a visual editor."
 msgstr "Please configure a visual editor."
 
-#: tortoisehg\hgtk\gdialog.py:809
+#: tortoisehg\hgtk\gdialog.py:823
 msgid "unknown mode name: %s"
 msgstr "unknown mode name: %s"
 
-#: tortoisehg\hgtk\gdialog.py:849
+#: tortoisehg\hgtk\gdialog.py:863
 msgid "Abort"
 msgstr "Abort"
 
-#: tortoisehg\hgtk\gdialog.py:889
+#: tortoisehg\hgtk\gdialog.py:904
 msgid "Confirm Abort"
 msgstr "Confirm Abort"
 
-#: tortoisehg\hgtk\gdialog.py:890
+#: tortoisehg\hgtk\gdialog.py:905
 msgid "Do you want to abort?"
 msgstr "Do you want to abort?"
 
 msgid "Invalid Revision"
 msgstr "Invalid Revision"
 
-#: tortoisehg\hgtk\gtklib.py:247
+#: tortoisehg\hgtk\gtklib.py:467
 msgid "Save File"
 msgstr "Save File"
 
-#: tortoisehg\hgtk\gtklib.py:248
+#: tortoisehg\hgtk\gtklib.py:468
 msgid "All files"
 msgstr "All files"
 
-#: tortoisehg\hgtk\gtklib.py:361
+#: tortoisehg\hgtk\gtklib.py:581
 msgid ""
 "The file \"%s\" already exists!\n"
 "\n"
 "\n"
 "Do you want to overwrite it?"
 
-#: tortoisehg\hgtk\gtklib.py:372
+#: tortoisehg\hgtk\gtklib.py:592
 msgid "Select Folder"
 msgstr "Select Folder"
 
-#: tortoisehg\hgtk\gtklib.py:861
+#: tortoisehg\hgtk\gtklib.py:1081
 msgid ""
 "Select language for spell checking.\n"
 "\n"
 "\n"
 "examples: en, en_GB, en_US"
 
-#: tortoisehg\hgtk\gtklib.py:867
+#: tortoisehg\hgtk\gtklib.py:1087
 msgid "Lang \"%s\" can not be set.\n"
 msgstr "Lang \"%s\" can not be set.\n"
 
-#: tortoisehg\hgtk\gtklib.py:880 tortoisehg\hgtk\thgconfig.py:667
+#: tortoisehg\hgtk\gtklib.py:1100 tortoisehg\hgtk\thgconfig.py:85
 msgid "Spell Check Language"
 msgstr "Spell Check Language"
 
-#: tortoisehg\hgtk\guess.py:53
+#: tortoisehg\hgtk\guess.py:40
 msgid "Detect Copies/Renames in %s"
 msgstr "Detect Copies/Renames in %s"
 
-#: tortoisehg\hgtk\guess.py:73
+#: tortoisehg\hgtk\guess.py:60
 msgid "Minimum Simularity Percentage"
 msgstr "Minimum Simularity Percentage"
 
-#: tortoisehg\hgtk\guess.py:90
+#: tortoisehg\hgtk\guess.py:77
 msgid "Unrevisioned Files"
 msgstr "Unrevisioned Files"
 
-#: tortoisehg\hgtk\guess.py:121
+#: tortoisehg\hgtk\guess.py:108
 msgid "Find Renames"
 msgstr "Find Renames"
 
-#: tortoisehg\hgtk\guess.py:124
+#: tortoisehg\hgtk\guess.py:111
 msgid "Find Copies"
 msgstr "Find Copies"
 
-#: tortoisehg\hgtk\guess.py:129
+#: tortoisehg\hgtk\guess.py:116
 msgid "Candidate Matches"
 msgstr "Candidate Matches"
 
-#: tortoisehg\hgtk\guess.py:165
+#: tortoisehg\hgtk\guess.py:152
 msgid "Dest"
 msgstr "Dest"
 
-#: tortoisehg\hgtk\guess.py:181
+#: tortoisehg\hgtk\guess.py:168
 msgid "Accept Match"
 msgstr "Accept Match"
 
-#: tortoisehg\hgtk\guess.py:186
+#: tortoisehg\hgtk\guess.py:173
 msgid "Differences from Source to Dest"
 msgstr "Differences from Source to Dest"
 
-#: tortoisehg\hgtk\guess.py:274
+#: tortoisehg\hgtk\guess.py:262
 msgid "finding source of "
 msgstr "finding source of "
 
-#: tortoisehg\hgtk\guess.py:377
+#: tortoisehg\hgtk\guess.py:366
 msgid ""
 "== %s and %s have identical contents ==\n"
 "\n"
 "== %s and %s have identical contents ==\n"
 "\n"
 
-#: tortoisehg\hgtk\hgcmd.py:186 tortoisehg\hgtk\hgcmd.py:529
+#: tortoisehg\hgtk\hgcmd.py:196 tortoisehg\hgtk\hgcmd.py:591
 msgid ""
 "\n"
 "[command interrupted]"
 "\n"
 "[command interrupted]"
 
-#: tortoisehg\hgtk\hgcmd.py:278
+#: tortoisehg\hgtk\hgcmd.py:288
 msgid "unknown CmdWidget style: %s"
 msgstr "unknown CmdWidget style: %s"
 
-#: tortoisehg\hgtk\hgcmd.py:291
+#: tortoisehg\hgtk\hgcmd.py:307
 msgid "Toggle log window"
 msgstr "Toggle log window"
 
-#: tortoisehg\hgtk\hgcmd.py:324
+#: tortoisehg\hgtk\hgcmd.py:347
 msgid "Stop transaction"
 msgstr "Stop transaction"
 
-#: tortoisehg\hgtk\hgcmd.py:326
+#: tortoisehg\hgtk\hgcmd.py:349
 msgid "Close this"
 msgstr "Close this"
 
-#: tortoisehg\hgtk\hgcmd.py:464 tortoisehg\hgtk\hgcmd.py:481
+#: tortoisehg\hgtk\hgcmd.py:488 tortoisehg\hgtk\hgcmd.py:505
 msgid "invalid state"
 msgstr "invalid state"
 
-#: tortoisehg\hgtk\hgcmd.py:613
+#: tortoisehg\hgtk\hgcmd.py:546 tortoisehg\hgtk\recovery.py:287
+msgid "Status: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\hgcmd.py:676
 msgid "Command Log"
 msgstr "Command Log"
 
 msgstr "Show e-mails which would be sent"
 
 #: tortoisehg\hgtk\hgemail.py:43 tortoisehg\hgtk\serve.py:73
-#: tortoisehg\hgtk\synch.py:96
+#: tortoisehg\hgtk\synch.py:90
 msgid "Configure"
 msgstr "Configure"
 
 msgid "Message identifier to reply to, for threading"
 msgstr "Message identifier to reply to, for threading"
 
-#: tortoisehg\hgtk\hgemail.py:99
+#: tortoisehg\hgtk\hgemail.py:98
 msgid "Send changesets as Hg patches"
 msgstr "Send changesets as Hg patches"
 
-#: tortoisehg\hgtk\hgemail.py:102
+#: tortoisehg\hgtk\hgemail.py:101
 msgid ""
 "Hg patches (as generated by export command) are compatible with most patch "
 "programs.  They include a header which contains the most important changeset "
 "programs.  They include a header which contains the most important changeset "
 "metadata."
 
-#: tortoisehg\hgtk\hgemail.py:107
+#: tortoisehg\hgtk\hgemail.py:106
 msgid "Use extended (git) patch format"
 msgstr "Use extended (git) patch format"
 
-#: tortoisehg\hgtk\hgemail.py:110
+#: 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 "
 "recipients may not be able to use them if they are not using git or "
 "Mercurial."
 
-#: tortoisehg\hgtk\hgemail.py:115
+#: tortoisehg\hgtk\hgemail.py:114
 msgid "Plain, do not prepend Hg header"
 msgstr "Plain, do not prepend Hg header"
 
-#: tortoisehg\hgtk\hgemail.py:118
+#: 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 "
 "useful if recipient is not using Mercurial (and does not like to see the "
 "headers)."
 
-#: tortoisehg\hgtk\hgemail.py:123
+#: tortoisehg\hgtk\hgemail.py:122
 msgid "Send single binary bundle, not patches"
 msgstr "Send single binary bundle, not patches"
 
-#: tortoisehg\hgtk\hgemail.py:127
+#: 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 "
 "from them. This is the safest way to send changes to recipient Mercurial "
 "users."
 
-#: tortoisehg\hgtk\hgemail.py:133
+#: tortoisehg\hgtk\hgemail.py:132
 msgid ""
 "This feature is only available when sending outgoing changesets. It is not "
 "applicable with revision ranges."
 "This feature is only available when sending outgoing changesets. It is not "
 "applicable with revision ranges."
 
-#: tortoisehg\hgtk\hgemail.py:136
+#: tortoisehg\hgtk\hgemail.py:135
 msgid "attach"
 msgstr "attach"
 
-#: tortoisehg\hgtk\hgemail.py:138
+#: tortoisehg\hgtk\hgemail.py:137
 msgid "send patches as attachments"
 msgstr "send patches as attachments"
 
-#: tortoisehg\hgtk\hgemail.py:139
+#: tortoisehg\hgtk\hgemail.py:138
 msgid "inline"
 msgstr "inline"
 
-#: tortoisehg\hgtk\hgemail.py:141
+#: tortoisehg\hgtk\hgemail.py:140
 msgid "send patches as inline attachments"
 msgstr "send patches as inline attachments"
 
-#: tortoisehg\hgtk\hgemail.py:142
+#: tortoisehg\hgtk\hgemail.py:141
 msgid "diffstat"
 msgstr "diffstat"
 
-#: tortoisehg\hgtk\hgemail.py:144
+#: tortoisehg\hgtk\hgemail.py:143
 msgid "add diffstat output to messages"
 msgstr "add diffstat output to messages"
 
-#: tortoisehg\hgtk\hgemail.py:152
+#: tortoisehg\hgtk\hgemail.py:151
 msgid "Subject:"
 msgstr "Subject:"
 
-#: tortoisehg\hgtk\hgemail.py:166
+#: tortoisehg\hgtk\hgemail.py:165
 msgid "Flags:"
 msgstr "Flags:"
 
-#: tortoisehg\hgtk\hgemail.py:180
+#: tortoisehg\hgtk\hgemail.py:181
 msgid "Patch Series (Bundle) Description"
 msgstr "Patch Series (Bundle) Description"
 
-#: tortoisehg\hgtk\hgemail.py:231
+#: 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.  "
 msgid "Glob:"
 msgstr "Glob:"
 
-#: tortoisehg\hgtk\hgignore.py:77 tortoisehg\hgtk\thgconfig.py:606
+#: tortoisehg\hgtk\hgignore.py:77 tortoisehg\hgtk\thgconfig.py:676
 msgid "Edit File"
 msgstr "Edit File"
 
 msgid "Invalid regexp expression"
 msgstr "Invalid regexp expression"
 
+#: tortoisehg\hgtk\hgignore.py:256
+msgid "Unable to write .hgignore file"
+msgstr ""
+
 #: tortoisehg\hgtk\hginit.py:22
 msgid "TortoiseHg Init"
 msgstr "TortoiseHg Init"
 msgid "Make repo compatible with Mercurial 1.0"
 msgstr "Make repo compatible with Mercurial 1.0"
 
-#: tortoisehg\hgtk\hginit.py:103
+#: tortoisehg\hgtk\hginit.py:65
+msgid "Run Commit after init"
+msgstr ""
+
+#: tortoisehg\hgtk\hginit.py:106
 msgid "Destination path is empty"
 msgstr "Destination path is empty"
 
-#: tortoisehg\hgtk\hginit.py:104
+#: tortoisehg\hgtk\hginit.py:107
 msgid "Please enter the directory path"
 msgstr "Please enter the directory path"
 
-#: tortoisehg\hgtk\hginit.py:118
+#: tortoisehg\hgtk\hginit.py:121
 msgid "Unable to create new repository"
 msgstr "Unable to create new repository"
 
-#: tortoisehg\hgtk\hginit.py:122 tortoisehg\hgtk\hginit.py:127
+#: tortoisehg\hgtk\hginit.py:125 tortoisehg\hgtk\hginit.py:130
 msgid "Error when creating repository"
 msgstr "Error when creating repository"
 
-#: tortoisehg\hgtk\hgthread.py:71 tortoisehg\hgtk\hgthread.py:83
-#: tortoisehg\hgtk\hgthread.py:90
+#: tortoisehg\hgtk\hgthread.py:78 tortoisehg\hgtk\hgthread.py:90
+#: tortoisehg\hgtk\hgthread.py:97
 msgid "response expected"
 msgstr "response expected"
 
-#: tortoisehg\hgtk\hgthread.py:87
+#: tortoisehg\hgtk\hgthread.py:94
 msgid "password: "
 msgstr "password: "
 
-#: tortoisehg\hgtk\hgthread.py:164
+#: tortoisehg\hgtk\hgthread.py:179
 msgid "[command returned code %d "
 msgstr "[command returned code %d "
 
-#: tortoisehg\hgtk\hgthread.py:166
+#: tortoisehg\hgtk\hgthread.py:181
 msgid "[command completed successfully "
 msgstr "[command completed successfully "
 
-#: tortoisehg\hgtk\hgthread.py:172
+#: tortoisehg\hgtk\hgthread.py:187
 msgid "abort: "
 msgstr "abort: "
 
-#: tortoisehg\hgtk\hgtk.py:73
+#: tortoisehg\hgtk\hgtk.py:78
 msgid ""
 "\n"
 "Caught keyboard interrupt, aborting.\n"
 "\n"
 "Caught keyboard interrupt, aborting.\n"
 
-#: tortoisehg\hgtk\hgtk.py:123
+#: tortoisehg\hgtk\hgtk.py:128
 msgid "can not read file \"%s\". Ignored.\n"
 msgstr "can not read file \"%s\". Ignored.\n"
 
-#: tortoisehg\hgtk\hgtk.py:202
+#: tortoisehg\hgtk\hgtk.py:207
 msgid "hgtk %s: %s\n"
 msgstr "hgtk %s: %s\n"
 
-#: tortoisehg\hgtk\hgtk.py:205
+#: tortoisehg\hgtk\hgtk.py:210
 msgid "hgtk: %s\n"
 msgstr "hgtk: %s\n"
 
-#: tortoisehg\hgtk\hgtk.py:208
+#: tortoisehg\hgtk\hgtk.py:213
 msgid ""
 "hgtk: command '%s' is ambiguous:\n"
 "    %s\n"
 "hgtk: command '%s' is ambiguous:\n"
 "    %s\n"
 
-#: tortoisehg\hgtk\hgtk.py:211
+#: tortoisehg\hgtk\hgtk.py:216
 msgid "hgtk: unknown command '%s'\n"
 msgstr "hgtk: unknown command '%s'\n"
 
-#: tortoisehg\hgtk\hgtk.py:214
+#: tortoisehg\hgtk\hgtk.py:219
 msgid "abort: %s!\n"
 msgstr "abort: %s!\n"
 
-#: tortoisehg\hgtk\hgtk.py:261 tortoisehg\hgtk\hgtk.py:460
+#: tortoisehg\hgtk\hgtk.py:267 tortoisehg\hgtk\hgtk.py:466
 msgid "There is no Mercurial repository here (.hg not found)"
 msgstr "There is no Mercurial repository here (.hg not found)"
 
-#: tortoisehg\hgtk\hgtk.py:273
+#: tortoisehg\hgtk\hgtk.py:279
 msgid "invalid arguments"
 msgstr "invalid arguments"
 
-#: tortoisehg\hgtk\hgtk.py:279
+#: tortoisehg\hgtk\hgtk.py:285
 msgid "unrecognized profiling format '%s' - Ignored\n"
 msgstr "unrecognised profiling format '%s' - Ignored\n"
 
-#: tortoisehg\hgtk\hgtk.py:294
+#: tortoisehg\hgtk\hgtk.py:300
 msgid ""
 "lsprof not available - install from "
 "http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
 "lsprof not available - install from "
 "http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
 
-#: tortoisehg\hgtk\hgtk.py:400
+#: tortoisehg\hgtk\hgtk.py:406
 msgid "Rename error"
 msgstr "Rename error"
 
-#: tortoisehg\hgtk\hgtk.py:401
+#: tortoisehg\hgtk\hgtk.py:407
 msgid "rename takes one or two path arguments"
 msgstr "rename takes one or two path arguments"
 
-#: tortoisehg\hgtk\hgtk.py:508
+#: tortoisehg\hgtk\hgtk.py:514
 msgid "mpatch error"
 msgstr "mpatch error"
 
-#: tortoisehg\hgtk\hgtk.py:511
+#: tortoisehg\hgtk\hgtk.py:517
 msgid "mpatch expects *.rej file argument\n"
 msgstr "mpatch expects *.rej file argument\n"
 
-#: tortoisehg\hgtk\hgtk.py:513 tortoisehg\hgtk\hgtk.py:520
+#: tortoisehg\hgtk\hgtk.py:519 tortoisehg\hgtk\hgtk.py:526
 msgid "%s does not exist\n"
 msgstr "%s does not exist\n"
 
-#: tortoisehg\hgtk\hgtk.py:539
+#: tortoisehg\hgtk\hgtk.py:546
 msgid "global options:"
 msgstr "global options:"
 
-#: tortoisehg\hgtk\hgtk.py:541
+#: tortoisehg\hgtk\hgtk.py:548
 msgid "use \"hgtk help\" for the full list of commands"
 msgstr "use \"hgtk help\" for the full list of commands"
 
-#: tortoisehg\hgtk\hgtk.py:545
+#: tortoisehg\hgtk\hgtk.py:552
 msgid ""
 "use \"hgtk help\" for the full list of commands or \"hgtk -v\" for details"
 msgstr ""
 "use \"hgtk help\" for the full list of commands or \"hgtk -v\" for details"
 
-#: tortoisehg\hgtk\hgtk.py:548
+#: tortoisehg\hgtk\hgtk.py:555
 msgid "use \"hgtk -v help%s\" to show aliases and global options"
 msgstr "use \"hgtk -v help%s\" to show aliases and global options"
 
-#: tortoisehg\hgtk\hgtk.py:551
+#: tortoisehg\hgtk\hgtk.py:558
 msgid "use \"hgtk -v help %s\" to show global options"
 msgstr "use \"hgtk -v help %s\" to show global options"
 
-#: tortoisehg\hgtk\hgtk.py:563 tortoisehg\hgtk\hgtk.py:670
+#: tortoisehg\hgtk\hgtk.py:570 tortoisehg\hgtk\hgtk.py:679
 msgid ""
 "list of commands:\n"
 "\n"
 "list of commands:\n"
 "\n"
 
-#: tortoisehg\hgtk\hgtk.py:571
+#: tortoisehg\hgtk\hgtk.py:578
 msgid ""
 "\n"
 "aliases: %s\n"
 "\n"
 "aliases: %s\n"
 
-#: tortoisehg\hgtk\hgtk.py:576 tortoisehg\hgtk\hgtk.py:639
+#: tortoisehg\hgtk\hgtk.py:583 tortoisehg\hgtk\hgtk.py:648
 msgid "(No help text available)"
 msgstr "(No help text available)"
 
-#: tortoisehg\hgtk\hgtk.py:584
+#: tortoisehg\hgtk\hgtk.py:591
 msgid "options:\n"
 msgstr "options:\n"
 
-#: tortoisehg\hgtk\hgtk.py:608
+#: tortoisehg\hgtk\hgtk.py:615
 msgid "(no help text available)"
 msgstr "(no help text available)"
 
-#: tortoisehg\hgtk\hgtk.py:613
+#: tortoisehg\hgtk\hgtk.py:620
 msgid "no commands defined\n"
 msgstr "no commands defined\n"
 
-#: tortoisehg\hgtk\hgtk.py:663
+#: tortoisehg\hgtk\hgtk.py:672
 msgid "Hgtk - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n"
 msgstr "Hgtk - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n"
 
-#: tortoisehg\hgtk\hgtk.py:668
+#: tortoisehg\hgtk\hgtk.py:677
 msgid ""
 "basic commands:\n"
 "\n"
 "basic commands:\n"
 "\n"
 
-#: tortoisehg\hgtk\hgtk.py:684
+#: tortoisehg\hgtk\hgtk.py:693
 msgid " (default: %s)"
 msgstr " (default: %s)"
 
-#: tortoisehg\hgtk\hgtk.py:697
+#: tortoisehg\hgtk\hgtk.py:710
 msgid "TortoiseHg Dialogs (version %s), Mercurial (version %s)\n"
 msgstr "TortoiseHg Dialogues (version %s), Mercurial (version %s)\n"
 
-#: tortoisehg\hgtk\hgtk.py:731
+#: tortoisehg\hgtk\hgtk.py:744
 msgid "repository root directory or symbolic path name"
 msgstr "repository root directory or symbolic path name"
 
-#: tortoisehg\hgtk\hgtk.py:732
+#: tortoisehg\hgtk\hgtk.py:745
 msgid "enable additional output"
 msgstr "enable additional output"
 
-#: tortoisehg\hgtk\hgtk.py:733
+#: tortoisehg\hgtk\hgtk.py:746
 msgid "suppress output"
 msgstr "suppress output"
 
-#: tortoisehg\hgtk\hgtk.py:734
+#: tortoisehg\hgtk\hgtk.py:747
 msgid "display help and exit"
 msgstr "display help and exit"
 
-#: tortoisehg\hgtk\hgtk.py:735
+#: tortoisehg\hgtk\hgtk.py:748
 msgid "start debugger"
 msgstr "start debugger"
 
-#: tortoisehg\hgtk\hgtk.py:736
+#: tortoisehg\hgtk\hgtk.py:749
 msgid "print command execution profile"
 msgstr "print command execution profile"
 
-#: tortoisehg\hgtk\hgtk.py:737
+#: tortoisehg\hgtk\hgtk.py:750
 msgid "do not fork GUI process"
 msgstr "do not fork GUI process"
 
-#: tortoisehg\hgtk\hgtk.py:738
+#: tortoisehg\hgtk\hgtk.py:751
 msgid "always fork GUI process"
 msgstr "always fork GUI process"
 
-#: tortoisehg\hgtk\hgtk.py:739
+#: tortoisehg\hgtk\hgtk.py:752
 msgid "read file list from file"
 msgstr "read file list from file"
 
-#: tortoisehg\hgtk\hgtk.py:743
+#: tortoisehg\hgtk\hgtk.py:756
 msgid "hgtk about"
 msgstr "hgtk about"