Commits

Steve Borho  committed 759b1ec Merge

Merge with stable

  • Participants
  • Parent commits 36e5c9d, 3a4d5c7

Comments (0)

Files changed (52)

 3cce987fa9b1f5f1e65995c5d2c0916144c95b83 2.9
 807f613ce8f05a7805690bd6400ab3ef34a6381c 2.9.1
 5719b55f4f267d58e52795155a14c7432524b08a 2.9.2
+46cb68ca0ac2831a94c75fe9ffa076751916dcb7 2.10

File doc/source/conf.py

 # built documents.
 #
 # The short X.Y version.
-version = '2.9'
+version = '2.10'
 # The full version, including alpha/beta/rc tags.
-release = '2.9.0'
+release = '2.10.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

File doc/source/figures/mq-tasktab.png

Removed
Old image

File doc/source/patches.txt

 
 When MQ is enabled, several Workbench features are exposed. Context menu
 options are exposed in the changeset menus, your patch queue is graphed
-together with your repository's history, and a Patch Queue task tab is
-activated.
-
-.. figure:: figures/mq-tasktab.png
-	:alt: Patch Queue Task Tab
-
-	MQ tool or task tab
-
-The :guilabel:`Patch Queue` task tab is also available as :command:`thg
-mq` from the command line.  Most MQ features are available from the
-Patch Queue task tab, though a few features (qimport -r/qfinish) are
-only supported via revision graph context menus.  Much functionality is
-supported in both places.
+together with your repository's history, and a Patch Queue is activated.
 
 Double clicking on an unapplied patch, an applied patch other than the
 current qtip, or the qparent triggers a qgoto command; making the double
 clicked revision the current patch.  Double clicking on any other
 revision will trigger a visual diff of that revision.
 
-In previous releases, the commit tool was a central feature in MQ use.
-In TortoiseHg 2.0, the commit tool is almost completely unaware of MQ.
-It only knows to not allow commits if the current working parent is an
-applied patch.  Instead, MQ functionality has been focused into the
-Workbench, Patch Queue task tab, and the shelve tool.
-
 .. note::
 	The Workbench must be restarted after enabling or disabling the MQ
 	extension in a repository.  This is true of most extensions.
 	It is recommended to learn the MQ extension before using the MQ
 	features of the Workbench.
 
+.. versionchanged:: 2.10
+   The :guilabel:`Patch Queue` task tab has been superseded by the
+   :guilabel:`Commit` task tab and the :guilabel:`Patch Queue` dock.
+
 Patch Rejects
 =============
 

File doc/source/workbench.txt

 
 ..
 
-	:guilabel:`Patch Queue`
-		This widget implements the MQ extension functionality.
-		See _`Patch Queue` for more detail.
-
-..		.. figure:: figures/mq-tasktab.png
-			:alt: Patch Queue Task Tab
-			
-			Patch Queue Task Tab
-
-..
-
 There is some relation between the revision or patch selected in the graph pane,
 and the task tabs.
 

File i18n/tortoisehg/ar.po

 msgstr ""
 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-23 19:25-0300\n"
+"POT-Creation-Date: 2013-10-31 00:28-0200\n"
 "PO-Revision-Date: 2011-10-25 07:12+0000\n"
 "Last-Translator: Fadi Mansour <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2013-09-24 06:02+0000\n"
-"X-Generator: Launchpad (build 16771)\n"
+"X-Launchpad-Export-Date: 2013-10-31 05:23+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
 
 msgid "TortoiseHg Overlay Icon Server"
 msgstr "مخدم أيقونات الدلالة لتورتويز إتش جي"
 msgid "Copyright 2008-2013 Steve Borho and others"
 msgstr ""
 
-msgid "Several icons are courtesy of the TortoiseSVN project"
-msgstr "عدد من الإيقونات مقتبسة من تورتويز إس في إن"
+msgid "Several icons are courtesy of the TortoiseSVN and Tango projects"
+msgstr ""
 
 msgid "You can visit our site here"
 msgstr "يمكنك زيارة موقعنا من هنا"
 msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
 msgstr "باستخدام Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
 
-msgid "A new version of TortoiseHg is ready for download!"
-msgstr "هناك نسخة جديدة من تورتويز إتش جي جاهزة للتحميل"
+#, python-format
+msgid "A new version of TortoiseHg (%s) is ready for download!"
+msgstr ""
 
 msgid "= Working Directory Parent ="
 msgstr "=أب مجلد العمل="
 msgid "Clean"
 msgstr ""
 
-msgid "&Discard"
-msgstr ""
-
-msgid "Confirm Discard"
-msgstr ""
-
-msgid "Discard outstanding changes to working directory?"
-msgstr ""
-
 msgid "Backing out, then merging..."
 msgstr ""
 
 msgid "Select patch folder"
 msgstr ""
 
+msgid "failed to start command\n"
+msgstr ""
+
+msgid "error while running command\n"
+msgstr ""
+
+msgid "Terminated by user"
+msgstr ""
+
+#, python-format
+msgid "[command terminated by user %s]"
+msgstr ""
+
+#, python-format
+msgid "[command interrupted %s]"
+msgstr ""
+
 #, python-format
 msgid "[command returned code %d %%s]"
 msgstr ""
 msgid "[command completed successfully %s]"
 msgstr ""
 
-msgid "failed to start command\n"
-msgstr ""
-
-msgid "error while running command\n"
-msgstr ""
-
 msgid "Running..."
 msgstr ""
 
-msgid "Terminated by user"
-msgstr ""
-
-msgid "Terminated"
-msgstr ""
-
 msgid "Failed!"
 msgstr ""
 
+msgid "Clea&r Log"
+msgstr ""
+
 msgid "TortoiseHg Command Dialog"
 msgstr ""
 
 "Are you sure you want to terminate?"
 msgstr ""
 
-msgid "TortoiseHg"
-msgstr ""
-
-msgctxt "window title"
+msgid "Command Error"
+msgstr ""
+
+#, python-format
+msgid "[Code: %d]"
+msgstr ""
+
+msgctxt "start progress"
 msgid "Commit"
 msgstr ""
 
-msgid "Commit Dialog Toolbar"
-msgstr ""
-
-msgid "Branch: "
-msgstr ""
-
-msgid "Copy message"
-msgstr ""
-
-msgid "Copy one of the recent commit messages"
-msgstr ""
-
-msgid "Show Issues"
-msgstr ""
-
-msgid "Please wait..."
-msgstr ""
-
-#, python-format
-msgid "Failed to load issue tracker '%s': %s"
-msgstr ""
-
-msgid "Issue Tracker"
-msgstr ""
-
-msgid "Show Issues..."
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "Commit changes"
-msgstr ""
-
-msgid "Commit"
-msgstr ""
-
-msgid "Amend current revision"
-msgstr ""
-
-msgid "Amend"
-msgstr ""
-
-msgid "Create a new patch"
-msgstr ""
-
-msgid "QNew"
-msgstr ""
-
-msgid "Refresh current patch"
-msgstr ""
-
-msgid "QRefresh"
-msgstr ""
-
-msgid "Confirm Branch Change"
-msgstr ""
-
-#, python-format
-msgid "Named branch \"%s\" already exists, last used in revision %d\n"
-msgstr ""
-
-msgid "Restart &Branch"
-msgstr ""
-
-msgid "&Commit to current branch"
-msgstr ""
-
-msgid "Confirm New Branch"
-msgstr ""
-
-#, python-format
-msgid "Create new named branch \"%s\" with this commit?\n"
-msgstr ""
-
-msgid "Create &Branch"
-msgstr ""
-
 msgctxt "start progress"
 msgid "MQ Action"
 msgstr ""
 
-msgid "Close Branch: "
-msgstr ""
-
-msgid "New Branch: "
-msgstr ""
-
-#, python-format
-msgid "<b>Selected Options:</b> %s"
-msgstr ""
-
-msgid "Parent:"
-msgstr ""
-
-msgid "Patch name:"
-msgstr ""
-
-#, python-format
-msgid "Close %s branch"
-msgstr ""
-
-#, python-format
-msgid "Rollback commit to revision %d"
-msgstr ""
-
-msgid "Confirm Undo"
-msgstr ""
-
 msgctxt "start progress"
 msgid "Rollback"
 msgstr ""
 
+msgid "Commit Dialog Toolbar"
+msgstr ""
+
+msgid "Branch: "
+msgstr ""
+
+msgid "Copy message"
+msgstr ""
+
+msgid "Copy one of the recent commit messages"
+msgstr ""
+
+msgid "Show Issues"
+msgstr ""
+
+msgid "Please wait..."
+msgstr ""
+
+#, python-format
+msgid "Failed to load issue tracker '%s': %s"
+msgstr ""
+
+msgid "Issue Tracker"
+msgstr ""
+
+msgid "Show Issues..."
+msgstr ""
+
+msgid "Stop"
+msgstr ""
+
+msgid "Commit changes"
+msgstr ""
+
+msgid "Commit"
+msgstr ""
+
+msgid "Amend current revision"
+msgstr ""
+
+msgid "Amend"
+msgstr ""
+
+msgid "Create a new patch"
+msgstr ""
+
+msgid "QNew"
+msgstr ""
+
+msgid "Refresh current patch"
+msgstr ""
+
+msgid "QRefresh"
+msgstr ""
+
+msgid "Confirm Branch Change"
+msgstr ""
+
+#, python-format
+msgid "Named branch \"%s\" already exists, last used in revision %d\n"
+msgstr ""
+
+msgid "Restart &Branch"
+msgstr ""
+
+msgid "&Commit to current branch"
+msgstr ""
+
+msgid "Confirm New Branch"
+msgstr ""
+
+#, python-format
+msgid "Create new named branch \"%s\" with this commit?\n"
+msgstr ""
+
+msgid "Create &Branch"
+msgstr ""
+
+msgid "Close Branch: "
+msgstr ""
+
+msgid "New Branch: "
+msgstr ""
+
+#, python-format
+msgid "<b>Selected Options:</b> %s"
+msgstr ""
+
+msgid "Parent:"
+msgstr ""
+
+msgid "Patch name:"
+msgstr ""
+
+#, python-format
+msgid "Close %s branch"
+msgstr ""
+
+#, python-format
+msgid "Rollback commit to revision %d"
+msgstr ""
+
+msgid "Confirm Undo"
+msgstr ""
+
 msgid "Discard current commit message?"
 msgstr ""
 
 msgid "Remove selected deleted files?"
 msgstr ""
 
-msgctxt "start progress"
+msgctxt "window title"
 msgid "Commit"
 msgstr ""
 
 msgid "Converted From:"
 msgstr ""
 
+msgid "Original Parent:"
+msgstr ""
+
 msgid "No items to display"
 msgstr ""
 
 msgid "Custom Tools"
 msgstr ""
 
-msgid "failed to run command\n"
-msgstr ""
-
-msgid "crashed\n"
-msgstr ""
-
 #, python-format
 msgid "command parse error: %s"
 msgstr ""
 msgstr ""
 
 #, python-format
+msgid "changeset: %s"
+msgstr ""
+
+msgid "Initial revision"
+msgstr ""
+
+#, python-format
 msgid ""
 "[WARNING] Invalid subrepo revision ID:\n"
 "\t%s\n"
 msgid "Subrepo removed from repository."
 msgstr ""
 
+msgid "Previously the subrepository was at the following revision:"
+msgstr ""
+
 msgid "Subrepo was not changed."
 msgstr ""
 
+msgid "[WARNING] Missing subrepo. Update to this revision to clone it."
+msgstr ""
+
+msgid "[WARNING] Incomplete subrepo. Update to this revision to pull it."
+msgstr ""
+
 msgid "Subrepo state is:"
 msgstr ""
 
-#, python-format
-msgid "changeset: %s"
-msgstr ""
-
 msgid "Revision has changed to:"
 msgstr ""
 
+#, python-format
+msgid "changeset: %s (not found on subrepository)"
+msgstr ""
+
 msgid "From:"
 msgstr ""
 
+msgid ""
+"[WARNING] Missing changed subrepository. Update to this revision to clone it."
+msgstr ""
+
 msgid "Subrepository not found in the working directory."
 msgstr ""
 
-msgid "Further subrepository revision information cannot be retrieved."
-msgstr ""
-
-msgid "Subrepository is either damaged or missing some revisions"
-msgstr ""
-
-msgid ""
-"You may need to open the missing subrepository and manually\n"
-"pull the missing revisions from its source repository."
-msgstr ""
-
-msgid "Initial revision"
+msgid ""
+"[WARNING] Incomplete changed subrepository. Update to this revision to pull "
+"it."
 msgstr ""
 
 msgid "Not a Mercurial subrepo, not previewable"
 msgid "Error previewing subrepo: %s"
 msgstr ""
 
+msgid "Subrepo may be damaged or inaccessible."
+msgstr ""
+
 msgid "The subrepository is dirty."
 msgstr ""
 
 msgid "View File at"
 msgstr ""
 
+msgid "Diff File to"
+msgstr ""
+
 msgid "&Originating Revision"
 msgstr ""
 
+msgid "&Local"
+msgstr ""
+
 #, python-format
 msgid "&Parent Revision (%d)"
 msgstr ""
 msgid "Discard all changes from merge target (other) revision"
 msgstr ""
 
+msgid "&Discard"
+msgstr ""
+
 msgid "Confirm Discard Changes"
 msgstr ""
 
 msgid "C&onfigure Format"
 msgstr ""
 
+msgid "&Commit to Queue..."
+msgstr ""
+
+msgid "Create &New Queue..."
+msgstr ""
+
+msgid "&Rename Active Queue..."
+msgstr ""
+
+msgid "&Delete Queue..."
+msgstr ""
+
+msgid "&Purge Queue..."
+msgstr ""
+
+msgid "Create Patch Queue"
+msgstr ""
+
+msgid "New patch queue name"
+msgstr ""
+
+msgid "Rename Patch Queue"
+msgstr ""
+
+#, python-format
+msgid "Rename patch queue '%s' to"
+msgstr ""
+
+msgid "Rename"
+msgstr ""
+
+msgid "Delete Patch Queue"
+msgstr ""
+
+msgid "Delete reference to"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Purge Patch Queue"
+msgstr ""
+
+msgid "Remove patch directory of"
+msgstr ""
+
+msgid "Purge"
+msgstr ""
+
+msgid "Rename Patch"
+msgstr ""
+
+#, python-format
+msgid "Rename patch <b>%s</b> to:"
+msgstr ""
+
+msgid "no guards"
+msgstr ""
+
 msgid "Patch Queue"
 msgstr ""
 
 msgid "Apply one patch"
 msgstr ""
 
-msgid "Guards"
+msgid "Set &Guards..."
 msgstr ""
 
 msgid "Configure guards for selected patch"
 msgstr ""
 
-msgid "Reorder patches"
-msgstr ""
-
-msgid "Delete"
+msgid "&Delete Patches..."
 msgstr ""
 
 msgid "Delete selected patches"
 msgid "Unapply all patches"
 msgstr ""
 
+msgid "Re&name Patch..."
+msgstr ""
+
 msgid "Patch Queue Actions Toolbar"
 msgstr ""
 
-msgid ""
-"<p>ATTENTION!<br>Guard or comment found.<br>Reordering patches will destroy "
-"them.<br><br>Continue?</p>"
-msgstr ""
-
 msgid "Configure guards"
 msgstr ""
 
 msgid "Input new guards for %s:"
 msgstr ""
 
-msgid "Guards must begin with \"+\" or \"-\""
-msgstr ""
-
-msgid "no guards"
+msgid "Confirm patch queue switch"
+msgstr ""
+
+#, python-format
+msgid "Do you really want to activate patch queue '%s' ?"
 msgstr ""
 
 #, python-format
 msgid "Guards: %d/%d"
 msgstr ""
 
-msgid "Queues"
-msgstr ""
-
-msgid "New Patch"
-msgstr ""
-
-msgid "TortoiseHg Patch Queue"
-msgstr ""
-
-msgid "QCommit"
-msgstr ""
-
-msgid "Create MQ repo"
-msgstr ""
-
-msgid "Patch commit messages..."
-msgstr ""
-
 msgid "MQ options"
 msgstr ""
 
-msgid "Force use of git extended diff format (--git)"
-msgstr ""
-
 msgid "Force push or pop (--force)"
 msgstr ""
 
-msgid "Apply patch to its recorded parent (--exact)"
-msgstr ""
-
-msgid "Update date field with current date (--currentdate)"
-msgstr ""
-
-msgid "Specify an explicit date:"
-msgstr ""
-
-msgid "Update author field with current user (--currentuser)"
-msgstr ""
-
-msgid "Specify an explicit author:"
+msgid "Tolerate non-conflicting local changes (--keep-changes)"
 msgstr ""
 
 msgid "### patch name ###"
 msgid "Deleted %d files and %d folders"
 msgstr ""
 
-#, python-format
-msgid "Patch remove - %s"
+msgid "Delete Patches"
 msgstr ""
 
 msgid "Remove patches from queue?"
 msgid "Patches to fold"
 msgstr ""
 
-msgid "Manage MQ patch queues"
-msgstr ""
-
-msgid "Repository:"
-msgstr ""
-
-msgid "Patch queues:"
-msgstr ""
-
-msgid "Reload"
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Rename"
-msgstr ""
-
-msgid "Purge"
-msgstr ""
-
-msgid "Patches:"
-msgstr ""
-
-msgid "QQueue"
-msgstr ""
-
-msgid "Confirm patch queue switch"
-msgstr ""
-
-#, python-format
-msgid "Do you really want to activate patch queue '%s' ?"
-msgstr ""
-
-msgid "TortoiseHg Prompt"
-msgstr ""
-
-msgid "New patch queue name"
-msgstr ""
-
-#, python-format
-msgid "Rename patch queue '%s' to"
-msgstr ""
-
-msgid "Confirm patch queue delete"
-msgstr ""
-
-#, python-format
-msgid "Do you really want to delete patch queue '%s' ?"
-msgstr ""
-
-msgid "Confirm patch queue purge"
-msgstr ""
-
-#, python-format
-msgid ""
-"<p>This will also erase the patchfiles on disk!</p><p>Do you really want to "
-"purge patch queue '%s' ?</p>"
-msgstr ""
-
-#, python-format
-msgid "Patch rename - %s"
-msgstr ""
-
-#, python-format
-msgid "Rename patch <b>%s</b> to:"
-msgstr ""
-
 msgid "Rename Error"
 msgstr ""
 
 msgid "Go back and change new patchname"
 msgstr ""
 
-msgid "Reorder Unapplied Patches"
-msgstr ""
-
-msgid "Unapplied Patches - drag to reorder"
-msgstr ""
-
-msgid "Applied Patches"
-msgstr ""
-
-msgid "Rename patch"
-msgstr ""
-
 msgid "&Undo"
 msgstr ""
 
 msgid "&Delete"
 msgstr ""
 
+msgid "&Editor Options"
+msgstr ""
+
 msgid "&Wrap"
 msgstr ""
 
 msgid "&AfterIndent"
 msgstr ""
 
+msgid "&TAB Inserts"
+msgstr ""
+
+msgid "&Auto"
+msgstr ""
+
+msgid "&TAB"
+msgstr ""
+
+msgid "&Spaces"
+msgstr ""
+
 msgid "EOL &Visibility"
 msgstr ""
 
 msgid "&Mac"
 msgstr ""
 
-msgid "&TAB Inserts"
-msgstr ""
-
-msgid "&Auto"
-msgstr ""
-
-msgid "&TAB"
-msgstr ""
-
-msgid "&Spaces"
-msgstr ""
-
 msgid "&Auto-Complete"
 msgstr ""
 
-msgid "&Enable"
-msgstr ""
-
-msgid "&Disable"
-msgstr ""
-
-msgid "&Editor Options"
-msgstr ""
-
 msgid "### regular expression ###"
 msgstr ""
 
 msgid "hint:"
 msgstr ""
 
-msgid "Keyboard interrupt"
+msgid "Keyboard Interrupt"
 msgstr ""
 
 msgid "Close this application?"
 msgid "Unable to translate input to local encoding."
 msgstr ""
 
-msgid "Goto"
-msgstr ""
-
-msgid "Go"
-msgstr ""
-
 msgid "Checkmark files to add"
 msgstr ""
 
 msgid "To rebase destination"
 msgstr ""
 
+msgid "Swap source and destination"
+msgstr ""
+
 msgid "Keep original changesets"
 msgstr ""
 
 msgid "Collapse the rebased changesets "
 msgstr ""
 
+msgid "Rebase entire source branch"
+msgstr ""
+
 msgid "Rebase unpublished onto Subversion head (override source, destination)"
 msgstr ""
 
 msgid "Show/Hide hidden changesets"
 msgstr ""
 
+msgid "Toggle graft relations visibility"
+msgstr ""
+
 msgid "Keyword Search"
 msgstr ""
 
 msgid "Convert an existing repository into a subrepository"
 msgstr ""
 
+msgid "Remo&ve Subrepository..."
+msgstr ""
+
+msgid "Remove this subrepository from the current revision"
+msgstr ""
+
 msgid "Copy the root path of the repository to the clipboard"
 msgstr ""
 
 msgid "Cannot update the .hgsub file in:<br><br>%s"
 msgstr ""
 
+msgid "Could not open .hgsub file"
+msgstr ""
+
+msgid "Cannot read the .hgsub file.<p>Subrepository removal failed."
+msgstr ""
+
+msgid "Subrepository not found"
+msgstr ""
+
+msgid ""
+"The selected subrepository was not found on the .hgsub file.<p>Perhaps it "
+"has already been removed?"
+msgstr ""
+
+msgid "&Yes"
+msgstr ""
+
+msgid "&No"
+msgstr ""
+
+msgid "Remove the selected repository?"
+msgstr ""
+
+#, python-format
+msgid ""
+"Do you really want to remove the repository \"<i>%s</i>\" from its parent "
+"repository \"<i>%s</i>\""
+msgstr ""
+
+msgid "Subrepository removed from .hgsub"
+msgstr ""
+
+msgid ""
+"The selected subrepository has been removed from the .hgsub file.<p>Remember "
+"that you must commit this .hgsub change in order to complete the removal of "
+"the subrepository!"
+msgstr ""
+
+msgid "Could not update .hgsub file"
+msgstr ""
+
+msgid "Cannot update the .hgsub file.<p>Subrepository removal failed."
+msgstr ""
+
 msgid "New Group"
 msgstr ""
 
 msgstr ""
 
 msgctxt "tab tooltip"
-msgid "MQ Patch"
-msgstr ""
-
-msgctxt "tab tooltip"
 msgid "Synchronize"
 msgstr ""
 
 msgid "Sync tab cannot exit"
 msgstr ""
 
-msgid "MQ tab cannot exit"
-msgstr ""
-
 msgid "Search tab cannot exit"
 msgstr ""
 
 msgid "Modi&fy History"
 msgstr ""
 
-msgid "&Unapply Patch (qgoto parent)"
+msgid "&Unapply Patch"
 msgstr ""
 
 msgid "Import to &MQ"
 msgid "&Finish Patch"
 msgstr ""
 
-msgid "Re&name Patch..."
+msgid "MQ &Options"
 msgstr ""
 
 msgid "&Rebase..."
 msgid "Compress History..."
 msgstr ""
 
+msgid "Rebase..."
+msgstr ""
+
 msgid "Goto common ancestor"
 msgstr ""
 
 msgid "Post Selected to Review Board..."
 msgstr ""
 
-msgid "Apply patch (QGoto)"
-msgstr ""
-
-msgid "QPush --move"
+msgid "Apply patch"
+msgstr ""
+
+msgid "Apply onto original parent"
+msgstr ""
+
+msgid "Apply only this patch"
 msgstr ""
 
 msgid "Fold patches..."
 msgid "Delete patches..."
 msgstr ""
 
-msgid "Reorder patches..."
-msgstr ""
-
 msgid "Rename patch..."
 msgstr ""
 
 msgid "The selected command is empty"
 msgstr ""
 
+#, python-format
+msgid ""
+"The following error message was returned:\n"
+"\n"
+"<b>%s</b>"
+msgstr ""
+
+msgid ""
+"\n"
+"\n"
+"Please check that the \"thg\" command is valid."
+msgstr ""
+
+msgid "Failed to execute custom TortoiseHg command"
+msgstr ""
+
+#, python-format
+msgid "The command \"%s\" failed (code %d)."
+msgstr ""
+
 msgid "Failed to execute custom command"
 msgstr ""
 
 "application"
 msgstr ""
 
-msgid "Unable to start"
-msgstr ""
-
-msgid "Previous command is still running"
-msgstr ""
-
 #, python-format
 msgid "Resolve Conflicts - %s"
 msgstr ""
 msgid "%s - Revision Details (%s)"
 msgstr ""
 
-msgid "Cannot revert to working directory"
-msgstr ""
-
-msgid "Reverting to the working directory revision does not make sense"
-msgstr ""
-
 #, python-format
 msgid "Revert - %s"
 msgstr ""
 
 #, python-format
-msgid "<b>Revert %s to its contents at revision %d?</b>"
-msgstr ""
-
-#, python-format
-msgid "<b>Revert %d files to their contents at revision %d?</b>"
+msgid "<b>Revert %s to its contents at the following revision?</b>"
+msgstr ""
+
+#, python-format
+msgid "<b>Revert %d files to their contents at the following revision?</b>"
 msgstr ""
 
 msgid "Revert all files to this revision"
 msgstr ""
 
+#, python-format
+msgid "revision %d's first parent (i.e. revision %d)"
+msgstr ""
+
+#, python-format
+msgid "revision %d's second parent (i.e. revision %d)"
+msgstr ""
+
+msgid "null revision (i.e. remove file(s))"
+msgstr ""
+
 msgid "Confirm Revert"
 msgstr ""
 
 msgid "thg merge [[-r] REV]"
 msgstr ""
 
-msgid "thg mq"
-msgstr ""
-
 msgid "a revision to post"
 msgstr ""
 
 msgid "thg purge"
 msgstr ""
 
-msgid "thg qqueue"
-msgstr ""
-
-msgid "Please enable the MQ extension first."
-msgstr ""
-
-msgid "thg qreorder"
-msgstr ""
-
 msgid "keep original changesets"
 msgstr ""
 
 msgid "thg shelve"
 msgstr ""
 
+msgid "sign even if the sigfile is modified"
+msgstr ""
+
+msgid "make the signature local"
+msgstr ""
+
+msgid "the key id to sign with"
+msgstr ""
+
+msgid "do not commit the sigfile after signing"
+msgstr ""
+
+msgid "use <text> as commit message"
+msgstr ""
+
+msgid "thg sign [-f] [-l] [-k KEY] [-m TEXT] [REV]"
+msgstr ""
+
+msgid "Please enable the Gpg extension first."
+msgstr ""
+
 msgid "show files without changes"
 msgstr ""
 
 msgid "remove a tag"
 msgstr ""
 
-msgid "use <text> as commit message"
-msgstr ""
-
 msgid "thg tag [-f] [-l] [-m TEXT] [-r REV] [NAME]"
 msgstr ""
 
 msgid "&Unspecified"
 msgstr ""
 
+#, python-format
+msgid "%dpt"
+msgstr ""
+
+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Strike"
+msgstr ""
+
+msgid "Underline"
+msgstr ""
+
 msgid "&Set..."
 msgstr ""
 
 "Specify which task buttons you want to show on the task toolbar and in which "
 "order.<br>Type a list of the task button names. Add separators by putting \"|"
 "\" between task button names.<br>Valid names are: log commit mq sync "
-"manifest grep and pbranch.<br>Default: log commit mq manifest grep pbranch | "
+"manifest grep and pbranch.<br>Default: log commit manifest grep pbranch | "
 "sync"
 msgstr ""
 
 "Queues Extension. Default: None (leave blank)"
 msgstr ""
 
-msgid "After Pull Operation"
-msgstr ""
-
-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, updateorrebase equates to pull -u --rebase.  "
-"Default: none"
-msgstr ""
-
-msgid "Default Push"
-msgstr ""
-
-msgid ""
-"Select the revisions that will be pushed by default, whenever you click the "
-"Push button.<ul><li><b>all</b>: The default. Push all changes in <i>all "
-"branches</i>.<li><b>branch</b>: Push all changes in the <i>current branch</"
-"i>.<li><b>revision</b>: Push the changes in the current branch <i><u>up to</"
-"u> the current revision</i>.</ul><p>Default: all"
-msgstr ""
-
-msgid "Confirm Push"
-msgstr ""
-
-msgid ""
-"Determines if TortoiseHg should show a confirmation dialog before pushing "
-"changesets. If False, push will be performed without any confirmation "
-"dialog. Default: True"
-msgstr ""
-
 msgid "Activate Bookmarks"
 msgstr ""
 
 "activate any bookmarks.</ul><p>Default: prompt"
 msgstr ""
 
-msgid "Target combo"
-msgstr ""
-
-msgid ""
-"Select if TortoiseHg will show a target combo in the sync toolbar."
-"<ul><li><b>auto</b>: The default. Show the combo if more than one target "
-"configured.<li><b>always</b>: Always show the combo.</ul><p>Default: auto"
-msgstr ""
-
 msgctxt "config item"
 msgid "Commit"
 msgstr ""
 "dialog.  Default: True"
 msgstr ""
 
+msgid "Sync"
+msgstr ""
+
+msgid "After Pull Operation"
+msgstr ""
+
+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, updateorrebase equates to pull -u --rebase.  "
+"Default: none"
+msgstr ""
+
+msgid "Default Push"
+msgstr ""
+
+msgid ""
+"Select the revisions that will be pushed by default, whenever you click the "
+"Push button.<ul><li><b>all</b>: The default. Push all changes in <i>all "
+"branches</i>.<li><b>branch</b>: Push all changes in the <i>current branch</"
+"i>.<li><b>revision</b>: Push the changes in the current branch <i><u>up to</"
+"u> the current revision</i>.</ul><p>Default: all"
+msgstr ""
+
+msgid "Confirm Push"
+msgstr ""
+
+msgid ""
+"Determines if TortoiseHg should show a confirmation dialog before pushing "
+"changesets. If False, push will be performed without any confirmation "
+"dialog. Default: True"
+msgstr ""
+
+msgid "Target Combo"
+msgstr ""
+
+msgid ""
+"Select if TortoiseHg will show a target combo in the sync toolbar."
+"<ul><li><b>auto</b>: The default. Show the combo if more than one target "
+"configured.<li><b>always</b>: Always show the combo.</ul><p>Default: auto"
+msgstr ""
+
+msgid "SSH Command"
+msgstr ""
+
+msgid ""
+"Command to use for SSH connections.<p>Default: \"ssh\" or \"TortoisePlink."
+"exe -ssh -2\" (Windows)"
+msgstr ""
+
 msgid "Server"
 msgstr ""
 
 "a successful commit.</ul><p>Default: never"
 msgstr ""
 
+msgid "Changeset Link"
+msgstr ""
+
+msgid ""
+"A \"template string\" that, when set, turns the revision number and short "
+"hashes that are shown on the revision panels into links.<br>The \"template "
+"string\" uses a \"mercurial template\"-like syntax that currently accepts "
+"two template expressions:<ul><li>{node|short} : replaced by the 12 digit "
+"revision id (note that {node} on its own is currently unsupported).<li>"
+"{rev} : replaced by the revision number.</ul>For example, in order to link "
+"to bitbucket commit pages you can set this to:<br>https://bitbucket.org/"
+"tortoisehg/thg/commits/{node|short}"
+msgstr ""
+
 msgid "Path to review board example \"http://demo.reviewboard.org\""
 msgstr ""
 
 msgid "Apply changes before exit?"
 msgstr ""
 
-msgid "&Yes"
-msgstr ""
-
 msgid "&No (discard changes)"
 msgstr ""
 
+msgid "Reload"
+msgstr ""
+
 msgid "Settings File:"
 msgstr ""
 
 msgid "&Yes (--force)"
 msgstr ""
 
-msgid "&No"
-msgstr ""
-
 msgid "Confirm Strip"
 msgstr ""
 
 msgid "password: "
 msgstr ""
 
+msgid "TortoiseHg Prompt"
+msgstr ""
+
 msgid "abort: "
 msgstr ""
 
 msgid "broken pipe\n"
 msgstr ""
 
-#, python-format
-msgid "[command terminated by user %s]"
-msgstr ""
-
-#, python-format
-msgid "[command interrupted %s]"
-msgstr ""
-
 msgid "Update to:"
 msgstr ""
 
 msgid "Revert files to local or other parent?"
 msgstr ""
 
-msgid "&Local"
-msgstr ""
-
 msgid "&Other"
 msgstr ""
 
 msgid "Delete the following unversioned files?"
 msgstr ""
 
+msgid "Confirm Discard"
+msgstr ""
+
+msgid "Discard outstanding changes to working directory?"
+msgstr ""
+
 msgid "Config files (*.conf *.config *.ini)"
 msgstr ""
 
 msgid "Open"
 msgstr ""
 
-msgid "TortoiseHg Workbench"
-msgstr ""
-
 msgid "New &Workbench"
 msgstr ""
 
 msgid "&View"
 msgstr ""
 
-msgid "Workbench Toolbars"
-msgstr ""
-
 msgid "&Repository"
 msgstr ""
 
 msgid "&Commit"
 msgstr ""
 
-msgid "M&Q Patch"
-msgstr ""
-
 msgid "&Patch Branch"
 msgstr ""
 
 msgid "Load all revisions into graph"
 msgstr ""
 
+msgid "Go to current revision"
+msgstr ""
+
 msgid "&Goto Revision..."
 msgstr ""
 
 msgid "&About TortoiseHg"
 msgstr ""
 
-msgid "Go to current revision"
-msgstr ""
-
 msgid "&Filter Toolbar"
 msgstr ""
 
 msgid "Failed to open repository"
 msgstr ""
 
+msgid "TortoiseHg Workbench"
+msgstr ""
+
 #, python-format
 msgid "%s - TortoiseHg Workbench - %s"
 msgstr ""
 #, python-format
 msgid "repository %s not found"
 msgstr ""
+
+#~ msgid "Several icons are courtesy of the TortoiseSVN project"
+#~ msgstr "عدد من الإيقونات مقتبسة من تورتويز إس في إن"
+
+#~ msgid "A new version of TortoiseHg is ready for download!"
+#~ msgstr "هناك نسخة جديدة من تورتويز إتش جي جاهزة للتحميل"

File i18n/tortoisehg/ca.po

 msgstr ""
 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-23 19:25-0300\n"
+"POT-Creation-Date: 2013-10-31 00:28-0200\n"
 "PO-Revision-Date: 2011-03-07 18:36+0000\n"
 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-09-24 06:03+0000\n"
-"X-Generator: Launchpad (build 16771)\n"
+"X-Launchpad-Export-Date: 2013-10-31 05:23+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
 
 msgid "TortoiseHg Overlay Icon Server"
 msgstr ""
 msgid "Copyright 2008-2013 Steve Borho and others"
 msgstr ""
 
-msgid "Several icons are courtesy of the TortoiseSVN project"
-msgstr "Algunes icones són cortesia del projecte TortoiseSVN"
+msgid "Several icons are courtesy of the TortoiseSVN and Tango projects"
+msgstr ""
 
 msgid "You can visit our site here"
 msgstr ""
 msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
 msgstr ""
 
-msgid "A new version of TortoiseHg is ready for download!"
-msgstr "Una nova versió de TortoiseHg està llesta per descarregar !"
+#, python-format
+msgid "A new version of TortoiseHg (%s) is ready for download!"
+msgstr ""
 
 msgid "= Working Directory Parent ="
 msgstr ""
 msgid "Clean"
 msgstr ""
 
-msgid "&Discard"
-msgstr ""
-
-msgid "Confirm Discard"
-msgstr ""
-
-msgid "Discard outstanding changes to working directory?"
-msgstr ""
-
 msgid "Backing out, then merging..."
 msgstr ""
 
 msgid "Select patch folder"
 msgstr ""
 
+msgid "failed to start command\n"
+msgstr ""
+
+msgid "error while running command\n"
+msgstr ""
+
+msgid "Terminated by user"
+msgstr ""
+
+#, python-format
+msgid "[command terminated by user %s]"
+msgstr ""
+
+#, python-format
+msgid "[command interrupted %s]"
+msgstr ""
+
 #, python-format
 msgid "[command returned code %d %%s]"
 msgstr ""
 msgid "[command completed successfully %s]"
 msgstr ""
 
-msgid "failed to start command\n"
-msgstr ""
-
-msgid "error while running command\n"
-msgstr ""
-
 msgid "Running..."
 msgstr ""
 
-msgid "Terminated by user"
-msgstr ""
-
-msgid "Terminated"
-msgstr ""
-
 msgid "Failed!"
 msgstr ""
 
+msgid "Clea&r Log"
+msgstr ""
+
 msgid "TortoiseHg Command Dialog"
 msgstr ""
 
 "Are you sure you want to terminate?"
 msgstr ""
 
-msgid "TortoiseHg"
-msgstr ""
-
-msgctxt "window title"
+msgid "Command Error"
+msgstr ""
+
+#, python-format
+msgid "[Code: %d]"
+msgstr ""
+
+msgctxt "start progress"
 msgid "Commit"
 msgstr ""
 
-msgid "Commit Dialog Toolbar"
-msgstr ""
-
-msgid "Branch: "
-msgstr ""
-
-msgid "Copy message"
-msgstr ""
-
-msgid "Copy one of the recent commit messages"
-msgstr ""
-
-msgid "Show Issues"
-msgstr ""
-
-msgid "Please wait..."
-msgstr ""
-
-#, python-format
-msgid "Failed to load issue tracker '%s': %s"
-msgstr ""
-
-msgid "Issue Tracker"
-msgstr ""
-
-msgid "Show Issues..."
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "Commit changes"
-msgstr ""
-
-msgid "Commit"
-msgstr ""
-
-msgid "Amend current revision"
-msgstr ""
-
-msgid "Amend"
-msgstr ""
-
-msgid "Create a new patch"
-msgstr ""
-
-msgid "QNew"
-msgstr ""
-
-msgid "Refresh current patch"
-msgstr ""
-
-msgid "QRefresh"
-msgstr ""
-
-msgid "Confirm Branch Change"
-msgstr ""
-
-#, python-format
-msgid "Named branch \"%s\" already exists, last used in revision %d\n"
-msgstr ""
-
-msgid "Restart &Branch"
-msgstr ""
-
-msgid "&Commit to current branch"
-msgstr ""
-
-msgid "Confirm New Branch"
-msgstr ""
-
-#, python-format
-msgid "Create new named branch \"%s\" with this commit?\n"
-msgstr ""
-
-msgid "Create &Branch"
-msgstr ""
-
 msgctxt "start progress"
 msgid "MQ Action"
 msgstr ""
 
-msgid "Close Branch: "
-msgstr ""
-
-msgid "New Branch: "
-msgstr ""
-
-#, python-format
-msgid "<b>Selected Options:</b> %s"
-msgstr ""
-
-msgid "Parent:"
-msgstr ""
-
-msgid "Patch name:"
-msgstr ""
-
-#, python-format
-msgid "Close %s branch"
-msgstr ""
-
-#, python-format
-msgid "Rollback commit to revision %d"
-msgstr ""
-
-msgid "Confirm Undo"
-msgstr ""
-
 msgctxt "start progress"
 msgid "Rollback"
 msgstr ""
 
+msgid "Commit Dialog Toolbar"
+msgstr ""
+
+msgid "Branch: "
+msgstr ""
+
+msgid "Copy message"
+msgstr ""
+
+msgid "Copy one of the recent commit messages"
+msgstr ""
+
+msgid "Show Issues"
+msgstr ""
+
+msgid "Please wait..."
+msgstr ""
+
+#, python-format
+msgid "Failed to load issue tracker '%s': %s"
+msgstr ""
+
+msgid "Issue Tracker"
+msgstr ""
+
+msgid "Show Issues..."
+msgstr ""
+
+msgid "Stop"
+msgstr ""
+
+msgid "Commit changes"
+msgstr ""
+
+msgid "Commit"
+msgstr ""
+
+msgid "Amend current revision"
+msgstr ""
+
+msgid "Amend"
+msgstr ""
+
+msgid "Create a new patch"
+msgstr ""
+
+msgid "QNew"
+msgstr ""
+
+msgid "Refresh current patch"
+msgstr ""
+
+msgid "QRefresh"
+msgstr ""
+
+msgid "Confirm Branch Change"
+msgstr ""
+
+#, python-format
+msgid "Named branch \"%s\" already exists, last used in revision %d\n"
+msgstr ""
+
+msgid "Restart &Branch"
+msgstr ""
+
+msgid "&Commit to current branch"
+msgstr ""
+
+msgid "Confirm New Branch"
+msgstr ""
+
+#, python-format
+msgid "Create new named branch \"%s\" with this commit?\n"
+msgstr ""
+
+msgid "Create &Branch"
+msgstr ""
+
+msgid "Close Branch: "
+msgstr ""
+
+msgid "New Branch: "
+msgstr ""
+
+#, python-format
+msgid "<b>Selected Options:</b> %s"
+msgstr ""
+
+msgid "Parent:"
+msgstr ""
+
+msgid "Patch name:"
+msgstr ""
+
+#, python-format
+msgid "Close %s branch"
+msgstr ""
+
+#, python-format
+msgid "Rollback commit to revision %d"
+msgstr ""
+
+msgid "Confirm Undo"
+msgstr ""
+
 msgid "Discard current commit message?"
 msgstr ""
 
 msgid "Remove selected deleted files?"
 msgstr ""
 
-msgctxt "start progress"
+msgctxt "window title"
 msgid "Commit"
 msgstr ""
 
 msgid "Converted From:"
 msgstr ""
 
+msgid "Original Parent:"
+msgstr ""
+
 msgid "No items to display"
 msgstr ""
 
 msgid "Custom Tools"
 msgstr ""
 
-msgid "failed to run command\n"
-msgstr ""
-
-msgid "crashed\n"
-msgstr ""
-
 #, python-format
 msgid "command parse error: %s"
 msgstr ""
 msgstr ""
 
 #, python-format
+msgid "changeset: %s"
+msgstr ""
+
+msgid "Initial revision"
+msgstr ""
+
+#, python-format
 msgid ""
 "[WARNING] Invalid subrepo revision ID:\n"
 "\t%s\n"
 msgid "Subrepo removed from repository."
 msgstr ""
 
+msgid "Previously the subrepository was at the following revision:"
+msgstr ""
+
 msgid "Subrepo was not changed."
 msgstr ""
 
+msgid "[WARNING] Missing subrepo. Update to this revision to clone it."
+msgstr ""
+
+msgid "[WARNING] Incomplete subrepo. Update to this revision to pull it."
+msgstr ""
+
 msgid "Subrepo state is:"
 msgstr ""
 
-#, python-format
-msgid "changeset: %s"
-msgstr ""
-
 msgid "Revision has changed to:"
 msgstr ""
 
+#, python-format
+msgid "changeset: %s (not found on subrepository)"
+msgstr ""
+
 msgid "From:"
 msgstr ""
 
+msgid ""
+"[WARNING] Missing changed subrepository. Update to this revision to clone it."
+msgstr ""
+
 msgid "Subrepository not found in the working directory."
 msgstr ""
 
-msgid "Further subrepository revision information cannot be retrieved."
-msgstr ""
-
-msgid "Subrepository is either damaged or missing some revisions"
-msgstr ""
-
-msgid ""
-"You may need to open the missing subrepository and manually\n"
-"pull the missing revisions from its source repository."
-msgstr ""
-
-msgid "Initial revision"
+msgid ""
+"[WARNING] Incomplete changed subrepository. Update to this revision to pull "
+"it."
 msgstr ""
 
 msgid "Not a Mercurial subrepo, not previewable"
 msgid "Error previewing subrepo: %s"
 msgstr ""
 
+msgid "Subrepo may be damaged or inaccessible."
+msgstr ""
+
 msgid "The subrepository is dirty."
 msgstr ""
 
 msgid "View File at"
 msgstr ""
 
+msgid "Diff File to"
+msgstr ""
+
 msgid "&Originating Revision"
 msgstr ""
 
+msgid "&Local"
+msgstr ""
+
 #, python-format
 msgid "&Parent Revision (%d)"
 msgstr ""
 msgid "Discard all changes from merge target (other) revision"
 msgstr ""
 
+msgid "&Discard"
+msgstr ""
+
 msgid "Confirm Discard Changes"
 msgstr ""
 
 msgid "C&onfigure Format"
 msgstr ""
 
+msgid "&Commit to Queue..."
+msgstr ""
+
+msgid "Create &New Queue..."
+msgstr ""
+
+msgid "&Rename Active Queue..."
+msgstr ""
+
+msgid "&Delete Queue..."
+msgstr ""
+
+msgid "&Purge Queue..."
+msgstr ""
+
+msgid "Create Patch Queue"
+msgstr ""
+
+msgid "New patch queue name"
+msgstr ""
+
+msgid "Rename Patch Queue"
+msgstr ""
+
+#, python-format
+msgid "Rename patch queue '%s' to"
+msgstr ""
+
+msgid "Rename"
+msgstr ""
+
+msgid "Delete Patch Queue"
+msgstr ""
+
+msgid "Delete reference to"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Purge Patch Queue"
+msgstr ""
+
+msgid "Remove patch directory of"
+msgstr ""
+
+msgid "Purge"
+msgstr ""
+
+msgid "Rename Patch"
+msgstr ""
+
+#, python-format
+msgid "Rename patch <b>%s</b> to:"
+msgstr ""
+
+msgid "no guards"
+msgstr ""
+
 msgid "Patch Queue"