We are currently indexing your data, so search results may be incomplete until we finish.
merge with stable
by
Changes to 25 files · Browse files at 6f96bf534dc3 Showing diff from parent 43a71c9d707c e4941e0e6899 Diff from another changeset...
-
.hgtags
-
MANIFEST.in
-
contrib/win32/mercurial.iss
-
doc/ReadMe.txt
-
doc/source/commit.txt
-
doc/source/common.txt
-
doc/source/intro.txt
-
doc/source/preface.txt
-
doc/source/shelve.txt
-
i18n/tortoisehg-ca.po
-
i18n/tortoisehg-cs.po
-
i18n/tortoisehg-da.po
-
i18n/tortoisehg-de.po
-
i18n/tortoisehg-es.po
-
i18n/tortoisehg-fr.po
-
i18n/tortoisehg-it.po
-
i18n/tortoisehg-ja.po
-
i18n/tortoisehg-nl.po
-
i18n/tortoisehg-pl.po
-
i18n/tortoisehg-pt.po
-
i18n/tortoisehg-pt_BR.po
-
i18n/tortoisehg-ru.po
-
i18n/tortoisehg-zh_CN.po
-
i18n/tortoisehg-zh_TW.po
-
setup.py
|
@@ -21,3 +21,4 @@ a88261eec1f43d37786bfdb492322bddd94dcf8d 0.7.5
525469f83de5473ab3d00fd5111ee91020251e62 0.7.6
ecf6fc1b0c9fd11e8ffe314c68ee75752371ac5f 0.8
+f515725f8f30e70571a6b39c648b8fdf1ee51132 0.8.1
|
||
|
@@ -3,3 +3,4 @@ include contrib/nautilus-thg.py
include COPYING.txt ReleaseNotes.txt
recursive-include i18n *.po
+recursive-include doc *
|
||
|
@@ -4,7 +4,7 @@ [Setup]
AppCopyright=Copyright 2005-2009 Matt Mackall and others
AppName=TortoiseHg
-AppVerName=TortoiseHg-0.8
+AppVerName=TortoiseHg-0.8.1
InfoAfterFile=contrib/win32/postinstall.txt
LicenseFile=COPYING.txt
ShowLanguageDialog=yes
@@ -13,9 +13,9 @@AppSupportURL=http://bitbucket.org/tortoisehg/stable/
AppUpdatesURL=http://bitbucket.org/tortoisehg/stable/
AppID=TortoiseHg
-AppContact=teekaysoh@gmail.com
+AppContact=Steve Borho <steve@borho.org>
AppMutex=thgtaskbar,Global\thgtaskbar
-OutputBaseFilename=TortoiseHg-0.8
+OutputBaseFilename=TortoiseHg-0.8.1
DefaultDirName={pf}\TortoiseHg
SourceDir=..\..
VersionInfoDescription=Mercurial distributed SCM
@@ -53,6 +53,8 @@Source: dist\*.dll; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete
Source: dist\library.zip; DestDir: {app}
Source: doc\*.html; DestDir: {app}\docs
+Source: doc\*.pdf; DestDir: {app}\docs
+Source: doc\*.chm; DestDir: {app}\docs
Source: icons\*; DestDir: {app}\icons; Flags: ignoreversion recursesubdirs createallsubdirs
Source: dist\gtk\*; DestDir: {app}\gtk; Flags: ignoreversion recursesubdirs createallsubdirs
Source: templates\*.*; DestDir: {app}\templates; Flags: recursesubdirs createallsubdirs
@@ -61,8 +63,7 @@Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt
Source: COPYING.txt; DestDir: {app}; DestName: Copying.txt
Source: ..\icons\hgicon.ico; DestDir: {app}
-;Source: ..\contrib\vcredist_x86.exe; DestDir: {tmp}; Check: ShouldInstallVCPPSP1 and not Is64BitInstallMode
-;Source: ..\contrib\vcredist_x64.exe; DestDir: {tmp}; Check: ShouldInstallVCPPSP1 and Is64BitInstallMode
+Source: ..\files\hgbook.pdf; DestDir: {app}/docs
Source: ..\files\THgShellx86.dll; DestDir: {app}; DestName: ThgShell.dll; Check: not Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete
Source: ..\files\ThgShellx64.dll; DestDir: {app}; DestName: ThgShell.dll; Check: Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete
@@ -72,9 +73,13 @@Filename: {app}\TortoiseHg.url; Section: InternetShortcut; Key: URL; String: http://bitbucket.org/tortoisehg/stable/
[Icons]
+Name: {group}\TortoiseHg Book (chm); Filename: {app}\docs\TortoiseHg.chm
+Name: {group}\TortoiseHg Book (pdf); Filename: {app}\docs\TortoiseHg.pdf
Name: {group}\TortoiseHg Web Site; Filename: {app}\TortoiseHg.url
+Name: {group}\Mercurial Book; Filename: {app}\docs\hgbook.pdf
+Name: {group}\Mercurial Command Reference; Filename: {app}\docs\hg.1.html
+Name: {group}\Mercurial Config Reference; Filename: {app}\docs\hgrc.5.html
Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url
-Name: {group}\Mercurial Command Reference; Filename: {app}\docs\hg.1.html
Name: {group}\Uninstall TortoiseHg; Filename: {uninstallexe}
[Run]
|
||
|
@@ -2,7 +2,7 @@
To build this documentation you need sphinx installed. On Ubuntu this
is the python-sphinx package. On Windows your best bet is
-easy_install.
+easy_install. To build without warnings, you need sphinx 0.6 or later.
To build PDF files you need latex packages. On Ubuntu this is
texlive-latex-extra and all of it's dependencies. On Windows the best
|
||
|
@@ -134,13 +134,13 @@
For files which are not partially selected, the commit operation avoids
the entire *backup, revert, patch, commit, recover* round trip and
-simply commits those files in place.
+commits those files in place.
This longer answer is only interesting when something goes wrong, which
on Windows unfortunately has a probability greater than 0. If some
program (virus checker, compiler) locks your file in the middle of this
process you may see an error about a failed patch. These errors are
-recoverable, simply delete any new :file:`.rej` files and try the commit again.
+recoverable. Delete any new :file:`.rej` files and try the commit again.
@@ -275,7 +275,7 @@* Support for two-parent state (merging) has been improved, especially
the file context menus.
* There is now a limit on the size of files that will be diffed by the commit
- and changelog tools. Files above this size will simply show a message
+ and changelog tools. Files above this size will only show a message
indicating why the file was not diffed. This limit (default: 1MB) is
configurable (per-repository if necessary) via the settings dialog
:menuselection:`TortoiseHg --> Max Diff Size`.
@@ -295,11 +295,10 @@read the rest of this page to understand how the native tool now measures up.
The default layout of the native commit tool is different than Qct. The
-file list is on the left side of the diff panel. This layout is actually
-configurable if you prefer the Qct layout, simply set the
-:menuselection:`Commit --> Bottom Diffs` configuration item to :guilabel:`True`
-in the TortoiseHg settings dialog. This change will take affect the next time
-you start the commit tool.
+file list is on the left side of the diff panel. If you prefer the Qct
+layout, set the :menuselection:`Commit --> Bottom Diffs` configuration
+item to :guilabel:`True` in the TortoiseHg settings dialog. This change
+will take affect the next time you start the commit tool.
Also different in the native commit tool is that all the diffs in the
working directory are shown in the diff panel at startup. Selecting
|
||
|
@@ -5,22 +5,33 @@ .. module:: common.dialog
:synopsis: Common features to all the dialog
-These features are commonly available in many TortoiseHg tools, so we
-document them here just once.
+These features are common to many TortoiseHg tools, so we document them
+here just once.
+
+Translations
+============
+
+The TortoiseHg tools use Python's
+`gettext <http://docs.python.org/library/gettext.html>`_ library to
+localize their text. To get localized dialogs, it is recommended that
+you set the LANGUAGE environment variable to your locale of choice.
+
+The Windows shell extension context menus get their translations from
+the Windows registry. Translations for many locales are available from
+the TortoiseHG `wiki <http://bitbucket.org/tortoisehg/stable/wiki/install>`_.
Geometry Restore
================
-Our primary applications like commit, changelog, and datamine, will
+Our primary applications like commit, changelog, and datamine will
restore their geometry and position from the last time they were run.
-This includes maximization.
+This includes maximization status.
If the state to be restored does not fit within your current screen
dimensions, the application will revert to factory default dimensions.
-The TortoiseHg dialogs which are more transitory in nature (clone, init,
-synch, update, merge) simply allow the window manager to place them
-where it wishes.
+The TortoiseHg dialogs which are more transitory in nature allow the
+window manager to place them where it wishes.
Keyboard Accelerators
=====================
@@ -58,8 +69,8 @@4) Provides feedback when no files were modified
If you prefer the previous (<=0.7) behavior of directly launching your
-visual diff tool, then you can recover that behavior via the user
-settings dialog and :menuselection:`TortoiseHg --> Skip Diff Window`.
+visual diff tool, you can recover that behavior via the user settings
+dialog and :menuselection:`TortoiseHg --> Skip Diff Window`.
Treeview searches
=================
@@ -70,24 +81,24 @@annotate pane in the datamine tool is a treeview.
Most of the TortoiseHg treeviews (as of release 0.8) are configured for
-live searches. You simply ensure that the treeview has focus (by
-clicking on a row), then begin typing. A small entry window will appear
-with the text you have typed and the treeview will immediately jump to
-the first row that matches the text you have entered thus far. As you
-enter more keys, it refines it's search.
+live searches. Ensure that the treeview has focus (by clicking on a
+row), and begin typing a search phrase. A small entry window will appear
+containing the text you have typed, and the treeview will immediately
+jump to the first row that matches the text you have entered thus far.
+As you enter more characters, the search is refined.
-* :kbd:`CTRL-F` will bring up the search window explicitly
-* :kbd:`CTRL-G` will advance the search to the next match,
-* :kbd:`SHIFT-CTRL-G` goes backwards
+* :kbd:`CTRL-F` opens the search window explicitly
+* :kbd:`CTRL-G` advances the search to the next match
+* :kbd:`SHIFT-CTRL-G` searches backwards
* The mouse scroll wheel will advance forwards and backwards through matching lines
HG command dialog
=================
-Many TortoiseHg tools use the *hgcmd* dialog to run Mercurial commands
-that could potentially be interactive. In release 0.8, this dialog was
-changed to draw all error messages in a dark red color to give it more
-contrast with normal output messages.
+Many TortoiseHg tools use the *hgcmd* dialog to execute Mercurial
+commands that could potentially be interactive. In release 0.8, this
+dialog was changed to draw all error messages in a dark red color to
+give it more contrast with normal output messages.
The window also properly focuses its :guilabel:`close` button when the
command has completed, so a simple :kbd:`Enter` is that that is required
|
||
|
@@ -5,4 +5,22 @@ .. module:: introduction
:synopsis: Introduce TortoiseHg and its various parts
-TortoiseHg is...
+TortoiseHg is a set of graphical tools and a shell extension for the
+`Mercurial <http://www.selenic.com/mercurial>`_ distributed revision control
+system.
+
+On Windows,
+ TortoiseHg consists of a shell extension, which provides overlay
+ icons and context menus in your file explorer, and a command line
+ program named hgtk.exe which can launch the TortoiseHg tools.
+ Binary packages of TortoiseHg for Windows come with Mercurial and a
+ merge tool and are thus completely ready for use "Out of the Box".
+
+On Linux,
+ TortoiseHg consists of a command line hgtk script, and a Nautilus
+ extension which provides overlays and context menus in your file
+ explorer.
+
+TortoiseHg is primarily written in Python and PyGtk (the Windows shell
+extension being a noticeable exception). The hgtk script can be used
+on any platform that supports PyGtk, including Mac OS X.
|
||
|
@@ -8,39 +8,53 @@ Audience
========
-This book is written for computer literate folk who want to use Mercurial to manage their data, but are
-uncomfortable using the command line client to do so. Since TortoiseHG is a windows shell extension
-it's assumed that the user is familiar with the windows explorer and knows how to use it.
-TortoiseHG comes with a simple python application, hgtk, which allows you to launch the TortoiseHg dialogs
-on any platform that supports Mercurial, and PyGtk. This is the easiest way to start using TortoiseHg on Linux
-and Mac OS X.
+This book is written for computer literate folk who want to use
+Mercurial to manage their data, but are uncomfortable using the command
+line client to do so. Since TortoiseHG is a windows shell extension it's
+assumed that the user is familiar with the windows explorer and knows
+how to use it. TortoiseHG comes with a simple python application, hgtk,
+which allows you to launch the TortoiseHg dialogs on any platform that
+supports Mercurial, and PyGtk. This is the easiest way to start using
+TortoiseHg on Linux and Mac OS X.
Reading guide
=============
-This Preface explains a little about the TortoiseHG project, the community of people who work on it,
-and the licensing conditions for using it and distributing it.
+This Preface explains a little about the TortoiseHG project, the
+community of people who work on it, and the licensing conditions for
+using it and distributing it.
-The :doc:`intro`, explains what TortoiseHG is, what it does, where it comes from and the
-basics for installing it on your PC.
+The :doc:`intro`, explains what TortoiseHG is, what it does, where it
+comes from and the basics for installing it on your PC.
-The Chapter 2 and others. TODO when the structure of the manual is enough stable.
+The remaining chapters describe the tools that are part of TortoiseHg.
TortoiseHG is free!
===================
-TODO
+TortoiseHg is released under
+`GPLv2 <http://www.gnu.org/licenses/gpl-2.0.html>`_. You are free to
+install it on as many computers as you like, and to redistribute it
+according to the GPLv2 license.
Community
=========
-TODO
+Mailing Lists:
+
+* `Users <https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss>`_
+* `Developers <https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop>`_
+
+Our `wiki <http://bitbucket.org/tortoisehg/stable>`_ is on BitBucket.
Acknowledgement
===============
-TODO
+Thanks to the many people who contribute to the TortoiseHg project. It
+take a community of developers, translators, and users to build a
+truly useful tool. Especially users who care enough to report bugs and
+file feature requests.
Conventions used in this manual
===============================
@@ -54,19 +68,21 @@ Indicates a label, button or anything that appears in user interfaces.
:menuselection:`TortoiseHG... --> About`
- Indicates a menu choice, or a combination of menu choice, tab selection and GUI label.
- For example :menuselection:`TortoiseHG... --> Global settings --> Commit --> User name`
- means do something in :guilabel:`User name` label under :guilabel:`Commit` tab selectable from the
- menu choice :menuselection:`TortoiseHG... --> Global settings`.
+ Indicates a menu choice, or a combination of menu choice, tab
+ selection and GUI label. For example
+ :menuselection:`TortoiseHG... --> Global settings --> Commit --> User name`
+ means do something in :guilabel:`User name` label under
+ :guilabel:`Commit` tab selectable from the menu choice
+ :menuselection:`TortoiseHG... --> Global settings`.
:file:`.hg/hgrc`
Indicates a filename or directory name.
:command:`hgtk log`
- Indicates a command to digit in command window.
+ Indicates a command to enter into command window.
.. note::
This is a note.
.. warning::
- An important note. Pay attention.
\ No newline at end of file+ An important note. Pay attention.
|
||
|
@@ -64,7 +64,7 @@ When the unshelve button is pressed, the shelved changes are reapplied
to the working directory.
-How is this different than record/commit?
+How is this different from record/commit?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Shelved changes are physically removed from the working directory until
@@ -82,7 +82,7 @@can be cleanly reapplied later if the shelved changes conflict with
changes made to your code after the shelving.
-How is this different than MQ?
+How is this different from MQ?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
A shelf is, in effect, a single unnamed MQ patch that is never converted
@@ -90,7 +90,7 @@maintaining a patch queue, since it can hold changes from one patch and
re-apply them to another patch (or an entirely new patch).
-How is this different than attic?
+How is this different from attic?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The attic extension is a super-set of the shelve feature. In particular,
|
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
|
@@ -7,21 +7,21 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-06-28 05:54+0000\n"
+"POT-Creation-Date: 2009-07-11 05:54+0000\n"
"PO-Revision-Date: 2009-02-27 11:13+0000\n"
"Last-Translator: Martin Kolařík <Unknown>\n"
"Language-Team: Czech <cs@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-01 19:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-23 20:28+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: hggtk\changeset.py:147
+#: hggtk\changeset.py:151
msgid "changeset:"
msgstr "sada změny:"
-#: hggtk\hgignore.py:122
+#: hggtk\hgignore.py:124
msgid "Refresh"
msgstr "Obnovit"
@@ -33,23 +33,19 @@msgid " and "
msgstr " a "
-#: hggtk\hgshelve.py:525 hggtk\hgshelve.py:576
+#: hggtk\hgshelve.py:520 hggtk\hgshelve.py:571
msgid "restoring %r to %r\n"
msgstr "%r se obnovuje do %r\n"
-#: hggtk\hgshelve.py:603
+#: hggtk\hgshelve.py:598
msgid "hg shelve [OPTION]... [FILE]..."
msgstr "hg shelve [OPTION]... [FILE]..."
-#: hggtk\hgshelve.py:610
+#: hggtk\hgshelve.py:605
msgid "hg unshelve [OPTION]... [FILE]..."
msgstr "hg unshelve [OPTION]... [FILE]..."
-#: hggtk\hgthread.py:78
-msgid "unrecognized response\n"
-msgstr "nerozeznaná odpověď\n"
-
-#: hggtk\hgthread.py:80 hggtk\hgthread.py:87
+#: hggtk\hgthread.py:68 hggtk\hgthread.py:80 hggtk\hgthread.py:87
msgid "response expected"
msgstr "očekávána odpověď"
@@ -57,15 +53,15 @@msgid "password: "
msgstr "heslo: "
-#: hggtk\hgtk.py:196 thgutil\hglib.py:305
+#: hggtk\hgtk.py:230
msgid "There is no Mercurial repository here (.hg not found)"
msgstr "Soubor .hg nebyl nalezen, složka není Mercurial repozitář"
-#: hggtk\hgtk.py:206 thgutil\hglib.py:325
+#: hggtk\hgtk.py:240
msgid "invalid arguments"
msgstr "neplatné parametry"
-#: hggtk\hgtk.py:602
+#: hggtk\hgtk.py:636
msgid "limit number of changes displayed"
msgstr "omezit počet zobrazených změn"
@@ -73,23 +69,23 @@msgid "Synchronize"
msgstr "Synchronizovat"
-#: hggtk\serve.py:346
+#: hggtk\serve.py:345
msgid "port to use (default: 8000)"
msgstr "použít port (výchozí: 8000)"
-#: hggtk\serve.py:347
+#: hggtk\serve.py:346
msgid "address to use"
msgstr "použít adresu"
-#: hggtk\serve.py:357
+#: hggtk\serve.py:356
msgid "use IPv6 in addition to IPv4"
msgstr "mimo IPv4 použít také IPv6"
-#: hggtk\serve.py:358
+#: hggtk\serve.py:357
msgid "SSL certificate file"
msgstr "soubor se SSL certifikátem"
-#: hggtk\serve.py:359
+#: hggtk\serve.py:358
msgid "hg serve [OPTION]..."
msgstr "hg serve [OPTION]..."
@@ -113,14 +109,6 @@msgid "About"
msgstr "O programu"
-#: thgutil\hglib.py:261
-msgid "extension '%s' overrides commands: %s\n"
-msgstr "rozšíření '%s' přepíše příkazy: %s\n"
-
-#: thgutil\hglib.py:301
-msgid "repository '%s' is not local"
-msgstr "repozitář '%s' není místní"
-
#: thgutil\menuthg.py:168 thgutil\menuthg.py:303
msgid "Create Clone"
msgstr "Vytvořit klon"
@@ -173,6 +161,18 @@msgid "Several icons are courtesy of the TortoiseSVN project"
msgstr ""
+#: hggtk\about.py:56
+msgid "(version %s)"
+msgstr ""
+
+#: hggtk\about.py:59
+msgid "Copyright 2009 TK Soh and others"
+msgstr ""
+
+#: hggtk\about.py:75
+msgid "with %s"
+msgstr ""
+
#: hggtk\backout.py:24
msgid "Backout changeset - "
msgstr ""
@@ -195,7 +195,7 @@"change being backed out."
msgstr ""
-#: hggtk\backout.py:73 hggtk\bugreport.py:43 hggtk\hgcmd.py:41
+#: hggtk\backout.py:73 hggtk\bugreport.py:43 hggtk\hgcmd.py:46
#: hggtk\hginit.py:84 hggtk\merge.py:72 hggtk\taskbarui.py:32
#: hggtk\update.py:70
msgid "Close"
@@ -239,91 +239,91 @@"http://bitbucket.org/tortoisehg/stable/issues\n"
msgstr ""
-#: hggtk\changeset.py:39
+#: hggtk\changeset.py:43
msgid "_Other parent"
msgstr ""
-#: hggtk\changeset.py:40
+#: hggtk\changeset.py:44
msgid "diff other parent"
msgstr ""
-#: hggtk\changeset.py:104
+#: hggtk\changeset.py:108
msgid "[All Files]"
msgstr ""
-#: hggtk\changeset.py:149
+#: hggtk\changeset.py:153
msgid "branch:"
msgstr ""
-#: hggtk\changeset.py:150
+#: hggtk\changeset.py:154
msgid "user/date:"
msgstr ""
-#: hggtk\changeset.py:158
+#: hggtk\changeset.py:168
msgid "parent:"
msgstr ""
-#: hggtk\changeset.py:171
+#: hggtk\changeset.py:188
msgid "child:"
msgstr ""
-#: hggtk\changeset.py:177
+#: hggtk\changeset.py:194
msgid "tags:"
msgstr ""
-#: hggtk\changeset.py:197
+#: hggtk\changeset.py:214
msgid " %s is larger than the specified max diff size"
msgstr ""
-#: hggtk\changeset.py:292
+#: hggtk\changeset.py:309
msgid "_visual diff"
msgstr ""
-#: hggtk\changeset.py:293
+#: hggtk\changeset.py:310
msgid "diff to _local"
msgstr ""
-#: hggtk\changeset.py:294
+#: hggtk\changeset.py:311
msgid "_view at revision"
msgstr ""
-#: hggtk\changeset.py:295
+#: hggtk\changeset.py:312
msgid "_save at revision"
msgstr ""
-#: hggtk\changeset.py:297 hggtk\datamine.py:117
+#: hggtk\changeset.py:314 hggtk\datamine.py:118
msgid "_file history"
msgstr ""
-#: hggtk\changeset.py:298 hggtk\datamine.py:116
+#: hggtk\changeset.py:315 hggtk\datamine.py:117
msgid "_annotate file"
msgstr ""
-#: hggtk\changeset.py:300
+#: hggtk\changeset.py:317
msgid "_revert file contents"
msgstr ""
-#: hggtk\changeset.py:358
+#: hggtk\changeset.py:375
msgid "Stat"
msgstr ""
-#: hggtk\changeset.py:360 hggtk\hgignore.py:109
+#: hggtk\changeset.py:377 hggtk\hgignore.py:111
msgid "Files"
msgstr ""
-#: hggtk\changeset.py:482
+#: hggtk\changeset.py:507
msgid "Save file to"
msgstr ""
-#: hggtk\changeset.py:547
+#: hggtk\changeset.py:572
msgid "Confirm revert file to old revision"
msgstr ""
-#: hggtk\changeset.py:548
+#: hggtk\changeset.py:573
msgid "Revert %s to contents at revision %d?"
msgstr ""
-#: hggtk\changeset.py:560 hggtk\synch.py:635
+#: hggtk\changeset.py:585 hggtk\synch.py:667
msgid "Toggle _Wordwrap"
msgstr ""
@@ -359,7 +359,7 @@msgid "use uncompressed transfer"
msgstr ""
-#: hggtk\clone.py:130 hggtk\synch.py:149
+#: hggtk\clone.py:130 hggtk\synch.py:150
msgid "use proxy server"
msgstr ""
@@ -407,411 +407,423 @@msgid "Clone error"
msgstr ""
-#: hggtk\commit.py:33
+#: hggtk\commit.py:34
msgid "Branch Operations"
msgstr ""
-#: hggtk\commit.py:37
+#: hggtk\commit.py:38
msgid "Changes take effect on next commit"
msgstr ""
-#: hggtk\commit.py:38
+#: hggtk\commit.py:39
msgid "No branch changes"
msgstr ""
-#: hggtk\commit.py:40
+#: hggtk\commit.py:41
msgid "Open a new named branch"
msgstr ""
-#: hggtk\commit.py:42
+#: hggtk\commit.py:43
msgid "Close current named branch"
msgstr ""
-#: hggtk\commit.py:154
+#: hggtk\commit.py:164
msgid "_Undo"
msgstr ""
-#: hggtk\commit.py:155
+#: hggtk\commit.py:165
msgid "undo recent commit"
msgstr ""
-#: hggtk\commit.py:156 hggtk\commit.py:364 hggtk\commit.py:373
-#: hggtk\commit.py:381 hggtk\commit.py:382
+#: hggtk\commit.py:166 hggtk\commit.py:374 hggtk\commit.py:383
+#: hggtk\commit.py:391 hggtk\commit.py:392
msgid "_Commit"
msgstr ""
-#: hggtk\commit.py:157 hggtk\commit.py:383
+#: hggtk\commit.py:167 hggtk\commit.py:393
msgid "commit"
msgstr ""
-#: hggtk\commit.py:169
+#: hggtk\commit.py:179
msgid "Confirm Discard Message"
msgstr ""
-#: hggtk\commit.py:170
+#: hggtk\commit.py:180
msgid "Discard current commit message?"
msgstr ""
-#: hggtk\commit.py:230
+#: hggtk\commit.py:240
msgid "Recent Commit Messages..."
msgstr ""
-#: hggtk\commit.py:269 hggtk\commit.py:270 hggtk\commit.py:271
-#: hggtk\commit.py:274
+#: hggtk\commit.py:279 hggtk\commit.py:280 hggtk\commit.py:281
+#: hggtk\commit.py:284
msgid "_commit"
msgstr ""
-#: hggtk\commit.py:292
+#: hggtk\commit.py:302
msgid "Confirm Exit"
msgstr ""
-#: hggtk\commit.py:293
+#: hggtk\commit.py:303
msgid "Save commit message at exit?"
msgstr ""
-#: hggtk\commit.py:320
+#: hggtk\commit.py:330
msgid "new branch: "
msgstr ""
-#: hggtk\commit.py:322
+#: hggtk\commit.py:332
msgid "close branch: "
msgstr ""
-#: hggtk\commit.py:324
+#: hggtk\commit.py:334
msgid "branch: "
msgstr ""
-#: hggtk\commit.py:334 hggtk\status.py:204
+#: hggtk\commit.py:344 hggtk\status.py:204
msgid "Re_vert"
msgstr ""
-#: hggtk\commit.py:335 hggtk\status.py:206 hggtk\thgconfig.py:744
+#: hggtk\commit.py:345 hggtk\status.py:206 hggtk\thgconfig.py:748
msgid "_Add"
msgstr ""
-#: hggtk\commit.py:336 hggtk\status.py:211 hggtk\thgconfig.py:754
+#: hggtk\commit.py:346 hggtk\status.py:211 hggtk\thgconfig.py:758
msgid "_Remove"
msgstr ""
-#: hggtk\commit.py:337 hggtk\status.py:208
+#: hggtk\commit.py:347 hggtk\status.py:208
msgid "Move"
msgstr ""
-#: hggtk\commit.py:348
+#: hggtk\commit.py:358
msgid "merge"
msgstr ""
-#: hggtk\commit.py:366 hggtk\commit.py:367 hggtk\commit.py:374
-#: hggtk\commit.py:375
+#: hggtk\commit.py:376 hggtk\commit.py:377 hggtk\commit.py:384
+#: hggtk\commit.py:385
msgid "QNew"
msgstr ""
-#: hggtk\commit.py:370 hggtk\commit.py:371
+#: hggtk\commit.py:380 hggtk\commit.py:381
msgid "QRefresh"
msgstr ""
-#: hggtk\commit.py:406 hggtk\commit.py:561
+#: hggtk\commit.py:416 hggtk\commit.py:566
msgid "Nothing Commited"
msgstr ""
-#: hggtk\commit.py:407
+#: hggtk\commit.py:417
msgid "No committable files selected"
msgstr ""
-#: hggtk\commit.py:424 hggtk\commit.py:479 hggtk\merge.py:83
-#: hggtk\thgconfig.py:465
+#: hggtk\commit.py:434 hggtk\commit.py:484 hggtk\merge.py:83
+#: hggtk\thgconfig.py:467
msgid "Commit"
msgstr ""
-#: hggtk\commit.py:425
+#: hggtk\commit.py:435
msgid "Unable to create "
msgstr ""
-#: hggtk\commit.py:480
+#: hggtk\commit.py:485
msgid "Unable to apply patch"
msgstr ""
-#: hggtk\commit.py:518
+#: hggtk\commit.py:523
msgid "Confirm Undo commit"
msgstr ""
-#: hggtk\commit.py:519
+#: hggtk\commit.py:524
msgid "Undo last commit"
msgstr ""
-#: hggtk\commit.py:525 hggtk\commit.py:540
+#: hggtk\commit.py:530 hggtk\commit.py:545
msgid "Undo commit"
msgstr ""
-#: hggtk\commit.py:526
+#: hggtk\commit.py:531
msgid ""
"Unable to undo!\n"
"\n"
"Tip revision differs from last commit."
msgstr ""
-#: hggtk\commit.py:541
+#: hggtk\commit.py:546
msgid "Errors during rollback!"
msgstr ""
-#: hggtk\commit.py:548
+#: hggtk\commit.py:553
msgid "Confirm Add/Remove"
msgstr ""
-#: hggtk\commit.py:549
+#: hggtk\commit.py:554
msgid "Add/Remove the following files?"
msgstr ""
-#: hggtk\commit.py:562 hggtk\tagadd.py:174
+#: hggtk\commit.py:567 hggtk\tagadd.py:174
msgid "Please enter commit message"
msgstr ""
-#: hggtk\commit.py:570
+#: hggtk\commit.py:575
msgid "Error"
msgstr ""
-#: hggtk\commit.py:571
+#: hggtk\commit.py:576
msgid "Message format configuration error"
msgstr ""
-#: hggtk\commit.py:580 hggtk\commit.py:588 hggtk\commit.py:600
+#: hggtk\commit.py:585 hggtk\commit.py:593 hggtk\commit.py:605
msgid "Confirm Commit"
msgstr ""
-#: hggtk\commit.py:581
+#: hggtk\commit.py:586
msgid ""
"The summary line length of %i is greater than %i.\n"
"\n"
"Ignore format policy and continue commit?"
msgstr ""
-#: hggtk\commit.py:589
+#: hggtk\commit.py:594
msgid ""
"The summary line is not followed by a blank line.\n"
"\n"
"Ignore format policy and continue commit?"
msgstr ""
-#: hggtk\commit.py:601
+#: hggtk\commit.py:606
msgid ""
"The following lines are over the %i-character limit: %s.\n"
"\n"
"Ignore format policy and continue commit?"
msgstr ""
-#: hggtk\commit.py:615
+#: hggtk\commit.py:620
msgid "Commit: Invalid username"
msgstr ""
-#: hggtk\commit.py:616
+#: hggtk\commit.py:621
msgid ""
"Your username has not been configured.\n"
"\n"
"Please configure your username and try again"
msgstr ""
-#: hggtk\commit.py:638
+#: hggtk\commit.py:643
msgid "Confirm Override Branch"
msgstr ""
-#: hggtk\commit.py:639
+#: hggtk\commit.py:644
msgid ""
"A branch named \"%s\" already exists,\n"
"override?"
msgstr ""
-#: hggtk\commit.py:644
+#: hggtk\commit.py:649
msgid "Confirm New Branch"
msgstr ""
-#: hggtk\commit.py:645
+#: hggtk\commit.py:650
msgid "Create new named branch \"%s\"?"
msgstr ""
-#: hggtk\commit.py:715
+#: hggtk\commit.py:720
msgid "Paste _Filenames"
msgstr ""
-#: hggtk\commit.py:716
+#: hggtk\commit.py:721
msgid "App_ly Format"
msgstr ""
-#: hggtk\commit.py:717
+#: hggtk\commit.py:722
msgid "C_onfigure Format"
msgstr ""
-#: hggtk\commit.py:743 hggtk\hgemail.py:307 hggtk\hgemail.py:312
+#: hggtk\commit.py:748 hggtk\hgemail.py:307 hggtk\hgemail.py:312
#: hggtk\hgemail.py:321
msgid "Info required"
msgstr ""
-#: hggtk\commit.py:744
+#: hggtk\commit.py:749
msgid "Message format needs to be configured"
msgstr ""
-#: hggtk\commit.py:756 hggtk\commit.py:761
+#: hggtk\commit.py:761 hggtk\commit.py:766
msgid "Warning"
msgstr ""
-#: hggtk\commit.py:757
+#: hggtk\commit.py:762
msgid "The summary line length of %i is greater than %i"
msgstr ""
-#: hggtk\commit.py:762
+#: hggtk\commit.py:767
msgid "The summary line is not followed by a blank line"
msgstr ""
-#: hggtk\datamine.py:35
+#: hggtk\datamine.py:36
msgid "DataMining"
msgstr ""
-#: hggtk\datamine.py:44 hggtk\hgcmd.py:37 hggtk\recovery.py:43
-#: hggtk\serve.py:61 hggtk\synch.py:60
+#: hggtk\datamine.py:45 hggtk\hgcmd.py:42 hggtk\recovery.py:43
+#: hggtk\serve.py:61 hggtk\synch.py:61
msgid "Stop"
msgstr ""
-#: hggtk\datamine.py:46
+#: hggtk\datamine.py:47
msgid "Stop operation on current tab"
msgstr ""
-#: hggtk\datamine.py:48
+#: hggtk\datamine.py:49
msgid "New Search"
msgstr ""
-#: hggtk\datamine.py:50
+#: hggtk\datamine.py:51
msgid "Open new search tab"
msgstr ""
-#: hggtk\datamine.py:61 hggtk\thgconfig.py:947
+#: hggtk\datamine.py:62 hggtk\thgconfig.py:952
msgid "Invalid path"
msgstr ""
-#: hggtk\datamine.py:62
+#: hggtk\datamine.py:63
msgid "Cannot annotate directory: %s"
msgstr ""
-#: hggtk\datamine.py:104
+#: hggtk\datamine.py:105
msgid "Filename"
msgstr ""
-#: hggtk\datamine.py:107 hggtk\datamine.py:525 hggtk\logview\treeview.py:423
-#: hggtk\thgconfig.py:160 hggtk\thgconfig.py:233
+#: hggtk\datamine.py:108 hggtk\datamine.py:543 hggtk\logview\treeview.py:424
+#: hggtk\thgconfig.py:162 hggtk\thgconfig.py:235
msgid "User"
msgstr ""
-#: hggtk\datamine.py:115 hggtk\datamine.py:124 hggtk\history.py:391
+#: hggtk\datamine.py:116 hggtk\datamine.py:125 hggtk\history.py:391
msgid "di_splay change"
msgstr ""
-#: hggtk\datamine.py:123
+#: hggtk\datamine.py:124
msgid "_zoom to change"
msgstr ""
-#: hggtk\datamine.py:125
+#: hggtk\datamine.py:126
msgid "_annotate parent"
msgstr ""
-#: hggtk\datamine.py:216
+#: hggtk\datamine.py:217
msgid "Search"
msgstr ""
-#: hggtk\datamine.py:217 hggtk\hgignore.py:49
+#: hggtk\datamine.py:218 hggtk\hgignore.py:51
msgid "Regexp:"
msgstr ""
-#: hggtk\datamine.py:219
+#: hggtk\datamine.py:220
msgid "Includes:"
msgstr ""
-#: hggtk\datamine.py:221
+#: hggtk\datamine.py:222
msgid "Excludes:"
msgstr ""
-#: hggtk\datamine.py:224
+#: hggtk\datamine.py:225
msgid "Start this search"
msgstr ""
-#: hggtk\datamine.py:225
+#: hggtk\datamine.py:226
msgid "Regular expression search pattern"
msgstr ""
-#: hggtk\datamine.py:226
+#: hggtk\datamine.py:227
msgid ""
"Comma separated list of inclusion patterns. By default, the entire "
"repository is searched."
msgstr ""
-#: hggtk\datamine.py:229
+#: hggtk\datamine.py:230
msgid ""
"Comma separated list of exclusion patterns. Exclusion patterns are applied "
"after inclusion patterns."
msgstr ""
-#: hggtk\datamine.py:235
+#: hggtk\datamine.py:236
msgid "Follow copies and renames"
msgstr ""
-#: hggtk\datamine.py:236
+#: hggtk\datamine.py:237
msgid "Ignore case"
msgstr ""
-#: hggtk\datamine.py:237
+#: hggtk\datamine.py:238
msgid "Show line numbers"
msgstr ""
-#: hggtk\datamine.py:238
+#: hggtk\datamine.py:239
msgid "Show all matching revisions"
msgstr ""
-#: hggtk\datamine.py:266 hggtk\datamine.py:523 hggtk\logview\treeview.py:372
+#: hggtk\datamine.py:267 hggtk\datamine.py:541 hggtk\logview\treeview.py:373
msgid "Rev"
msgstr ""
-#: hggtk\datamine.py:267 hggtk\datamine.py:524
+#: hggtk\datamine.py:268 hggtk\datamine.py:542
msgid "File"
msgstr ""
-#: hggtk\datamine.py:268
+#: hggtk\datamine.py:269
msgid "Matches"
msgstr ""
-#: hggtk\datamine.py:290
+#: hggtk\datamine.py:291
msgid "Search %d"
msgstr ""
-#: hggtk\datamine.py:332
+#: hggtk\datamine.py:333
msgid "No regular expression given"
msgstr ""
-#: hggtk\datamine.py:333
+#: hggtk\datamine.py:334
msgid "You must provide a search expression"
msgstr ""
-#: hggtk\datamine.py:361
+#: hggtk\datamine.py:340
+msgid "Invalid regular expression"
+msgstr ""
+
+#: hggtk\datamine.py:341
+msgid "Error: %s"
+msgstr ""
+
+#: hggtk\datamine.py:363
+msgid "Abort: %s"
+msgstr ""
+
+#: hggtk\datamine.py:376
msgid "Search \"%s\""
msgstr ""
-#: hggtk\datamine.py:473
+#: hggtk\datamine.py:491
msgid "File is unrevisioned"
msgstr ""
-#: hggtk\datamine.py:474
+#: hggtk\datamine.py:492
msgid "Unable to annotate "
msgstr ""
-#: hggtk\datamine.py:494
+#: hggtk\datamine.py:512
msgid "Follow"
msgstr ""
-#: hggtk\datamine.py:522
+#: hggtk\datamine.py:540
msgid "Line"
msgstr ""
-#: hggtk\datamine.py:526 hggtk\guess.py:100
+#: hggtk\datamine.py:544 hggtk\guess.py:100
msgid "Source"
msgstr ""
-#: hggtk\datamine.py:618
+#: hggtk\datamine.py:636
msgid "Follow Rename:"
msgstr ""
@@ -819,55 +831,55 @@msgid "TortoiseHg Prompt"
msgstr ""
-#: hggtk\gdialog.py:377
+#: hggtk\gdialog.py:390
msgid " Aborted"
msgstr ""
-#: hggtk\gdialog.py:388
+#: hggtk\gdialog.py:401
msgid " Messages and Errors"
msgstr ""
-#: hggtk\gdialog.py:399
+#: hggtk\gdialog.py:412
msgid "No visual diff configured"
msgstr ""
-#: hggtk\gdialog.py:400
+#: hggtk\gdialog.py:413
msgid "Please select a visual diff application."
msgstr ""
-#: hggtk\gdialog.py:459
+#: hggtk\gdialog.py:472
msgid "making snapshot of %d files from rev %s\n"
msgstr ""
-#: hggtk\gdialog.py:492
+#: hggtk\gdialog.py:505
msgid "edit failed"
msgstr ""
-#: hggtk\gdialog.py:500 hggtk\thgconfig.py:543
+#: hggtk\gdialog.py:513 hggtk\thgconfig.py:545
msgid "No visual editor configured"
msgstr ""
-#: hggtk\gdialog.py:501 hggtk\thgconfig.py:544
+#: hggtk\gdialog.py:514 hggtk\thgconfig.py:546
msgid "Please configure a visual editor."
msgstr ""
-#: hggtk\gtklib.py:88
+#: hggtk\gtklib.py:95
msgid "Running"
msgstr ""
-#: hggtk\gtklib.py:94
+#: hggtk\gtklib.py:101
msgid "Done"
msgstr ""
-#: hggtk\gtklib.py:176
+#: hggtk\gtklib.py:183
msgid "Save File"
msgstr ""
-#: hggtk\gtklib.py:177
+#: hggtk\gtklib.py:184
msgid "All files"
msgstr ""
-#: hggtk\gtklib.py:254
+#: hggtk\gtklib.py:261
msgid "Select Folder"
msgstr ""
@@ -917,7 +929,7 @@"\n"
msgstr ""
-#: hggtk\hgcmd.py:149
+#: hggtk\hgcmd.py:154
msgid ""
"\n"
"[command interrupted]"
@@ -1086,34 +1098,42 @@msgid "You must configure SMTP"
msgstr ""
-#: hggtk\hgignore.py:27
+#: hggtk\hgignore.py:29
msgid "Ignore filter for "
msgstr ""
-#: hggtk\hgignore.py:34
+#: hggtk\hgignore.py:36
msgid "Glob:"
msgstr ""
-#: hggtk\hgignore.py:40 hggtk\hgignore.py:55 hggtk\tagadd.py:47
+#: hggtk\hgignore.py:42 hggtk\hgignore.py:57 hggtk\tagadd.py:47
msgid "Add"
msgstr ""
-#: hggtk\hgignore.py:79
+#: hggtk\hgignore.py:81
msgid "Filters"
msgstr ""
-#: hggtk\hgignore.py:86
+#: hggtk\hgignore.py:88
msgid "Patterns"
msgstr ""
-#: hggtk\hgignore.py:97
+#: hggtk\hgignore.py:99
msgid "Remove Selected"
msgstr ""
-#: hggtk\hgignore.py:105
+#: hggtk\hgignore.py:107
msgid "Unknown Files"
msgstr ""
+#: hggtk\hgignore.py:178
+msgid "Invalid glob expression"
+msgstr ""
+
+#: hggtk\hgignore.py:194
+msgid "Invalid regexp expression"
+msgstr ""
+
#: hggtk\hginit.py:39
msgid "Create a new repository"
msgstr ""
@@ -1134,27 +1154,27 @@msgid "Create"
msgstr ""
-#: hggtk\hginit.py:116
+#: hggtk\hginit.py:121
msgid "Destination path is empty"
msgstr ""
-#: hggtk\hginit.py:117
+#: hggtk\hginit.py:122
msgid "Please enter the directory path"
msgstr ""
-#: hggtk\hginit.py:131
+#: hggtk\hginit.py:136
msgid "Unable to create new repository"
msgstr ""
-#: hggtk\hginit.py:135 hggtk\hginit.py:140
+#: hggtk\hginit.py:140 hggtk\hginit.py:145
msgid "Error when creating repository"
msgstr ""
-#: hggtk\hginit.py:157
+#: hggtk\hginit.py:162
msgid "New repository created"
msgstr ""
-#: hggtk\hginit.py:158
+#: hggtk\hginit.py:163
msgid "in directory %s"
msgstr ""
@@ -1215,340 +1235,354 @@msgid "applying patch\n"
msgstr ""
-#: hggtk\hgshelve.py:514
+#: hggtk\hgshelve.py:509
msgid "saving patch to shelve\n"
msgstr ""
-#: hggtk\hgshelve.py:527
+#: hggtk\hgshelve.py:522
msgid "removing shelve file\n"
msgstr ""
-#: hggtk\hgshelve.py:536
+#: hggtk\hgshelve.py:531
msgid "removing backup for %r : %r\n"
msgstr ""
-#: hggtk\hgshelve.py:561
+#: hggtk\hgshelve.py:556
msgid "applying shelved patch\n"
msgstr ""
-#: hggtk\hgshelve.py:574
+#: hggtk\hgshelve.py:569
msgid "restoring backup files\n"
msgstr ""
-#: hggtk\hgshelve.py:581
+#: hggtk\hgshelve.py:576
msgid "removing backup files\n"
msgstr ""
-#: hggtk\hgshelve.py:587
+#: hggtk\hgshelve.py:582
msgid "removing shelved patches\n"
msgstr ""
-#: hggtk\hgshelve.py:589
+#: hggtk\hgshelve.py:584
msgid "unshelve completed\n"
msgstr ""
-#: hggtk\hgshelve.py:591
+#: hggtk\hgshelve.py:586
msgid "nothing to unshelve\n"
msgstr ""
-#: hggtk\hgshelve.py:597
+#: hggtk\hgshelve.py:592
msgid "mark new/missing files as added/removed before shelving"
msgstr ""
-#: hggtk\hgshelve.py:599
+#: hggtk\hgshelve.py:594
msgid "overwrite existing shelve data"
msgstr ""
+#: hggtk\hgshelve.py:596
+msgid "append to existing shelve data"
+msgstr ""
+
#: hggtk\hgshelve.py:601
-msgid "append to existing shelve data"
-msgstr ""
-
-#: hggtk\hgshelve.py:606
msgid "inspect shelved changes only"
msgstr ""
-#: hggtk\hgshelve.py:608
+#: hggtk\hgshelve.py:603
msgid "proceed even if patches do not unshelve cleanly"
msgstr ""
-#: hggtk\hgthread.py:176
+#: hggtk\hgthread.py:159
msgid "[command returned code %d]\n"
msgstr ""
-#: hggtk\hgthread.py:178
+#: hggtk\hgthread.py:161
msgid "[command completed successfully]\n"
msgstr ""
-#: hggtk\hgtk.py:74
+#: hggtk\hgthread.py:166
+msgid "abort: "
+msgstr ""
+
+#: hggtk\hgtk.py:94
msgid "can not read file \"%s\". Ignored.\n"
msgstr ""
-#: hggtk\hgtk.py:146
+#: hggtk\hgtk.py:168 hggtk\hgtk.py:188
+msgid "abort: %s!\n"
+msgstr ""
+
+#: hggtk\hgtk.py:176
msgid "hgtk %s: %s\n"
msgstr ""
-#: hggtk\hgtk.py:149
+#: hggtk\hgtk.py:179
msgid "hgtk: %s\n"
msgstr ""
-#: hggtk\hgtk.py:152
+#: hggtk\hgtk.py:182
msgid ""
"hgtk: command '%s' is ambiguous:\n"
" %s\n"
msgstr ""
-#: hggtk\hgtk.py:155
+#: hggtk\hgtk.py:185
msgid "hgtk: unknown command '%s'\n"
msgstr ""
-#: hggtk\hgtk.py:158
-msgid "abort: %s!\n"
-msgstr ""
-
-#: hggtk\hgtk.py:291
+#: hggtk\hgtk.py:319
+msgid "Rename error"
+msgstr ""
+
+#: hggtk\hgtk.py:320
msgid "rename takes one or two path arguments"
msgstr ""
-#: hggtk\hgtk.py:383
+#: hggtk\hgtk.py:414
msgid "global options:"
msgstr ""
-#: hggtk\hgtk.py:385
+#: hggtk\hgtk.py:416
msgid "use \"hgtk help\" for the full list of commands"
msgstr ""
-#: hggtk\hgtk.py:389
+#: hggtk\hgtk.py:420
msgid ""
"use \"hgtk help\" for the full list of commands or \"hgtk -v\" for details"
msgstr ""
-#: hggtk\hgtk.py:392
+#: hggtk\hgtk.py:423
msgid "use \"hgtk -v help%s\" to show aliases and global options"
msgstr ""
-#: hggtk\hgtk.py:395
+#: hggtk\hgtk.py:426
msgid "use \"hgtk -v help %s\" to show global options"
msgstr ""
-#: hggtk\hgtk.py:408
+#: hggtk\hgtk.py:438 hggtk\hgtk.py:540
+msgid ""
+"list of commands:\n"
+"\n"
+msgstr ""
+
+#: hggtk\hgtk.py:446
msgid ""
"\n"
"aliases: %s\n"
msgstr ""
-#: hggtk\hgtk.py:413 hggtk\hgtk.py:439 hggtk\hgtk.py:474
+#: hggtk\hgtk.py:451 hggtk\hgtk.py:477 hggtk\hgtk.py:509
msgid "(No help text available)"
msgstr ""
-#: hggtk\hgtk.py:421
+#: hggtk\hgtk.py:459
msgid "options:\n"
msgstr ""
-#: hggtk\hgtk.py:444
+#: hggtk\hgtk.py:482
msgid "no commands defined\n"
msgstr ""
-#: hggtk\hgtk.py:500 hggtk\hgtk.py:526
-msgid ""
-"list of commands:\n"
-"\n"
-msgstr ""
-
-#: hggtk\hgtk.py:519
+#: hggtk\hgtk.py:533
msgid "Hgtk - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n"
msgstr ""
-#: hggtk\hgtk.py:524
+#: hggtk\hgtk.py:538
msgid ""
"basic commands:\n"
"\n"
msgstr ""
-#: hggtk\hgtk.py:540
+#: hggtk\hgtk.py:554
msgid " (default: %s)"
msgstr ""
-#: hggtk\hgtk.py:553
+#: hggtk\hgtk.py:581
+msgid ""
+"This version of TortoiseHg requires Mercurial version %s.n to %s.n, but "
+"finds %s"
+msgstr ""
+
+#: hggtk\hgtk.py:587
msgid "TortoiseHg Dialogs (version %s), Mercurial (version %s)\n"
msgstr ""
-#: hggtk\hgtk.py:582
+#: hggtk\hgtk.py:616
msgid "repository root directory or symbolic path name"
msgstr ""
-#: hggtk\hgtk.py:583
+#: hggtk\hgtk.py:617
msgid "enable additional output"
msgstr ""
-#: hggtk\hgtk.py:584
+#: hggtk\hgtk.py:618
msgid "display help and exit"
msgstr ""
-#: hggtk\hgtk.py:585
+#: hggtk\hgtk.py:619
msgid "start debugger"
msgstr ""
-#: hggtk\hgtk.py:586
+#: hggtk\hgtk.py:620
msgid "do not fork GUI process"
msgstr ""
-#: hggtk\hgtk.py:587
+#: hggtk\hgtk.py:621
msgid "read file list from file"
msgstr ""
-#: hggtk\hgtk.py:591
+#: hggtk\hgtk.py:625
msgid "hgtk about"
msgstr ""
-#: hggtk\hgtk.py:592
+#: hggtk\hgtk.py:626
msgid "hgtk add [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:593
+#: hggtk\hgtk.py:627
msgid "hgtk clone SOURCE [DEST]"
msgstr ""
-#: hggtk\hgtk.py:595
+#: hggtk\hgtk.py:629
msgid "record user as committer"
msgstr ""
-#: hggtk\hgtk.py:596
+#: hggtk\hgtk.py:630
msgid "record datecode as commit date"
msgstr ""
-#: hggtk\hgtk.py:597
+#: hggtk\hgtk.py:631
msgid "hgtk commit [OPTIONS] [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:598
+#: hggtk\hgtk.py:632
msgid "hgtk datamine"
msgstr ""
-#: hggtk\hgtk.py:599
+#: hggtk\hgtk.py:633
msgid "hgtk hgignore [FILE]"
msgstr ""
-#: hggtk\hgtk.py:600
+#: hggtk\hgtk.py:634
msgid "hgtk init [DEST]"
msgstr ""
-#: hggtk\hgtk.py:603
+#: hggtk\hgtk.py:637
msgid "hgtk log [OPTIONS] [FILE]"
msgstr ""
-#: hggtk\hgtk.py:605 hggtk\hgtk.py:632
+#: hggtk\hgtk.py:639 hggtk\hgtk.py:666
msgid "revision to update"
msgstr ""
-#: hggtk\hgtk.py:606
+#: hggtk\hgtk.py:640
msgid "hgtk merge"
msgstr ""
-#: hggtk\hgtk.py:607
+#: hggtk\hgtk.py:641
msgid "hgtk recovery"
msgstr ""
-#: hggtk\hgtk.py:608
+#: hggtk\hgtk.py:642
msgid "hgtk shelve"
msgstr ""
-#: hggtk\hgtk.py:609
+#: hggtk\hgtk.py:643
msgid "hgtk synch"
msgstr ""
-#: hggtk\hgtk.py:611
+#: hggtk\hgtk.py:645
msgid "revisions to compare"
msgstr ""
-#: hggtk\hgtk.py:612
+#: hggtk\hgtk.py:646
msgid "hgtk status [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:613
+#: hggtk\hgtk.py:647
msgid "hgtk userconfig"
msgstr ""
-#: hggtk\hgtk.py:614
+#: hggtk\hgtk.py:648
msgid "hgtk repoconfig"
msgstr ""
-#: hggtk\hgtk.py:615
+#: hggtk\hgtk.py:649
msgid "hgtk guess"
msgstr ""
-#: hggtk\hgtk.py:616
+#: hggtk\hgtk.py:650
msgid "hgtk remove [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:617
+#: hggtk\hgtk.py:651
msgid "hgtk rename SOURCE [DEST]"
msgstr ""
-#: hggtk\hgtk.py:618
+#: hggtk\hgtk.py:652
msgid "hgtk revert [FILE]..."
msgstr ""
-#: hggtk\hgtk.py:621
+#: hggtk\hgtk.py:655
msgid "name of the webdir config file"
msgstr ""
-#: hggtk\hgtk.py:622
+#: hggtk\hgtk.py:656
msgid "hgtk serve [OPTION]..."
msgstr ""
-#: hggtk\hgtk.py:624
+#: hggtk\hgtk.py:658
msgid "wait until the second ticks over"
msgstr ""
-#: hggtk\hgtk.py:625
+#: hggtk\hgtk.py:659
msgid "notify the shell for path(s) given"
msgstr ""
-#: hggtk\hgtk.py:626
+#: hggtk\hgtk.py:660
msgid "remove the status cache"
msgstr ""
-#: hggtk\hgtk.py:627
+#: hggtk\hgtk.py:661
msgid "show the contents of the status cache (no update)"
msgstr ""
-#: hggtk\hgtk.py:629
+#: hggtk\hgtk.py:663
msgid "udpate all repos in current dir"
msgstr ""
-#: hggtk\hgtk.py:630
+#: hggtk\hgtk.py:664
msgid "hgtk thgstatus [OPTION]"
msgstr ""
-#: hggtk\hgtk.py:635
+#: hggtk\hgtk.py:669
msgid "changeset to view in diff tool"
msgstr ""
-#: hggtk\hgtk.py:636
+#: hggtk\hgtk.py:670
msgid "revisions to view in diff tool"
msgstr ""
-#: hggtk\hgtk.py:637
+#: hggtk\hgtk.py:671
msgid "launch visual diff tool"
msgstr ""
-#: hggtk\hgtk.py:639
+#: hggtk\hgtk.py:673
msgid "print license"
msgstr ""
-#: hggtk\hgtk.py:640
+#: hggtk\hgtk.py:674
msgid "hgtk version [OPTION]"
msgstr ""
-#: hggtk\hgtk.py:642
+#: hggtk\hgtk.py:676
msgid "show the command options"
msgstr ""
-#: hggtk\hgtk.py:643
+#: hggtk\hgtk.py:677
msgid "[-o] CMD"
msgstr ""
-#: hggtk\hgtk.py:644
+#: hggtk\hgtk.py:678
msgid "hgtk help [COMMAND]"
msgstr ""
@@ -1717,37 +1751,37 @@msgid "Remove revision %d and all descendants?"
msgstr ""
-#: hggtk\history.py:548
+#: hggtk\history.py:550
msgid "Confirm Revert Revision(s)"
msgstr ""
-#: hggtk\history.py:549
+#: hggtk\history.py:551
msgid ""
"Revert all files to revision %d?\n"
"This will overwrite your local changes"
msgstr ""
-#: hggtk\history.py:611 hggtk\history.py:691
+#: hggtk\history.py:613 hggtk\history.py:693
msgid "Write bundle to"
msgstr ""
-#: hggtk\history.py:660 hggtk\status.py:1045
+#: hggtk\history.py:662 hggtk\status.py:1045
msgid "Save patch to"
msgstr ""
-#: hggtk\history.py:667 hggtk\history.py:696 hggtk\thgconfig.py:368
-#: hggtk\thgconfig.py:670
+#: hggtk\history.py:669 hggtk\history.py:698 hggtk\thgconfig.py:370
+#: hggtk\thgconfig.py:674
msgid "Confirm Overwrite"
msgstr ""
-#: hggtk\history.py:668 hggtk\history.py:697
+#: hggtk\history.py:670 hggtk\history.py:699
msgid ""
"The file \"%s\" already exists!\n"
"\n"
"Do you want to overwrite it?"
msgstr ""
-#: hggtk\logfilter.py:27 hggtk\taskbarui.py:31 hggtk\thgconfig.py:452
+#: hggtk\logfilter.py:27 hggtk\taskbarui.py:31 hggtk\thgconfig.py:454
msgid "Apply"
msgstr ""
@@ -1755,7 +1789,7 @@msgid "Log Filter - %s"
msgstr ""
-#: hggtk\logfilter.py:46 hggtk\logview\treeview.py:398
+#: hggtk\logfilter.py:46 hggtk\logview\treeview.py:399
msgid "Branch"
msgstr ""
@@ -1817,23 +1851,23 @@msgid "Invalid revision range"
msgstr ""
-#: hggtk\logview\treeview.py:357
+#: hggtk\logview\treeview.py:358
msgid "Graph"
msgstr ""
-#: hggtk\logview\treeview.py:385
+#: hggtk\logview\treeview.py:386
msgid "ID"
msgstr ""
-#: hggtk\logview\treeview.py:411
+#: hggtk\logview\treeview.py:412
msgid "Summary"
msgstr ""
-#: hggtk\logview\treeview.py:436
+#: hggtk\logview\treeview.py:437
msgid "Local Date"
msgstr ""
-#: hggtk\logview\treeview.py:449
+#: hggtk\logview\treeview.py:450
msgid "Universal Date"
msgstr ""
@@ -1869,11 +1903,11 @@msgid "Not a head revision!"
msgstr ""
-#: hggtk\merge.py:154
+#: hggtk\merge.py:155
msgid "Confirm undo merge"
msgstr ""
-#: hggtk\merge.py:155
+#: hggtk\merge.py:156
msgid "Clean checkout of original revision?"
msgstr ""
@@ -1881,7 +1915,7 @@msgid "TortoiseHg Recovery - "
msgstr ""
-#: hggtk\recovery.py:43 hggtk\synch.py:60
+#: hggtk\recovery.py:43 hggtk\synch.py:61
msgid "Stop the hg operation"
msgstr ""
@@ -1917,11 +1951,11 @@msgid "Validate repository consistency"
msgstr ""
-#: hggtk\recovery.py:99 hggtk\synch.py:367
+#: hggtk\recovery.py:99 hggtk\synch.py:386
msgid "Cannot close now"
msgstr ""
-#: hggtk\recovery.py:100 hggtk\synch.py:368
+#: hggtk\recovery.py:100 hggtk\synch.py:387
msgid "command is running"
msgstr ""
@@ -1945,15 +1979,15 @@msgid "Rollback repository '%s' ?"
msgstr ""
-#: hggtk\recovery.py:159 hggtk\synch.py:507
+#: hggtk\recovery.py:159 hggtk\synch.py:526
msgid "Cannot run now"
msgstr ""
-#: hggtk\recovery.py:160 hggtk\synch.py:508
+#: hggtk\recovery.py:160 hggtk\synch.py:527
msgid "Please try again after the previous command is completed"
msgstr ""
-#: hggtk\recovery.py:222 hggtk\synch.py:601
+#: hggtk\recovery.py:222 hggtk\synch.py:627
msgid "[command interrupted]"
msgstr ""
@@ -1981,7 +2015,7 @@msgid "Launch browser to view repository"
msgstr ""
-#: hggtk\serve.py:69 hggtk\synch.py:93
+#: hggtk\serve.py:69 hggtk\synch.py:94
msgid "Configure"
msgstr ""
@@ -2023,55 +2057,55 @@msgid "Defaulting to "
msgstr ""
-#: hggtk\serve.py:306
+#: hggtk\serve.py:305
msgid "cannot start server: "
msgstr ""
-#: hggtk\serve.py:317
+#: hggtk\serve.py:316
msgid "listening at http://%s%s/%s (%s:%d)\n"
msgstr ""
+#: hggtk\serve.py:341
+msgid "name of access log file to write to"
+msgstr ""
+
#: hggtk\serve.py:342
-msgid "name of access log file to write to"
+msgid "run server in background"
msgstr ""
#: hggtk\serve.py:343
-msgid "run server in background"
+msgid "used internally by daemon mode"
msgstr ""
#: hggtk\serve.py:344
-msgid "used internally by daemon mode"
-msgstr ""
-
-#: hggtk\serve.py:345
msgid "name of error log file to write to"
msgstr ""
-#: hggtk\serve.py:348
+#: hggtk\serve.py:347
msgid "prefix path to serve from (default: server root)"
msgstr ""
+#: hggtk\serve.py:349
+msgid "name to show in web pages (default: working dir)"
+msgstr ""
+
#: hggtk\serve.py:350
-msgid "name to show in web pages (default: working dir)"
-msgstr ""
-
-#: hggtk\serve.py:351
msgid "name of the webdir config file (serve more than one repo)"
msgstr ""
+#: hggtk\serve.py:352
+msgid "name of file to write process ID to"
+msgstr ""
+
#: hggtk\serve.py:353
-msgid "name of file to write process ID to"
+msgid "for remote clients"
msgstr ""
#: hggtk\serve.py:354
-msgid "for remote clients"
+msgid "web templates to use"
msgstr ""
#: hggtk\serve.py:355
-msgid "web templates to use"
-msgstr ""
-
-#: hggtk\serve.py:356
msgid "template style to use"
msgstr ""
@@ -2300,14 +2334,6 @@msgid "&other"
msgstr ""
-#: hggtk\status.py:1123 hggtk\status.py:1124
-msgid "l"
-msgstr ""
-
-#: hggtk\status.py:1126
-msgid "o"
-msgstr ""
-
#: hggtk\status.py:1136
msgid "Revert the following files?"
msgstr ""
@@ -2351,159 +2377,159 @@msgid "Delete Errors"
msgstr ""
-#: hggtk\synch.py:52
+#: hggtk\synch.py:53
msgid "TortoiseHg Synchronize - "
msgstr ""
-#: hggtk\synch.py:64
+#: hggtk\synch.py:65
msgid "Incoming"
msgstr ""
-#: hggtk\synch.py:66
+#: hggtk\synch.py:67
msgid "Display changes that can be pulled from selected repository"
msgstr ""
-#: hggtk\synch.py:69
+#: hggtk\synch.py:70
msgid " Pull "
msgstr ""
-#: hggtk\synch.py:71
+#: hggtk\synch.py:72
msgid "Pull changes from selected repository"
msgstr ""
-#: hggtk\synch.py:75
+#: hggtk\synch.py:76
msgid "Outgoing"
msgstr ""
-#: hggtk\synch.py:77
+#: hggtk\synch.py:78
msgid "Display local changes that will be pushed to selected repository"
msgstr ""
-#: hggtk\synch.py:80
+#: hggtk\synch.py:81
msgid "Push"
msgstr ""
-#: hggtk\synch.py:82
+#: hggtk\synch.py:83
msgid "Push local changes to selected repository"
msgstr ""
-#: hggtk\synch.py:85 hggtk\thgconfig.py:481
+#: hggtk\synch.py:86 hggtk\thgconfig.py:483
msgid "Email"
msgstr ""
-#: hggtk\synch.py:87
+#: hggtk\synch.py:88
msgid "Email local outgoing changes to one or more recipients"
msgstr ""
-#: hggtk\synch.py:95
+#: hggtk\synch.py:96
msgid "Configure peer repository paths"
msgstr ""
-#: hggtk\synch.py:106
+#: hggtk\synch.py:107
msgid "Repo:"
msgstr ""
-#: hggtk\synch.py:111
+#: hggtk\synch.py:112
msgid "Bundle:"
msgstr ""
-#: hggtk\synch.py:155
+#: hggtk\synch.py:156
msgid "Post pull operation"
msgstr ""
-#: hggtk\synch.py:157
+#: hggtk\synch.py:158
msgid "Nothing"
msgstr ""
-#: hggtk\synch.py:158 hggtk\update.py:80
+#: hggtk\synch.py:159 hggtk\update.py:80
msgid "Update"
msgstr ""
-#: hggtk\synch.py:159
+#: hggtk\synch.py:160
msgid "Fetch"
msgstr ""
-#: hggtk\synch.py:160
+#: hggtk\synch.py:161
msgid "Rebase"
msgstr ""
-#: hggtk\synch.py:168
+#: hggtk\synch.py:169
msgid "Advanced Options"
msgstr ""
-#: hggtk\synch.py:190
+#: hggtk\synch.py:191
msgid "Force pull or push"
msgstr ""
-#: hggtk\synch.py:191
+#: hggtk\synch.py:192
msgid "Run even when remote repository is unrelated."
msgstr ""
-#: hggtk\synch.py:195
+#: hggtk\synch.py:196
msgid "Target Revision:"
msgstr ""
-#: hggtk\synch.py:199
+#: hggtk\synch.py:200
msgid "A specific revision up to which you would like to push or pull."
msgstr ""
-#: hggtk\synch.py:203
+#: hggtk\synch.py:204
msgid "Remote Command:"
msgstr ""
-#: hggtk\synch.py:207
+#: hggtk\synch.py:208
msgid "Name of hg executable on remote machine."
msgstr ""
-#: hggtk\synch.py:215
+#: hggtk\synch.py:216
msgid "Incoming/Outgoing"
msgstr ""
-#: hggtk\synch.py:218
+#: hggtk\synch.py:219
msgid "Show Patches"
msgstr ""
-#: hggtk\synch.py:219
+#: hggtk\synch.py:220
msgid "Show Newest First"
msgstr ""
-#: hggtk\synch.py:220
+#: hggtk\synch.py:221
msgid "Show No Merges"
msgstr ""
-#: hggtk\synch.py:243
+#: hggtk\synch.py:244
msgid "View pulled revisions"
msgstr ""
-#: hggtk\synch.py:245
+#: hggtk\synch.py:246
msgid "Update to branch tip"
msgstr ""
-#: hggtk\synch.py:340
+#: hggtk\synch.py:359
msgid "unknown sort key '%s'"
msgstr ""
-#: hggtk\synch.py:350
+#: hggtk\synch.py:369
msgid "Select Repository"
msgstr ""
-#: hggtk\synch.py:358
+#: hggtk\synch.py:377
msgid "Select Bundle"
msgstr ""
-#: hggtk\synch.py:359
+#: hggtk\synch.py:378
msgid "Bundle (*.hg)"
msgstr ""
-#: hggtk\synch.py:360
+#: hggtk\synch.py:379
msgid "Bundle (*)"
msgstr ""
-#: hggtk\synch.py:466
+#: hggtk\synch.py:485
msgid "No repository selected"
msgstr ""
-#: hggtk\synch.py:467
+#: hggtk\synch.py:486
msgid "Select a peer repository to compare with"
msgstr ""
@@ -2730,189 +2756,199 @@"dialogs. Default: False (show diffs to right of file list)"
msgstr ""
-#: hggtk\thgconfig.py:61
+#: hggtk\thgconfig.py:59
+msgid "Capture Stderr"
+msgstr ""
+
+#: hggtk\thgconfig.py:60
+msgid ""
+"Redirect stderr to a buffer which is parsed at the end of the process for "
+"runtime errors. Default: True"
+msgstr ""
+
+#: hggtk\thgconfig.py:62
+msgid "Fork hgtk"
+msgstr ""
+
+#: hggtk\thgconfig.py:63
+msgid ""
+"When running hgtk from the command line, fork a background process to run "
+"graphical dialogs. Default: True"
+msgstr ""
+
+#: hggtk\thgconfig.py:67
msgid "Username"
msgstr ""
-#: hggtk\thgconfig.py:62
+#: hggtk\thgconfig.py:68
msgid "Name associated with commits"
msgstr ""
-#: hggtk\thgconfig.py:63
-msgid "External Commit Tool"
-msgstr ""
-
-#: hggtk\thgconfig.py:64
-msgid ""
-"Select commit tool launched by TortoiseHg. (Qct is no longer distributed as "
-"part of TortoiseHG.) Default: None (use the builtin tool)"
-msgstr ""
-
-#: hggtk\thgconfig.py:67
+#: hggtk\thgconfig.py:69
msgid "Summary Line Length"
msgstr ""
-#: hggtk\thgconfig.py:68
+#: hggtk\thgconfig.py:70
msgid ""
"Maximum length of the commit message summary line. If set, TortoiseHG will "
"issue a warning if the summary line is too long or not separated by a blank "
"line. Default: 0 (unenforced)"
msgstr ""
-#: hggtk\thgconfig.py:72
+#: hggtk\thgconfig.py:74
msgid "Message Line Length"
msgstr ""
-#: hggtk\thgconfig.py:73
+#: hggtk\thgconfig.py:75
msgid ""
"Word wrap length of the commit message. If set, the popup menu can be used "
"to format the message and a warning will be issued if any lines are too long "
"at commit. Default: 0 (unenforced)"
msgstr ""
-#: hggtk\thgconfig.py:80
+#: hggtk\thgconfig.py:82
msgid "Author Coloring"
msgstr ""
-#: hggtk\thgconfig.py:81
+#: hggtk\thgconfig.py:83
msgid ""
"Color changesets by author name. If not enabled, the changes are colored "
"green for merge, red for non-trivial parents, black for normal. Default: "
"False"
msgstr ""
-#: hggtk\thgconfig.py:85
+#: hggtk\thgconfig.py:87
msgid "Long Summary"
msgstr ""
-#: hggtk\thgconfig.py:86
+#: hggtk\thgconfig.py:88
msgid ""
"If true, concatenate multiple lines of changeset summary until they reach 80 "
"characters. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:89
+#: hggtk\thgconfig.py:91
msgid "Log Batch Size"
msgstr ""
-#: hggtk\thgconfig.py:90
+#: hggtk\thgconfig.py:92
msgid ""
"The number of revisions to read and display in the changelog viewer in a "
"single batch. Default: 500"
msgstr ""
-#: hggtk\thgconfig.py:93
+#: hggtk\thgconfig.py:95
msgid "Copy Hash"
msgstr ""
-#: hggtk\thgconfig.py:94
+#: hggtk\thgconfig.py:96
msgid ""
"Allow the changelog viewer to copy the changeset hash of the currently "
"selected changeset into the clipboard. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:99
+#: hggtk\thgconfig.py:101
msgid "After pull operation"
msgstr ""
-#: hggtk\thgconfig.py:101
+#: hggtk\thgconfig.py:103
msgid ""
"Operation which is performed directly after a successful pull. update "
"equates to pull --update, fetch equates to the fetch extension, rebase "
"equates to pull --rebase. Default: none"
msgstr ""
-#: hggtk\thgconfig.py:106
+#: hggtk\thgconfig.py:108
msgid "Name"
msgstr ""
-#: hggtk\thgconfig.py:107
+#: hggtk\thgconfig.py:109
msgid ""
"Repository name to use in the web interface. Default is the working "
"directory."
msgstr ""
-#: hggtk\thgconfig.py:109 hggtk\thgconfig.py:778
+#: hggtk\thgconfig.py:111 hggtk\thgconfig.py:782
msgid "Description"
msgstr ""
-#: hggtk\thgconfig.py:110
+#: hggtk\thgconfig.py:112
msgid "Textual description of the repository's purpose or contents."
msgstr ""
-#: hggtk\thgconfig.py:112
+#: hggtk\thgconfig.py:114
msgid "Contact"
msgstr ""
-#: hggtk\thgconfig.py:113
+#: hggtk\thgconfig.py:115
msgid "Name or email address of the person in charge of the repository."
msgstr ""
-#: hggtk\thgconfig.py:115
+#: hggtk\thgconfig.py:117
msgid "Style"
msgstr ""
-#: hggtk\thgconfig.py:117
+#: hggtk\thgconfig.py:119
msgid "Which template map style to use"
msgstr ""
-#: hggtk\thgconfig.py:118
+#: hggtk\thgconfig.py:120
msgid "Archive Formats"
msgstr ""
-#: hggtk\thgconfig.py:119
+#: hggtk\thgconfig.py:121
msgid "Comma separated list of archive formats allowed for downloading"
msgstr ""
-#: hggtk\thgconfig.py:121
+#: hggtk\thgconfig.py:123
msgid "Port to listen on"
msgstr ""
-#: hggtk\thgconfig.py:121 hggtk\thgconfig.py:231
+#: hggtk\thgconfig.py:123 hggtk\thgconfig.py:233
msgid "Port"
msgstr ""
-#: hggtk\thgconfig.py:122
+#: hggtk\thgconfig.py:124
msgid "Push Requires SSL"
msgstr ""
-#: hggtk\thgconfig.py:123
+#: hggtk\thgconfig.py:125
msgid ""
"Whether to require that inbound pushes be transported over SSL to prevent "
"password sniffing."
msgstr ""
-#: hggtk\thgconfig.py:125
+#: hggtk\thgconfig.py:127
msgid "Stripes"
msgstr ""
-#: hggtk\thgconfig.py:126
+#: hggtk\thgconfig.py:128
msgid ""
"How many lines a \"zebra stripe\" should span in multiline output. Default "
"is 1; set to 0 to disable."
msgstr ""
-#: hggtk\thgconfig.py:128
+#: hggtk\thgconfig.py:130
msgid "Max Files"
msgstr ""
-#: hggtk\thgconfig.py:129
+#: hggtk\thgconfig.py:131
msgid "Maximum number of files to list per changeset."
msgstr ""
-#: hggtk\thgconfig.py:130
+#: hggtk\thgconfig.py:132
msgid "Max Changes"
msgstr ""
-#: hggtk\thgconfig.py:131
+#: hggtk\thgconfig.py:133
msgid "Maximum number of changes to list on the changelog."
msgstr ""
-#: hggtk\thgconfig.py:132
+#: hggtk\thgconfig.py:134
msgid "Allow Push"
msgstr ""
-#: hggtk\thgconfig.py:133
+#: hggtk\thgconfig.py:135
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 "
@@ -2922,11 +2958,11 @@"examined after the deny_push list."
msgstr ""
-#: hggtk\thgconfig.py:140
+#: hggtk\thgconfig.py:142
msgid "Deny Push"
msgstr ""
-#: hggtk\thgconfig.py:141
+#: hggtk\thgconfig.py:143
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. "
@@ -2935,81 +2971,81 @@"The contents of the deny_push list are examined before the allow_push list."
msgstr ""
-#: hggtk\thgconfig.py:147
+#: hggtk\thgconfig.py:149
msgid "Encoding"
msgstr ""
-#: hggtk\thgconfig.py:148
+#: hggtk\thgconfig.py:150
msgid "Character encoding name"
msgstr ""
-#: hggtk\thgconfig.py:151 hggtk\thgconfig.py:232
+#: hggtk\thgconfig.py:153 hggtk\thgconfig.py:234
msgid "Host"
msgstr ""
-#: hggtk\thgconfig.py:152
+#: hggtk\thgconfig.py:154
msgid ""
"Host name and (optional) port of proxy server, for example \"myproxy:8000\""
msgstr ""
-#: hggtk\thgconfig.py:154
+#: hggtk\thgconfig.py:156
msgid "Bypass List"
msgstr ""
-#: hggtk\thgconfig.py:155
+#: hggtk\thgconfig.py:157
msgid ""
"Optional. Comma-separated list of host names that should bypass the proxy"
msgstr ""
-#: hggtk\thgconfig.py:157 hggtk\thgconfig.py:233
+#: hggtk\thgconfig.py:159 hggtk\thgconfig.py:235
msgid "Password"
msgstr ""
-#: hggtk\thgconfig.py:158
+#: hggtk\thgconfig.py:160
msgid "Optional. Password to authenticate with at the proxy server"
msgstr ""
-#: hggtk\thgconfig.py:161
+#: hggtk\thgconfig.py:163
msgid "Optional. User name to authenticate with at the proxy server"
msgstr ""
-#: hggtk\thgconfig.py:165
+#: hggtk\thgconfig.py:167
msgid "From"
msgstr ""
-#: hggtk\thgconfig.py:166
+#: hggtk\thgconfig.py:168
msgid "Email address to use in the \"From\" header and for the SMTP envelope"
msgstr ""
-#: hggtk\thgconfig.py:167
+#: hggtk\thgconfig.py:169
msgid "To"
msgstr ""
-#: hggtk\thgconfig.py:168
+#: hggtk\thgconfig.py:170
msgid "Comma-separated list of recipient email addresses"
msgstr ""
-#: hggtk\thgconfig.py:169
+#: hggtk\thgconfig.py:171
msgid "Cc"
msgstr ""
-#: hggtk\thgconfig.py:170
+#: hggtk\thgconfig.py:172
msgid "Comma-separated list of carbon copy recipient email addresses"
msgstr ""
-#: hggtk\thgconfig.py:172
+#: hggtk\thgconfig.py:174
msgid "Bcc"
msgstr ""
-#: hggtk\thgconfig.py:173
+#: hggtk\thgconfig.py:175
msgid "Comma-separated list of blind carbon copy recipient email addresses"
msgstr ""
-#: hggtk\thgconfig.py:175
+#: hggtk\thgconfig.py:177
msgid "method"
msgstr ""
-#: hggtk\thgconfig.py:176
+#: hggtk\thgconfig.py:178
msgid ""
"Optional. Method to use to send email messages. If value is \"smtp\" "
"(default), use SMTP (configured below). Otherwise, use as name of program "
@@ -3019,231 +3055,231 @@"messages."
msgstr ""
-#: hggtk\thgconfig.py:181
+#: hggtk\thgconfig.py:183
msgid "Host name of mail server"
msgstr ""
-#: hggtk\thgconfig.py:181
+#: hggtk\thgconfig.py:183
msgid "SMTP Host"
msgstr ""
-#: hggtk\thgconfig.py:182
+#: hggtk\thgconfig.py:184
msgid "SMTP Port"
msgstr ""
-#: hggtk\thgconfig.py:183
+#: hggtk\thgconfig.py:185
msgid "Port to connect to on mail server. Default: 25"
msgstr ""
-#: hggtk\thgconfig.py:185
+#: hggtk\thgconfig.py:187
msgid "SMTP TLS"
msgstr ""
-#: hggtk\thgconfig.py:186
+#: hggtk\thgconfig.py:188
msgid "Connect to mail server using TLS. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:188
+#: hggtk\thgconfig.py:190
msgid "SMTP Username"
msgstr ""
-#: hggtk\thgconfig.py:189
+#: hggtk\thgconfig.py:191
msgid "Username to authenticate to mail server with"
msgstr ""
-#: hggtk\thgconfig.py:190
+#: hggtk\thgconfig.py:192
msgid "SMTP Password"
msgstr ""
-#: hggtk\thgconfig.py:191
+#: hggtk\thgconfig.py:193
msgid "Password to authenticate to mail server with"
msgstr ""
-#: hggtk\thgconfig.py:192
+#: hggtk\thgconfig.py:194
msgid "Local Hostname"
msgstr ""
-#: hggtk\thgconfig.py:193
+#: hggtk\thgconfig.py:195
msgid "Hostname the sender can use to identify itself to the mail server."
msgstr ""
-#: hggtk\thgconfig.py:196
+#: hggtk\thgconfig.py:198
msgid "Git Format"
msgstr ""
-#: hggtk\thgconfig.py:197
+#: hggtk\thgconfig.py:199
msgid "Use git extended diff header format. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:199
+#: hggtk\thgconfig.py:201
msgid "No Dates"
msgstr ""
-#: hggtk\thgconfig.py:200
+#: hggtk\thgconfig.py:202
msgid "Do not include modification dates in diff headers. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:202
+#: hggtk\thgconfig.py:204
msgid "Show Function"
msgstr ""
-#: hggtk\thgconfig.py:203
+#: hggtk\thgconfig.py:205
msgid "Show which function each change is in. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:205
+#: hggtk\thgconfig.py:207
msgid "Ignore White Space"
msgstr ""
-#: hggtk\thgconfig.py:206
+#: hggtk\thgconfig.py:208
msgid "Ignore white space when comparing lines. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:208
+#: hggtk\thgconfig.py:210
msgid "Ignore WS Amount"
msgstr ""
-#: hggtk\thgconfig.py:209
+#: hggtk\thgconfig.py:211
msgid "Ignore changes in the amount of white space. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:211
+#: hggtk\thgconfig.py:213
msgid "Ignore Blank Lines"
msgstr ""
-#: hggtk\thgconfig.py:212
+#: hggtk\thgconfig.py:214
msgid "Ignore changes whose lines are all blank. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:225
+#: hggtk\thgconfig.py:227
msgid "Edit remote repository path"
msgstr ""
-#: hggtk\thgconfig.py:231
+#: hggtk\thgconfig.py:233
msgid "URL"
msgstr ""
-#: hggtk\thgconfig.py:232
+#: hggtk\thgconfig.py:234
msgid "Folder"
msgstr ""
-#: hggtk\thgconfig.py:234 hggtk\thgconfig.py:731
+#: hggtk\thgconfig.py:236 hggtk\thgconfig.py:735
msgid "Alias"
msgstr ""
-#: hggtk\thgconfig.py:369 hggtk\thgconfig.py:671
+#: hggtk\thgconfig.py:371 hggtk\thgconfig.py:675
msgid "Overwrite existing '%s' path?"
msgstr ""
-#: hggtk\thgconfig.py:423
+#: hggtk\thgconfig.py:425
msgid "No repository found"
msgstr ""
-#: hggtk\thgconfig.py:424
+#: hggtk\thgconfig.py:426
msgid "no repo at "
msgstr ""
-#: hggtk\thgconfig.py:432
+#: hggtk\thgconfig.py:434
msgid "User global settings"
msgstr ""
-#: hggtk\thgconfig.py:434
+#: hggtk\thgconfig.py:436
msgid "%s repository settings"
msgstr ""
-#: hggtk\thgconfig.py:439
+#: hggtk\thgconfig.py:441
msgid "Edit File"
msgstr ""
-#: hggtk\thgconfig.py:468
+#: hggtk\thgconfig.py:470
msgid "Changelog"
msgstr ""
-#: hggtk\thgconfig.py:471
+#: hggtk\thgconfig.py:473
msgid "Sync"
msgstr ""
-#: hggtk\thgconfig.py:475
+#: hggtk\thgconfig.py:477
msgid "Web"
msgstr ""
-#: hggtk\thgconfig.py:478
+#: hggtk\thgconfig.py:480
msgid "Proxy"
msgstr ""
-#: hggtk\thgconfig.py:484
+#: hggtk\thgconfig.py:486
msgid "Diff"
msgstr ""
-#: hggtk\thgconfig.py:497
+#: hggtk\thgconfig.py:499
msgid "Unapplied changes"
msgstr ""
-#: hggtk\thgconfig.py:498
+#: hggtk\thgconfig.py:500
msgid "Lose changes and switch files?."
msgstr ""
-#: hggtk\thgconfig.py:509
+#: hggtk\thgconfig.py:511
msgid "TortoiseHg Configure Repository - "
msgstr ""
-#: hggtk\thgconfig.py:513
+#: hggtk\thgconfig.py:515
msgid "TortoiseHg Configure User-Global Settings"
msgstr ""
-#: hggtk\thgconfig.py:557
+#: hggtk\thgconfig.py:559
msgid "Confirm quit without saving?"
msgstr ""
-#: hggtk\thgconfig.py:558
+#: hggtk\thgconfig.py:560
msgid "Yes to abandon changes, No to continue"
msgstr ""
-#: hggtk\thgconfig.py:646
+#: hggtk\thgconfig.py:649
msgid "No Repository Found"
msgstr ""
-#: hggtk\thgconfig.py:647
+#: hggtk\thgconfig.py:650
msgid "Path testing cannot work without a repository"
msgstr ""
-#: hggtk\thgconfig.py:713
+#: hggtk\thgconfig.py:717
msgid "Remote repository paths"
msgstr ""
-#: hggtk\thgconfig.py:735
+#: hggtk\thgconfig.py:739
msgid "Repository Path"
msgstr ""
-#: hggtk\thgconfig.py:749
+#: hggtk\thgconfig.py:753
msgid "_Edit"
msgstr ""
-#: hggtk\thgconfig.py:759
+#: hggtk\thgconfig.py:763
msgid "_Test"
msgstr ""
-#: hggtk\thgconfig.py:764
+#: hggtk\thgconfig.py:768
msgid "Set as _default"
msgstr ""
-#: hggtk\thgconfig.py:863
+#: hggtk\thgconfig.py:868
msgid "Suggested"
msgstr ""
-#: hggtk\thgconfig.py:873
+#: hggtk\thgconfig.py:878
msgid "History"
msgstr ""
-#: hggtk\thgconfig.py:911
+#: hggtk\thgconfig.py:916
msgid "# Generated by tortoisehg-config\n"
msgstr ""
-#: hggtk\thgconfig.py:948
+#: hggtk\thgconfig.py:953
msgid "Skipped saving path with no alias"
msgstr ""
-#: hggtk\thgconfig.py:976
+#: hggtk\thgconfig.py:983
msgid "Unable to write configuration file"
msgstr ""
@@ -3361,11 +3397,27 @@msgid "There are no file changes to view"
msgstr ""
-#: hggtk\visdiff.py:242
+#: hggtk\visdiff.py:213
+msgid "Unable to delete temp files"
+msgstr ""
+
+#: hggtk\visdiff.py:214
+msgid "Close diff tools and try again, or quit to leak files?"
+msgstr ""
+
+#: hggtk\visdiff.py:215
+msgid "&Quit"
+msgstr ""
+
+#: hggtk\visdiff.py:215
+msgid "Try &Again"
+msgstr ""
+
+#: hggtk\visdiff.py:253
msgid "Tool launch failure"
msgstr ""
-#: hggtk\visdiff.py:243
+#: hggtk\visdiff.py:254
msgid "%s : %s"
msgstr ""
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
@@ -125,7 +125,7 @@
# Create a config.py. Distributions will need to supply their own
cfgfile = os.path.join('thgutil', 'config.py')
- if not os.path.exists(cfgfile):
+ if not os.path.exists(cfgfile) and not os.path.exists('.hg/requires'):
f = open(cfgfile, "w")
f.write('bin_path = "/usr/bin"\n')
f.write('license_path = "/usr/share/doc/tortoisehg/Copying.txt.gz"\n')
|
||
Add a tag
Loading...