--- a/i18n/da.po Wed Jun 29 12:54:34 2011 +0200
+++ b/i18n/da.po Wed Jun 29 16:05:41 2011 -0500
@@ -18,7 +18,7 @@
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
"POT-Creation-Date: 2011-04-19 09:32+0200\n"
-"PO-Revision-Date: 2011-04-19 09:45+0200\n"
+"PO-Revision-Date: 2011-06-28 09:26+0200\n"
"Last-Translator: <mg@lazybytes.net>\n"
"Language-Team: Danish\n"
"Language: Danish\n"
@@ -44,6 +44,9 @@
"This section contains help for extensions that are distributed together with "
"Mercurial. Help for other extensions is available in the help system."
msgstr ""
+"Denne sektion indeholder hjælp for udviddelser distribueret sammen med\n"
+"Mercurial. Hjælp til andre udviddelser er tilgængelig i\n"
+"hjælpesystemet."
msgid "Options:"
msgstr "Valgmuligheder:"
--- a/i18n/ja.po Wed Jun 29 12:54:34 2011 +0200
+++ b/i18n/ja.po Wed Jun 29 16:05:41 2011 -0500
@@ -104,7 +104,7 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2011-03-01 15:32+0900\n"
+"POT-Creation-Date: 2011-06-29 21:47+0900\n"
"PO-Revision-Date: 2009-11-16 21:24+0100\n"
"Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
"Language-Team: Japanese\n"
@@ -386,140 +386,235 @@
msgid ""
"This hook extension adds comments on bugs in Bugzilla when changesets\n"
-"that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
-"bug status."
-msgstr ""
-
-msgid ""
-"The hook updates the Bugzilla database directly. Only Bugzilla\n"
-"installations using MySQL are supported."
-msgstr ""
-
-msgid ""
-"The hook relies on a Bugzilla script to send bug change notification\n"
-"emails. That script changes between Bugzilla versions; the\n"
-"'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
-"subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
-"be run by Mercurial as the user pushing the change; you will need to\n"
-"ensure the Bugzilla install file permissions are set appropriately."
-msgstr ""
-
-msgid ""
-"The extension is configured through three different configuration\n"
-"sections. These keys are recognized in the [bugzilla] section:"
-msgstr ""
-
-msgid ""
-"host\n"
-" Hostname of the MySQL server holding the Bugzilla database."
-msgstr ""
-
-msgid ""
-"db\n"
-" Name of the Bugzilla database in MySQL. Default 'bugs'."
-msgstr ""
-
-msgid ""
-"user\n"
-" Username to use to access MySQL server. Default 'bugs'."
-msgstr ""
-
-msgid ""
-"password\n"
+"that refer to bugs by Bugzilla ID are seen. The comment is formatted using\n"
+"the Mercurial template mechanism."
+msgstr ""
+
+msgid "The hook does not change bug status."
+msgstr ""
+
+msgid "Three basic modes of access to Bugzilla are provided:"
+msgstr ""
+
+msgid ""
+"1. Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later."
+msgstr ""
+
+msgid ""
+"2. Check data via the Bugzilla XMLRPC interface and submit bug change\n"
+" via email to Bugzilla email interface. Requires Bugzilla 3.4 or later."
+msgstr ""
+
+msgid ""
+"3. Writing directly to the Bugzilla database. Only Bugzilla installations\n"
+" using MySQL are supported. Requires Python MySQLdb."
+msgstr ""
+
+msgid ""
+"Writing directly to the database is susceptible to schema changes, and\n"
+"relies on a Bugzilla contrib script to send out bug change\n"
+"notification emails. This script runs as the user running Mercurial,\n"
+"must be run on the host with the Bugzilla install, and requires\n"
+"permission to read Bugzilla configuration details and the necessary\n"
+"MySQL user and password to have full access rights to the Bugzilla\n"
+"database. For these reasons this access mode is now considered\n"
+"deprecated, and will not be updated for new Bugzilla versions going\n"
+"forward."
+msgstr ""
+
+msgid ""
+"Access via XMLRPC needs a Bugzilla username and password to be specified\n"
+"in the configuration. Comments are added under that username. Since the\n"
+"configuration must be readable by all Mercurial users, it is recommended\n"
+"that the rights of that user are restricted in Bugzilla to the minimum\n"
+"necessary to add comments."
+msgstr ""
+
+msgid ""
+"Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends\n"
+"email to the Bugzilla email interface to submit comments to bugs.\n"
+"The From: address in the email is set to the email address of the Mercurial\n"
+"user, so the comment appears to come from the Mercurial user. In the event\n"
+"that the Mercurial user email is not recognised by Bugzilla as a Bugzilla\n"
+"user, the email associated with the Bugzilla username used to log into\n"
+"Bugzilla is used instead as the source of the comment."
+msgstr ""
+
+msgid "Configuration items common to all access modes:"
+msgstr ""
+
+msgid ""
+"bugzilla.version\n"
+" This access type to use. Values recognised are:"
+msgstr ""
+
+msgid ""
+" :``xmlrpc``: Bugzilla XMLRPC interface.\n"
+" :``xmlrpc+email``: Bugzilla XMLRPC and email interfaces.\n"
+" :``3.0``: MySQL access, Bugzilla 3.0 and later.\n"
+" :``2.18``: MySQL access, Bugzilla 2.18 and up to but not\n"
+" including 3.0.\n"
+" :``2.16``: MySQL access, Bugzilla 2.16 and up to but not\n"
+" including 2.18."
+msgstr ""
+
+msgid ""
+"bugzilla.regexp\n"
+" Regular expression to match bug IDs in changeset commit message.\n"
+" Must contain one \"()\" group. The default expression matches ``Bug\n"
+" 1234``, ``Bug no. 1234``, ``Bug number 1234``, ``Bugs 1234,5678``,\n"
+" ``Bug 1234 and 5678`` and variations thereof. Matching is case\n"
+" insensitive."
+msgstr ""
+
+msgid ""
+"bugzilla.style\n"
+" The style file to use when formatting comments."
+msgstr ""
+
+msgid ""
+"bugzilla.template\n"
+" Template to use when formatting comments. Overrides style if\n"
+" specified. In addition to the usual Mercurial keywords, the\n"
+" extension specifies:"
+msgstr ""
+
+msgid ""
+" :``{bug}``: The Bugzilla bug ID.\n"
+" :``{root}``: The full pathname of the Mercurial repository.\n"
+" :``{webroot}``: Stripped pathname of the Mercurial repository.\n"
+" :``{hgweb}``: Base URL for browsing Mercurial repositories."
+msgstr ""
+
+#, fuzzy
+msgid ""
+" Default ``changeset {node|short} in repo {root} refers to bug\n"
+" {bug}.\\ndetails:\\n\\t{desc|tabindent}``"
+msgstr ""
+"リポジトリ {root} のリビジョン {node|short} がバグ {bug} に関連。\n"
+"詳細:\n"
+"\t{desc|tabindent}"
+
+msgid ""
+"bugzilla.strip\n"
+" The number of path separator characters to strip from the front of\n"
+" the Mercurial repository path (``{root}`` in templates) to produce\n"
+" ``{webroot}``. For example, a repository with ``{root}``\n"
+" ``/var/local/my-project`` with a strip of 2 gives a value for\n"
+" ``{webroot}`` of ``my-project``. Default 0."
+msgstr ""
+
+msgid ""
+"web.baseurl\n"
+" Base URL for browsing Mercurial repositories. Referenced from\n"
+" templates as ``{hgweb}``."
+msgstr ""
+
+msgid "Configuration items common to XMLRPC+email and MySQL access modes:"
+msgstr ""
+
+msgid ""
+"bugzilla.usermap\n"
+" Path of file containing Mercurial committer email to Bugzilla user email\n"
+" mappings. If specified, the file should contain one mapping per\n"
+" line::"
+msgstr ""
+
+msgid " committer = Bugzilla user"
+msgstr ""
+
+msgid " See also the ``[usermap]`` section."
+msgstr ""
+
+msgid ""
+"The ``[usermap]`` section is used to specify mappings of Mercurial\n"
+"committer email to Bugzilla user email. See also ``bugzilla.usermap``.\n"
+"Contains entries of the form ``committer = Bugzilla user``."
+msgstr ""
+
+msgid "XMLRPC access mode configuration:"
+msgstr ""
+
+msgid ""
+"bugzilla.bzurl\n"
+" The base URL for the Bugzilla installation.\n"
+" Default ``http://localhost/bugzilla``."
+msgstr ""
+
+msgid ""
+"bugzilla.user\n"
+" The username to use to log into Bugzilla via XMLRPC. Default\n"
+" ``bugs``."
+msgstr ""
+
+msgid ""
+"bugzilla.password\n"
+" The password for Bugzilla login."
+msgstr ""
+
+msgid ""
+"XMLRPC+email access mode uses the XMLRPC access mode configuration items,\n"
+"and also:"
+msgstr ""
+
+msgid ""
+"bugzilla.bzemail\n"
+" The Bugzilla email address."
+msgstr ""
+
+msgid ""
+"In addition, the Mercurial email settings must be configured. See the\n"
+"documentation in hgrc(5), sections ``[email]`` and ``[smtp]``."
+msgstr ""
+
+msgid "MySQL access mode configuration:"
+msgstr ""
+
+msgid ""
+"bugzilla.host\n"
+" Hostname of the MySQL server holding the Bugzilla database.\n"
+" Default ``localhost``."
+msgstr ""
+
+msgid ""
+"bugzilla.db\n"
+" Name of the Bugzilla database in MySQL. Default ``bugs``."
+msgstr ""
+
+msgid ""
+"bugzilla.user\n"
+" Username to use to access MySQL server. Default ``bugs``."
+msgstr ""
+
+msgid ""
+"bugzilla.password\n"
" Password to use to access MySQL server."
msgstr ""
msgid ""
-"timeout\n"
+"bugzilla.timeout\n"
" Database connection timeout (seconds). Default 5."
msgstr ""
msgid ""
-"version\n"
-" Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
-" '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
-" to 2.18."
-msgstr ""
-
-msgid ""
-"bzuser\n"
+"bugzilla.bzuser\n"
" Fallback Bugzilla user name to record comments with, if changeset\n"
" committer cannot be found as a Bugzilla user."
msgstr ""
msgid ""
-"bzdir\n"
+"bugzilla.bzdir\n"
" Bugzilla install directory. Used by default notify. Default\n"
-" '/var/www/html/bugzilla'."
-msgstr ""
-
-msgid ""
-"notify\n"
+" ``/var/www/html/bugzilla``."
+msgstr ""
+
+msgid ""
+"bugzilla.notify\n"
" The command to run to get Bugzilla to send bug change notification\n"
-" emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
-" and 'user' (committer bugzilla email). Default depends on version;\n"
-" from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
-" %(id)s %(user)s\"."
-msgstr ""
-
-msgid ""
-"regexp\n"
-" Regular expression to match bug IDs in changeset commit message.\n"
-" Must contain one \"()\" group. The default expression matches 'Bug\n"
-" 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
-" 1234 and 5678' and variations thereof. Matching is case insensitive."
-msgstr ""
-
-msgid ""
-"style\n"
-" The style file to use when formatting comments."
-msgstr ""
-
-msgid ""
-"template\n"
-" Template to use when formatting comments. Overrides style if\n"
-" specified. In addition to the usual Mercurial keywords, the\n"
-" extension specifies::"
-msgstr ""
-
-msgid ""
-" {bug} The Bugzilla bug ID.\n"
-" {root} The full pathname of the Mercurial repository.\n"
-" {webroot} Stripped pathname of the Mercurial repository.\n"
-" {hgweb} Base URL for browsing Mercurial repositories."
-msgstr ""
-
-msgid ""
-" Default 'changeset {node|short} in repo {root} refers '\n"
-" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'"
-msgstr ""
-
-msgid ""
-"strip\n"
-" The number of slashes to strip from the front of {root} to produce\n"
-" {webroot}. Default 0."
-msgstr ""
-
-msgid ""
-"usermap\n"
-" Path of file containing Mercurial committer ID to Bugzilla user ID\n"
-" mappings. If specified, the file should contain one mapping per\n"
-" line, \"committer\"=\"Bugzilla user\". See also the [usermap] section."
-msgstr ""
-
-msgid ""
-"The [usermap] section is used to specify mappings of Mercurial\n"
-"committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
-"\"committer\"=\"Bugzilla user\""
-msgstr ""
-
-msgid "Finally, the [web] section supports one entry:"
-msgstr ""
-
-msgid ""
-"baseurl\n"
-" Base URL for browsing Mercurial repositories. Reference from\n"
-" templates as {hgweb}."
+" emails. Substitutes from a map with 3 keys, ``bzdir``, ``id`` (bug\n"
+" id) and ``user`` (committer bugzilla email). Default depends on\n"
+" version; from 2.18 it is \"cd %(bzdir)s && perl -T\n"
+" contrib/sendbugmail.pl %(id)s %(user)s\"."
msgstr ""
msgid "Activating the extension::"
@@ -536,13 +631,70 @@
" incoming.bugzilla = python:hgext.bugzilla.hook"
msgstr ""
-msgid "Example configuration:"
-msgstr ""
-
-msgid ""
-"This example configuration is for a collection of Mercurial\n"
-"repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
-"installation in /opt/bugzilla-3.2. ::"
+#, fuzzy
+msgid "Example configurations:"
+msgstr "設定ファイル"
+
+msgid ""
+"XMLRPC example configuration. This uses the Bugzilla at\n"
+"``http://my-project.org/bugzilla``, logging in as user\n"
+"``bugmail@my-project.org`` with password ``plugh``. It is used with a\n"
+"collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
+"with a web interface at ``http://my-project.org/hg``. ::"
+msgstr ""
+
+msgid ""
+" [bugzilla]\n"
+" bzurl=http://my-project.org/bugzilla\n"
+" user=bugmail@my-project.org\n"
+" password=plugh\n"
+" version=xmlrpc\n"
+" template=Changeset {node|short} in {root|basename}.\n"
+" {hgweb}/{webroot}/rev/{node|short}\\n\n"
+" {desc}\\n\n"
+" strip=5"
+msgstr ""
+
+msgid ""
+" [web]\n"
+" baseurl=http://my-project.org/hg"
+msgstr ""
+
+msgid ""
+"XMLRPC+email example configuration. This uses the Bugzilla at\n"
+"``http://my-project.org/bugzilla``, logging in as user\n"
+"``bugmail@my-project.org`` with password ``plugh``. It is used with a\n"
+"collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
+"with a web interface at ``http://my-project.org/hg``. Bug comments\n"
+"are sent to the Bugzilla email address\n"
+"``bugzilla@my-project.org``. ::"
+msgstr ""
+
+msgid ""
+" [bugzilla]\n"
+" bzurl=http://my-project.org/bugzilla\n"
+" user=bugmail@my-project.org\n"
+" password=plugh\n"
+" version=xmlrpc\n"
+" bzemail=bugzilla@my-project.org\n"
+" template=Changeset {node|short} in {root|basename}.\n"
+" {hgweb}/{webroot}/rev/{node|short}\\n\n"
+" {desc}\\n\n"
+" strip=5"
+msgstr ""
+
+msgid ""
+" [usermap]\n"
+" user@emaildomain.com=user.name@bugzilladomain.com"
+msgstr ""
+
+msgid ""
+"MySQL example configuration. This has a local Bugzilla 3.2 installation\n"
+"in ``/opt/bugzilla-3.2``. The MySQL database is on ``localhost``,\n"
+"the Bugzilla database name is ``bugs`` and MySQL is\n"
+"accessed with MySQL username ``bugs`` password ``XYZZY``. It is used\n"
+"with a collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
+"with a web interface at ``http://my-project.org/hg``. ::"
msgstr ""
msgid ""
@@ -558,28 +710,22 @@
" strip=5"
msgstr ""
-msgid ""
-" [web]\n"
-" baseurl=http://dev.domain.com/hg"
-msgstr ""
-
-msgid ""
-" [usermap]\n"
-" user@emaildomain.com=user.name@bugzilladomain.com"
-msgstr ""
-
-msgid "Commits add a comment to the Bugzilla bug record of the form::"
+msgid "All the above add a comment to the Bugzilla bug record of the form::"
msgstr ""
msgid ""
" Changeset 3b16791d6642 in repository-name.\n"
-" http://dev.domain.com/hg/repository-name/rev/3b16791d6642"
+" http://my-project.org/hg/repository-name/rev/3b16791d6642"
msgstr ""
msgid " Changeset commit comment. Bug 1234.\n"
msgstr ""
#, python-format
+msgid "python mysql support not available: %s"
+msgstr "python mysql のサポートが利用できません: %s"
+
+#, python-format
msgid "connecting to %s:%s as %s, password %s\n"
msgstr "%s:%s に %s として接続しています (パスワード:%s)\n"
@@ -628,6 +774,14 @@
msgid "cannot find bugzilla user id for %s or %s"
msgstr "%s か %s の buzilla ユーザ ID を見つけることができません"
+#, fuzzy
+msgid "configuration 'bzemail' missing"
+msgstr "設定ファイル"
+
+#, fuzzy, python-format
+msgid "default bugzilla user %s email not found"
+msgstr "副リポジトリ %s の が見つかりません"
+
#, python-format
msgid "bugzilla version %s not supported"
msgstr "bugzilla のバージョン %s は未サポートです"
@@ -642,16 +796,12 @@
"\t{desc|tabindent}"
#, python-format
-msgid "python mysql support not available: %s"
-msgstr "python mysql のサポートが利用できません: %s"
-
-#, python-format
msgid "hook type %s does not pass a changeset id"
msgstr "フック種別 %s によりチェンジセットの処理が抑止されました"
-#, python-format
-msgid "database error: %s"
-msgstr "データベースエラー: %s"
+#, fuzzy, python-format
+msgid "Bugzilla error: %s"
+msgstr "hg: 解析エラー: %s\n"
msgid "command to display child changesets"
msgstr "子チェンジセット表示のコマンド"
@@ -815,19 +965,19 @@
msgstr "コマンド出力のカラー化"
msgid ""
-"This extension modifies the status and resolve commands to add color to "
-"their\n"
-"output to reflect file status, the qseries command to add color to reflect\n"
-"patch status (applied, unapplied, missing), and to diff-related\n"
-"commands to highlight additions, removals, diff headers, and trailing\n"
-"whitespace."
+"This extension modifies the status and resolve commands to add color\n"
+"to their output to reflect file status, the qseries command to add\n"
+"color to reflect patch status (applied, unapplied, missing), and to\n"
+"diff-related commands to highlight additions, removals, diff headers,\n"
+"and trailing whitespace."
msgstr ""
msgid ""
"Other effects in addition to color, like bold and underlined text, are\n"
-"also available. Effects are rendered with the ECMA-48 SGR control\n"
-"function (aka ANSI escape codes). This module also provides the\n"
-"render_text function, which can be used to add effects to any text."
+"also available. By default, the terminfo database is used to find the\n"
+"terminal codes used to change color and effect. If terminfo is not\n"
+"available, then effects are rendered with the ECMA-48 SGR control\n"
+"function (aka ANSI escape codes)."
msgstr ""
msgid "Default effects may be overridden from your configuration file::"
@@ -883,8 +1033,37 @@
msgstr ""
msgid ""
-"The color extension will try to detect whether to use ANSI codes or\n"
-"Win32 console APIs, unless it is made explicit::"
+"The available effects in terminfo mode are 'blink', 'bold', 'dim',\n"
+"'inverse', 'invisible', 'italic', 'standout', and 'underline'; in\n"
+"ECMA-48 mode, the options are 'bold', 'inverse', 'italic', and\n"
+"'underline'. How each is rendered depends on the terminal emulator.\n"
+"Some may not be available for a given terminal type, and will be\n"
+"silently ignored."
+msgstr ""
+
+msgid ""
+"Because there are only eight standard colors, this module allows you\n"
+"to define color names for other color slots which might be available\n"
+"for your terminal type, assuming terminfo mode. For instance::"
+msgstr ""
+
+msgid ""
+" color.brightblue = 12\n"
+" color.pink = 207\n"
+" color.orange = 202"
+msgstr ""
+
+msgid ""
+"to set 'brightblue' to color slot 12 (useful for 16 color terminals\n"
+"that have brighter colors defined in the upper eight) and, 'pink' and\n"
+"'orange' to colors in 256-color xterm's default color cube. These\n"
+"defined colors may then be used as any of the pre-defined eight,\n"
+"including appending '_background' to set the background to that color."
+msgstr ""
+
+msgid ""
+"The color extension will try to detect whether to use terminfo, ANSI\n"
+"codes or Win32 console APIs, unless it is made explicit; e.g.::"
msgstr ""
msgid ""
@@ -892,16 +1071,22 @@
" mode = ansi"
msgstr ""
-msgid "Any value other than 'ansi', 'win32', or 'auto' will disable color."
+msgid ""
+"Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will\n"
+"disable color."
+msgstr ""
+
+msgid "no terminfo entry for setab/setaf: reverting to ECMA-48 color\n"
+msgstr ""
+
+#, python-format
+msgid "warning: failed to set color mode to %s\n"
msgstr ""
#, python-format
msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
msgstr "未知の色/効果指定 %r を無視(color.%s で設定記述)\n"
-msgid "win32console not found, please install pywin32\n"
-msgstr ""
-
#. i18n: 'always', 'auto', and 'never' are keywords and should
#. not be translated
msgid "when to colorize (boolean, always, auto, or never)"
@@ -1363,6 +1548,15 @@
msgid "hg debugcvsps [OPTION]... [PATH]..."
msgstr "hg debugcvsps [OPTION]... [PATH]..."
+msgid ":svnrev: String. Converted subversion revision number."
+msgstr ""
+
+msgid ":svnpath: String. Converted subversion revision project path."
+msgstr ""
+
+msgid ":svnuuid: String. Converted subversion revision repository identifier."
+msgstr ""
+
#, python-format
msgid "%s does not look like a Bazaar repository"
msgstr "%s は Bazaar 形式ではないと思われます"
@@ -1423,10 +1617,6 @@
msgstr "変換: %s\n"
#, python-format
-msgid "%s\n"
-msgstr "%s\n"
-
-#, python-format
msgid "%s: unknown repository type"
msgstr "%s: 未知のリポジトリ形式"
@@ -1698,6 +1888,10 @@
msgid "updating tags\n"
msgstr "タグの更新中\n"
+#, fuzzy
+msgid "updating bookmarks\n"
+msgstr "ブックマーク %s の更新中\n"
+
#, python-format
msgid "%s is not a valid start revision"
msgstr "%s は正しい開始リビジョンではありません"
@@ -1710,10 +1904,45 @@
msgid "%s does not look like a monotone repository"
msgstr "%s は monotone 形式ではないと思われます"
+msgid "bad mtn packet - no end of commandnbr"
+msgstr ""
+
+#, python-format
+msgid "bad mtn packet - bad stream type %s"
+msgstr ""
+
+msgid "bad mtn packet - no divider before size"
+msgstr ""
+
+msgid "bad mtn packet - no end of packet size"
+msgstr ""
+
+#, python-format
+msgid "bad mtn packet - bad packet size %s"
+msgstr ""
+
+#, python-format
+msgid "bad mtn packet - unable to read full packet read %s of %s"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "mtn command '%s' returned %s"
+msgstr "コマンド '%s' 失敗: %s"
+
#, python-format
msgid "copying file in renamed directory from '%s' to '%s'"
msgstr "改名先ディレクトリの '%s' から '%s' へファイルを複製中"
+msgid "unable to determine mtn automate interface version"
+msgstr ""
+
+#, python-format
+msgid "mtn automate stdio header unexpected: %s"
+msgstr ""
+
+msgid "failed to reach end of mtn automate stdio headers"
+msgstr ""
+
#, python-format
msgid "%s does not look like a P4 repository"
msgstr "%s は P4 形式ではないと思われます"
@@ -1923,11 +2152,13 @@
msgid ""
"The ``win32text.forbid*`` hooks provided by the win32text extension\n"
-"have been unified into a single hook named ``eol.hook``. The hook will\n"
-"lookup the expected line endings from the ``.hgeol`` file, which means\n"
-"you must migrate to a ``.hgeol`` file first before using the hook.\n"
-"Remember to enable the eol extension in the repository where you\n"
-"install the hook."
+"have been unified into a single hook named ``eol.checkheadshook``. The\n"
+"hook will lookup the expected line endings from the ``.hgeol`` file,\n"
+"which means you must migrate to a ``.hgeol`` file first before using\n"
+"the hook. ``eol.checkheadshook`` only checks heads, intermediate\n"
+"invalid revisions will be pushed. To forbid them completely, use the\n"
+"``eol.checkallhook`` hook. These hooks are best used as\n"
+"``pretxnchangegroup`` hooks."
msgstr ""
msgid ""
@@ -1936,25 +2167,25 @@
msgstr "パターン合致に関する詳細は :hg:`help patterns` を参照してください。\n"
#, python-format
-msgid "%s should not have CRLF line endings"
-msgstr ""
-
-#, python-format
-msgid "%s should not have LF line endings"
+msgid "ignoring unknown EOL style '%s' from %s\n"
msgstr ""
#, python-format
msgid "warning: ignoring .hgeol file due to parse error at %s: %s\n"
msgstr ""
-msgid "the eol extension is incompatible with the win32text extension"
+#, python-format
+msgid " %s in %s should not have %s line endings"
+msgstr ""
+
+msgid "end-of-line check failed:\n"
+msgstr ""
+
+#, fuzzy
+msgid "the eol extension is incompatible with the win32text extension\n"
msgstr "eol エクステンションと win32text エクステンションは併用できません"
#, python-format
-msgid "ignoring unknown EOL style '%s' from %s\n"
-msgstr ""
-
-#, python-format
msgid "inconsistent newline style in %s\n"
msgstr ""
@@ -1970,7 +2201,7 @@
msgstr ""
msgid ""
-"The extdiff extension also allows to configure new diff commands, so\n"
+"The extdiff extension also allows you to configure new diff commands, so\n"
"you do not need to type :hg:`extdiff -p kdiff3` always. ::"
msgstr ""
@@ -2008,6 +2239,7 @@
" $parent1, $plabel1 - filename, descriptive label of first parent\n"
" $child, $clabel - filename, descriptive label of child revision\n"
" $parent2, $plabel2 - filename, descriptive label of second parent\n"
+" $root - repository root\n"
" $parent is an alias for $parent1."
msgstr ""
@@ -2226,6 +2458,9 @@
msgid "%s Note: This key has expired (signed by: \"%s\")\n"
msgstr "%s 備考: 有効期限切れ鍵(\"%s\" による署名)\n"
+msgid "hg sigs"
+msgstr "hg sigs"
+
msgid "list signed changesets"
msgstr "署名済みリビジョンの一覧表示"
@@ -2233,6 +2468,9 @@
msgid "%s:%d node does not exist\n"
msgstr "%s:%d ノードは存在しません\n"
+msgid "hg sigcheck REVISION"
+msgstr "hg sigcheck REVISION"
+
msgid "verify all the signatures there may be for a particular revision"
msgstr "特定リビジョンに関する全署名の検証"
@@ -2240,6 +2478,30 @@
msgid "No valid signature for %s\n"
msgstr "%s の正しい署名ではありません\n"
+msgid "make the signature local"
+msgstr "自リポジトリローカルな署名"
+
+msgid "sign even if the sigfile is modified"
+msgstr "署名ファイルが変更されていても署名を実施"
+
+msgid "do not commit the sigfile after signing"
+msgstr "署名後の署名ファイルのコミットを抑止"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "the key id to sign with"
+msgstr "署名に使用する鍵ID"
+
+msgid "TEXT"
+msgstr "テキスト"
+
+msgid "commit message"
+msgstr "コミットメッセージ"
+
+msgid "hg sign [OPTION]... [REVISION]..."
+msgstr "hg sign [OPTION]... [REVISION]..."
+
msgid "add a signature for the current or given revision"
msgstr "指定リビジョンへの署名の付与"
@@ -2274,36 +2536,6 @@
msgid "unknown signature version"
msgstr "未知の署名バージョン"
-msgid "make the signature local"
-msgstr "自リポジトリローカルな署名"
-
-msgid "sign even if the sigfile is modified"
-msgstr "署名ファイルが変更されていても署名を実施"
-
-msgid "do not commit the sigfile after signing"
-msgstr "署名後の署名ファイルのコミットを抑止"
-
-msgid "ID"
-msgstr "ID"
-
-msgid "the key id to sign with"
-msgstr "署名に使用する鍵ID"
-
-msgid "TEXT"
-msgstr "テキスト"
-
-msgid "commit message"
-msgstr "コミットメッセージ"
-
-msgid "hg sign [OPTION]... [REVISION]..."
-msgstr "hg sign [OPTION]... [REVISION]..."
-
-msgid "hg sigcheck REVISION"
-msgstr "hg sigcheck REVISION"
-
-msgid "hg sigs"
-msgstr "hg sigs"
-
msgid "command to view revision graphs from a shell"
msgstr "端末でのリビジョングラフ表示のコマンド"
@@ -2317,8 +2549,26 @@
"リビジョングラフが表示されます。\n"
#, python-format
-msgid "--graph option is incompatible with --%s"
-msgstr "--graph と --%s は非互換です"
+msgid "-G/--graph option is incompatible with --%s"
+msgstr "-G/--graph と --%s は併用出来ません"
+
+msgid "-G/--graph option is incompatible with --follow with file argument"
+msgstr "-G/--graph と、ファイル名指定付きの --follow は併用出来ません"
+
+msgid "NUM"
+msgstr "数値"
+
+msgid "limit number of changes displayed"
+msgstr "最大表示リビジョン数"
+
+msgid "show patch"
+msgstr "パッチ形式での表示"
+
+msgid "show the specified revision or range"
+msgstr "指定された単一、 ないしリビジョン区間の表示"
+
+msgid "hg glog [OPTION]... [FILE]"
+msgstr "hg glog [OPTION]... [FILE]"
msgid "show revision history alongside an ASCII revision graph"
msgstr "ASCII 文字によるリビジョングラフ表示を持つ履歴表示"
@@ -2339,21 +2589,6 @@
msgid "show the revision DAG"
msgstr "リビジョングラフの表示"
-msgid "NUM"
-msgstr "数値"
-
-msgid "limit number of changes displayed"
-msgstr "最大表示リビジョン数"
-
-msgid "show patch"
-msgstr "パッチ形式での表示"
-
-msgid "show the specified revision or range"
-msgstr "指定された単一、 ないしリビジョン区間の表示"
-
-msgid "hg glog [OPTION]... [FILE]"
-msgstr "hg glog [OPTION]... [FILE]"
-
msgid "hooks for integrating with the CIA.vc notification service"
msgstr "CIA.vc 通知サービスとの統合向けのフック集"
@@ -2373,7 +2608,7 @@
" # Append a diffstat to the log message (optional)\n"
" #diffstat = False\n"
" # Template to use for log messages (optional)\n"
-" #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
+" #template = {desc}\\n{baseurl}{webroot}/rev/{node}-- {diffstat}\n"
" # Style to use (optional)\n"
" #style = foo\n"
" # The URL of the CIA notification service (optional)\n"
@@ -2382,7 +2617,9 @@
" # Make sure to set email.from if you do this.\n"
" #url = http://cia.vc/\n"
" # print message instead of sending it (optional)\n"
-" #test = False"
+" #test = False\n"
+" # number of slashes to strip for url paths\n"
+" #strip = 0"
msgstr ""
msgid ""
@@ -2829,17 +3066,17 @@
"を実行します。 使用可能なテンプレートやフィルタに関しては\n"
":hg:`help templates` を参照してください。"
-msgid "Three additional date template filters are provided::"
-msgstr "テンプレートでの日時用フィルタが 3 つ追加されます::"
-
-msgid ""
-" utcdate \"2006/09/18 15:13:13\"\n"
-" svnutcdate \"2006-09-18 15:13:13Z\"\n"
-" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
-msgstr ""
-" utcdate \"2006/09/18 15:13:13\"\n"
-" svnutcdate \"2006-09-18 15:13:13Z\"\n"
-" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
+msgid "Three additional date template filters are provided:"
+msgstr "テンプレートでの日時用フィルタが 3 つ追加されます:"
+
+msgid ""
+":``utcdate``: \"2006/09/18 15:13:13\"\n"
+":``svnutcdate``: \"2006-09-18 15:13:13Z\"\n"
+":``svnisodate``: \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
+msgstr ""
+":``utcdate``: \"2006/09/18 15:13:13\"\n"
+":``svnutcdate``: \"2006-09-18 15:13:13Z\"\n"
+":``svnisodate``: \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
msgid ""
"The default template mappings (view with :hg:`kwdemo -d`) can be\n"
@@ -2888,6 +3125,15 @@
msgid "no [keyword] patterns configured"
msgstr "[keyword] でのパターン設定がありません"
+msgid "show default keyword template maps"
+msgstr "デフォルトのテンプレートマップで表示"
+
+msgid "read maps from rcfile"
+msgstr "設定ファイルからのマップ設定の読み込み"
+
+msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
+msgstr "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
+
msgid "print [keywordmaps] configuration and an expansion example"
msgstr "[keywordmaps] での設定内容および展開例の表示"
@@ -2980,6 +3226,9 @@
"\n"
"\tキーワードを展開\n"
+msgid "hg kwexpand [OPTION]... [FILE]..."
+msgstr "hg kwexpand [OPTION]... [FILE]..."
+
msgid "expand keywords in the working directory"
msgstr "作業領域におけるキーワードの展開"
@@ -2993,6 +3242,18 @@
" 指定されたファイルに未コミット変更がある場合、 実行は中断されます。\n"
" "
+msgid "show keyword status flags of all files"
+msgstr "全ファイルのキーワード展開設定を表示"
+
+msgid "show files excluded from expansion"
+msgstr "キーワード展開対象外のファイルを表示"
+
+msgid "only show unknown (not tracked) files"
+msgstr "構成管理対象外のファイルを表示"
+
+msgid "hg kwfiles [OPTION]... [FILE]..."
+msgstr "hg kwfiles [OPTION]... [FILE]..."
+
msgid "show files configured for keyword expansion"
msgstr "キーワード展開対象ファイルの表示"
@@ -3037,6 +3298,9 @@
" i = 無視(構成管理対象外)\n"
" "
+msgid "hg kwshrink [OPTION]... [FILE]..."
+msgstr "hg kwshrink [OPTION]... [FILE]..."
+
msgid "revert expanded keywords in the working directory"
msgstr "作業領域中のキーワード展開の取り消し"
@@ -3052,33 +3316,6 @@
" 指定されたファイルに未コミット変更がある場合、 実行は中断されます。\n"
" "
-msgid "show default keyword template maps"
-msgstr "デフォルトのテンプレートマップで表示"
-
-msgid "read maps from rcfile"
-msgstr "設定ファイルからのマップ設定の読み込み"
-
-msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
-msgstr "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
-
-msgid "hg kwexpand [OPTION]... [FILE]..."
-msgstr "hg kwexpand [OPTION]... [FILE]..."
-
-msgid "show keyword status flags of all files"
-msgstr "全ファイルのキーワード展開設定を表示"
-
-msgid "show files excluded from expansion"
-msgstr "キーワード展開対象外のファイルを表示"
-
-msgid "only show unknown (not tracked) files"
-msgstr "構成管理対象外のファイルを表示"
-
-msgid "hg kwfiles [OPTION]... [FILE]..."
-msgstr "hg kwfiles [OPTION]... [FILE]..."
-
-msgid "hg kwshrink [OPTION]... [FILE]..."
-msgstr "hg kwshrink [OPTION]... [FILE]..."
-
msgid "manage a stack of patches"
msgstr "パッチ併用の管理"
@@ -3162,6 +3399,9 @@
"されます。 :hg:`qqueue` を使うことで、 相互に独立した別の管理キューを\n"
"作成することができます。\n"
+msgid "print first line of patch header"
+msgstr "パッチヘッダの最初の行を表示"
+
#, python-format
msgid "malformated mq status line: %s\n"
msgstr "不正な MQ 状態行: %s\n"
@@ -3202,12 +3442,12 @@
msgstr "%s を適用 - 合致するネガティブガードはありません\n"
#, python-format
-msgid "allowing %s - guarded by %r\n"
-msgstr "%s を適用 - ガード %r が適用されました\n"
-
-#, python-format
-msgid "skipping %s - guarded by %r\n"
-msgstr "%s を抑止 - ガード %r が適用されました\n"
+msgid "allowing %s - guarded by %s\n"
+msgstr "%s を適用 - ガード %s が適用されました\n"
+
+#, python-format
+msgid "skipping %s - guarded by %s\n"
+msgstr "%s を抑止 - ガード %s が適用されました\n"
#, python-format
msgid "skipping %s - no matching guards\n"
@@ -3269,6 +3509,14 @@
msgstr "パッチが曖昧なため、 適用を中止\n"
#, python-format
+msgid "revision %s refers to unknown patches: %s\n"
+msgstr "リビジョン %s が未知のパッチを参照しています: %s\n"
+
+#, python-format
+msgid "unknown patches: %s\n"
+msgstr "未知のパッチです: %s\n"
+
+#, python-format
msgid "revision %d is not managed"
msgstr "リビジョン %d は MQ 管理下にありません"
@@ -3312,6 +3560,14 @@
msgstr "\"%s\" はパッチ名として使用できません"
#, python-format
+msgid "patch name cannot begin with \"%s\""
+msgstr "パッチ名の最初の文字に \"%s\" は使用出来ません"
+
+#, python-format
+msgid "\"%s\" cannot be used in the name of a patch"
+msgstr "\"%s\" を含む名前はパッチ名に使用出来ません"
+
+#, python-format
msgid "\"%s\" already exists as a directory"
msgstr "\"%s\" はディレクトリとして既に存在します"
@@ -3353,8 +3609,8 @@
msgstr "適用中のパッチ %s の再適用はできません"
#, python-format
-msgid "guarded by %r"
-msgstr "ガード %r が適用されました"
+msgid "guarded by %s"
+msgstr "ガード %s が適用されました"
msgid "no matching guards"
msgstr "合致するガードはありません"
@@ -3370,7 +3626,7 @@
msgstr "全てのパッチが適用中です\n"
msgid "cannot use --exact and --move together"
-msgstr "--exact と --move の併用はできません"
+msgstr "--exact と --move は併用できません"
msgid "cannot push --exact with applied patches"
msgstr "パッチ適用中に、 --exact 付きでのパッチ適用はできません"
@@ -3531,6 +3787,15 @@
msgid "adding %s to series file\n"
msgstr "パッチ %s を追加中\n"
+msgid "keep patch file"
+msgstr "パッチファイルの削除を抑止"
+
+msgid "stop managing a revision (DEPRECATED)"
+msgstr "指定リビジョンを管理対象から除外(非推奨)"
+
+msgid "hg qdelete [-k] [PATCH]..."
+msgstr "hg qdelete [-k] [PATCH]..."
+
msgid "remove patches from queue"
msgstr "管理対象からのパッチ除外"
@@ -3550,6 +3815,12 @@
" 管理対象外となったパッチを通常リビジョン化する場合は :hg:`qfinish`\n"
" を使用してください。"
+msgid "show only the last patch"
+msgstr "最終適用パッチのみを表示"
+
+msgid "hg qapplied [-1] [-s] [PATCH]"
+msgstr "hg qapplied [-1] [-s] [PATCH]"
+
msgid "print the patches already applied"
msgstr "適用中のパッチ一覧の表示"
@@ -3559,12 +3830,42 @@
msgid "only one patch applied\n"
msgstr "単一のパッチだけが適用中です\n"
+msgid "show only the first patch"
+msgstr "最初の未適用パッチのみを表示"
+
+msgid "hg qunapplied [-1] [-s] [PATCH]"
+msgstr "hg qunapplied [-1] [-s] [PATCH]"
+
msgid "print the patches not yet applied"
msgstr "未適用のパッチ一覧の表示"
msgid "all patches applied\n"
msgstr "全てのパッチが適用中です\n"
+msgid "import file in patch directory"
+msgstr "パッチ管理領域中のファイルから取り込み"
+
+msgid "NAME"
+msgstr "名前"
+
+msgid "name of patch file"
+msgstr "パッチファイル名"
+
+msgid "overwrite existing files"
+msgstr "既存ファイルの上書き"
+
+msgid "place existing revisions under mq control"
+msgstr "既存リビジョンを MQ 管理下に移行"
+
+msgid "use git extended diff format"
+msgstr "git 拡張差分形式の使用"
+
+msgid "qpush after importing"
+msgstr "パッチ取り込み後にパッチ適用(qpush)を実施"
+
+msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
+msgstr "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
+
msgid "import a patch"
msgstr "パッチの取り込み"
@@ -3602,13 +3903,16 @@
" With -g/--git, patches imported with --rev will use the git diff\n"
" format. See the diffs help topic for information on why this is\n"
" important for preserving rename/copy information and permission\n"
-" changes."
-msgstr ""
-" -r/--rev を指定することで、 既存の通常リビジョンを MQ 管理下に置く\n"
-" ことができます(例: 'qimport --rev tip -n patch' は、 tip を MQ 管理\n"
-" 下に置きます)。 -g/--git 指定は、 --rev 指定による取り込みの際に git\n"
-" 差分形式を使用します。 改名／複製情報や、 権限設定の情報保持にとっての\n"
-" git 差分形式の有用性に関しては、 'help diffs' を参照してください。"
+" changes. Use :hg:`qfinish` to remove changesets from mq control."
+msgstr ""
+" -r/--rev を指定することで、\n"
+" 既存の通常リビジョンを MQ 管理下に置くことができます\n"
+" (例: 'qimport --rev tip -n patch' は、 tip を MQ 管理下に置きます)。\n"
+" -g/--git 指定は、 --rev 指定による取り込みの際に\n"
+" git 差分形式を使用します。\n"
+" 改名／複製情報や、 権限設定の情報保持にとっての\n"
+" git 差分形式の有用性に関しては、 'help diffs' を参照してください。\n"
+" リビジョンを MQ 管理下から除外する場合、 :hg:`qfinish` を使用します。"
msgid ""
" To import a patch from standard input, pass - as the patch file.\n"
@@ -3631,6 +3935,12 @@
" 成功時のコマンド終了値は 0 です。\n"
" "
+msgid "create queue repository"
+msgstr "パッチ管理自身を Mercurial で構成管理"
+
+msgid "hg qinit [-c]"
+msgstr "hg qinit [-c]"
+
msgid "init a new queue repository (DEPRECATED)"
msgstr "パッチ管理領域の初期化(非推奨)"
@@ -3655,6 +3965,24 @@
" によって作成されます。 -c 指定有りでの作成ならば、 :hg:`init --mq`\n"
" を使用してください。"
+msgid "use pull protocol to copy metadata"
+msgstr "メタデータ複製に pull プロトコルを使用"
+
+msgid "do not update the new working directories"
+msgstr "新規作業領域の更新を抑止"
+
+msgid "use uncompressed transfer (fast over LAN)"
+msgstr "非圧縮での転送(LAN での高速転送用)"
+
+msgid "REPO"
+msgstr "リポジトリ"
+
+msgid "location of source patch repository"
+msgstr "複製元パッチ管理領域位置"
+
+msgid "hg qclone [OPTION]... SOURCE [DEST]"
+msgstr "hg qclone [OPTION]... SOURCE [DEST]"
+
msgid "clone main and patch repository at same time"
msgstr "リポジトリとパッチ管理領域の同時複製"
@@ -3707,24 +4035,63 @@
msgid "updating destination repository\n"
msgstr "複製先の作業領域を更新中\n"
+msgid "hg qcommit [OPTION]... [FILE]..."
+msgstr "hg qcommit [OPTION]... [FILE]..."
+
msgid "commit changes in the queue repository (DEPRECATED)"
msgstr "パッチ管理領域の変更をコミット(非推奨)"
msgid " This command is deprecated; use :hg:`commit --mq` instead."
msgstr " 本コマンドは非推奨です。 :hg:`commit --mq` を使用してください。"
+msgid "print patches not in series"
+msgstr "パッチ管理領域中の未知のパッチファイルを表示"
+
+msgid "hg qseries [-ms]"
+msgstr "hg qseries [-ms]"
+
msgid "print the entire series file"
msgstr "既知のパッチ一覧の表示"
+msgid "hg qtop [-s]"
+msgstr "hg qtop [-s]"
+
msgid "print the name of the current patch"
msgstr "現行パッチの名前表示"
+msgid "hg qnext [-s]"
+msgstr "hg qnext [-s]"
+
msgid "print the name of the next patch"
msgstr "現行パッチの「次」の既知のパッチの名前表示"
+msgid "hg qprev [-s]"
+msgstr "hg qprev [-s]"
+
msgid "print the name of the previous patch"
msgstr "現行パッチの「前」の既知のパッチの名前表示"
+msgid "import uncommitted changes (DEPRECATED)"
+msgstr "作業領域の変更内容のパッチへの取り込み(非推奨)"
+
+msgid "add \"From: <current user>\" to patch"
+msgstr "\"From: <現ユーザ名>\" をパッチに追加"
+
+msgid "USER"
+msgstr "ユーザ"
+
+msgid "add \"From: <USER>\" to patch"
+msgstr "\"From: <ユーザ>\" をパッチに追加"
+
+msgid "add \"Date: <current date>\" to patch"
+msgstr "\"Date: <現在時刻>\" をパッチに追加"
+
+msgid "add \"Date: <DATE>\" to patch"
+msgstr "\"Date: <日時>\" をパッチに追加"
+
+msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
+msgstr "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
+
msgid "create a new patch"
msgstr "新規パッチの作成"
@@ -3778,6 +4145,24 @@
" 成功時のコマンド終了値は 0 です。\n"
" "
+msgid "refresh only files already in the patch and specified files"
+msgstr "既存のパッチ対象に加え、明示されたファイルを処理対象にする"
+
+msgid "add/update author field in patch with current user"
+msgstr "パッチ作成者情報を現行ユーザに設定"
+
+msgid "add/update author field in patch with given user"
+msgstr "パッチ作成者情報を指定ユーザに設定"
+
+msgid "add/update date field in patch with current date"
+msgstr "パッチ作成日付情報を現時刻に設定"
+
+msgid "add/update date field in patch with given date"
+msgstr "パッチ作成日付情報を指定時刻に設定"
+
+msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
+msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
+
msgid "update the current patch"
msgstr "現行パッチの更新"
@@ -3821,7 +4206,10 @@
" 'help diffs' を参照してください。"
msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
-msgstr "\"-e\" は、 \"-m\" ないし \"-l\" と併用できません"
+msgstr "\"-e\" と、 \"-m\" ないし \"-l\" は併用できません"
+
+msgid "hg qdiff [OPTION]... [FILE]..."
+msgstr "hg qdiff [OPTION]... [FILE]..."
msgid "diff of the current patch and subsequent modifications"
msgstr "現行パッチと作業領域変更の結合結果の表示"
@@ -3846,6 +4234,15 @@
" 場合は :hg:`diff` を、 作業領域の変更内容を含まない現行パッチの内容\n"
" のみを見たい場合は :hg:`export qtip` を使用してください。"
+msgid "edit patch header"
+msgstr "パッチヘッダ内容の編集"
+
+msgid "keep folded patch files"
+msgstr "結合対象パッチのパッチファイル削除を抑止"
+
+msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
+msgstr "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
+
msgid "fold the named patches into the current patch"
msgstr "指定パッチの現行パッチへの統合"
@@ -3888,9 +4285,24 @@
msgid "error folding patch %s"
msgstr "パッチ %s の統合に失敗"
+msgid "overwrite any local changes"
+msgstr "作業領域中の変更を上書き"
+
+msgid "hg qgoto [OPTION]... PATCH"
+msgstr "hg qgoto [OPTION]... PATCH"
+
msgid "push or pop patches until named patch is at top of stack"
msgstr "指定パッチを適用パッチの最上位にする qpush/qpop の実施"
+msgid "list all patches and guards"
+msgstr "全てのパッチのガード状況を一覧表示"
+
+msgid "drop all guards"
+msgstr "全てのガード設定を破棄"
+
+msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
+msgstr "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
+
msgid "set or print guards for a patch"
msgstr "パッチのガード設定ないし表示"
@@ -3938,9 +4350,36 @@
msgid "no patch named %s"
msgstr "パッチ %s は未知のパッチです"
+msgid "hg qheader [PATCH]"
+msgstr "hg qheader [PATCH]"
+
msgid "print the header of the topmost or specified patch"
msgstr "現行パッチないし指定パッチのヘッダ表示"
+msgid "apply on top of local changes"
+msgstr "作業領域の変更をそのままでパッチを適用"
+
+msgid "apply the target patch to its recorded parent"
+msgstr "パッチに記録された親リビジョンに対して適用"
+
+msgid "list patch name in commit text"
+msgstr "コミットメッセージとしてパッチ名を列挙"
+
+msgid "apply all patches"
+msgstr "全てのパッチを適用"
+
+msgid "merge from another queue (DEPRECATED)"
+msgstr "他のパッチ管理領域とのマージ(非推奨)"
+
+msgid "merge queue name (DEPRECATED)"
+msgstr "マージ対象のパッチ管理領域名(非推奨)"
+
+msgid "reorder patch series and apply only the patch"
+msgstr "パッチ一覧の順序変更とパッチ適用"
+
+msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
+msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
+
msgid "push the next patch onto the stack"
msgstr "次のパッチの適用"
@@ -3951,13 +4390,6 @@
" -f/--force が指定された場合、 パッチ適用対象ファイルの、\n"
" 作業領域における変更内容は破棄されます。"
-msgid ""
-" Return 0 on succces.\n"
-" "
-msgstr ""
-" 成功時のコマンド終了値は 0 です。\n"
-" "
-
msgid "no saved queues found, please use -n\n"
msgstr "保存されたパッチ管理領域がありません。 -n を使用してください\n"
@@ -3965,6 +4397,18 @@
msgid "merging with queue at: %s\n"
msgstr "パッチ管理領域 %s とマージ中\n"
+msgid "pop all patches"
+msgstr "全てのパッチの適用を解除"
+
+msgid "queue name to pop (DEPRECATED)"
+msgstr "パッチ解除先のパッチ管理領域名(非推奨)"
+
+msgid "forget any local changes to patched files"
+msgstr "パッチ対象ファイルに対する作業領域中の変更を破棄"
+
+msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
+msgstr "hg qpop [-a] [-f] [PATCH | INDEX]"
+
msgid "pop the current patch off the stack"
msgstr "現行パッチの適用解除"
@@ -3981,6 +4425,9 @@
msgid "using patch queue: %s\n"
msgstr "パッチ管理領域 %s を使用中\n"
+msgid "hg qrename PATCH1 [PATCH2]"
+msgstr "hg qrename PATCH1 [PATCH2]"
+
msgid "rename a patch"
msgstr "パッチの改名"
@@ -3991,13 +4438,14 @@
" 引数が1つの場合、 現行パッチを指定された名前に改名します。\n"
" 引数が2つの場合、 1つ目のパッチの名前を2つ目に改名します。"
-#, python-format
-msgid "%s already exists"
-msgstr "ファイル %s は既に存在します"
-
-#, python-format
-msgid "A patch named %s already exists in the series file"
-msgstr "同名のパッチ %s が既に存在します"
+msgid "delete save entry"
+msgstr "保存エントリの破棄"
+
+msgid "update queue working directory"
+msgstr "パッチ管理領域の更新"
+
+msgid "hg qrestore [-d] [-u] REV"
+msgstr "hg qrestore [-d] [-u] REV"
msgid "restore the queue state saved by a revision (DEPRECATED)"
msgstr "指定リビジョンによって保存されたパッチ管理状態の復旧(非推奨)"
@@ -4005,6 +4453,21 @@
msgid " This command is deprecated, use :hg:`rebase` instead."
msgstr " 本コマンドは非推奨です。 :hg:`rebase` を使用してください。"
+msgid "copy patch directory"
+msgstr "パッチ管理領域の複製"
+
+msgid "copy directory name"
+msgstr "複製先ディレクトリ名"
+
+msgid "clear queue status file"
+msgstr "パッチ状態ファイル(status)のクリア"
+
+msgid "force copy"
+msgstr "複製の強行"
+
+msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
+msgstr "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
+
msgid "save current queue state (DEPRECATED)"
msgstr "パッチ管理状態の保存(非推奨)"
@@ -4020,17 +4483,40 @@
msgid "copy %s to %s\n"
msgstr "%s から %s に複製します\n"
+msgid "force removal of changesets, discard uncommitted changes (no backup)"
+msgstr "リビジョンを強制的に削除し、 未コミット変更内容を破棄(保存無し)"
+
+msgid ""
+"bundle only changesets with local revision number greater than REV which are "
+"not descendants of REV (DEPRECATED)"
+msgstr ""
+"指定リビジョンよりリビジョン番号が大きく子孫以外のものを bundle 化(非推奨)"
+
+msgid "no backups"
+msgstr "バックアップ作成の抑止"
+
+msgid "no backups (DEPRECATED)"
+msgstr "バックアップ作成の抑止(非推奨)"
+
+msgid "do not modify working copy during strip"
+msgstr "処理中の作業領域更新を抑止"
+
+msgid "hg strip [-k] [-f] [-n] REV..."
+msgstr "hg strip [-k] [-f] [-n] REV..."
+
msgid "strip changesets and all their descendants from the repository"
msgstr "リポジトリからの、 特定リビジョンおよびその子孫の除外"
msgid ""
" The strip command removes the specified changesets and all their\n"
-" descendants. If the working directory has uncommitted changes,\n"
-" the operation is aborted unless the --force flag is supplied."
+" descendants. If the working directory has uncommitted changes, the\n"
+" operation is aborted unless the --force flag is supplied, in which\n"
+" case changes will be discarded."
msgstr ""
" :hg:`strip` は指定のリビジョンおよび、 指定リビジョンの子孫を\n"
" 取り除きます。 作業領域に未コミットの変更がある場合、\n"
-" --force が指定されない限りは処理を中断します。"
+" --force が指定されない限りは処理を中断します。\n"
+" --force が指定された場合、 変更内容は破棄されます。"
msgid ""
" If a parent of the working directory is stripped, then the working\n"
@@ -4067,6 +4553,21 @@
msgid "empty revision set"
msgstr "指定に該当するリビジョンはありません"
+msgid "disable all guards"
+msgstr "全てのガード設定を破棄"
+
+msgid "list all guards in series file"
+msgstr "各パッチに設定されたガードを一覧化"
+
+msgid "pop to before first guarded applied patch"
+msgstr "適用可否が変化するパッチの適用を解除"
+
+msgid "pop, then reapply patches"
+msgstr "qpop 実施後に再度パッチを適用"
+
+msgid "hg qselect [OPTION]... [GUARD]..."
+msgstr "hg qselect [OPTION]... [GUARD]..."
+
msgid "set or print guarded patches to push"
msgstr "作業領域におけるガード選択の設定ないし表示"
@@ -4084,12 +4585,12 @@
" 場合にはパッチは適用されません。 例えば::"
msgid ""
-" qguard foo.patch -stable (negative guard)\n"
-" qguard bar.patch +stable (positive guard)\n"
+" qguard foo.patch -- -stable (negative guard)\n"
+" qguard bar.patch +stable (positive guard)\n"
" qselect stable"
msgstr ""
-" qguard foo.patch -stable (「負」のガード)\n"
-" qguard bar.patch +stable (「正」のガード)\n"
+" qguard foo.patch -- -stable (「負」のガード)\n"
+" qguard bar.patch +stable (「正」のガード)\n"
" qselect stable"
msgid ""
@@ -4168,6 +4669,12 @@
msgid "reapplying unguarded patches\n"
msgstr "ガードが無効なパッチを再適用中\n"
+msgid "finish all applied changesets"
+msgstr "全ての適用中パッチを通常リビジョン化"
+
+msgid "hg qfinish [-a] [REV]..."
+msgstr "hg qfinish [-a] [REV]..."
+
msgid "move applied patches into repository history"
msgstr "適用中パッチの通常リビジョン化"
@@ -4201,6 +4708,24 @@
msgid "no revisions specified"
msgstr "リビジョン指定がありません"
+msgid "list all available queues"
+msgstr "有効なキューの一覧表示"
+
+msgid "create new queue"
+msgstr "新規キューの作成"
+
+msgid "rename active queue"
+msgstr "現行キューの改名"
+
+msgid "delete reference to queue"
+msgstr "キューへの参照の削除"
+
+msgid "delete queue, and remove patch dir"
+msgstr "キューおよび管理ディレクトリの削除"
+
+msgid "[OPTION] [QUEUE]"
+msgstr "[OPTION] [QUEUE]"
+
msgid "manage multiple patch queues"
msgstr "複数のパッチキューの管理"
@@ -4309,293 +4834,19 @@
msgid "mq: (empty queue)\n"
msgstr "mq: (空キュー)\n"
+msgid ""
+"``mq()``\n"
+" Changesets managed by MQ."
+msgstr ""
+"``mq()``\n"
+" MQ 管理下にあるリビジョン"
+
+msgid "mq takes no arguments"
+msgstr "mq 指定には引数が指定できません"
+
msgid "operate on patch repository"
msgstr "パッチ管理リポジトリへの操作"
-msgid "print first line of patch header"
-msgstr "パッチヘッダの最初の行を表示"
-
-msgid "show only the last patch"
-msgstr "最終適用パッチのみを表示"
-
-msgid "hg qapplied [-1] [-s] [PATCH]"
-msgstr "hg qapplied [-1] [-s] [PATCH]"
-
-msgid "use pull protocol to copy metadata"
-msgstr "メタデータ複製に pull プロトコルを使用"
-
-msgid "do not update the new working directories"
-msgstr "新規作業領域の更新を抑止"
-
-msgid "use uncompressed transfer (fast over LAN)"
-msgstr "非圧縮での転送(LAN での高速転送用)"
-
-msgid "REPO"
-msgstr "リポジトリ"
-
-msgid "location of source patch repository"
-msgstr "複製元パッチ管理領域位置"
-
-msgid "hg qclone [OPTION]... SOURCE [DEST]"
-msgstr "hg qclone [OPTION]... SOURCE [DEST]"
-
-msgid "hg qcommit [OPTION]... [FILE]..."
-msgstr "hg qcommit [OPTION]... [FILE]..."
-
-msgid "hg qdiff [OPTION]... [FILE]..."
-msgstr "hg qdiff [OPTION]... [FILE]..."
-
-msgid "keep patch file"
-msgstr "パッチファイルの削除を抑止"
-
-msgid "stop managing a revision (DEPRECATED)"
-msgstr "指定リビジョンを管理対象から除外(非推奨)"
-
-msgid "hg qdelete [-k] [PATCH]..."
-msgstr "hg qdelete [-k] [PATCH]..."
-
-msgid "edit patch header"
-msgstr "パッチヘッダ内容の編集"
-
-msgid "keep folded patch files"
-msgstr "結合対象パッチのパッチファイル削除を抑止"
-
-msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
-msgstr "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
-
-msgid "overwrite any local changes"
-msgstr "作業領域中の変更を上書き"
-
-msgid "hg qgoto [OPTION]... PATCH"
-msgstr "hg qgoto [OPTION]... PATCH"
-
-msgid "list all patches and guards"
-msgstr "全てのパッチのガード状況を一覧表示"
-
-msgid "drop all guards"
-msgstr "全てのガード設定を破棄"
-
-msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
-msgstr "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
-
-msgid "hg qheader [PATCH]"
-msgstr "hg qheader [PATCH]"
-
-msgid "import file in patch directory"
-msgstr "パッチ管理領域中のファイルから取り込み"
-
-msgid "NAME"
-msgstr "名前"
-
-msgid "name of patch file"
-msgstr "パッチファイル名"
-
-msgid "overwrite existing files"
-msgstr "既存ファイルの上書き"
-
-msgid "place existing revisions under mq control"
-msgstr "既存リビジョンを MQ 管理下に移行"
-
-msgid "use git extended diff format"
-msgstr "git 拡張差分形式の使用"
-
-msgid "qpush after importing"
-msgstr "パッチ取り込み後にパッチ適用(qpush)を実施"
-
-msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
-msgstr "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
-
-msgid "create queue repository"
-msgstr "パッチ管理自身を Mercurial で構成管理"
-
-msgid "hg qinit [-c]"
-msgstr "hg qinit [-c]"
-
-msgid "import uncommitted changes (DEPRECATED)"
-msgstr "作業領域の変更内容のパッチへの取り込み(非推奨)"
-
-msgid "add \"From: <current user>\" to patch"
-msgstr "\"From: <現ユーザ名>\" をパッチに追加"
-
-msgid "USER"
-msgstr "ユーザ"
-
-msgid "add \"From: <USER>\" to patch"
-msgstr "\"From: <ユーザ>\" をパッチに追加"
-
-msgid "add \"Date: <current date>\" to patch"
-msgstr "\"Date: <現在時刻>\" をパッチに追加"
-
-msgid "add \"Date: <DATE>\" to patch"
-msgstr "\"Date: <日時>\" をパッチに追加"
-
-msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
-msgstr "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
-
-msgid "hg qnext [-s]"
-msgstr "hg qnext [-s]"
-
-msgid "hg qprev [-s]"
-msgstr "hg qprev [-s]"
-
-msgid "pop all patches"
-msgstr "全てのパッチの適用を解除"
-
-msgid "queue name to pop (DEPRECATED)"
-msgstr "パッチ解除先のパッチ管理領域名(非推奨)"
-
-msgid "forget any local changes to patched files"
-msgstr "パッチ対象ファイルに対する作業領域中の変更を破棄"
-
-msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
-msgstr "hg qpop [-a] [-f] [PATCH | INDEX]"
-
-msgid "apply on top of local changes"
-msgstr "作業領域の変更をそのままでパッチを適用"
-
-msgid "apply the target patch to its recorded parent"
-msgstr "パッチに記録された親リビジョンに対して適用"
-
-msgid "list patch name in commit text"
-msgstr "コミットメッセージとしてパッチ名を列挙"
-
-msgid "apply all patches"
-msgstr "全てのパッチを適用"
-
-msgid "merge from another queue (DEPRECATED)"
-msgstr "他のパッチ管理領域とのマージ(非推奨)"
-
-msgid "merge queue name (DEPRECATED)"
-msgstr "マージ対象のパッチ管理領域名(非推奨)"
-
-msgid "reorder patch series and apply only the patch"
-msgstr "パッチ一覧の順序変更とパッチ適用"
-
-msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
-msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
-
-msgid "refresh only files already in the patch and specified files"
-msgstr "既存のパッチ対象に加え、明示されたファイルを処理対象にする"
-
-msgid "add/update author field in patch with current user"
-msgstr "パッチ作成者情報を現行ユーザに設定"
-
-msgid "add/update author field in patch with given user"
-msgstr "パッチ作成者情報を指定ユーザに設定"
-
-msgid "add/update date field in patch with current date"
-msgstr "パッチ作成日付情報を現時刻に設定"
-
-msgid "add/update date field in patch with given date"
-msgstr "パッチ作成日付情報を指定時刻に設定"
-
-msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
-msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
-
-msgid "hg qrename PATCH1 [PATCH2]"
-msgstr "hg qrename PATCH1 [PATCH2]"
-
-msgid "delete save entry"
-msgstr "保存エントリの破棄"
-
-msgid "update queue working directory"
-msgstr "パッチ管理領域の更新"
-
-msgid "hg qrestore [-d] [-u] REV"
-msgstr "hg qrestore [-d] [-u] REV"
-
-msgid "copy patch directory"
-msgstr "パッチ管理領域の複製"
-
-msgid "copy directory name"
-msgstr "複製先ディレクトリ名"
-
-msgid "clear queue status file"
-msgstr "パッチ状態ファイル(status)のクリア"
-
-msgid "force copy"
-msgstr "複製の強行"
-
-msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
-msgstr "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
-
-msgid "disable all guards"
-msgstr "全てのガード設定を破棄"
-
-msgid "list all guards in series file"
-msgstr "各パッチに設定されたガードを一覧化"
-
-msgid "pop to before first guarded applied patch"
-msgstr "適用可否が変化するパッチの適用を解除"
-
-msgid "pop, then reapply patches"
-msgstr "qpop 実施後に再度パッチを適用"
-
-msgid "hg qselect [OPTION]... [GUARD]..."
-msgstr "hg qselect [OPTION]... [GUARD]..."
-
-msgid "print patches not in series"
-msgstr "パッチ管理領域中の未知のパッチファイルを表示"
-
-msgid "hg qseries [-ms]"
-msgstr "hg qseries [-ms]"
-
-msgid ""
-"force removal of changesets even if the working directory has uncommitted "
-"changes"
-msgstr "作業領域に未コミット修正があっても強制的にリビジョンを除外"
-
-msgid ""
-"bundle only changesets with local revision number greater than REV which are "
-"not descendants of REV (DEPRECATED)"
-msgstr ""
-"指定リビジョンよりリビジョン番号が大きく子孫以外のものを bundle 化(非推奨)"
-
-msgid "no backups"
-msgstr "バックアップ作成の抑止"
-
-msgid "no backups (DEPRECATED)"
-msgstr "バックアップ作成の抑止(非推奨)"
-
-msgid "do not modify working copy during strip"
-msgstr "処理中の作業領域更新を抑止"
-
-msgid "hg strip [-k] [-f] [-n] REV..."
-msgstr "hg strip [-k] [-f] [-n] REV..."
-
-msgid "hg qtop [-s]"
-msgstr "hg qtop [-s]"
-
-msgid "show only the first patch"
-msgstr "最初の未適用パッチのみを表示"
-
-msgid "hg qunapplied [-1] [-s] [PATCH]"
-msgstr "hg qunapplied [-1] [-s] [PATCH]"
-
-msgid "finish all applied changesets"
-msgstr "全ての適用中パッチを通常リビジョン化"
-
-msgid "hg qfinish [-a] [REV]..."
-msgstr "hg qfinish [-a] [REV]..."
-
-msgid "list all available queues"
-msgstr "有効なキューの一覧表示"
-
-msgid "create new queue"
-msgstr "新規キューの作成"
-
-msgid "rename active queue"
-msgstr "現行キューの改名"
-
-msgid "delete reference to queue"
-msgstr "キューへの参照の削除"
-
-msgid "delete queue, and remove patch dir"
-msgstr "キューおよび管理ディレクトリの削除"
-
-msgid "[OPTION] [QUEUE]"
-msgstr "[OPTION] [QUEUE]"
-
msgid "hooks for sending email notifications at commit/push time"
msgstr "commit/push 契機でのメール通知用フック集"
@@ -4619,7 +4870,9 @@
" # one email for each incoming changeset\n"
" incoming.notify = python:hgext.notify.hook\n"
" # batch emails when many changesets incoming at one time\n"
-" changegroup.notify = python:hgext.notify.hook"
+" changegroup.notify = python:hgext.notify.hook\n"
+" # batch emails when many changesets outgoing at one time (client side)\n"
+" outgoing.notify = python:hgext.notify.hook"
msgstr ""
msgid ""
@@ -4643,7 +4896,8 @@
" style = ... # style file to use when formatting email\n"
" template = ... # template to use when formatting email\n"
" incoming = ... # template to use when run as incoming hook\n"
-" changegroup = ... # template when run as changegroup hook\n"
+" outgoing = ... # template to use when run as outgoing hook\n"
+" changegroup = ... # template to use when run as changegroup hook\n"
" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
" maxsubject = 67 # truncate subject line longer than this\n"
" diffstat = True # add a diffstat before the diff content\n"
@@ -4779,32 +5033,6 @@
msgid "when to paginate (boolean, always, auto, or never)"
msgstr ""
-msgid "interpret suffixes to refer to ancestor revisions"
-msgstr "祖先リビジョン参照のための接尾辞の解釈"
-
-msgid ""
-"This extension allows you to use git-style suffixes to refer to the\n"
-"ancestors of a specific revision."
-msgstr ""
-
-msgid "For example, if you can refer to a revision as \"foo\", then::"
-msgstr ""
-
-msgid ""
-" foo^N = Nth parent of foo\n"
-" foo^0 = foo\n"
-" foo^1 = first parent of foo\n"
-" foo^2 = second parent of foo\n"
-" foo^ = foo^1"
-msgstr ""
-
-msgid ""
-" foo~N = Nth first grandparent of foo\n"
-" foo~0 = foo\n"
-" foo~1 = foo^1 = foo^ = first parent of foo\n"
-" foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
-msgstr ""
-
msgid "command to send changesets as (a series of) patch emails"
msgstr "電子メールによる変更内容パッチ送付のコマンド"
@@ -4843,11 +5071,11 @@
"メールアーカイブにおいては、 一連のスレッドとして扱われます。"
msgid ""
-"To configure other defaults, add a section like this to your hgrc\n"
-"file::"
-msgstr ""
-"以下の様な記述を設定ファイルに追加することで、 無指定時の設定を変更でき\n"
-"ます::"
+"To configure other defaults, add a section like this to your\n"
+"configuration file::"
+msgstr ""
+"以下の様な記述を設定ファイルに追加することで、\n"
+"無指定時の設定を変更できます::"
msgid ""
" [email]\n"
@@ -4898,6 +5126,81 @@
msgid "Please enter a valid value.\n"
msgstr "適切な値を入力してください。\n"
+msgid "send patches as attachments"
+msgstr "添付ファイルとしてパッチを送信"
+
+msgid "send patches as inline attachments"
+msgstr "インライン添付ファイルとしてパッチを送信"
+
+msgid "email addresses of blind carbon copy recipients"
+msgstr "BCC 宛先のメールアドレス"
+
+msgid "email addresses of copy recipients"
+msgstr "CC 宛先のメールアドレス"
+
+msgid "ask for confirmation before sending"
+msgstr "送信前に確認を実施"
+
+msgid "add diffstat output to messages"
+msgstr "差分統計を出力に追加"
+
+msgid "use the given date as the sending date"
+msgstr "メールの Date ヘッダ値に指定日時を設定"
+
+msgid "use the given file as the series description"
+msgstr "指定ファイルの内容を説明文として使用"
+
+msgid "email address of sender"
+msgstr "メールの From ヘッダ値"
+
+msgid "print messages that would be sent"
+msgstr "送信予定のメールの内容を表示"
+
+msgid "write messages to mbox file instead of sending them"
+msgstr "メール送信の代わりに、 mbox ファイルに書き出す"
+
+msgid "email addresses replies should be sent to"
+msgstr "返信メールの送付先アドレス"
+
+msgid "subject of first message (intro or single patch)"
+msgstr "説明文ないし単一パッチ送信メールの Subject ヘッダ値"
+
+msgid "message identifier to reply to"
+msgstr "返信対象のメッセージID"
+
+msgid "flags to add in subject prefixes"
+msgstr "subject 欄に付与するフラグ"
+
+msgid "email addresses of recipients"
+msgstr "TO 宛先のメールアドレス"
+
+msgid "omit hg patch header"
+msgstr "Mercurial 固有のパッチヘッダを省略"
+
+msgid "send changes not found in the target repository"
+msgstr "対象リポジトリに無いリビジョンをパッチ形式で送信"
+
+msgid "send changes not in target as a binary bundle"
+msgstr "対象リポジトリに無いリビジョンをバンドル形式で送信"
+
+msgid "name of the bundle attachment file"
+msgstr "バンドル形式添付ファイルのファイル名"
+
+msgid "a revision to send"
+msgstr "送信するリビジョン"
+
+msgid "run even when remote repository is unrelated (with -b/--bundle)"
+msgstr "連携先が無関係なリポジトリでも送信(-b/--bundle 指定時)"
+
+msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
+msgstr "連携先指定の代わりとなる基底リビジョン(-b/--bundle 指定時)"
+
+msgid "send an introduction email for a single patch"
+msgstr "説明文を独立したメールで送信"
+
+msgid "hg email [OPTION]... [DEST]..."
+msgstr "hg email [OPTION]... [DEST]...\""
+
msgid "send changesets by email"
msgstr "電子メールによる変更内容のパッチ送付"
@@ -4999,6 +5302,8 @@
" In case email sending fails, you will find a backup of your series\n"
" introductory message in ``.hg/last-email.txt``."
msgstr ""
+" メール送信に失敗した場合、\n"
+" 導入メッセージは ``.hg/last-email.txt`` に保存されます。"
msgid ""
" hg email -r 3000 # send patch 3000 only\n"
@@ -5123,81 +5428,6 @@
msgid "sending"
msgstr "送信中"
-msgid "send patches as attachments"
-msgstr "添付ファイルとしてパッチを送信"
-
-msgid "send patches as inline attachments"
-msgstr "インライン添付ファイルとしてパッチを送信"
-
-msgid "email addresses of blind carbon copy recipients"
-msgstr "BCC 宛先のメールアドレス"
-
-msgid "email addresses of copy recipients"
-msgstr "CC 宛先のメールアドレス"
-
-msgid "ask for confirmation before sending"
-msgstr "送信前に確認を実施"
-
-msgid "add diffstat output to messages"
-msgstr "差分統計を出力に追加"
-
-msgid "use the given date as the sending date"
-msgstr "メールの Date ヘッダ値に指定日時を設定"
-
-msgid "use the given file as the series description"
-msgstr "指定ファイルの内容を説明文として使用"
-
-msgid "email address of sender"
-msgstr "メールの From ヘッダ値"
-
-msgid "print messages that would be sent"
-msgstr "送信予定のメールの内容を表示"
-
-msgid "write messages to mbox file instead of sending them"
-msgstr "メール送信の代わりに、 mbox ファイルに書き出す"
-
-msgid "email addresses replies should be sent to"
-msgstr "返信メールの送付先アドレス"
-
-msgid "subject of first message (intro or single patch)"
-msgstr "説明文ないし単一パッチ送信メールの Subject ヘッダ値"
-
-msgid "message identifier to reply to"
-msgstr "返信対象のメッセージID"
-
-msgid "flags to add in subject prefixes"
-msgstr "subject 欄に付与するフラグ"
-
-msgid "email addresses of recipients"
-msgstr "TO 宛先のメールアドレス"
-
-msgid "omit hg patch header"
-msgstr "Mercurial 固有のパッチヘッダを省略"
-
-msgid "send changes not found in the target repository"
-msgstr "対象リポジトリに無いリビジョンをパッチ形式で送信"
-
-msgid "send changes not in target as a binary bundle"
-msgstr "対象リポジトリに無いリビジョンをバンドル形式で送信"
-
-msgid "name of the bundle attachment file"
-msgstr "バンドル形式添付ファイルのファイル名"
-
-msgid "a revision to send"
-msgstr "送信するリビジョン"
-
-msgid "run even when remote repository is unrelated (with -b/--bundle)"
-msgstr "連携先が無関係なリポジトリでも送信(-b/--bundle 指定時)"
-
-msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
-msgstr "連携先指定の代わりとなる基底リビジョン(-b/--bundle 指定時)"
-
-msgid "send an introduction email for a single patch"
-msgstr "説明文を独立したメールで送信"
-
-msgid "hg email [OPTION]... [DEST]..."
-msgstr "hg email [OPTION]... [DEST]...\""
-
msgid "show progress bars for some actions"
msgstr "処理における進捗状況表示"
@@ -5226,9 +5456,9 @@
msgid ""
"Valid entries for the format field are topic, bar, number, unit,\n"
-"estimate, and item. item defaults to the last 20 characters of the\n"
-"item, but this can be changed by adding either ``-<num>`` which would\n"
-"take the last num characters, or ``+<num>`` for the first num\n"
+"estimate, speed, and item. item defaults to the last 20 characters of\n"
+"the item, but this can be changed by adding either ``-<num>`` which\n"
+"would take the last num characters, or ``+<num>`` for the first num\n"
"characters.\n"
msgstr ""
@@ -5262,9 +5492,28 @@
msgid "%dy%02dw"
msgstr ""
+#, python-format
+msgid "%d %s/sec"
+msgstr ""
+
msgid "command to delete untracked files from the working directory"
msgstr "作業領域中の未登録ファイルを削除するコマンド"
+msgid "abort if an error occurs"
+msgstr "エラーが発生した場合、 中断する"
+
+msgid "purge ignored files too"
+msgstr "無視したファイルも削除する"
+
+msgid "print filenames instead of deleting them"
+msgstr "ファイル削除の変わりにファイル名表示を実施"
+
+msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
+msgstr "ファイル名をNUL文字(0x00)で終端(xargs -p/--print との併用向け)"
+
+msgid "hg purge [OPTION]... [DIR]..."
+msgstr "hg purge [OPTION]... [DIR]...\""
+
msgid "removes files not tracked by Mercurial"
msgstr "Mercurial による管理対象ではないファイルの削除"
@@ -5320,21 +5569,6 @@
msgid "Removing directory %s\n"
msgstr "ディレクトリ %s を削除しています\n"
-msgid "abort if an error occurs"
-msgstr "エラーが発生した場合、 中断する"
-
-msgid "purge ignored files too"
-msgstr "無視したファイルも削除する"
-
-msgid "print filenames instead of deleting them"
-msgstr "ファイル削除の変わりにファイル名表示を実施"
-
-msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
-msgstr "ファイル名をNUL文字(0x00)で終端(xargs -p/--print との併用向け)"
-
-msgid "hg purge [OPTION]... [DIR]..."
-msgstr "hg purge [OPTION]... [DIR]...\""
-
msgid "command to move sets of revisions to a different ancestor"
msgstr "一連のリビジョンを異なる履歴ツリー上の位置に移動させるコマンド"
@@ -5352,6 +5586,51 @@
"詳細は以下を参照してください:\n"
"http://mercurial.selenic.com/wiki/RebaseExtension\n"
+msgid "rebase from the specified changeset"
+msgstr "指定リビジョンから移動"
+
+msgid ""
+"rebase from the base of the specified changeset (up to greatest common "
+"ancestor of base and dest)"
+msgstr "指定リビジョンの先祖から移動 (移動先との共通祖先まで遡ります)"
+
+msgid "rebase onto the specified changeset"
+msgstr "複製先リビジョン"
+
+msgid "collapse the rebased changesets"
+msgstr "リベース後に移動リビジョンを単一化"
+
+msgid "use text as collapse commit message"
+msgstr "指定テキストを要約コミットメッセージとして使用"
+
+msgid "read collapse commit message from file"
+msgstr "要約コミットメッセージをファイルから読み込み"
+
+msgid "keep original changesets"
+msgstr "元リビジョンを維持"
+
+msgid "keep original branch names"
+msgstr "元ブランチ名を維持"
+
+msgid "force detaching of source from its original branch"
+msgstr "リベース元を元ブランチから強制的に移動"
+
+msgid "specify merge tool"
+msgstr "マージツールの指定"
+
+msgid "continue an interrupted rebase"
+msgstr "中断されたリベースを再開"
+
+msgid "abort an interrupted rebase"
+msgstr "中断されたリベースを中止"
+
+msgid ""
+"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
+"hg rebase {-a|-c}"
+msgstr ""
+"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
+"hg rebase {-a|-c}"
+
msgid "move changeset (and descendants) to a different branch"
msgstr "別な履歴位置へのリビジョン(およびその子孫)の移動"
@@ -5448,17 +5727,23 @@
" 成功時のコマンド終了値は 0、 移植が実施されない場合は 1 です。\n"
" "
+msgid "message can only be specified with collapse"
+msgstr ""
+
msgid "cannot use both abort and continue"
msgstr "--abort と --continue は併用できません"
msgid "cannot use collapse with continue or abort"
-msgstr "--collapse は --abort や --continue と併用できません"
+msgstr "--collapse と、 --abort や --continue は併用できません"
msgid "cannot use detach with continue or abort"
-msgstr "--detach は --abort や --continue と併用できません"
+msgstr "--detach と、 --abort や --continue は併用できません"
msgid "abort and continue do not allow specifying revisions"
-msgstr "--abort や --continue は、 りビジョン指定と併用できません"
+msgstr "--abort や --continue と、 りビジョン指定は併用できません"
+
+msgid "tool option will be ignored\n"
+msgstr ""
msgid "cannot specify both a revision and a base"
msgstr "--soruce と --base は併用できません"
@@ -5472,9 +5757,6 @@
msgid "nothing to rebase\n"
msgstr "リベースの必要はありません\n"
-msgid "cannot use both keepbranches and extrafn"
-msgstr "--keepbranches と --extrafn は併用できません"
-
msgid "rebasing"
msgstr "リベース実施中"
@@ -5482,7 +5764,7 @@
msgstr "チェンジセット"
msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)"
-msgstr "衝突が未解決です (:hg:`resolve` と :hg:`rebase --continue` 参照)"
+msgstr "衝突が未解消です (:hg:`resolve` と :hg:`rebase --continue` 参照)"
#, python-format
msgid "no changes, revision %d skipped\n"
@@ -5526,48 +5808,27 @@
msgid "source is descendant of destination"
msgstr "移動元は移動先の子孫です"
+msgid "--tool can only be used with --rebase"
+msgstr "--tool は --rebase 指定時にしか使用出来ません"
+
msgid "rebase working directory to branch head"
msgstr "作業領域をブランチヘッドにリベース"
-msgid "rebase from the specified changeset"
-msgstr "指定リビジョンから移動"
-
-msgid ""
-"rebase from the base of the specified changeset (up to greatest common "
-"ancestor of base and dest)"
-msgstr "指定リビジョンの先祖から移動 (移動先との共通祖先まで遡ります)"
-
-msgid "rebase onto the specified changeset"
-msgstr "複製先リビジョン"
-
-msgid "collapse the rebased changesets"
-msgstr "リベース後に移動リビジョンを単一化"
-
-msgid "keep original changesets"
-msgstr "元リビジョンを維持"
-
-msgid "keep original branch names"
-msgstr "元ブランチ名を維持"
-
-msgid "force detaching of source from its original branch"
-msgstr "リベース元を元ブランチから強制的に移動"
-
-msgid "continue an interrupted rebase"
-msgstr "中断されたリベースを再開"
-
-msgid "abort an interrupted rebase"
-msgstr "中断されたリベースを中止"
-
-msgid ""
-"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
-"hg rebase {-a|-c}"
-msgstr ""
-"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
-"hg rebase {-a|-c}"
+msgid "specify merge tool for rebase"
+msgstr "リベース用のマージツールの指定"
msgid "commands to interactively select changes for commit/qrefresh"
msgstr "commit または qrefresh 実行時に対話的な変更選択を行うコマンド"
+msgid "ignore white space when comparing lines"
+msgstr "差分判定の際に空白文字を無視"
+
+msgid "ignore changes in the amount of white space"
+msgstr "差分判定の際に空白文字の数を無視"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "差分判定の際に空白行を無視"
+
msgid "this modifies a binary file (all or nothing)\n"
msgstr "これはバイナリファイルに対する変更です(部分的な選択は不可能)\n"
@@ -5623,6 +5884,9 @@
msgid "record change %d/%d to %r?"
msgstr "この変更 (%d 件目 / %d 件中) を %r に記録しますか？"
+msgid "hg record [OPTION]... [FILE]..."
+msgstr "hg record [OPTION]... [FILE]..."
+
msgid "interactively select changes to commit"
msgstr "コミットする内容を対話的に選択します"
@@ -5671,11 +5935,23 @@
msgid " This command is not available when committing a merge."
msgstr " 本コマンドをマージのコミットに使用することはできません。"
+msgid "interactively record a new patch"
+msgstr "新規パッチのコミット内容を対話的に選択"
+
+msgid ""
+" See :hg:`help qnew` & :hg:`help record` for more information and\n"
+" usage.\n"
+" "
+msgstr ""
+" 用法等の詳細は :hg:`help qnew` および :hg:`help record`\n"
+" を参照してください。"
+
msgid "'mq' extension not loaded"
msgstr "'mq' エクステンションが読み込まれていません"
-msgid "running non-interactively, use commit instead"
-msgstr "非対話的に実行する場合は commit を使用してください"
+#, python-format
+msgid "running non-interactively, use %s instead"
+msgstr "非対話的に実行する場合は、%s を使用してください"
msgid "cannot partially commit a merge (use \"hg commit\" instead)"
msgstr "マージの部分コミットはできません (\"hg commit\" を使用してください)"
@@ -5683,12 +5959,12 @@
msgid "no changes to record\n"
msgstr "記録可能な変更がありません\n"
-msgid "hg record [OPTION]... [FILE]..."
-msgstr "hg record [OPTION]... [FILE]..."
-
msgid "hg qrecord [OPTION]... PATCH [FILE]..."
msgstr "hg qrecord [OPTION]... PATCH [FILE]..."
+msgid "interactively select changes to refresh"
+msgstr "パッチ更新内容内容を対話的に選択"
+
msgid "recreates hardlinks between repository clones"
msgstr "複製リポジトリ間でのハードリンクの再生成"
@@ -5733,10 +6009,18 @@
msgid "hardlinks are not supported on this system"
msgstr "このシステム上ではハードリンクが未サポートです"
+#, fuzzy
+msgid "must specify local origin repository"
+msgstr "%s はローカルの Mercurial リポジトリではありません"
+
#, python-format
msgid "relinking %s to %s\n"
msgstr "%s から %s にハードリンク中\n"
+#, fuzzy
+msgid "there is nothing to relink\n"
+msgstr "マージの必要がありません"
+
#, python-format
msgid "tip has %d files, estimated total number of files: %s\n"
msgstr ""
@@ -5754,10 +6038,6 @@
msgid "source and destination are on different devices"
msgstr "リンク元とリンク先が同一ファイルシステム上にありません"
-#, python-format
-msgid "not linkable: %s\n"
-msgstr "リンク不可ファイル: %s\n"
-
msgid "pruning"
msgstr "刈り込み中"
@@ -5768,8 +6048,8 @@
msgid "relinking"
msgstr "再リンク中"
-#, python-format
-msgid "relinked %d files (%d bytes reclaimed)\n"
+#, fuzzy, python-format
+msgid "relinked %d files (%s reclaimed)\n"
msgstr "%d ファイルを再リンク(%d バイトの節約)\n"
msgid "[ORIGIN]"
@@ -5829,6 +6109,10 @@
"same name.\n"
msgstr ""
+#, python-format
+msgid "custom scheme %s:// conflicts with drive letter %s:\\\n"
+msgstr ""
+
msgid "share a common history between several working directories"
msgstr "複数作業領域による履歴情報領域の共有"
@@ -5921,6 +6205,9 @@
msgid "commit failed"
msgstr "コミットに失敗"
+msgid "filter corrupted changeset (no user or date)"
+msgstr ""
+
msgid ""
"y: transplant this changeset\n"
"n: skip this changeset\n"
@@ -5944,105 +6231,6 @@
msgid "no such option\n"
msgstr "そのようなオプションはありません\n"
-msgid "transplant changesets from another branch"
-msgstr "別のブランチへのチェンジセットの移植"
-
-msgid ""
-" Selected changesets will be applied on top of the current working\n"
-" directory with the log of the original changeset. If --log is\n"
-" specified, log messages will have a comment appended of the form::"
-msgstr ""
-" 選択されたチェンジセットは、 元チェンジセットのコミットログと一緒に\n"
-" 現在の作業領域上に適用されます。 --log 指定がある場合、 以下の形式の\n"
-" メッセージが追加されます::"
-
-msgid " (transplanted from CHANGESETHASH)"
-msgstr " (transplanted from CHANGESETHASH)"
-
-msgid ""
-" You can rewrite the changelog message with the --filter option.\n"
-" Its argument will be invoked with the current changelog message as\n"
-" $1 and the patch as $2."
-msgstr ""
-" --filter によりコミットログを改変することができます。 指定された値は\n"
-" コマンド起動に使用され、 第1引数にはコミットメッセージ、 第2引数には\n"
-" パッチが指定されます。"
-
-msgid ""
-" If --source/-s is specified, selects changesets from the named\n"
-" repository. If --branch/-b is specified, selects changesets from\n"
-" the branch holding the named revision, up to that revision. If\n"
-" --all/-a is specified, all changesets on the branch will be\n"
-" transplanted, otherwise you will be prompted to select the\n"
-" changesets you want."
-msgstr ""
-" --source/-s が指定された場合、 指定のリポジトリから移植されます。\n"
-" --branch/-b が指定された場合、 指定の名前を持つブランチから移植\n"
-" されます。 --all/-a が指定された場合、 指定されたブランチ中の全ての\n"
-" チェンジセットが移植対処となり、 それ以外の場合は移植対象とする\n"
-" チェンジセットの問い合わせがあります。"
-
-msgid ""
-" :hg:`transplant --branch REVISION --all` will rebase the selected\n"
-" branch (up to the named revision) onto your current working\n"
-" directory."
-msgstr ""
-" :hg:`transplant --branch REVISION --all` 形式での起動の場合、\n"
-" 指定 REVISION までのブランチ全体が、 現在の作業領域上に移植されます。"
-
-msgid ""
-" You can optionally mark selected transplanted changesets as merge\n"
-" changesets. You will not be prompted to transplant any ancestors\n"
-" of a merged transplant, and you can merge descendants of them\n"
-" normally instead of transplanting them."
-msgstr ""
-" 選択した対象チェンジセットの移植を、 マージ実施とみなすことも可能\n"
-" です。 移植の際にマージ対象リビジョンに関する問い合わせは無く、 移植\n"
-" 後の移植元の子孫に対しては、 移植ではなく通常のマージが可能です。"
-
-msgid ""
-" If no merges or revisions are provided, :hg:`transplant` will\n"
-" start an interactive changeset browser."
-msgstr ""
-" マージ対象もリビジョン指定もない場合、 :hg:`transplant` は対話的に\n"
-" 移植を行ないます。"
-
-msgid ""
-" If a changeset application fails, you can fix the merge by hand\n"
-" and then resume where you left off by calling :hg:`transplant\n"
-" --continue/-c`.\n"
-" "
-msgstr ""
-" 移植に失敗した場合、 手動での衝突解消後に :hg:`transplant\n"
-" --continue/-c` を実行することで、 中断された移植を再開可能です。\n"
-" "
-
-msgid "--continue is incompatible with branch, all or merge"
-msgstr "--continue は --branch、 --all、 --merge と併用できません"
-
-msgid "no source URL, branch tag or revision list provided"
-msgstr "元 URL、 ブランチタグ、 リビジョン指定のいずれも指定されていません"
-
-msgid "--all requires a branch revision"
-msgstr "--all 指定にはブランチリビジョンが必要です"
-
-msgid "--all is incompatible with a revision list"
-msgstr "--all とリビジョン指定は併用できません"
-
-msgid "no revision checked out"
-msgstr "作業領域が未更新です"
-
-msgid "outstanding uncommitted merges"
-msgstr "マージが未コミットです"
-
-msgid "outstanding local changes"
-msgstr "未コミットの変更があります"
-
-msgid ""
-"``transplanted(set)``\n"
-" Transplanted changesets in set."
-msgstr ""
-
msgid "pull patches from REPO"
msgstr "パッチ取り込み元リポジトリの指定"
@@ -6073,6 +6261,112 @@
msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
msgstr "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
+msgid "transplant changesets from another branch"
+msgstr "別のブランチへのチェンジセットの移植"
+
+msgid ""
+" Selected changesets will be applied on top of the current working\n"
+" directory with the log of the original changeset. The changesets\n"
+" are copied and will thus appear twice in the history. Use the\n"
+" rebase extension instead if you want to move a whole branch of\n"
+" unpublished changesets."
+msgstr ""
+
+msgid ""
+" If --log is specified, log messages will have a comment appended\n"
+" of the form::"
+msgstr ""
+
+msgid " (transplanted from CHANGESETHASH)"
+msgstr " (transplanted from CHANGESETHASH)"
+
+msgid ""
+" You can rewrite the changelog message with the --filter option.\n"
+" Its argument will be invoked with the current changelog message as\n"
+" $1 and the patch as $2."
+msgstr ""
+" --filter によりコミットログを改変することができます。 指定された値は\n"
+" コマンド起動に使用され、 第1引数にはコミットメッセージ、 第2引数には\n"
+" パッチが指定されます。"
+
+msgid ""
+" If --source/-s is specified, selects changesets from the named\n"
+" repository. If --branch/-b is specified, selects changesets from\n"
+" the branch holding the named revision, up to that revision. If\n"
+" --all/-a is specified, all changesets on the branch will be\n"
+" transplanted, otherwise you will be prompted to select the\n"
+" changesets you want."
+msgstr ""
+" --source/-s が指定された場合、 指定のリポジトリから移植されます。\n"
+" --branch/-b が指定された場合、 指定の名前を持つブランチから移植\n"
+" されます。 --all/-a が指定された場合、 指定されたブランチ中の全ての\n"
+" チェンジセットが移植対処となり、 それ以外の場合は移植対象とする\n"
+" チェンジセットの問い合わせがあります。"
+
+msgid ""
+" :hg:`transplant --branch REVISION --all` will transplant the\n"
+" selected branch (up to the named revision) onto your current\n"
+" working directory."
+msgstr ""
+
+msgid ""
+" You can optionally mark selected transplanted changesets as merge\n"
+" changesets. You will not be prompted to transplant any ancestors\n"
+" of a merged transplant, and you can merge descendants of them\n"
+" normally instead of transplanting them."
+msgstr ""
+" 選択した対象チェンジセットの移植を、 マージ実施とみなすことも可能\n"
+" です。 移植の際にマージ対象リビジョンに関する問い合わせは無く、 移植\n"
+" 後の移植元の子孫に対しては、 移植ではなく通常のマージが可能です。"
+
+msgid ""
+" If no merges or revisions are provided, :hg:`transplant` will\n"
+" start an interactive changeset browser."
+msgstr ""
+" マージ対象もリビジョン指定もない場合、 :hg:`transplant` は対話的に\n"
+" 移植を行ないます。"
+
+msgid ""
+" If a changeset application fails, you can fix the merge by hand\n"
+" and then resume where you left off by calling :hg:`transplant\n"
+" --continue/-c`.\n"
+" "
+msgstr ""
+" 移植に失敗した場合、 手動での衝突解消後に :hg:`transplant\n"
+" --continue/-c` を実行することで、 中断された移植を再開可能です。\n"
+" "
+
+msgid "--continue is incompatible with branch, all or merge"
+msgstr "--continue と --branch、 --all、 --merge は併用できません"
+
+msgid "no source URL, branch tag or revision list provided"
+msgstr "元 URL、 ブランチタグ、 リビジョン指定のいずれも指定されていません"
+
+msgid "--all requires a branch revision"
+msgstr "--all 指定にはブランチリビジョンが必要です"
+
+msgid "--all is incompatible with a revision list"
+msgstr "--all とリビジョンリスト指定は併用できません"
+
+msgid "no revision checked out"
+msgstr "作業領域が未更新です"
+
+msgid "outstanding uncommitted merges"
+msgstr "マージが未コミットです"
+
+msgid "outstanding local changes"
+msgstr "未コミットの変更があります"
+
+msgid ""
+"``transplanted([set])``\n"
+" Transplanted changesets in set, or all transplanted changesets."
+msgstr ""
+
+msgid ""
+":transplanted: String. The node identifier of the transplanted\n"
+" changeset if any."
+msgstr ""
+
msgid "allow the use of MBCS paths with problematic encodings"
msgstr "問題のある文字コードでの多バイト符号化文字を使用したパス名の有効化"
@@ -6336,15 +6630,24 @@
msgid "bookmark '%s' contains illegal character"
msgstr "ブックマーク '%s' は不正な文字を含んでいます"
+#, python-format
+msgid "branch %s not found"
+msgstr "ブランチ %s が見つかりません"
+
+#, python-format
+msgid "updating bookmark %s\n"
+msgstr "ブックマーク %s の更新中\n"
+
+#, python-format
+msgid "not updating divergent bookmark %s\n"
+msgstr "衝突するブックマーク %s は更新しません\n"
+
msgid "searching for changed bookmarks\n"
msgstr "変更されたブックマークを探索中\n"
msgid "no changed bookmarks found\n"
msgstr "変更されたブックマークはありません\n"
-msgid "invalid changegroup"
-msgstr "チェンジグループが不正です"
-
msgid "unknown parent"
msgstr "未知の親"
@@ -6399,21 +6702,21 @@
msgid "invalid format spec '%%%s' in output filename"
msgstr "出力ファイル名に不正なフォーマット '%%%s' 指定"
-#, python-format
-msgid "adding %s\n"
-msgstr "%s を追加登録中\n"
-
-#, python-format
-msgid "removing %s\n"
-msgstr "%s を登録除外中\n"
-
-#, python-format
-msgid "recording removal of %s as rename to %s (%d%% similar)\n"
-msgstr "%s の削除を %s へのファイル名変更として記録中 (類似度 %d%%)\n"
-
-#, python-format
-msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
-msgstr "%s は未コミットなので、 %s のコピーデータは残りません\n"
+msgid "cannot specify --changelog and --manifest at the same time"
+msgstr "--changelog と --manifest は同時には指定出来ません"
+
+msgid "cannot specify filename with --changelog or --manifest"
+msgstr "--changelog ないし --manifest とファイル名は同時に指定出来ません"
+
+msgid "cannot specify --changelog or --manifest without a repository"
+msgstr "--changelog ないし --manifest の指定はリポジトリ指定が必要です"
+
+msgid "invalid arguments"
+msgstr "引数が不正です"
+
+#, python-format
+msgid "revlog '%s' not found"
+msgstr "revlog '%s' が見つかりません"
#, python-format
msgid "%s: not copying - file is not managed\n"
@@ -6556,6 +6859,10 @@
msgstr "ファイル名が明示された場合のみ複製/改名を追跡可能です"
#, python-format
+msgid "adding %s\n"
+msgstr "%s を追加登録中\n"
+
+#, python-format
msgid "skipping missing subrepository: %s\n"
msgstr "存在しない副リポジトリへの処理を省略: %s\n"
@@ -6599,6 +6906,138 @@
msgid "empty commit message"
msgstr "コミットメッセージがありません"
+msgid "repository root directory or name of overlay bundle file"
+msgstr "リポジトリのルート位置、 ないしバンドルファイルのパス"
+
+msgid "DIR"
+msgstr "ディレクトリ"
+
+msgid "change working directory"
+msgstr "作業領域の変更"
+
+msgid "do not prompt, assume 'yes' for any required answers"
+msgstr "問い合わせをせず、 確認事項は全て 'yes' とみなす"
+
+msgid "suppress output"
+msgstr "出力を抑止"
+
+msgid "enable additional output"
+msgstr "付加的な出力を有効化"
+
+msgid "set/override config option (use 'section.name=value')"
+msgstr "オプション設定を指定／上書き(指定形式は 'section.name=value')"
+
+msgid "CONFIG"
+msgstr "設定"
+
+msgid "enable debugging output"
+msgstr "デバッグ出力を有効化"
+
+msgid "start debugger"
+msgstr "デバッガを開始"
+
+msgid "set the charset encoding"
+msgstr "文字エンコーディングの設定"
+
+msgid "ENCODE"
+msgstr "文字コード"
+
+msgid "MODE"
+msgstr "モード"
+
+msgid "set the charset encoding mode"
+msgstr "文字エンコーディングのモード設定"
+
+msgid "always print a traceback on exception"
+msgstr "例外発生の際に常にトレースバックを表示"
+
+msgid "time how long the command takes"
+msgstr "コマンド実行の所要時間を計測"
+
+msgid "print command execution profile"
+msgstr "コマンド実行のプロファイルを表示"
+
+msgid "output version information and exit"
+msgstr "バージョン情報を表示して終了"
+
+msgid "display help and exit"
+msgstr "ヘルプ情報を表示して終了"
+
+msgid "do not perform actions, just print output"
+msgstr "実施予定の処理内容の表示のみで処理実施は抑止"
+
+msgid "specify ssh command to use"
+msgstr "SSH 連携で使用する ssh コマンド"
+
+msgid "specify hg command to run on the remote side"
+msgstr "遠隔ホスト側で実行される hg コマンド"
+
+msgid "do not verify server certificate (ignoring web.cacerts config)"
+msgstr "サーバ証明書の検証省略(web.cacerts 設定の無視)"
+
+msgid "PATTERN"
+msgstr "パターン"
+
+msgid "include names matching the given patterns"
+msgstr "パターンに合致したファイルを処理対象に追加"
+
+msgid "exclude names matching the given patterns"
+msgstr "パターンに合致したファイルを処理対象から除外"
+
+msgid "use text as commit message"
+msgstr "指定テキストをコミットメッセージとして使用"
+
+msgid "read commit message from file"
+msgstr "コミットメッセージをファイルから読み込み"
+
+msgid "record the specified date as commit date"
+msgstr "指定日時をコミット日時として記録"
+
+msgid "record the specified user as committer"
+msgstr "指定ユーザをコミットユーザとして記録"
+
+msgid "STYLE"
+msgstr "スタイル"
+
+msgid "display using template map file"
+msgstr "当該スタイルで表示をカスタマイズ"
+
+msgid "display with template"
+msgstr "当該テンプレートで表示をカスタマイズ"
+
+msgid "do not show merges"
+msgstr "マージ実施リビジョンの表示抑止"
+
+msgid "output diffstat-style summary of changes"
+msgstr "diffstat 形式の変更概要を生成"
+
+msgid "treat all files as text"
+msgstr "全ファイルをテキストファイルと仮定"
+
+msgid "omit dates from diff headers"
+msgstr "差分表示の際に日付情報の表示を抑止"
+
+msgid "show which function each change is in"
+msgstr "差分表示の際に関数名情報を表示"
+
+msgid "produce a diff that undoes the changes"
+msgstr "変更を取り消すための差分を生成"
+
+msgid "number of lines of context to show"
+msgstr "差分コンテキストの行数"
+
+msgid "SIMILARITY"
+msgstr "類似度"
+
+msgid "guess renamed files by similarity (0<=s<=100)"
+msgstr "ファイル改名推定の際の類似度(0 以上 100 以下)"
+
+msgid "recurse into subrepositories"
+msgstr "副リポジトリへの再帰的適用"
+
+msgid "[OPTION]... [FILE]..."
+msgstr "[OPTION]... [FILE]..."
+
msgid "add the specified files on the next commit"
msgstr "指定ファイルの追加登録予約"
@@ -6697,6 +7136,36 @@
msgid "similarity must be between 0 and 100"
msgstr "類似度は0から100の間でなければなりません"
+msgid "annotate the specified revision"
+msgstr "当該リビジョン時点での由来情報を表示"
+
+msgid "follow copies/renames and list the filename (DEPRECATED)"
+msgstr "複製／改名元ファイルの履歴追跡と、 ファイル名の表示(非推奨)"
+
+msgid "don't follow copies and renames"
+msgstr "複製／改名元ファイル履歴の追跡を抑止"
+
+msgid "list the author (long with -v)"
+msgstr "ユーザ名を表示(-v 指定時は詳細表示)"
+
+msgid "list the filename"
+msgstr "ファイル名を表示"
+
+msgid "list the date (short with -q)"
+msgstr "日付を表示(-q 指定時は簡略表示)"
+
+msgid "list the revision number (default)"
+msgstr "リビジョン番号を表示(既定動作)"
+
+msgid "list the changeset"
+msgstr "ハッシュ値を表示"
+
+msgid "show line number at the first appearance"
+msgstr "由来リビジョンでの初出時の行番号を表示"
+
+msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
+msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
+
msgid "show changeset information by line for each file"
msgstr "ファイル行毎のリビジョン情報表示"
@@ -6731,6 +7200,24 @@
msgid "%s: binary file\n"
msgstr "%s: バイナリファイルです\n"
+msgid "do not pass files through decoders"
+msgstr "デコード処理を回避"
+
+msgid "directory prefix for files in archive"
+msgstr "アーカイブファイルのディレクトリ接頭辞"
+
+msgid "PREFIX"
+msgstr "接頭辞"
+
+msgid "revision to distribute"
+msgstr "アーカイブ対象リビジョン"
+
+msgid "type of distribution to create"
+msgstr "アーカイブ種別"
+
+msgid "[OPTION]... DEST"
+msgstr "[OPTION]... DEST"
+
msgid "create an unversioned archive of a repository revision"
msgstr "特定リビジョン時点のアーカイブのリポジトリ外への生成"
@@ -6794,6 +7281,18 @@
msgid "cannot archive plain files to stdout"
msgstr "通常ファイルのアーカイブ先に標準出力を指定することはできません"
+msgid "merge with old dirstate parent after backout"
+msgstr "打ち消しリビジョンを現親リビジョンとマージ"
+
+msgid "parent to choose when backing out merge"
+msgstr "打ち消しリビジョンとのマージ対象"
+
+msgid "revision to backout"
+msgstr "打ち消し対象リビジョン"
+
+msgid "[OPTION]... [-r] REV"
+msgstr "[OPTION]... [-r] REV"
+
msgid "reverse effect of earlier changeset"
msgstr "以前のチェンジセットにおける変更の打ち消し"
@@ -6872,6 +7371,30 @@
msgid "merging with changeset %s\n"
msgstr "リビジョン %s とマージ中\n"
+msgid "reset bisect state"
+msgstr "探索状態のリセット"
+
+msgid "mark changeset good"
+msgstr "対象リビジョンの探索状態を good 化"
+
+msgid "mark changeset bad"
+msgstr "対象リビジョンの探索状態を bad 化"
+
+msgid "skip testing changeset"
+msgstr "対象リビジョンの判定作業を省略"
+
+msgid "extend the bisect range"
+msgstr "探索範囲の拡張"
+
+msgid "use command to check changeset state"
+msgstr "good/bad 判定用コマンド"
+
+msgid "do not update to target"
+msgstr "対象リビジョンによる作業領域内容の更新を抑止"
+
+msgid "[-gbsr] [-U] [-c CMD] [REV]"
+msgstr "[-gbsr] [-U] [-c CMD] [REV]"
+
msgid "subdivision search of changesets"
msgstr "リビジョンの分割探索"
@@ -6922,10 +7445,12 @@
#, python-format
msgid ""
"Not all ancestors of this changeset have been checked.\n"
-"To check the other ancestors, start from the common ancestor, %s.\n"
+"Use bisect --extend to continue the bisection from\n"
+"the common ancestor, %s.\n"
msgstr ""
"このリビジョンの祖先に対する確認は完全ではありません。\n"
-"全てを確認するには、 共通の祖先 %s から検索を開始してください。\n"
+"共通の祖先 %s から検索を継続する場合、\n"
+"--extend 付きで :hg:`bisect` を実行してください。\n"
msgid "Due to skipped revisions, the first good revision could be any of:\n"
msgstr "検証省略により、 最初の good なリビジョンは以下から選択可能です:\n"
@@ -6958,9 +7483,31 @@
msgstr "リビジョン %d:%s: %s\n"
#, python-format
+msgid "Extending search to changeset %d:%s\n"
+msgstr "探索範囲を %d:%s まで拡張\n"
+
+msgid "nothing to extend"
+msgstr "探索範囲は拡張されませんでした"
+
+#, python-format
msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
msgstr "リビジョン %d:%s を検証中(検証残 %d、 検証済み %d)\n"
+msgid "force"
+msgstr "強制実施"
+
+msgid "delete a given bookmark"
+msgstr "指定ブックマークの削除"
+
+msgid "rename a given bookmark"
+msgstr "指定ブックマークの改名"
+
+msgid "do not mark a new bookmark active"
+msgstr "新規ブックマークをアクティブ化しない"
+
+msgid "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]"
+msgstr "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]"
+
msgid "track a line of development with movable markers"
msgstr "移動可能なマーキングによる履歴進展の追跡"
@@ -7005,11 +7552,13 @@
" bookmarks エクステンションを有効にしなければなりません。\n"
" "
-msgid "a bookmark of this name does not exist"
-msgstr "この名前のブックマークは存在しません"
-
-msgid "a bookmark of the same name already exists"
-msgstr "同じ名前のブックマークがすでに存在します"
+#, python-format
+msgid "bookmark '%s' does not exist"
+msgstr "ブックマーク '%s' は存在しません"
+
+#, python-format
+msgid "bookmark '%s' already exists (use -f to force)"
+msgstr "ブックマーク '%s' は存在します(強制実行する場合は -f を指定)"
msgid "new bookmark name required"
msgstr "新しいブックマーク名を要求しました"
@@ -7029,6 +7578,15 @@
msgid "no bookmarks set\n"
msgstr "ブックマークは存在しません\n"
+msgid "set branch name even if it shadows an existing branch"
+msgstr "同名既存ブランチが存在する場合でもブランチ作成を実施"
+
+msgid "reset branch name to parent branch name"
+msgstr "ブランチ名設定を解消し、 親リビジョンのブランチに戻る"
+
+msgid "[-fC] [NAME]"
+msgstr "[-fC] [NAME]"
+
msgid "set or show the current branch name"
msgstr "ブランチ名の設定、 ないし現ブランチ名の表示"
@@ -7067,18 +7625,43 @@
" 使用してください。 現ブランチを閉鎖する場合は\n"
" :hg:`commit --close-branch` を使用してください。"
+msgid " .. note::"
+msgstr " .. note::"
+
+msgid ""
+" Branch names are permanent. Use :hg:`bookmark` to create a\n"
+" light-weight bookmark instead. See :hg:`help glossary` for more\n"
+" information about named branches and bookmarks."
+msgstr ""
+" ブランチ名は永続的なものです。軽量な名前付けをする場合は、\n"
+" :hg:`bookmark` でブックマークを作成してください。\n"
+" 名前付きブランチとブックマークの詳細に関しては、\n"
+" :hg:`help glossary` を参照してください。"
+
#, python-format
msgid "reset working directory to branch %s\n"
msgstr "作業領域のブランチを %s にリセット\n"
-msgid ""
-"a branch of the same name already exists (use 'hg update' to switch to it)"
-msgstr "同名のブランチが存在します(ブランチの切り替えは :hg:`update`)"
+msgid "a branch of the same name already exists"
+msgstr "同じ名前のブランチがすでに存在します"
+
+#. i18n: "it" refers to an existing branch
+msgid "use 'hg update' to switch to it"
+msgstr "作業領域を既存ブランチに切り替えるには 'hg update' を使用してください"
#, python-format
msgid "marked working directory as branch %s\n"
msgstr "作業領域をブランチ %s に設定\n"
+msgid "show only branches that have unmerged heads"
+msgstr "未マージなヘッドを持つブランチのみを表示"
+
+msgid "show normal and closed branches"
+msgstr "閉鎖したヘッドも表示"
+
+msgid "[-ac]"
+msgstr "[-ac]"
+
msgid "list repository named branches"
msgstr "リポジトリ中の名前付きブランチの一覧"
@@ -7116,6 +7699,27 @@
msgid " (inactive)"
msgstr " (非アクティブ)"
+msgid "run even when the destination is unrelated"
+msgstr "連携先が無関係なリポジトリでも実行"
+
+msgid "a changeset intended to be added to the destination"
+msgstr "バンドルに含めたいリビジョン"
+
+msgid "a specific branch you would like to bundle"
+msgstr "バンドルに含めたいブランチ"
+
+msgid "a base changeset assumed to be available at the destination"
+msgstr "連携先リポジトリに存在することを仮定するリビジョン"
+
+msgid "bundle all changesets in the repository"
+msgstr "リポジトリ中の全リビジョンをバンドルに含める"
+
+msgid "bundle compression type to use"
+msgstr "バンドルファイルの圧縮形式"
+
+msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
+msgstr "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
+
msgid "create a changegroup file"
msgstr "バンドルファイルの生成"
@@ -7176,6 +7780,18 @@
msgid "unknown bundle type specified with --type"
msgstr "--type に未知のバンドル種別が指定されました"
+msgid "print output to file with formatted name"
+msgstr "ファイル内容の保存先"
+
+msgid "print the given revision"
+msgstr "出力対象リビジョン"
+
+msgid "apply any matching decode filter"
+msgstr "デコード処理を実施"
+
+msgid "[OPTION]... FILE..."
+msgstr "[OPTION]... FILE..."
+
msgid "output the current or given revision of files"
msgstr "指定されたリビジョン時点のファイル内容の出力"
@@ -7207,6 +7823,21 @@
" :``%p``: 対象ファイルのリポジトリルートからの相対パス\n"
" "
+msgid "the clone will include an empty working copy (only a repository)"
+msgstr "作業領域の更新無し(管理領域のみの複製)"
+
+msgid "revision, tag or branch to check out"
+msgstr "作業領域更新用リビジョン(タグ名／ブランチ名)"
+
+msgid "include the specified changeset"
+msgstr "複製対象に含めるリビジョン"
+
+msgid "clone only the specified branch"
+msgstr "指定ブランチのみを複製"
+
+msgid "[OPTION]... SOURCE [DEST]"
+msgstr "[OPTION]... SOURCE [DEST]"
+
msgid "make a copy of an existing repository"
msgstr "既存リポジトリの複製"
@@ -7339,6 +7970,12 @@
msgid "cannot specify both --noupdate and --updaterev"
msgstr "--noupdate と --updaterev は併用できません"
+msgid "mark new/missing files as added/removed before committing"
+msgstr "コミット前に、 新規／不在ファイルを登録／除外"
+
+msgid "mark a branch as closed, hiding it from the branch list"
+msgstr "ブランチを閉鎖し、 ブランチ一覧での表示から除外"
+
msgid "commit the specified files or all outstanding changes"
msgstr "指定ファイルないし全ての変更内容のリポジトリへの記録"
@@ -7387,6 +8024,10 @@
msgid "can only close branch heads"
msgstr "ブランチヘッドのみ閉鎖できます"
+#, python-format
+msgid "nothing changed (%d missing files, see 'hg status')\n"
+msgstr "改変はありません (%d 個のファイルが不在。 'hg status' で確認を)\n"
+
msgid "nothing changed\n"
msgstr "変更なし\n"
@@ -7401,6 +8042,15 @@
msgid "committed changeset %d:%s\n"
msgstr "コミット対象リビジョン %d:%s\n"
+msgid "record a copy that has already occurred"
+msgstr "手動で複製済みのファイルに対して、 複製の旨を記録"
+
+msgid "forcibly copy over an existing managed file"
+msgstr "同名の登録済みファイルが存在しても複製を実施"
+
+msgid "[OPTION]... [SOURCE]... DEST"
+msgstr "[OPTION]... [SOURCE]... DEST"
+
msgid "mark files as copied for the next commit"
msgstr "指定されたファイルの複製"
@@ -7437,14 +8087,34 @@
" 成功時のコマンドの終了値は 0、 エラー発生時は 1 です。\n"
" "
+msgid "[INDEX] REV1 REV2"
+msgstr "[INDEX] REV1 REV2"
+
msgid "find the ancestor revision of two revisions in a given index"
msgstr "指定範囲における2つのリビジョンの祖先リビジョンの検索"
msgid "either two or three arguments required"
msgstr "2ないし3の引数が必要です"
-msgid "builds a repo with a given dag from scratch in the current empty repo"
-msgstr "空リポジトリから指定された記号に基くリポジトリの生成"
+msgid "add single file mergeable changes"
+msgstr ""
+
+msgid "add single file all revs overwrite"
+msgstr ""
+
+msgid "add new file at each rev"
+msgstr ""
+
+msgid "[OPTION]... [TEXT]"
+msgstr ""
+
+msgid "builds a repo with a given DAG from scratch in the current empty repo"
+msgstr ""
+
+msgid ""
+" The description of the DAG is read from stdin if not given on the\n"
+" command line."
+msgstr ""
msgid " Elements:"
msgstr " 表記:"
@@ -7461,8 +8131,6 @@
" - \"/p2\" is a merge of the preceding node and p2\n"
" - \":tag\" defines a local tag for the preceding node\n"
" - \"@branch\" sets the named branch for subsequent nodes\n"
-" - \"!command\" runs the command using your shell\n"
-" - \"!!my command\\n\" is like \"!\", but to the end of the line\n"
" - \"#...\\n\" is a comment up to the end of the line"
msgstr ""
@@ -7482,36 +8150,25 @@
msgid ""
" All string valued-elements are either strictly alphanumeric, or must\n"
-" be enclosed in double quotes (\"...\"), with \"\\\" as escape character."
-msgstr ""
-
-msgid ""
-" Note that the --overwritten-file and --appended-file options imply the\n"
-" use of \"HGMERGE=internal:local\" during DAG buildup.\n"
-" "
-msgstr ""
-
-msgid "need at least one of -m, -a, -o, -n"
-msgstr "-m, -a, -o, -n のいずれか1つは必須です"
+" be enclosed in double quotes (\"...\"), with \"\\\" as escape "
+"character.\n"
+" "
+msgstr ""
+
+msgid "reading DAG from stdin\n"
+msgstr ""
msgid "repository is not empty"
msgstr "リポジトリが空ではありません"
-#, python-format
-msgid "%s command %s"
-msgstr ""
-
-msgid "list all available commands and options"
-msgstr "利用可能なコマンドおよびオプション一覧の表示"
-
-msgid "returns the completion list associated with the given command"
-msgstr "指定コマンドの補完リストの作成"
-
-msgid "show information detected about current filesystem"
-msgstr "ファイルシステムに関する情報の表示"
-
-msgid "rebuild the dirstate as it would look like for the given revision"
-msgstr "指定リビジョン時点相当の dirstate の再構築"
+msgid "building"
+msgstr ""
+
+msgid "show all details"
+msgstr ""
+
+msgid "lists the contents of a bundle"
+msgstr ""
msgid "validate the correctness of the current dirstate"
msgstr "現時点の dirstate の整合性検証"
@@ -7535,73 +8192,35 @@
msgid ".hg/dirstate inconsistent with current parent's manifest"
msgstr "親リビジョンの管理情報と .hg/dirstate の間に不整合があります"
-msgid "show combined config settings from all hgrc files"
-msgstr "全設定ファイルによる最終的な設定内容の表示"
-
-msgid " With no arguments, print names and values of all config items."
-msgstr ""
-" 引数指定が無い場合、 全ての設定項目に対して、 名前と値を表示します。"
-
-msgid ""
-" With one argument of the form section.name, print just the value\n"
-" of that config item."
-msgstr ""
-" 'section.name' 形式に合致する引数を1つだけ指定した場合、 その設定項目\n"
-" 値のみを表示します。"
-
-msgid ""
-" With multiple arguments, print names and values of all config\n"
-" items with matching section names."
-msgstr ""
-" 複数の引数が指定された場合、 それらをセクション名とみなし、 該当する\n"
-" セクションの設定項目を全て表示します。"
-
-msgid ""
-" With --debug, the source (filename and line number) is printed\n"
-" for each config item."
-msgstr ""
-" --debug 指定がある場合、 設定項目毎に記述位置(ファイル名と行番号)が\n"
-" 表示されます。\n"
-" "
-
-#, python-format
-msgid "read config from: %s\n"
-msgstr "設定読み込み元: %s\n"
-
-msgid "only one config item permitted"
-msgstr "複数の設定項目指定は無効です"
-
-msgid "access the pushkey key/value protocol"
-msgstr ""
-
-msgid " With two args, list the keys in the given namespace."
-msgstr ""
-
-msgid ""
-" With five args, set a key to new if it currently is set to old.\n"
-" Reports success or failure.\n"
-" "
-msgstr ""
-
-msgid "parse and apply a revision specification"
-msgstr "リビジョン指定記述の解析／適用"
-
-msgid "manually set the parents of the current working directory"
-msgstr "作業領域の親リビジョンの手動設定"
-
-msgid ""
-" This is useful for writing repository conversion tools, but should\n"
-" be used with care."
-msgstr ""
-" 本コマンドはリポジトリ変換ツールの作成に有用ですが、 利用には注意が\n"
-" 必要です。"
-
-msgid "show the contents of the current dirstate"
-msgstr "現時点の dirstate 内容の表示"
-
-#, python-format
-msgid "copy: %s -> %s\n"
-msgstr "%s から %s に複製\n"
+msgid "[COMMAND]"
+msgstr "[COMMAND]"
+
+msgid "list all available commands and options"
+msgstr "利用可能なコマンドおよびオプション一覧の表示"
+
+msgid "show the command options"
+msgstr "当該コマンドのオプション一覧の表示"
+
+msgid "[-o] CMD"
+msgstr "[-o] CMD"
+
+msgid "returns the completion list associated with the given command"
+msgstr "指定コマンドの補完リストの作成"
+
+msgid "use tags as labels"
+msgstr ""
+
+msgid "annotate with branch names"
+msgstr ""
+
+msgid "use dots for runs"
+msgstr ""
+
+msgid "separate elements by spaces"
+msgstr ""
+
+msgid "[OPTION]... [FILE [REV]...]"
+msgstr "[OPTION]... [FILE [REV]...]"
msgid "format the changelog or an index DAG as a concise textual description"
msgstr ""
@@ -7619,6 +8238,15 @@
msgid "need repo for changelog dag"
msgstr ""
+msgid "open changelog"
+msgstr ""
+
+msgid "open manifest"
+msgstr ""
+
+msgid "-c|-m|FILE REV"
+msgstr ""
+
msgid "dump the contents of a data file revision"
msgstr "データファイルリビジョンの内容表示"
@@ -7626,15 +8254,67 @@
msgid "invalid revision identifier %s"
msgstr "リビジョン指定 %s は不正です"
+msgid "try extended date formats"
+msgstr "拡張日時形式の使用"
+
+msgid "[-e] DATE [RANGE]"
+msgstr "[-e] DATE [RANGE]"
+
msgid "parse and display a date"
msgstr "日付の解析および表示"
+msgid "use old-style discovery"
+msgstr ""
+
+msgid "use old-style discovery with non-heads included"
+msgstr ""
+
+msgid "[-l REV] [-r REV] [-b BRANCH]... [OTHER]"
+msgstr ""
+
+msgid "runs the changeset discovery protocol in isolation"
+msgstr ""
+
+msgid "parse and apply a fileset specification"
+msgstr ""
+
+msgid "[PATH]"
+msgstr "[PATH]"
+
+msgid "show information detected about current filesystem"
+msgstr "ファイルシステムに関する情報の表示"
+
+msgid "id of head node"
+msgstr ""
+
+msgid "id of common node"
+msgstr ""
+
+msgid "REPO FILE [-H|-C ID]..."
+msgstr ""
+
+msgid "retrieves a bundle from a repo"
+msgstr ""
+
+msgid ""
+" Every ID must be a full-length hex node id string. Saves the bundle to "
+"the\n"
+" given file.\n"
+" "
+msgstr ""
+
msgid "display the combined ignore pattern"
msgstr ""
msgid "no ignore patterns found"
msgstr ""
+msgid "revlog format"
+msgstr ""
+
+msgid "[-f FORMAT] -c|-m|FILE"
+msgstr ""
+
msgid "dump the contents of an index file"
msgstr "インデックスファイルの内容表示"
@@ -7671,30 +8351,6 @@
msgid " (templates seem to have been installed incorrectly)\n"
msgstr " (テンプレートのインストールが不適切なようです)\n"
-msgid "Checking patch...\n"
-msgstr "パッチの検証中...\n"
-
-msgid " patch call failed:\n"
-msgstr " パッチ適用が失敗\n"
-
-msgid " unexpected patch output!\n"
-msgstr " 想定と異なるパッチ出力です\n"
-
-msgid " patch test failed!\n"
-msgstr " パッチ適用試験が失敗\n"
-
-msgid ""
-" (Current patch tool may be incompatible with patch, or misconfigured. "
-"Please check your configuration file)\n"
-msgstr " (ツールが未対応なパッチ形式か、 設定ミスです。 設定確認が必要です)\n"
-
-msgid ""
-" Internal patcher failure, please report this error to http://mercurial."
-"selenic.com/wiki/BugTracker\n"
-msgstr ""
-"内部パッチツールが機能しません。 http://mercurial.selenic.com/wiki/"
-"BugTracker へのエラー報告にご協力ください\n"
-
msgid "Checking commit editor...\n"
msgstr "メッセージ入力用エディタの検証中...\n"
@@ -7721,6 +8377,49 @@
msgid "%s problems detected, please check your install!\n"
msgstr "障害が%s件検出されました。 インストール内容を確認してください\n"
+msgid "REPO ID..."
+msgstr ""
+
+msgid "test whether node ids are known to a repo"
+msgstr ""
+
+msgid ""
+" Every ID must be a full-length hex node id string. Returns a list of 0s "
+"and 1s\n"
+" indicating unknown/known.\n"
+" "
+msgstr ""
+
+msgid "REPO NAMESPACE [KEY OLD NEW]"
+msgstr "REPO NAMESPACE [KEY OLD NEW]"
+
+msgid "access the pushkey key/value protocol"
+msgstr ""
+
+msgid " With two args, list the keys in the given namespace."
+msgstr ""
+
+msgid ""
+" With five args, set a key to new if it currently is set to old.\n"
+" Reports success or failure.\n"
+" "
+msgstr ""
+
+msgid "revision to rebuild to"
+msgstr "再構築対象リビジョン"
+
+msgid "[-r REV] [REV]"
+msgstr "[-r REV] [REV]"
+
+msgid "rebuild the dirstate as it would look like for the given revision"
+msgstr "指定リビジョン時点相当の dirstate の再構築"
+
+msgid "revision to debug"
+msgstr "デバッグ対象リビジョン"
+
+msgid "[-r REV] FILE"
+msgstr "[-r REV] FILE"
+
msgid "dump rename information"
msgstr "改名情報の表示"
@@ -7732,9 +8431,59 @@
msgid "%s not renamed\n"
msgstr "%s は改名されていません\n"
+msgid "dump index data"
+msgstr ""
+
+msgid "-c|-m|FILE"
+msgstr ""
+
+msgid "show data and statistics about a revlog"
+msgstr ""
+
+msgid "parse and apply a revision specification"
+msgstr "リビジョン指定記述の解析／適用"
+
+msgid "REV1 [REV2]"
+msgstr "REV1 [REV2]"
+
+msgid "manually set the parents of the current working directory"
+msgstr "作業領域の親リビジョンの手動設定"
+
+msgid ""
+" This is useful for writing repository conversion tools, but should\n"
+" be used with care."
+msgstr ""
+" 本コマンドはリポジトリ変換ツールの作成に有用ですが、 利用には注意が\n"
+" 必要です。"
+
+msgid "do not display the saved mtime"
+msgstr "記録された mtime 情報の表示抑止"
+
+msgid "sort by saved mtime"
+msgstr "記録された mtime 情報で整列"
+
+msgid "[OPTION]..."
+msgstr "[OPTION]..."
+
+msgid "show the contents of the current dirstate"
+msgstr "現時点の dirstate 内容の表示"
+
+#, python-format
+msgid "copy: %s -> %s\n"
+msgstr "%s から %s に複製\n"
+
+msgid "revision to check"
+msgstr "確認対象リビジョン"
+
msgid "show how files match on given patterns"
msgstr "指定パターンへのファイル合致状況の表示"
+msgid "REPO [OPTIONS]... [ONE [TWO]]"
+msgstr ""
+
+msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
+msgstr "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
+
msgid "diff repository (or selected files)"
msgstr "作業領域全体(ないし指定ファイル)の差分抽出"
@@ -7778,6 +8527,15 @@
" git 拡張差分形式で表示するには -g/--git を指定します。 詳細は\n"
" :hg:`help diffs` を参照してください。"
+msgid "diff against the second parent"
+msgstr "第2親との差分を使用"
+
+msgid "revisions to export"
+msgstr "対象リビジョン"
+
+msgid "[OPTION]... [-o OUTFILESPEC] REV..."
+msgstr "[OPTION]... [-o OUTFILESPEC] REV..."
+
msgid "dump the header and diffs for one or more changesets"
msgstr "1つ以上のリビジョンに対するヘッダおよび変更内容の出力"
@@ -7890,6 +8648,34 @@
msgid "not removing %s: file is already untracked\n"
msgstr "%s は削除されません: 既に構成管理対象ではありません\n"
+#, python-format
+msgid "removing %s\n"
+msgstr "%s を登録除外中\n"
+
+msgid "end fields with NUL"
+msgstr "各フィールドの区切りにNUL文字(0x00)を使用"
+
+msgid "print all revisions that match"
+msgstr "合致するリビジョンを全て表示"
+
+msgid "follow changeset history, or file history across copies and renames"
+msgstr "複製元や改名元の履歴も遡る"
+
+msgid "ignore case when matching"
+msgstr "大文字小文字を無視して検索"
+
+msgid "print only filenames and revisions that match"
+msgstr "合致の際にファイル名とリビジョンのみを表示"
+
+msgid "print matching line numbers"
+msgstr "合致した行番号を表示"
+
+msgid "only search files changed within revision range"
+msgstr "指定リビジョン範囲のみを検索"
+
+msgid "[OPTION]... PATTERN [FILE]..."
+msgstr "[OPTION]... PATTERN [FILE]..."
+
msgid "search for a pattern in specified files and revisions"
msgstr "特定のパターンに合致するファイルとリビジョンの検索"
@@ -7931,6 +8717,24 @@
msgid "grep: invalid match pattern: %s\n"
msgstr "grep: '%s' は不正なパターンです\n"
+msgid "STARTREV"
+msgstr "開始リビジョン"
+
+msgid "show only heads which are descendants of STARTREV"
+msgstr "指定リビジョンの子孫となるヘッドのみを表示"
+
+msgid "show topological heads only"
+msgstr "子を持たない全てのリビジョンを表示"
+
+msgid "show active branchheads only (DEPRECATED)"
+msgstr "アクティブなブランチヘッドのみを表示 (非推奨)"
+
+msgid "show normal and closed branch heads"
+msgstr "閉鎖したヘッドも表示"
+
+msgid "[-ac] [-r STARTREV] [REV]..."
+msgstr "[-ac] [-r STARTREV] [REV]..."
+
msgid "show current repository heads or show branch heads"
msgstr "現時点でのリポジトリ(ないしブランチ)のヘッド表示"
@@ -7995,6 +8799,15 @@
msgid " (started at %s)"
msgstr "(%s から開始)"
+msgid "show only help for extensions"
+msgstr "エクステンションのヘルプのみを表示"
+
+msgid "show only help for commands"
+msgstr "コマンドに関するヘルプのみを表示"
+
+msgid "[-ec] [TOPIC]"
+msgstr "[-ec] [TOPIC]"
+
msgid "show help for a given topic or a help overview"
msgstr "指定されたトピックのヘルプや、 ヘルプ概要の表示"
@@ -8026,6 +8839,10 @@
"全コマンドの一覧は \"hg help\" で、 コマンド詳細は \"hg -v\" で表示されます"
#, python-format
+msgid "use \"hg help %s\" to show the full help text"
+msgstr "\"hg help %s\" で詳細なヘルプが表示されます"
+
+#, python-format
msgid "use \"hg -v help%s\" to show builtin aliases and global options"
msgstr "組み込み別名およびグローバルオプションの表示は \"hg -v help%s\""
@@ -8074,9 +8891,21 @@
msgid "options:\n"
msgstr "オプション:\n"
+#, python-format
+msgid "use \"hg help -e %s\" to show help for the %s extension"
+msgstr "\"hg help -e %s\" によってエクステンション %s のヘルプが表示されます"
+
msgid "no commands defined\n"
msgstr "コマンドが定義されていません\n"
+#, python-format
+msgid ""
+"\n"
+"use \"hg help -c %s\" to see help for the %s command\n"
+msgstr ""
+"\n"
+"\"hg help -c %s\" によってコマンド %s のヘルプが表示されます\n"
+
msgid "no help text available"
msgstr "ヘルプはありません"
@@ -8120,13 +8949,49 @@
"\n"
"追加のヘルプトピック:"
+msgid "identify the specified revision"
+msgstr "当該リビジョンの識別情報を表示"
+
+msgid "show local revision number"
+msgstr "リビジョン番号を表示"
+
+msgid "show global revision id"
+msgstr "ハッシュ値を表示"
+
+msgid "show branch"
+msgstr "ブランチ名を表示"
+
+msgid "show tags"
+msgstr "タグを表示"
+
+msgid "show bookmarks"
+msgstr "ブックマークの表示"
+
+msgid "[-nibtB] [-r REV] [SOURCE]"
+msgstr "[-nibtB] [-r REV] [SOURCE]"
+
msgid "identify the working copy or specified revision"
msgstr "作業領域ないし特定リビジョンの識別情報表示"
msgid ""
-" With no revision, print a summary of the current state of the\n"
+" Print a summary identifying the repository state at REV using one or\n"
+" two parent hash identifiers, followed by a \"+\" if the working\n"
+" directory has uncommitted changes, the branch name (if not default),\n"
+" a list of tags, and a list of bookmarks."
+msgstr ""
+" 1つないし2つの親リビジョンのハッシュ値を使用して、\n"
+" 指定リビジョンにおける要約情報を表示します。\n"
+" 親リビジョンハッシュに続けて、\n"
+" 作業領域に未コミットの変更がある場合は \"+\" 、\n"
+" default 以外のブランチであればブランチ名、\n"
+" 付与されているタグの一覧、\n"
+" および付与されているブックマークの一覧が表示されます。"
+
+msgid ""
+" When REV is not given, print a summary of the current state of the\n"
" repository."
-msgstr " リビジョン指定無しの起動の際には、 作業領域の状態を表示します。"
+msgstr ""
+" リビジョン指定無しで起動された場合は、 作業領域の状態を表示します。"
msgid ""
" Specifying a path to a repository root or Mercurial bundle will\n"
@@ -8135,20 +9000,37 @@
" パス指定有りでの起動の際には、 他のリポジトリないしバンドルファイルの\n"
" 状態を表示します。"
-msgid ""
-" This summary identifies the repository state using one or two\n"
-" parent hash identifiers, followed by a \"+\" if there are\n"
-" uncommitted changes in the working directory, a list of tags for\n"
-" this revision and a branch name for non-default branches."
-msgstr ""
-" 本コマンドの出力する要約情報は、 1つないし2つの親リビジョンのハッシュ\n"
-" 値を使用して、 作業領域の状態を識別します。 作業領域に未コミットの\n"
-" 変更がある場合は \"+\"、 当該リビジョンにタグが付いている場合はタグの\n"
-" 一覧、 default 以外のブランチの場合にはブランチ名が、 ハッシュ値の後に\n"
-" 続きます。"
-
-msgid "can't query remote revision number, branch, tags, or bookmarks"
-msgstr "リビジョン番号/ブランチ/タグ/ブックマークは遠隔問い合わせできません"
+msgid "can't query remote revision number, branch, or tags"
+msgstr "リビジョン番号/ブランチ/タグは遠隔問い合わせできません"
+
+msgid ""
+"directory strip option for patch. This has the same meaning as the "
+"corresponding patch option"
+msgstr "パス要素除去数(patch コマンドの同名オプションと同機能)"
+
+msgid "PATH"
+msgstr "パス"
+
+msgid "base path (DEPRECATED)"
+msgstr "基底パス (非推奨)"
+
+msgid "skip check for outstanding uncommitted changes"
+msgstr "作業領域中の未コミット変更の確認を省略"
+
+msgid "don't commit, just update the working directory"
+msgstr "作業領域の更新のみで、 コミット実施を抑止"
+
+msgid "apply patch without touching the working directory"
+msgstr "作業領域を改変せずにパッチを適用"
+
+msgid "apply patch to the nodes from which it was generated"
+msgstr "パッチ作成時と同じ親リビジョンに対して適用"
+
+msgid "use any branch information in patch (implied by --exact)"
+msgstr "パッチ中のブランチ情報を利用(--exact 指定時は自動適用)"
+
+msgid "[OPTION]... PATCH..."
+msgstr "[OPTION]... PATCH..."
msgid "import an ordered set of patches"
msgstr "パッチの順次取り込み"
@@ -8207,6 +9089,17 @@
" 発生する可能性があります。"
msgid ""
+" Use --bypass to apply and commit patches directly to the\n"
+" repository, not touching the working directory. Without --exact,\n"
+" patches will be applied on top of the working directory parent\n"
+" revision."
+msgstr ""
+" --bypass 指定することで、 作業領域を改変せずに、\n"
+" リポジトリへ変更内容を直接反映させることが出来ます。\n"
+" --exact 指定が無い場合、 変更内容の適用対象は、\n"
+" 作業領域の親リビジョンになります。"
+
+msgid ""
" With -s/--similarity, hg will attempt to discover renames and\n"
" copies in the patch in the same way as 'addremove'."
msgstr ""
@@ -8222,15 +9115,21 @@
" URL が指定された場合、 パッチを当該 URL からダウンロードします。\n"
" -d/--date での日時表記は :hg:`help dates` を参照してください。"
+msgid "cannot use --no-commit with --bypass"
+msgstr "--no-commit と --bypass は併用出来ません"
+
+msgid "cannot use --similarity with --bypass"
+msgstr "--similarity と --bypass は併用出来ません"
+
+msgid "patch is damaged or loses information"
+msgstr "パッチには破損ないし情報の欠落があります"
+
msgid "to working directory"
msgstr "作業領域"
msgid "not a Mercurial patch"
msgstr "Mercurial 向けのパッチではありません"
-msgid "patch is damaged or loses information"
-msgstr "パッチには破損ないし情報の欠落があります"
-
msgid "applying patch from stdin\n"
msgstr "標準入力からのパッチを適用中\n"
@@ -8241,6 +9140,27 @@
msgid "no diffs found"
msgstr "差分がありません"
+msgid "run even if remote repository is unrelated"
+msgstr "連携先が無関係なリポジトリでも実行"
+
+msgid "show newest record first"
+msgstr "新しいリビジョンから先に表示"
+
+msgid "file to store the bundles into"
+msgstr "バンドルファイルの書き出し先"
+
+msgid "a remote changeset intended to be added"
+msgstr "取り込み対象リビジョン"
+
+msgid "compare bookmarks"
+msgstr "ブックマークの比較"
+
+msgid "a specific branch you would like to pull"
+msgstr "取り込み対象ブランチ"
+
+msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
+msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
+
msgid "show new changesets found in source"
msgstr "指定リポジトリ中の未取り込みリビジョンの検索"
@@ -8276,6 +9196,9 @@
msgid "remote doesn't support bookmarks\n"
msgstr "連携先リポジトリはブックマークが未サポートです\n"
+msgid "[-e CMD] [--remotecmd CMD] [DEST]"
+msgstr "[-e CMD] [--remotecmd CMD] [DEST]"
+
msgid "create a new repository in the given directory"
msgstr "指定されたディレクトリでの新規リポジトリの作成"
@@ -8296,6 +9219,18 @@
" 複製先として ``ssh://`` URL 形式を指定することも可能です。\n"
" 詳細に関しては、 :hg:`help urls` を参照してください。"
+msgid "search the repository as it is in REV"
+msgstr "当該リビジョン時点のファイル一覧から検索"
+
+msgid "end filenames with NUL, for use with xargs"
+msgstr "ファイル名をNUL文字(0x00)で終端(xargs との併用向け)"
+
+msgid "print complete paths from the filesystem root"
+msgstr "ファイルシステムのルートからの絶対パスで表示"
+
+msgid "[OPTION]... [PATTERN]..."
+msgstr "[OPTION]... [PATTERN]..."
+
msgid "locate files matching specific patterns"
msgstr "指定されたパターンに合致する名前を持つファイルの特定"
@@ -8333,6 +9268,42 @@
" 含む単一のファイル名を、 \"xargs\" が複数のファイル名に解釈して\n"
" しまう問題は、 このオプションにより解消されます。"
+msgid "only follow the first parent of merge changesets"
+msgstr "マージの際には第1親のみを遡る"
+
+msgid "show revisions matching date spec"
+msgstr "指定日時に合致するリビジョンを表示"
+
+msgid "show copied files"
+msgstr "複製されたファイルを表示"
+
+msgid "do case-insensitive search for a given text"
+msgstr "指定キーワードによる検索(大文字小文字は無視)"
+
+msgid "include revisions where files were removed"
+msgstr "ファイルが登録除外されたリビジョンを含める"
+
+msgid "show only merges"
+msgstr "マージ実施リビジョンのみを表示"
+
+msgid "revisions committed by user"
+msgstr "当該ユーザによってコミットされたリビジョンを表示"
+
+msgid "show only changesets within the given named branch (DEPRECATED)"
+msgstr "指定の名前付きブランチに属するリビジョンのみを表示 (非推奨)"
+
+msgid "show changesets within the given named branch"
+msgstr "指定の名前付きブランチに属するリビジョンを表示"
+
+msgid "do not display revision or any of its ancestors"
+msgstr "当該リビジョンとその祖先の表示を抑止"
+
+msgid "show hidden changesets"
+msgstr "隠れたリビジョンの表示"
+
+msgid "[OPTION]... [FILE]"
+msgstr "[OPTION]... [FILE]"
+
msgid "show revision history of entire repository or files"
msgstr "リポジトリ全体ないしファイルの変更履歴の表示"
@@ -8391,6 +9362,15 @@
" 固定されているためです。 ファイル一覧が予期せぬ内容となるのは、\n"
" 親同士で内容が異なるファイルのみが列挙されるためです。"
+msgid "revision to display"
+msgstr "表示対象リビジョン"
+
+msgid "list files from all revisions"
+msgstr "関連する全ファイルの表示"
+
+msgid "[-r REV]"
+msgstr "[-r REV]"
+
msgid "output the current or given revision of the project manifest"
msgstr "現時点ないし指定時点でのリポジトリマニフェストの出力"
@@ -8412,6 +9392,28 @@
" --debug が指定された場合、 各ファイルのリビジョンのハッシュ値が\n"
" 表示されます。"
+msgid ""
+" If option --all is specified, the list of all files from all revisions\n"
+" is printed. This includes deleted and renamed files."
+msgstr ""
+" --all が指定された場合、 リビジョンに関わる全ファイルが表示されます。\n"
+" この場合、 削除／改名対象ファイルも含まれます。"
+
+msgid "can't specify a revision with --all"
+msgstr "リビジョン指定と --all は併用出来ません"
+
+msgid "force a merge with outstanding changes"
+msgstr "作業領域中の未コミット変更ごとマージを実施"
+
+msgid "revision to merge"
+msgstr "マージ対象リビジョン"
+
+msgid "review revisions to merge (no merge is performed)"
+msgstr "マージ対象リビジョンの確認(マージ処理は未実施)"
+
+msgid "[-P] [-f] [[-r] REV]"
+msgstr "[-P] [-f] [[-r] REV]"
+
msgid "merge working directory with another revision"
msgstr "作業領域の内容と他のリビジョンのマージ"
@@ -8436,11 +9438,13 @@
msgid ""
" ``--tool`` can be used to specify the merge tool used for file\n"
" merges. It overrides the HGMERGE environment variable and your\n"
-" configuration files."
-msgstr ""
-" ``--tool`` を使用することで、 ファイルのマージに使用するコマンドを\n"
-" 指定可能です。 このオプションによる指定は、 HGMERGE 環境変数や\n"
-" 設定ファイルによる指定を上書きします。"
+" configuration files. See :hg:`help merge-tools` for options."
+msgstr ""
+" ``--tool`` を使用することで、\n"
+" ファイルのマージに使用するコマンドを指定可能です。\n"
+" このオプションによる指定は、\n"
+" HGMERGE 環境変数や設定ファイルによる指定を上書きします。\n"
+" 指定の詳細に関しては、 :hg:`help merge-tools` を参照してください。"
msgid ""
" If no revision is specified, the working directory's parent is a\n"
@@ -8468,24 +9472,22 @@
" Returns 0 on success, 1 if there are unresolved files.\n"
" "
msgstr ""
-" 成功時のコマンド終了値は 0、 未解決ファイルがある場合は 1 です。\n"
-" "
-
-#, python-format
-msgid ""
-"branch '%s' has %d heads - please merge with an explicit rev\n"
-"(run 'hg heads .' to see heads)"
-msgstr ""
-"ブランチ '%s' には %d 個のヘッドあります - 対象を明示してください\n"
-"('hg heads' でヘッド一覧が表示されます)"
-
-#, python-format
-msgid ""
-"branch '%s' has one head - please merge with an explicit rev\n"
-"(run 'hg heads' to see all heads)"
-msgstr ""
-"ブランチ '%s' は単一ヘッドです - 対象を明示してください\n"
-"('hg heads' でヘッド一覧が表示されます)"
+" 成功時のコマンド終了値は 0、 未解消ファイルがある場合は 1 です。\n"
+" "
+
+#, python-format
+msgid "branch '%s' has %d heads - please merge with an explicit rev"
+msgstr "ブランチ '%s' には %d 個のヘッドあります - 対象を明示してください"
+
+msgid "run 'hg heads .' to see heads"
+msgstr "'hg heads .' によりヘッドを一覧表示出来ます"
+
+#, python-format
+msgid "branch '%s' has one head - please merge with an explicit rev"
+msgstr "ブランチ '%s' は単一ヘッドです - 対象を明示してください"
+
+msgid "run 'hg heads' to see all heads"
+msgstr "'hg heads' によりヘッドを一覧表示出来ます"
msgid "there is nothing to merge"
msgstr "マージの必要がありません"
@@ -8494,12 +9496,20 @@
msgid "%s - use \"hg update\" instead"
msgstr "%s - \"hg update\" を使用してください"
-msgid ""
-"working dir not at a head rev - use \"hg update\" or merge with an explicit "
-"rev"
-msgstr ""
-"作業領域の親リビジョンはヘッドではありません。\n"
-"リビジョンを明示しての \"hg update\" ないしマージを実施してください。"
+msgid "working directory not at a head revision"
+msgstr "作業領域の親リビジョンは、 ヘッドではありません"
+
+msgid "use 'hg update' or merge with an explicit revision"
+msgstr "リビジョンを明示して、'hg update' ないしマージを実施してください"
+
+msgid "a changeset intended to be included in the destination"
+msgstr "反映対象とするリビジョン"
+
+msgid "a specific branch you would like to push"
+msgstr "反映対象とするブランチ"
+
+msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
+msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
msgid "show changesets not found in the destination"
msgstr "連携先リポジトリに含まれないチェンジセットの表示"
@@ -8524,6 +9534,12 @@
" 1 です。\n"
" "
+msgid "show parents of the specified revision"
+msgstr "親リビジョンの表示対象"
+
+msgid "[-r REV] [FILE]"
+msgstr "[-r REV] [FILE]"
+
msgid "show the parents of the working directory or revision"
msgstr "作業領域(ないし指定リビジョン)の親リビジョンの表示"
@@ -8546,6 +9562,9 @@
msgid "'%s' not found in manifest!"
msgstr "'%s' は管理対象ではありません"
+msgid "[NAME]"
+msgstr "[NAME]"
+
msgid "show aliases for remote repositories"
msgstr "連携先リポジトリの別名一覧の表示"
@@ -8557,6 +9576,14 @@
" シンボル名が指定されない場合、 全ての別名定義が表示されます。"
msgid ""
+" Option -q/--quiet suppresses all output when searching for NAME\n"
+" and shows only the path names when listing all definitions."
+msgstr ""
+" -q/--quiet が指定された場合、\n"
+" シンボル名検索の過程における表示は抑止され、\n"
+" 結果表示もシンボル名のみが表示されます。"
+
+msgid ""
" Path names are defined in the [paths] section of your\n"
" configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n"
" repository, ``.hg/hgrc`` is used, too."
@@ -8594,15 +9621,37 @@
msgid "not found!\n"
msgstr "指定シンボルは不明です\n"
-msgid "not updating, since new heads added\n"
-msgstr "新規ヘッドが追加されたため、 作業領域は更新しません\n"
+#, python-format
+msgid "not updating: %s\n"
+msgstr "更新中断: %s\n"
msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
msgstr "(ヘッド一覧表示は 'hg heads'、 マージ実施は 'hg merge')\n"
+msgid "(run 'hg heads .' to see heads, 'hg merge' to merge)\n"
+msgstr "(ヘッド一覧表示は 'hg heads .'、 マージ実施は 'hg merge')\n"
+
+msgid "(run 'hg heads' to see heads)\n"
+msgstr "(ヘッド一覧表示は 'hg heads')\n"
+
msgid "(run 'hg update' to get a working copy)\n"
msgstr "(作業領域の更新は 'hg update')\n"
+msgid "update to new branch head if changesets were pulled"
+msgstr "新規取り込みの際には作業領域を新規のブランチヘッドで更新"
+
+msgid "run even when remote repository is unrelated"
+msgstr "連携先が無関係なリポジトリでも実行"
+
+msgid "BOOKMARK"
+msgstr "ブックマーク"
+
+msgid "bookmark to pull"
+msgstr "取り込み対象ブックマーク"
+
+msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
+msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
+
msgid "pull changes from the specified source"
msgstr "指定リポジトリからの変更履歴の取り込み"
@@ -8642,7 +9691,7 @@
" Returns 0 on success, 1 if an update had unresolved files.\n"
" "
msgstr ""
-" 成功時のコマンド終了値は 0、 更新で未解決ファイルが検出された場合は\n"
+" 成功時のコマンド終了値は 0、 更新で未解消ファイルが検出された場合は\n"
" 1 です。\n"
" "
@@ -8659,6 +9708,18 @@
msgid "importing bookmark %s\n"
msgstr "ブックマーク %s の取り込み中\n"
+msgid "force push"
+msgstr "反映先にヘッドが増える場合でも実施"
+
+msgid "bookmark to push"
+msgstr "反映対象ブックマーク"
+
+msgid "allow pushing a new branch"
+msgstr "新規ブランチの反映を許可"
+
+msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
+msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
+
msgid "push changes to the specified destination"
msgstr "指定リポジトリへの変更履歴の反映"
@@ -8763,6 +9824,12 @@
" 成功時のコマンド終了値は 0、 修復不要ないし修復失敗時は 1 です。\n"
" "
+msgid "record delete for missing files"
+msgstr "手動で削除済みのファイルに対して、 登録除外の旨を記録"
+
+msgid "remove (and delete) file even if added or modified"
+msgstr "追加登録／変更対象であっても登録除外(ファイルは削除)"
+
msgid "remove the specified files on the next commit"
msgstr "次回コミットにおける指定ファイルの登録除外"
@@ -8776,10 +9843,12 @@
" force deletion, and -Af can be used to remove files from the next\n"
" revision without deleting them from the working directory."
msgstr ""
-" 現行ブランチにおける登録除外であり、 リポジトリ履歴から抹消される\n"
-" わけではありません。 手動で削除したファイルを登録除外するには\n"
-" -A/--after を、 強制的に登録除外するには -f/--force を、 作業領域中の\n"
-" ファイルを削除することなく登録除外するには -Af を指定します。"
+" 現行ブランチにおける登録除外であり、\n"
+" リポジトリ履歴から抹消されるわけではありません。\n"
+" 手動で削除したファイルを登録除外するには -A/--after を、\n"
+" 強制的に登録除外するには -f/--force を、\n"
+" 登録除外の際に、作業領域中のファイルを削除しない場合には\n"
+" -Af を指定します。"
msgid ""
" The following table details the behavior of remove for different\n"
@@ -8788,9 +9857,10 @@
" reported by :hg:`status`). The actions are Warn, Remove (from\n"
" branch) and Delete (from disk)::"
msgstr ""
-" ファイルの状態(横)とオプション指定(縦)の組み合わせにおける挙動は、\n"
-" 以下の一覧を参照してください。 ファイルの状態は、 :hg:`status` の表示\n"
-" に倣い、 追加(Added)[A]、 改変無し(Clean)[C]、 改変有り(Modified)[M]\n"
+" ファイルの状態(横)と、 オプション指定(縦)の組み合わせにおける挙動は、\n"
+" 以下の一覧を参照してください。\n"
+" ファイルの状態は、 :hg:`status` の表示に倣い、\n"
+" 追加(Added)[A]、 改変無し(Clean)[C]、 改変有り(Modified)[M]\n"
" および不在(Missing)[!] で表します。\n"
" 挙動は、 警告(Warn)[W]、 構成管理からの登録除外(Remove)[R] および\n"
" 作業領域からの削除(Delete)[D] で表します::"
@@ -8809,6 +9879,14 @@
" -Af R R R R"
msgid ""
+" Note that remove never deletes files in Added [A] state from the\n"
+" working directory, not even if option --force is specified."
+msgstr ""
+" 作業領域における追加 [A] 状態のファイルに関しては、\n"
+" --force を指定しなくても、\n"
+" 登録除外操作によって破棄されることはありません。"
+
+msgid ""
" This command schedules the files to be removed at the next commit.\n"
" To undo a remove before that, see :hg:`revert`."
msgstr ""
@@ -8841,6 +9919,12 @@
msgstr ""
"%s は削除されません: ファイルは追加登録対象です(削除の強行は -f を指定)\n"
+msgid "record a rename that has already occurred"
+msgstr "手動で改名済みのファイルに対して、 改名の旨を記録"
+
+msgid "[OPTION]... SOURCE... DEST"
+msgstr "[OPTION]... SOURCE... DEST"
+
msgid "rename files; equivalent of copy + remove"
msgstr "ファイルの改名(copy + remove と等価)"
@@ -8860,6 +9944,21 @@
" 本コマンドの実行結果は次回のコミットの際に効果を発揮します。 改名\n"
" 操作のコミット前取り消しは :hg:`help revert` を参照してください。"
+msgid "select all unresolved files"
+msgstr "衝突未解消の全ファイルを処理対象にする"
+
+msgid "list state of files needing merge"
+msgstr "マージの必要なファイルの解消状態一覧"
+
+msgid "mark files as resolved"
+msgstr "当該ファイルを衝突解消済み状態に設定"
+
+msgid "mark files as unresolved"
+msgstr "当該ファイルを衝突未解消状態に設定"
+
+msgid "hide status prefix"
+msgstr "状態記号の表示を抑止"
+
msgid "redo merges or set/view the merge status of files"
msgstr "マージの再実施、 ないし各ファイルのマージ状況管理"
@@ -8945,77 +10044,60 @@
msgid "no files or directories specified; use --all to remerge all files"
msgstr "再マージには、 ファイル／ディレクトリか、 --all を指定してください"
-msgid "restore individual files or directories to an earlier state"
-msgstr "ファイル／ディレクトリ状態の復旧"
+msgid "revert all changes when no arguments given"
+msgstr "引数指定が無い場合に、 全ファイルの内容を復旧"
+
+msgid "tipmost revision matching date"
+msgstr "当該日時の最新リビジョンを使用"
+
+msgid "revert to the specified revision"
+msgstr "当該リビジョン時点の内容で復旧"
+
+msgid "do not save backup copies of files"
+msgstr "取り消し実施前内容のバックアップを抑止"
+
+msgid "[OPTION]... [-r REV] [NAME]..."
+msgstr "[OPTION]... [-r REV] [NAME]..."
+
+msgid "restore files to their checkout state"
+msgstr "親リビジョンの状態でファイルを復旧"
msgid ""
" .. note::\n"
-" This command is most likely not what you are looking for.\n"
-" Revert will partially overwrite content in the working\n"
-" directory without changing the working directory parents. Use\n"
-" :hg:`update -r rev` to check out earlier revisions, or\n"
-" :hg:`update --clean .` to undo a merge which has added another\n"
-" parent."
+" To check out earlier revisions, you should use :hg:`update REV`.\n"
+" To cancel a merge (and lose your changes), use :hg:`update --clean .`."
msgstr ""
" .. note::\n"
-" 本コマンドは、 あなたの期待するものと違う可能性が高いです。\n"
-" 本コマンドは、 作業領域の親リビジョンはそのままで、 作業領域の\n"
-" 一部を上書きします。\n"
-" 作業領域の親リビジョンを変更する場合は :hg:`update -r rev` を、\n"
-" 他のリビジョンとのマージを取り消す場合は\n"
-" :hg:`update --clean .` を使用してください。"
-
-msgid ""
-" With no revision specified, revert the named files or directories\n"
-" to the contents they had in the parent of the working directory.\n"
-" This restores the contents of the affected files to an unmodified\n"
-" state and unschedules adds, removes, copies, and renames. If the\n"
-" working directory has two parents, you must explicitly specify a\n"
-" revision."
-msgstr ""
-" リビジョン指定が無い場合、 指定されたファイル／ディレクトリを作業\n"
-" 領域の親リビジョン時点の内容へと復旧します。 本コマンドは対象\n"
-" ファイルに対して、 状態を「改変無し」とし、 add/remove/copy/rename\n"
-" 実行の効果を打ち消します。 作業領域の親リビジョンが2つある場合は、\n"
-" どちらの内容で復旧するのかを明示的に指定する必要があります。"
-
-msgid ""
-" Using the -r/--rev option, revert the given files or directories\n"
-" to their contents as of a specific revision. This can be helpful\n"
-" to \"roll back\" some or all of an earlier change. See :hg:`help\n"
-" dates` for a list of formats valid for -d/--date."
+" 作業領域を別リビジョン時点に変更したい場合は、\n"
+" :hg:`update 対象リビジョン` を実行してください。\n"
+" マージの実施を取り消す場合は、\n"
+" :hg:`update --clean .` を実行してください\n"
+" (マージにおける修正内容は破棄されます)"
+
+msgid ""
+" With no revision specified, revert the specified files or directories\n"
+" to the state they had in the first parent of the working directory.\n"
+" This restores the contents of files to an unmodified\n"
+" state and unschedules adds, removes, copies, and renames."
+msgstr ""
+" リビジョン指定が無い場合は、 \n"
+" 指定されたファイル／ディレクトリを、\n"
+" 作業領域の第1親リビジョン時点の内容へと復旧します。\n"
+" 本コマンドは対象ファイルに対して、 状態を「改変無し」とし、\n"
+" add/remove/copy/rename の実施予定を取り消します。"
+
+msgid ""
+" Using the -r/--rev or -d/--date options, revert the given files or\n"
+" directories to their states as of a specific revision. Because\n"
+" revert does not change the working directory parents, this will\n"
+" cause these files to appear modified. This can be helpful to \"back\n"
+" out\" some or all of an earlier change. See :hg:`backout` for a\n"
+" related method."
msgstr ""
" -r/--rev が指定された場合、 指定されたファイル／ディレクトリを、\n"
-" 指定されたリビジョン時点の内容へと復旧します。 以前の変更内容の一部\n"
-" ないし全部を取り消す用途にも使用できます。 -d/--date での日時表記は\n"
-" :hg:`help dates` を参照してください。"
-
-msgid ""
-" Revert modifies the working directory. It does not commit any\n"
-" changes, or change the parent of the working directory. If you\n"
-" revert to a revision other than the parent of the working\n"
-" directory, the reverted files will thus appear modified\n"
-" afterwards."
-msgstr ""
-" 本コマンドは作業領域の内容は変更しますが、 変更のコミットや、 作業\n"
-" 領域の親リビジョンは変更しません。 そのため、 作業領域の親リビジョン\n"
-" 以外のリビジョンを指定して復旧した場合、 復旧後のファイルの状態は\n"
-" 「改変有り」として扱われます。"
-
-msgid ""
-" If a file has been deleted, it is restored. If the executable mode\n"
-" of a file was changed, it is reset."
-msgstr ""
-" ファイルが削除されていた場合、 ファイルは復旧されます。 実行権限が変更\n"
-" されていた場合、 変更前の状態に復旧されます。"
-
-msgid ""
-" If names are given, all files matching the names are reverted.\n"
-" If no arguments are given, no files are reverted."
-msgstr ""
-" 復旧対象が指定された場合、 指定された名前に合致する全てのファイルが\n"
-" 復旧対象となります。 復旧対象が指定されなかった場合は、 いずれの\n"
-" ファイルも復旧されません。"
+" 指定されたリビジョン時点の内容へと復旧します。\n"
+" 以前の変更内容の一部ないし全部を、 取り消す用途にも使用できます。\n"
+" -d/--date での日時表記は :hg:`help dates` を参照してください。"
msgid ""
" Modified files are saved with a .orig suffix before reverting.\n"
@@ -9027,11 +10109,34 @@
msgid "you can't specify a revision and a date"
msgstr "リビジョンと日時は同時には指定出来ません"
-msgid "uncommitted merge - use \"hg update\", see \"hg help revert\""
-msgstr "マージが未コミットです(\"hg update\" 実施又は \"hg help revert\" 参照)"
-
-msgid "no files or directories specified; use --all to revert the whole repo"
-msgstr "復旧には、 ファイル／ディレクトリか、 --all を指定してください"
+msgid "no files or directories specified"
+msgstr "ファイル／ディレクトリ指定がありません"
+
+msgid ""
+"uncommitted merge, use --all to discard all changes, or 'hg update -C .' to "
+"abort the merge"
+msgstr ""
+"マージが未コミットです -変更全破棄なら --all 付き実行、マージ取りやめなら "
+"'hg update -C .' 実行"
+
+#, python-format
+msgid ""
+"uncommitted changes, use --all to discard all changes, or 'hg update %s' to "
+"update"
+msgstr ""
+"変更が未コミットです -変更全破棄なら --all 付き実行、作業領域更新なら 'hg "
+"update %s' 実行"
+
+#, python-format
+msgid "use --all to revert all files, or 'hg update %s' to update"
+msgstr ""
+"全ファイル復旧なら --all 付き実行、作業領域更新なら 'hg update %s' 実行"
+
+msgid "uncommitted changes, use --all to discard all changes"
+msgstr "未コミット変更があります - 変更全破棄なら --all 付き実行"
+
+msgid "use --all to revert all files"
+msgstr "全ファイル復旧なら --all 付き実行"
#, python-format
msgid "forgetting %s\n"
@@ -9124,6 +10229,51 @@
msgid " Print the root directory of the current repository."
msgstr " 現リポジトリのルートディレクトリ位置を表示します。"
+msgid "name of access log file to write to"
+msgstr "アクセスログの書き出し先ファイル"
+
+msgid "name of error log file to write to"
+msgstr "エラーログの書き出し先ファイル"
+
+msgid "PORT"
+msgstr "ポート番号"
+
+msgid "port to listen on (default: 8000)"
+msgstr "要求受け付けポート番号(既定値: 8000)"
+
+msgid "address to listen on (default: all interfaces)"
+msgstr "要求受け付けアドレス(既定値: 全インタフェース)"
+
+msgid "ADDR"
+msgstr "アドレス"
+
+msgid "prefix path to serve from (default: server root)"
+msgstr "公開パス接頭辞(既定値: ルート)"
+
+msgid "name to show in web pages (default: working directory)"
+msgstr "表示名(既定値: 作業領域のパス)"
+
+msgid "name of the hgweb config file (see \"hg help hgweb\")"
+msgstr "hgweb 設定ファイル位置(\"hg help hgweb\" 参照)"
+
+msgid "name of the hgweb config file (DEPRECATED)"
+msgstr "hgweb 設定ファイル位置 (非推奨)"
+
+msgid "for remote clients"
+msgstr "(ホスト間連携での内部用途向け)"
+
+msgid "web templates to use"
+msgstr "当該テンプレートで表示をカスタマイズ"
+
+msgid "template style to use"
+msgstr "当該スタイルで表示をカスタマイズ"
+
+msgid "use IPv6 in addition to IPv4"
+msgstr "IPv4 に加えて IPv6 を使用"
+
+msgid "SSL certificate file"
+msgstr "SSL 証明書ファイル"
+
msgid "start stand-alone webserver"
msgstr "独立したウェブサーバの実行開始"
@@ -9168,6 +10318,9 @@
" サーバに空きポート番号の検出および使用をさせる場合、 ポート番号には\n"
" 0 を指定します。 この場合、 使用するポート番号が表示されます。"
+msgid "cannot use --stdio with --cmdserver"
+msgstr "--stdio と --cmdserver は併用できません"
+
msgid "There is no Mercurial repository here (.hg not found)"
msgstr "Mercurial リポジトリが見つかりません(.hg が不在です)"
@@ -9175,6 +10328,77 @@
msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
msgstr "http://%s%s/%s で待ち受け開始(バインド先は %s:%d)\n"
+msgid "show untrusted configuration options"
+msgstr "信頼できない設定項目も表示"
+
+msgid "[-u] [NAME]..."
+msgstr "[-u] [NAME]..."
+
+msgid "show combined config settings from all hgrc files"
+msgstr "全設定ファイルによる最終的な設定内容の表示"
+
+msgid " With no arguments, print names and values of all config items."
+msgstr ""
+" 引数指定が無い場合、 全ての設定項目に対して、 名前と値を表示します。"
+
+msgid ""
+" With one argument of the form section.name, print just the value\n"
+" of that config item."
+msgstr ""
+" 'section.name' 形式に合致する引数を1つだけ指定した場合、 その設定項目\n"
+" 値のみを表示します。"
+
+msgid ""
+" With multiple arguments, print names and values of all config\n"
+" items with matching section names."
+msgstr ""
+" 複数の引数が指定された場合、 それらをセクション名とみなし、 該当する\n"
+" セクションの設定項目を全て表示します。"
+
+msgid ""
+" With --debug, the source (filename and line number) is printed\n"
+" for each config item."
+msgstr ""
+" --debug 指定がある場合、 設定項目毎に記述位置(ファイル名と行番号)が\n"
+" 表示されます。\n"
+" "
+
+msgid "only one config item permitted"
+msgstr "複数の設定項目指定は無効です"
+
+msgid "show status of all files"
+msgstr "全ての状態を表示"
+
+msgid "show only modified files"
+msgstr "変更されたファイルを表示"
+
+msgid "show only added files"
+msgstr "追加登録されたファイルを表示"
+
+msgid "show only removed files"
+msgstr "登録除外されたファイルを表示"
+
+msgid "show only deleted (but tracked) files"
+msgstr "削除されたファイル(登録除外は未実施)を表示"
+
+msgid "show only files without changes"
+msgstr "変更の無いファイルを表示"
+
+msgid "show only unknown (not tracked) files"
+msgstr "構成管理対象外のファイルを表示"
+
+msgid "show only ignored files"
+msgstr "無視対象のファイルを表示"
+
+msgid "show source of copied files"
+msgstr "複製元ファイルを表示"
+
+msgid "show difference from revision"
+msgstr "当該リビジョンとの差分で状態を判定"
+
+msgid "list the changed files of a revision"
+msgstr "指定リビジョンにおける更新ファイルの一覧"
+
msgid "show changed files in the working directory"
msgstr "作業領域のファイル操作状況の表示"
@@ -9248,6 +10472,9 @@
" I = 無視(Ignored)\n"
" = 直前に表示される新規登録予定ファイル(A)の複製元"
+msgid "check for push and pull"
+msgstr "push/pull 実施結果の確認"
+
msgid "summarize working directory state"
msgstr "作業領域状態の概要表示"
@@ -9313,7 +10540,7 @@
#, python-format
msgid "%d unresolved"
-msgstr "衝突未解決ファイル %d"
+msgstr "衝突未解消ファイル %d"
#, python-format
msgid "%d subrepos"
@@ -9371,6 +10598,24 @@
msgid "remote: (synced)\n"
msgstr "想定連携結果 : (同期済み)\n"
+msgid "force tag"
+msgstr "タグ付けの強制実施"
+
+msgid "make the tag local"
+msgstr "ローカルタグとして作成"
+
+msgid "revision to tag"
+msgstr "タグ付け対象リビジョン"
+
+msgid "remove a tag"
+msgstr "タグの削除"
+
+msgid "use <text> as commit message"
+msgstr "コミットメッセージ"
+
+msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
+msgstr "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
+
msgid "add one or more tags for the current or given revision"
msgstr "現リビジョンないし指定リビジョンへのタグの付与"
@@ -9472,6 +10717,9 @@
" -v/--verbose が指定された場合、 ローカルタグには \"local\" 表示の\n"
" 第3のカラムが追加されます。"
+msgid "[-p] [-g]"
+msgstr "[-p] [-g]"
+
msgid "show the tip revision"
msgstr "tip リビジョンの表示"
@@ -9495,6 +10743,12 @@
" リポジトリでの tip が現リポジトリの tip となります。 \"tip\" タグは\n"
" 特別なタグで、 改名や、 他のリビジョンへの付け替えはできません。"
+msgid "update to new branch head if changesets were unbundled"
+msgstr "新規取り込みの際には作業領域を新規ブランチヘッドでで更新"
+
+msgid "[-u] FILE..."
+msgstr "[-u] FILE..."
+
msgid "apply one or more changegroup files"
msgstr "バンドルファイルの適用"
@@ -9510,6 +10764,15 @@
" 成功時のコマンド終了値は 0、 衝突未解消ファイルがある場合は 1 です。\n"
" "
+msgid "discard uncommitted changes (no backup)"
+msgstr "未コミット変更内容の破棄(保存無し)"
+
+msgid "update across branches if no uncommitted changes"
+msgstr "未コミット変更が無い場合、 ブランチ横断でも更新を実施します"
+
+msgid "[-c] [-C] [-d DATE] [[-r] REV]"
+msgstr "[-c] [-C] [-d DATE] [[-r] REV]"
+
msgid "update working directory (or switch revisions)"
msgstr "作業領域の内容更新(ないしリビジョンの切り替え)"
@@ -9535,6 +10798,13 @@
" 作業領域を指定リビジョンで更新します。"
msgid ""
+" Update sets the working directory's parent revison to the specified\n"
+" changeset (see :hg:`help parents`)."
+msgstr ""
+" 作業領域の親リビジョンを、 指定されたリビジョンに更新します\n"
+" (:hg:`help parents` 参照)。"
+
+msgid ""
" The following rules apply when the working directory contains\n"
" uncommitted changes:"
msgstr " 作業領域に未コミット変更がある場合、 以下の規則が適用されます:"
@@ -9578,11 +10848,11 @@
" (:hg:`clone -U` と同等)。"
msgid ""
-" If you want to update just one file to an older changeset, use\n"
-" :hg:`revert`."
-msgstr ""
-" 特定のファイルだけを以前の状態に戻す場合は :hg:`revert`\n"
-" を使用してください。"
+" If you want to revert just one file to an older revision, use\n"
+" :hg:`revert [-r REV] NAME`."
+msgstr ""
+" 特定のファイルだけを以前の状態に戻す場合は、\n"
+" :hg:`revert [-r リビジョン] ファイル名` を使用してください。"
msgid "cannot specify both -c/--check and -C/--clean"
msgstr "-c/--check と -C/--clean は併用できません"
@@ -9627,808 +10897,13 @@
"頒布条件に関しては同梱されるライセンス条項をお読みください。\n"
"市場適合性や特定用途への可否を含め、 本製品は無保証です。\n"
-msgid "repository root directory or name of overlay bundle file"
-msgstr "リポジトリのルート位置、 ないしバンドルファイルのパス"
-
-msgid "DIR"
-msgstr "ディレクトリ"
-
-msgid "change working directory"
-msgstr "作業領域の変更"
-
-msgid "do not prompt, assume 'yes' for any required answers"
-msgstr "問い合わせをせず、 確認事項は全て 'yes' とみなす"
-
-msgid "suppress output"
-msgstr "出力を抑止"
-
-msgid "enable additional output"
-msgstr "付加的な出力を有効化"
-
-msgid "set/override config option (use 'section.name=value')"
-msgstr "オプション設定を指定／上書き(指定形式は 'section.name=value')"
-
-msgid "CONFIG"
-msgstr "設定"
-
-msgid "enable debugging output"
-msgstr "デバッグ出力を有効化"
-
-msgid "start debugger"
-msgstr "デバッガを開始"
-
-msgid "set the charset encoding"
-msgstr "文字エンコーディングの設定"
-
-msgid "ENCODE"
-msgstr "文字コード"
-
-msgid "MODE"
-msgstr "モード"
-
-msgid "set the charset encoding mode"
-msgstr "文字エンコーディングのモード設定"
-
-msgid "always print a traceback on exception"
-msgstr "例外発生の際に常にトレースバックを表示"
-
-msgid "time how long the command takes"
-msgstr "コマンド実行の所要時間を計測"
-
-msgid "print command execution profile"
-msgstr "コマンド実行のプロファイルを表示"
-
-msgid "output version information and exit"
-msgstr "バージョン情報を表示して終了"
-
-msgid "display help and exit"
-msgstr "ヘルプ情報を表示して終了"
-
-msgid "do not perform actions, just print output"
-msgstr "実施予定の処理内容の表示のみで処理実施は抑止"
-
-msgid "specify ssh command to use"
-msgstr "SSH 連携で使用する ssh コマンド"
-
-msgid "specify hg command to run on the remote side"
-msgstr "遠隔ホスト側で実行される hg コマンド"
-
-msgid "do not verify server certificate (ignoring web.cacerts config)"
-msgstr "サーバ証明書の検証省略(web.cacerts 設定の無視)"
-
-msgid "PATTERN"
-msgstr "パターン"
-
-msgid "include names matching the given patterns"
-msgstr "パターンに合致したファイルを処理対象に追加"
-
-msgid "exclude names matching the given patterns"
-msgstr "パターンに合致したファイルを処理対象から除外"
-
-msgid "use text as commit message"
-msgstr "指定テキストをコミットメッセージとして使用"
-
-msgid "read commit message from file"
-msgstr "コミットメッセージをファイルから読み込み"
-
-msgid "record datecode as commit date"
-msgstr "記録される日時情報"
-
-msgid "record the specified user as committer"
-msgstr "記録される作成者情報"
-
-msgid "STYLE"
-msgstr "スタイル"
-
-msgid "display using template map file"
-msgstr "当該スタイルで表示をカスタマイズ"
-
-msgid "display with template"
-msgstr "当該テンプレートで表示をカスタマイズ"
-
-msgid "do not show merges"
-msgstr "マージ実施リビジョンの表示抑止"
-
-msgid "output diffstat-style summary of changes"
-msgstr "diffstat 形式の変更概要を生成"
-
-msgid "treat all files as text"
-msgstr "全ファイルをテキストファイルと仮定"
-
-msgid "omit dates from diff headers"
-msgstr "差分表示の際に日付情報の表示を抑止"
-
-msgid "show which function each change is in"
-msgstr "差分表示の際に関数名情報を表示"
-
-msgid "produce a diff that undoes the changes"
-msgstr "変更を取り消すための差分を生成"
-
-msgid "ignore white space when comparing lines"
-msgstr "差分判定の際に空白文字を無視"
-
-msgid "ignore changes in the amount of white space"
-msgstr "差分判定の際に空白文字の数を無視"
-
-msgid "ignore changes whose lines are all blank"
-msgstr "差分判定の際に空白行を無視"
-
-msgid "number of lines of context to show"
-msgstr "差分コンテキストの行数"
-
-msgid "SIMILARITY"
-msgstr "類似度"
-
-msgid "guess renamed files by similarity (0<=s<=100)"
-msgstr "ファイル改名推定の際の類似度(0 以上 100 以下)"
-
-msgid "recurse into subrepositories"
-msgstr "副リポジトリへの再帰的適用"
-
-msgid "[OPTION]... [FILE]..."
-msgstr "[OPTION]... [FILE]..."
-
-msgid "annotate the specified revision"
-msgstr "当該リビジョン時点での由来情報を表示"
-
-msgid "follow copies/renames and list the filename (DEPRECATED)"
-msgstr "複製／改名元ファイルの履歴追跡と、 ファイル名の表示(非推奨)"
-
-msgid "don't follow copies and renames"
-msgstr "複製／改名元ファイル履歴の追跡を抑止"
-
-msgid "list the author (long with -v)"
-msgstr "ユーザ名を表示(-v 指定時は詳細表示)"
-
-msgid "list the filename"
-msgstr "ファイル名を表示"
-
-msgid "list the date (short with -q)"
-msgstr "日付を表示(-q 指定時は簡略表示)"
-
-msgid "list the revision number (default)"
-msgstr "リビジョン番号を表示(既定動作)"
-
-msgid "list the changeset"
-msgstr "ハッシュ値を表示"
-
-msgid "show line number at the first appearance"
-msgstr "由来リビジョンでの初出時の行番号を表示"
-
-msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
-msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
-
-msgid "do not pass files through decoders"
-msgstr "デコード処理を回避"
-
-msgid "PREFIX"
-msgstr "接頭辞"
-
-msgid "directory prefix for files in archive"
-msgstr "アーカイブファイルのディレクトリ接頭辞"
-
-msgid "revision to distribute"
-msgstr "アーカイブ対象リビジョン"
-
-msgid "type of distribution to create"
-msgstr "アーカイブ種別"
-
-msgid "[OPTION]... DEST"
-msgstr "[OPTION]... DEST"
-
-msgid "merge with old dirstate parent after backout"
-msgstr "打ち消しリビジョンを現親リビジョンとマージ"
-
-msgid "parent to choose when backing out merge"
-msgstr "打ち消しリビジョンとのマージ対象"
-
-msgid "specify merge tool"
-msgstr "マージツールの指定"
-
-msgid "revision to backout"
-msgstr "打ち消し対象リビジョン"
-
-msgid "[OPTION]... [-r] REV"
-msgstr "[OPTION]... [-r] REV"
-
-msgid "reset bisect state"
-msgstr "探索状態のリセット"
-
-msgid "mark changeset good"
-msgstr "対象リビジョンの探索状態を good 化"
-
-msgid "mark changeset bad"
-msgstr "対象リビジョンの探索状態を bad 化"
-
-msgid "skip testing changeset"
-msgstr "対象リビジョンの判定作業を省略"
-
-msgid "use command to check changeset state"
-msgstr "good/bad 判定用コマンド"
-
-msgid "do not update to target"
-msgstr "対象リビジョンによる作業領域内容の更新を抑止"
-
-msgid "[-gbsr] [-U] [-c CMD] [REV]"
-msgstr "[-gbsr] [-U] [-c CMD] [REV]"
-
-msgid "force"
-msgstr "強制実施"
-
-msgid "delete a given bookmark"
-msgstr "指定ブックマークの削除"
-
-msgid "rename a given bookmark"
-msgstr "指定ブックマークの改名"
-
-msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
-msgstr "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
-
-msgid "set branch name even if it shadows an existing branch"
-msgstr "同名既存ブランチが存在する場合でもブランチ作成を実施"
-
-msgid "reset branch name to parent branch name"
-msgstr "ブランチ名設定を解消し、 親リビジョンのブランチに戻る"
-
-msgid "[-fC] [NAME]"
-msgstr "[-fC] [NAME]"
-
-msgid "show only branches that have unmerged heads"
-msgstr "未マージなヘッドを持つブランチのみを表示"
-
-msgid "show normal and closed branches"
-msgstr "閉鎖したヘッドも表示"
-
-msgid "[-ac]"
-msgstr "[-ac]"
-
-msgid "run even when the destination is unrelated"
-msgstr "連携先が無関係なリポジトリでも実行"
-
-msgid "a changeset intended to be added to the destination"
-msgstr "バンドルに含めたいリビジョン"
-
-msgid "a specific branch you would like to bundle"
-msgstr "バンドルに含めたいブランチ"
-
-msgid "a base changeset assumed to be available at the destination"
-msgstr "連携先リポジトリに存在することを仮定するリビジョン"
-
-msgid "bundle all changesets in the repository"
-msgstr "リポジトリ中の全リビジョンをバンドルに含める"
-
-msgid "bundle compression type to use"
-msgstr "バンドルファイルの圧縮形式"
-
-msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
-msgstr "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
-
-msgid "print output to file with formatted name"
-msgstr "ファイル内容の保存先"
-
-msgid "print the given revision"
-msgstr "出力対象リビジョン"
-
-msgid "apply any matching decode filter"
-msgstr "デコード処理を実施"
-
-msgid "[OPTION]... FILE..."
-msgstr "[OPTION]... FILE..."
-
-msgid "the clone will include an empty working copy (only a repository)"
-msgstr "作業領域の更新無し(管理領域のみの複製)"
-
-msgid "revision, tag or branch to check out"
-msgstr "作業領域更新用リビジョン(タグ名／ブランチ名)"
-
-msgid "include the specified changeset"
-msgstr "複製対象に含めるリビジョン"
-
-msgid "clone only the specified branch"
-msgstr "指定ブランチのみを複製"
-
-msgid "[OPTION]... SOURCE [DEST]"
-msgstr "[OPTION]... SOURCE [DEST]"
-
-msgid "mark new/missing files as added/removed before committing"
-msgstr "コミット前に、 新規／不在ファイルを登録／除外"
-
-msgid "mark a branch as closed, hiding it from the branch list"
-msgstr "ブランチを閉鎖し、 ブランチ一覧での表示から除外"
-
-msgid "record a copy that has already occurred"
-msgstr "手動で複製済みのファイルに対して、 複製の旨を記録"
-
-msgid "forcibly copy over an existing managed file"
-msgstr "同名の登録済みファイルが存在しても複製を実施"
-
-msgid "[OPTION]... [SOURCE]... DEST"
-msgstr "[OPTION]... [SOURCE]... DEST"
-
-msgid "[INDEX] REV1 REV2"
-msgstr "[INDEX] REV1 REV2"
-
-msgid "add single file mergeable changes"
-msgstr ""
-
-msgid "add single file all revs append to"
-msgstr ""
-
-msgid "add single file all revs overwrite"
-msgstr ""
-
-msgid "add new file at each rev"
-msgstr ""
-
-msgid "[OPTION]... TEXT"
-msgstr "[OPTION]... TEXT"
-
-msgid "[COMMAND]"
-msgstr "[COMMAND]"
-
-msgid "show the command options"
-msgstr "当該コマンドのオプション一覧の表示"
-
-msgid "[-o] CMD"
-msgstr "[-o] CMD"
-
-msgid "use tags as labels"
-msgstr ""
-
-msgid "annotate with branch names"
-msgstr ""
-
-msgid "use dots for runs"
-msgstr ""
-
-msgid "separate elements by spaces"
-msgstr ""
-
-msgid "[OPTION]... [FILE [REV]...]"
-msgstr "[OPTION]... [FILE [REV]...]"
-
-msgid "try extended date formats"
-msgstr "拡張日時形式の使用"
-
-msgid "[-e] DATE [RANGE]"
-msgstr "[-e] DATE [RANGE]"
-
-msgid "FILE REV"
-msgstr "FILE REV"
-
-msgid "[PATH]"
-msgstr "[PATH]"
-
-msgid "revlog format"
-msgstr ""
-
-msgid "REPO NAMESPACE [KEY OLD NEW]"
-msgstr "REPO NAMESPACE [KEY OLD NEW]"
-
-msgid "revision to rebuild to"
-msgstr "再構築対象リビジョン"
-
-msgid "[-r REV] [REV]"
-msgstr "[-r REV] [REV]"
-
-msgid "revision to debug"
-msgstr "デバッグ対象リビジョン"
-
-msgid "[-r REV] FILE"
-msgstr "[-r REV] FILE"
-
-msgid "REV1 [REV2]"
-msgstr "REV1 [REV2]"
-
-msgid "do not display the saved mtime"
-msgstr "記録された mtime 情報の表示抑止"
-
-msgid "[OPTION]..."
-msgstr "[OPTION]..."
-
-msgid "revision to check"
-msgstr "確認対象リビジョン"
-
-msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
-msgstr "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
-
-msgid "diff against the second parent"
-msgstr "第2親との差分を使用"
-
-msgid "revisions to export"
-msgstr "対象リビジョン"
-
-msgid "[OPTION]... [-o OUTFILESPEC] REV..."
-msgstr "[OPTION]... [-o OUTFILESPEC] REV..."
-
-msgid "end fields with NUL"
-msgstr "各フィールドの区切りにNUL文字(0x00)を使用"
-
-msgid "print all revisions that match"
-msgstr "合致するリビジョンを全て表示"
-
-msgid "follow changeset history, or file history across copies and renames"
-msgstr "複製元や改名元の履歴も遡る"
-
-msgid "ignore case when matching"
-msgstr "大文字小文字を無視して検索"
-
-msgid "print only filenames and revisions that match"
-msgstr "合致の際にファイル名とリビジョンのみを表示"
-
-msgid "print matching line numbers"
-msgstr "合致した行番号を表示"
-
-msgid "only search files changed within revision range"
-msgstr "指定リビジョン範囲のみを検索"
-
-msgid "[OPTION]... PATTERN [FILE]..."
-msgstr "[OPTION]... PATTERN [FILE]..."
-
-msgid "show only heads which are descendants of STARTREV"
-msgstr "指定リビジョンの子孫となるヘッドのみを表示"
-
-msgid "STARTREV"
-msgstr "開始リビジョン"
-
-msgid "show topological heads only"
-msgstr "子を持たない全てのリビジョンを表示"
-
-msgid "show active branchheads only (DEPRECATED)"
-msgstr "アクティブなブランチヘッドのみを表示 (非推奨)"
-
-msgid "show normal and closed branch heads"
-msgstr "閉鎖したヘッドも表示"
-
-msgid "[-ac] [-r STARTREV] [REV]..."
-msgstr "[-ac] [-r STARTREV] [REV]..."
-
-msgid "[TOPIC]"
-msgstr "[TOPIC]"
-
-msgid "identify the specified revision"
-msgstr "当該リビジョンの識別情報を表示"
-
-msgid "show local revision number"
-msgstr "リビジョン番号を表示"
-
-msgid "show global revision id"
-msgstr "ハッシュ値を表示"
-
-msgid "show branch"
-msgstr "ブランチ名を表示"
-
-msgid "show tags"
-msgstr "タグを表示"
-
-msgid "show bookmarks"
-msgstr "ブックマークの表示"
-
-msgid "[-nibtB] [-r REV] [SOURCE]"
-msgstr "[-nibtB] [-r REV] [SOURCE]"
-
-msgid ""
-"directory strip option for patch. This has the same meaning as the "
-"corresponding patch option"
-msgstr "パス要素除去数(patch コマンドの同名オプションと同機能)"
-
-msgid "PATH"
-msgstr "パス"
-
-msgid "base path"
-msgstr "基底パス"
-
-msgid "skip check for outstanding uncommitted changes"
-msgstr "作業領域中の未コミット変更の確認を省略"
-
-msgid "don't commit, just update the working directory"
-msgstr "作業領域の更新のみで、 コミット実施を抑止"
-
-msgid "apply patch to the nodes from which it was generated"
-msgstr "パッチ作成時と同じ親リビジョンに対して適用"
-
-msgid "use any branch information in patch (implied by --exact)"
-msgstr "パッチ中のブランチ情報を利用(--exact 指定時は自動適用)"
-
-msgid "[OPTION]... PATCH..."
-msgstr "[OPTION]... PATCH..."
-
-msgid "run even if remote repository is unrelated"
-msgstr "連携先が無関係なリポジトリでも実行"
-
-msgid "show newest record first"
-msgstr "新しいリビジョンから先に表示"
-
-msgid "file to store the bundles into"
-msgstr "バンドルファイルの書き出し先"
-
-msgid "a remote changeset intended to be added"
-msgstr "取り込み対象リビジョン"
-
-msgid "compare bookmarks"
-msgstr "ブックマークの比較"
-
-msgid "a specific branch you would like to pull"
-msgstr "取り込み対象ブランチ"
-
-msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
-msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
-
-msgid "[-e CMD] [--remotecmd CMD] [DEST]"
-msgstr "[-e CMD] [--remotecmd CMD] [DEST]"
-
-msgid "search the repository as it is in REV"
-msgstr "当該リビジョン時点のファイル一覧から検索"
-
-msgid "end filenames with NUL, for use with xargs"
-msgstr "ファイル名をNUL文字(0x00)で終端(xargs との併用向け)"
-
-msgid "print complete paths from the filesystem root"
-msgstr "ファイルシステムのルートからの絶対パスで表示"
-
-msgid "[OPTION]... [PATTERN]..."
-msgstr "[OPTION]... [PATTERN]..."
-
-msgid "only follow the first parent of merge changesets"
-msgstr "マージの際には第1親のみを遡る"
-
-msgid "show revisions matching date spec"
-msgstr "指定日時に合致するリビジョンを表示"
-
-msgid "show copied files"
-msgstr "複製されたファイルを表示"
-
-msgid "do case-insensitive search for a given text"
-msgstr "指定キーワードによる検索(大文字小文字は無視)"
-
-msgid "include revisions where files were removed"
-msgstr "ファイルが登録除外されたリビジョンを含める"
-
-msgid "show only merges"
-msgstr "マージ実施リビジョンのみを表示"
-
-msgid "revisions committed by user"
-msgstr "当該ユーザによってコミットされたリビジョンを表示"
-
-msgid "show only changesets within the given named branch (DEPRECATED)"
-msgstr "指定の名前付きブランチに属するリビジョンのみを表示 (非推奨)"
-
-msgid "show changesets within the given named branch"
-msgstr "指定の名前付きブランチに属するリビジョンを表示"
-
-msgid "do not display revision or any of its ancestors"
-msgstr "当該リビジョンとその祖先の表示を抑止"
-
-msgid "[OPTION]... [FILE]"
-msgstr "[OPTION]... [FILE]"
-
-msgid "revision to display"
-msgstr "表示対象リビジョン"
-
-msgid "[-r REV]"
-msgstr "[-r REV]"
-
-msgid "force a merge with outstanding changes"
-msgstr "作業領域中の未コミット変更ごとマージを実施"
-
-msgid "revision to merge"
-msgstr "マージ対象リビジョン"
-
-msgid "review revisions to merge (no merge is performed)"
-msgstr "マージ対象リビジョンの確認(マージ処理は未実施)"
-
-msgid "[-P] [-f] [[-r] REV]"
-msgstr "[-P] [-f] [[-r] REV]"
-
-msgid "a changeset intended to be included in the destination"
-msgstr "反映対象とするリビジョン"
-
-msgid "a specific branch you would like to push"
-msgstr "反映対象とするブランチ"
-
-msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
-msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
-
-msgid "show parents of the specified revision"
-msgstr "親リビジョンの表示対象"
-
-msgid "[-r REV] [FILE]"
-msgstr "[-r REV] [FILE]"
-
-msgid "[NAME]"
-msgstr "[NAME]"
-
-msgid "update to new branch head if changesets were pulled"
-msgstr "新規取り込みの際には作業領域を新規のブランチヘッドで更新"
-
-msgid "run even when remote repository is unrelated"
-msgstr "連携先が無関係なリポジトリでも実行"
-
-msgid "BOOKMARK"
-msgstr "ブックマーク"
-
-msgid "bookmark to pull"
-msgstr "取り込み対象ブックマーク"
-
-msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
-msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
-
-msgid "force push"
-msgstr "反映先にヘッドが増える場合でも実施"
-
-msgid "bookmark to push"
-msgstr "反映対象ブックマーク"
-
-msgid "allow pushing a new branch"
-msgstr "新規ブランチの反映を許可"
-
-msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
-msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
-
-msgid "record delete for missing files"
-msgstr "手動で削除済みのファイルに対して、 登録除外の旨を記録"
-
-msgid "remove (and delete) file even if added or modified"
-msgstr "追加登録／変更対象であっても登録除外(ファイルは削除)"
-
-msgid "record a rename that has already occurred"
-msgstr "手動で改名済みのファイルに対して、 改名の旨を記録"
-
-msgid "[OPTION]... SOURCE... DEST"
-msgstr "[OPTION]... SOURCE... DEST"
-
-msgid "select all unresolved files"
-msgstr "衝突未解消の全ファイルを処理対象にする"
-
-msgid "list state of files needing merge"
-msgstr "マージの必要なファイルの解消状態一覧"
-
-msgid "mark files as resolved"
-msgstr "当該ファイルを衝突解消済み状態に設定"
-
-msgid "mark files as unresolved"
-msgstr "当該ファイルを衝突解消済み状態に設定"
-
-msgid "hide status prefix"
-msgstr "状態記号の表示を抑止"
-
-msgid "revert all changes when no arguments given"
-msgstr "引数指定が無い場合に、 全ファイルの内容を復旧"
-
-msgid "tipmost revision matching date"
-msgstr "当該日時の最新リビジョンを使用"
-
-msgid "revert to the specified revision"
-msgstr "当該リビジョン時点の内容で復旧"
-
-msgid "do not save backup copies of files"
-msgstr "取り消し実施前内容のバックアップを抑止"
-
-msgid "[OPTION]... [-r REV] [NAME]..."
-msgstr "[OPTION]... [-r REV] [NAME]..."
-
-msgid "name of access log file to write to"
-msgstr "アクセスログの書き出し先ファイル"
-
-msgid "name of error log file to write to"
-msgstr "エラーログの書き出し先ファイル"
-
-msgid "PORT"
-msgstr "ポート番号"
-
-msgid "port to listen on (default: 8000)"
-msgstr "要求受け付けポート番号(既定値: 8000)"
-
-msgid "ADDR"
-msgstr "アドレス"
-
-msgid "address to listen on (default: all interfaces)"
-msgstr "要求受け付けアドレス(既定値: 全インタフェース)"
-
-msgid "prefix path to serve from (default: server root)"
-msgstr "公開パス接頭辞(既定値: ルート)"
-
-msgid "name to show in web pages (default: working directory)"
-msgstr "表示名(既定値: 作業領域のパス)"
-
-msgid "name of the hgweb config file (see \"hg help hgweb\")"
-msgstr "hgweb 設定ファイル位置(\"hg help hgweb\" 参照)"
-
-msgid "name of the hgweb config file (DEPRECATED)"
-msgstr "hgweb 設定ファイル位置 (非推奨)"
-
-msgid "for remote clients"
-msgstr "(ホスト間連携での内部用途向け)"
-
-msgid "web templates to use"
-msgstr "当該テンプレートで表示をカスタマイズ"
-
-msgid "template style to use"
-msgstr "当該スタイルで表示をカスタマイズ"
-
-msgid "use IPv6 in addition to IPv4"
-msgstr "IPv4 に加えて IPv6 を使用"
-
-msgid "SSL certificate file"
-msgstr "SSL 証明書ファイル"
-
-msgid "show untrusted configuration options"
-msgstr "信頼できない設定項目も表示"
-
-msgid "[-u] [NAME]..."
-msgstr "[-u] [NAME]..."
-
-msgid "check for push and pull"
-msgstr "push/pull 実施結果の確認"
-
-msgid "show status of all files"
-msgstr "全ての状態を表示"
-
-msgid "show only modified files"
-msgstr "変更されたファイルを表示"
-
-msgid "show only added files"
-msgstr "追加登録されたファイルを表示"
-
-msgid "show only removed files"
-msgstr "登録除外されたファイルを表示"
-
-msgid "show only deleted (but tracked) files"
-msgstr "削除されたファイル(登録除外は未実施)を表示"
-
-msgid "show only files without changes"
-msgstr "変更の無いファイルを表示"
-
-msgid "show only unknown (not tracked) files"
-msgstr "構成管理対象外のファイルを表示"
-
-msgid "show only ignored files"
-msgstr "無視対象のファイルを表示"
-
-msgid "show source of copied files"
-msgstr "複製元ファイルを表示"
-
-msgid "show difference from revision"
-msgstr "当該リビジョンとの差分で状態を判定"
-
-msgid "list the changed files of a revision"
-msgstr "指定リビジョンにおける更新ファイルの一覧"
-
-msgid "force tag"
-msgstr "タグ付けの強制実施"
-
-msgid "make the tag local"
-msgstr "ローカルタグとして作成"
-
-msgid "revision to tag"
-msgstr "タグ付け対象リビジョン"
-
-msgid "remove a tag"
-msgstr "タグの削除"
-
-msgid "use <text> as commit message"
-msgstr "コミットメッセージ"
-
-msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
-msgstr "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
-
-msgid "[-p] [-g]"
-msgstr "[-p] [-g]"
-
-msgid "update to new branch head if changesets were unbundled"
-msgstr "新規取り込みの際には作業領域を新規ブランチヘッドでで更新"
-
-msgid "[-u] FILE..."
-msgstr "[-u] FILE..."
-
-msgid "discard uncommitted changes (no backup)"
-msgstr "未コミット変更内容の破棄(保存無し)"
-
-msgid "update across branches if no uncommitted changes"
-msgstr "未コミット変更が無い場合、 ブランチ横断でも更新を実施します"
-
-msgid "[-c] [-C] [-d DATE] [[-r] REV]"
-msgstr "[-c] [-C] [-d DATE] [[-r] REV]"
+#, python-format
+msgid "unknown mode %s"
+msgstr "未知のモード %s"
+
+#, python-format
+msgid "unknown command %s"
+msgstr "未知のコマンド %s"
#, python-format
msgid "cannot include %s (%s)"
@@ -10465,14 +10940,6 @@
msgstr "%s は登録済です!\n"
#, python-format
-msgid "%s not added!\n"
-msgstr "%s は追加登録されません\n"
-
-#, python-format
-msgid "%s still exists!\n"
-msgstr "%s の削除に失敗しました!\n"
-
-#, python-format
msgid "%s not tracked!\n"
msgstr "%s は管理されていません!\n"
@@ -10500,14 +10967,13 @@
msgid "invalid event type in dag: %s"
msgstr ""
+msgid "nullid"
+msgstr ""
+
msgid "working directory state appears damaged!"
msgstr "作業領域の状態管理に問題があります!"
#, python-format
-msgid "'\\n' and '\\r' disallowed in filenames: %r"
-msgstr "'\\n' と '\\r' はファイル名で使用しないでください: %r"
-
-#, python-format
msgid "directory %r already in dirstate"
msgstr "ディレクトリ %r は既に管理対象に含まれています"
@@ -10519,10 +10985,6 @@
msgid "setting %r to other parent only allowed in merges"
msgstr "%r の別親への設定はマージでのみ可能です"
-#, python-format
-msgid "not in dirstate: %s\n"
-msgstr "%s は管理情報中にありません\n"
-
msgid "unknown"
msgstr "未知"
@@ -10545,24 +11007,6 @@
msgid "unsupported file type (type is %s)"
msgstr "未サポートのファイル種別(%s)"
-msgid "searching for changes\n"
-msgstr "変更点を探索中\n"
-
-msgid "queries"
-msgstr "問い合わせ"
-
-msgid "searching"
-msgstr "検索中"
-
-msgid "already have changeset "
-msgstr "既にチェンジセットがあります "
-
-msgid "warning: repository is unrelated\n"
-msgstr "警告: 無関係なリポジトリです\n"
-
-msgid "repository is unrelated"
-msgstr "無関係なリポジトリです"
-
#, python-format
msgid "push creates new remote branches: %s!"
msgstr "連携先に新しいブランチが作成されます: %s!"
@@ -10571,11 +11015,12 @@
msgstr "連携先への新規ブランチ作成は 'hg push --new-branch'"
#, python-format
-msgid "push creates new remote heads on branch '%s'!"
-msgstr "連携先のブランチ '%s' に新しいヘッドが作成されます!"
-
-msgid "push creates new remote heads!"
-msgstr "連携先に新しいヘッドが作成されます!"
+msgid "push creates new remote head %s on branch '%s'!"
+msgstr "新しいヘッド %s が連携先のブランチ '%s' に作成されます!"
+
+#, python-format
+msgid "push creates new remote head %s!"
+msgstr "新しいヘッド %s が連携先に作成されます!"
msgid "you should pull and merge or use push -f to force"
msgstr "pull と merge を実施するか、 push -f で強制実行してください"
@@ -10707,11 +11152,6 @@
#, python-format
msgid ""
-"No argument found for substitution of %i variable in alias '%s' definition."
-msgstr "%i 変数の置換に対応する引数がありません(別名 '%s' 定義)"
-
-#, python-format
-msgid ""
"error in definition for alias '%s': %s may only be given on the command "
"line\n"
msgstr "別名定義 '%s' のエラー: %s はコマンド行での直接指定限定です\n"
@@ -10755,12 +11195,13 @@
msgid "repository '%s' is not local"
msgstr "リポジトリ '%s' はローカルリポジトリではありません"
+#, python-format
+msgid "no repository found in %r (.hg not found)"
+msgstr "%r 配下にはリポジトリがありません (.hg が見つかりません)"
+
msgid "warning: --repository ignored\n"
msgstr "警告: --repository 指定を無視します\n"
-msgid "invalid arguments"
-msgstr "引数が不正です"
-
#, python-format
msgid "unrecognized profiling format '%s' - Ignored\n"
msgstr "不正なプロファイル形式 '%s' を無視します\n"
@@ -10770,7 +11211,7 @@
"misc/lsprof/"
msgstr ""
"lsprof が利用できません - http://codespeak.net/svn/user/arigo/hack/misc/"
-"lsprof/ からインストールしてください"
+"lsprof/からインストールしてください"
#, python-format
msgid "*** failed to import extension %s from %s: %s\n"
@@ -10842,6 +11283,239 @@
msgid "merging %s failed!\n"
msgstr "%s のマージに失敗!\n"
+msgid "unterminated string"
+msgstr "文字列が終端していません"
+
+msgid "syntax error"
+msgstr "文法エラー"
+
+msgid "missing argument"
+msgstr "引数がありません"
+
+msgid "can't use a list in this context"
+msgstr "ここではリストを使用できません"
+
+msgid ""
+"``modified()``\n"
+" File that is modified according to status."
+msgstr ""
+"``modified()``\n"
+" 更新ステータスを持つファイル"
+
+#. i18n: "modified" is a keyword
+msgid "modified takes no arguments"
+msgstr "modified 指定には引数が指定できません"
+
+msgid ""
+"``added()``\n"
+" File that is added according to status."
+msgstr ""
+"``added()``\n"
+" 追加ステータスを持つファイル"
+
+#. i18n: "added" is a keyword
+msgid "added takes no arguments"
+msgstr "added 指定には引数が指定できません"
+
+msgid ""
+"``removed()``\n"
+" File that is removed according to status."
+msgstr ""
+"``removed()``\n"
+" 削除ステータスを持つファイル"
+
+#. i18n: "removed" is a keyword
+msgid "removed takes no arguments"
+msgstr "removed 指定には引数が指定できません"
+
+msgid ""
+"``deleted()``\n"
+" File that is deleted according to status."
+msgstr ""
+"``deleted()``\n"
+" 削除ステータスを持つファイル"
+
+#. i18n: "deleted" is a keyword
+msgid "deleted takes no arguments"
+msgstr "deleted 指定には引数が指定できません"
+
+msgid ""
+"``unknown()``\n"
+" File that is unknown according to status. These files will only be\n"
+" considered if this predicate is used."
+msgstr ""
+"``unknown()``\n"
+" 未知ステータスを持つファイル。\n"
+" 本述語が指定された時のみ、\n"
+" 未知ファイルが Mercurial の取り扱い対象になります。"
+
+#. i18n: "unknown" is a keyword
+msgid "unknown takes no arguments"
+msgstr "unknown 指定には引数が指定できません"
+
+msgid ""
+"``ignored()``\n"
+" File that is ignored according to status. These files will only be\n"
+" considered if this predicate is used."
+msgstr ""
+"``ignored()``\n"
+" 無視ステータスを持つファイル。\n"
+" 本述語が指定された時のみ、\n"
+" 無視ファイルが Mercurial の取り扱い対象になります。"
+
+#. i18n: "ignored" is a keyword
+msgid "ignored takes no arguments"
+msgstr "ignored 指定には引数が指定できません"
+
+msgid ""
+"``clean()``\n"
+" File that is clean according to status."
+msgstr ""
+"``clean()``\n"
+" 変更無しステータスを持つファイル"
+
+#. i18n: "clean" is a keyword
+msgid "clean takes no arguments"
+msgstr "clean 指定には引数が指定できません"
+
+#, python-format
+msgid "not a function: %s"
+msgstr "関数ではありません: %s"
+
+msgid ""
+"``binary()``\n"
+" File that appears to be binary (contails NUL bytes)."
+msgstr ""
+"``binary()``\n"
+" バイナリと思われるファイル (NUL バイトを含むファイル)"
+
+#. i18n: "binary" is a keyword
+msgid "binary takes no arguments"
+msgstr "binary 指定には引数が指定できません"
+
+msgid ""
+"``exec()``\n"
+" File that is marked as executable."
+msgstr ""
+"``exec()``\n"
+" 実行可能ビットが立っているファイル"
+
+#. i18n: "exec" is a keyword
+msgid "exec takes no arguments"
+msgstr "exec 指定には引数が指定できません"
+
+msgid ""
+"``symlink()``\n"
+" File that is marked as a symlink."
+msgstr ""
+"``symlink()``\n"
+" シンボリックリンクとみなされているファイル"
+
+#. i18n: "symlink" is a keyword
+msgid "symlink takes no arguments"
+msgstr "symlink 指定には引数が指定できません"
+
+msgid ""
+"``resolved()``\n"
+" File that is marked resolved according to the resolve state."
+msgstr ""
+"``resolved()``\n"
+" マージステータスが解消済みのファイル"
+
+#. i18n: "resolved" is a keyword
+msgid "resolved takes no arguments"
+msgstr "resolved 指定には引数が指定できません"
+
+msgid ""
+"``unresolved()``\n"
+" File that is marked unresolved according to the resolve state."
+msgstr ""
+"``unresolved()``\n"
+" マージステータスが未解消のファイル"
+
+#. i18n: "unresolved" is a keyword
+msgid "unresolved takes no arguments"
+msgstr "unresolved 指定には引数が指定できません"
+
+msgid ""
+"``hgignore()``\n"
+" File that matches the active .hgignore pattern."
+msgstr ""
+"``hgignore()``\n"
+" 有効な .hgignore パターンに合致するファイル"
+
+msgid "hgignore takes no arguments"
+msgstr "hgignore 指定には引数が指定できません"
+
+msgid ""
+"``grep(regex)``\n"
+" File contains the given regular expression."
+msgstr ""
+"``grep(regex)``\n"
+" 正規表現 regexp に合致する内容を持つファイル"
+
+msgid "grep requires a pattern"
+msgstr "grep にはパターン指定が必要です"
+
+#, python-format
+msgid "couldn't parse size: %s"
+msgstr "サイズ指定の解析に失敗: %s"
+
+msgid ""
+"``size(expression)``\n"
+" File size matches the given expression. Examples:"
+msgstr ""
+"``size(expression)``\n"
+" サイズが指定条件に合致するファイル。条件例:"
+
+msgid ""
+" - 1k (files from 1024 to 2047 bytes)\n"
+" - < 20k (files less than 20480 bytes)\n"
+" - >= .5MB (files at least 524288 bytes)\n"
+" - 4k - 1MB (files from 4096 bytes to 1048576 bytes)"
+msgstr ""
+" - 1k (1024 〜 2047 バイトのファイル)\n"
+" - < 20k (20480 バイト未満のファイル)\n"
+" - >= .5MB (524288 バイト以上のファイル)\n"
+" - 4k - 1MB (4096 〜 1048576 バイトのファイル)"
+
+#. i18n: "size" is a keyword
+msgid "size requires an expression"
+msgstr "size には条件指定が必要です"
+
+msgid ""
+"``encoding(name)``\n"
+" File can be successfully decoded with the given character\n"
+" encoding. May not be useful for encodings other than ASCII and\n"
+" UTF-8."
+msgstr ""
+"``encoding(name)``\n"
+" 指定エンコーディング方式でデコード可能なファイル。\n"
+" ASCII や UTF-8 以外のエンコーディングに対しては、\n"
+" 無益かもしれません。"
+
+#. i18n: "encoding" is a keyword
+msgid "encoding requires an encoding name"
+msgstr "encoding にはエンコーディング名が必要です"
+
+#, python-format
+msgid "unknown encoding '%s'"
+msgstr "不明なエンコーディング '%s' が指定されました"
+
+msgid ""
+"``copied()``\n"
+" File that is recorded as being copied."
+msgstr ""
+"``copied()``\n"
+" 複製されたファイル"
+
+#. i18n: "copied" is a keyword
+msgid "copied takes no arguments"
+msgstr "copied 指定には引数が指定できません"
+
+msgid "invalid token"
+msgstr "不正な記述"
+
msgid "starting revisions are not directly related"
msgstr "開始リビジョンと直接の関連がありません"
@@ -10877,6 +11551,9 @@
msgid "Specifying Revision Sets"
msgstr "複数リビジョンの指定"
+msgid "Specifying File Sets"
+msgstr "複数ファイルの指定"
+
msgid "Diff Formats"
msgstr "差分形式"
@@ -10901,95 +11578,25 @@
msgid "Glossary"
msgstr "用語集"
-msgid ""
-"Mercurial reads configuration data from several files, if they exist.\n"
-"Below we list the most specific file first."
-msgstr ""
-"Mercurial は設定ファイルを複数の場所から読み込みます。\n"
-"優先度順に読み込み位置を並べたものを以下に示します。"
-
-msgid "On Windows, these configuration files are read:"
-msgstr "Windows 環境では以下の設定ファイルが読み込まれます:"
-
-msgid ""
-"- ``<repo>\\.hg\\hgrc``\n"
-"- ``%USERPROFILE%\\.hgrc``\n"
-"- ``%USERPROFILE%\\mercurial.ini``\n"
-"- ``%HOME%\\.hgrc``\n"
-"- ``%HOME%\\mercurial.ini``\n"
-"- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial."
-"ini found)\n"
-"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial."
-"ini found)\n"
-"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n"
-"- ``<hg.exe-dir>\\mercurial.ini``"
-msgstr ""
-"- ``<リポジトリ>\\.hg\\hgrc``\n"
-"- ``%USERPROFILE%\\.hgrc``\n"
-"- ``%USERPROFILE%\\mercurial.ini``\n"
-"- ``%HOME%\\.hgrc``\n"
-"- ``%HOME%\\mercurial.ini``\n"
-"- ``C:\\mercurial\\mercurial.ini`` (regkey, hgrc.d\\, mercurial.ini 不在時)\n"
-"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (hgrc.d\\, mercurial.ini 不在"
-"時)\n"
-"- ``<インストール先>\\hgrc.d\\*.rc`` (mercurial.ini 不在時)\n"
-"- ``<インストール先>\\mercurial.ini``"
-
-msgid "On Unix, these files are read:"
-msgstr "Unix 環境では以下の設定ファイルが読み込まれます:"
-
-msgid ""
-"- ``<repo>/.hg/hgrc``\n"
-"- ``$HOME/.hgrc``\n"
-"- ``/etc/mercurial/hgrc``\n"
-"- ``/etc/mercurial/hgrc.d/*.rc``\n"
-"- ``<install-root>/etc/mercurial/hgrc``\n"
-"- ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
-msgstr ""
-"- ``<リポジトリ>/.hg/hgrc``\n"
-"- ``$HOME/.hgrc``\n"
-"- ``/etc/mercurial/hgrc``\n"
-"- ``/etc/mercurial/hgrc.d/*.rc``\n"
-"- ``<インストール先>/etc/mercurial/hgrc``\n"
-"- ``<インストール先>/etc/mercurial/hgrc.d/*.rc``"
-
-msgid ""
-"If there is a per-repository configuration file which is not owned by\n"
-"the active user, Mercurial will warn you that the file is skipped::"
-msgstr ""
-"実行ユーザ以外が所有となっているリポジトリ毎設定ファイルがある場合、\n"
-"Mercurial は当該ファイルを読み込まない旨の警告を表示します::"
-
-msgid ""
-" not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP"
-msgstr " 信頼できないファイル <repo>/.hg/hgrc (所有者 USER, グループ GROUP)"
-
-msgid ""
-"If this bothers you, the warning can be silenced (the file would still\n"
-"be ignored) or trust can be established. Use one of the following\n"
-"settings, the syntax is explained below:"
-msgstr ""
-"そのようなファイルを意図的に使用している場合、 警告表示を抑止する(但し\n"
-"ファイルは読み込まれません)ことも、 信頼して読み込むことも可能です。\n"
-"以下の文法に従い設定を行ってください:"
-
-msgid ""
-"- ``ui.report_untrusted = False``\n"
-"- ``trusted.users = USER``\n"
-"- ``trusted.groups = GROUP``"
-msgstr ""
-"- ``ui.report_untrusted = False``\n"
-"- ``trusted.users = ユーザ``\n"
-"- ``trusted.groups = グループ``"
-
-msgid ""
-"The configuration files for Mercurial use a simple ini-file format. A\n"
-"configuration file consists of sections, led by a ``[section]`` header\n"
-"and followed by ``name = value`` entries::"
+msgid "syntax for Mercurial ignore files"
+msgstr "Mercurial の無視指定ファイルの文法"
+
+msgid ""
+"The Mercurial system uses a set of configuration files to control\n"
+"aspects of its behavior."
+msgstr ""
+"Mercurial では、 挙動を制御するために、\n"
+"複数の設定ファイルを使用します。"
+
+msgid ""
+"The configuration files use a simple ini-file format. A configuration\n"
+"file consists of sections, led by a ``[section]`` header and followed\n"
+"by ``name = value`` entries::"
msgstr ""
"Mercurial の設定ファイルは、 いわゆる ini ファイル形式で記述されます。\n"
-"設定ファイルは、 ``[セクション名]`` 形式のヘッダから始まるセクションから\n"
-"構成され、 ``名前 = 値`` 形式の要素が列挙されます::"
+"設定ファイルは、\n"
+"``[セクション名]`` 形式のヘッダによって始まるセクションから構成され、\n"
+"セクションには ``名前 = 値`` 形式の要素が列挙されます::"
msgid ""
" [ui]\n"
@@ -11002,19 +11609,1843 @@
msgid ""
"The above entries will be referred to as ``ui.username`` and\n"
-"``ui.verbose``, respectively. Please see the hgrc man page for a full\n"
-"description of the possible configuration values:"
-msgstr ""
-"上記記述はそれぞれ、 ``ui.username`` および ``ui.verbose`` として\n"
-"参照されます。 設定ファイルで指定可能な値の詳細に関しては、\n"
-"hgrc のマニュアルページを参照してください:"
-
-msgid ""
-"- on Unix-like systems: ``man hgrc``\n"
-"- online: http://www.selenic.com/mercurial/hgrc.5.html\n"
-msgstr ""
-"- Unix 系システム: ``man hgrc``\n"
-"- オンライン版: http://www.selenic.com/mercurial/hgrc.5.html\n"
+"``ui.verbose``, respectively. See the Syntax section below."
+msgstr ""
+"上記記述はそれぞれ、\n"
+"``ui.username`` および ``ui.verbose`` として参照されます。\n"
+"後述する文法の詳細を参照してください。"
+
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+"ファイル\n"
+"-----"
+
+msgid ""
+"Mercurial reads configuration data from several files, if they exist.\n"
+"These files do not exist by default and you will have to create the\n"
+"appropriate configuration files yourself: global configuration like\n"
+"the username setting is typically put into\n"
+"``%USERPROFILE%\\mercurial.ini`` or ``$HOME/.hgrc`` and local\n"
+"configuration is put into the per-repository ``<repo>/.hg/hgrc`` file."
+msgstr ""
+
+msgid ""
+"The names of these files depend on the system on which Mercurial is\n"
+"installed. ``*.rc`` files from a single directory are read in\n"
+"alphabetical order, later ones overriding earlier ones. Where multiple\n"
+"paths are given below, settings from earlier paths override later\n"
+"ones."
+msgstr ""
+
+msgid "| (Unix, Windows) ``<repo>/.hg/hgrc``"
+msgstr ""
+
+msgid ""
+" Per-repository configuration options that only apply in a\n"
+" particular repository. This file is not version-controlled, and\n"
+" will not get transferred during a \"clone\" operation. Options in\n"
+" this file override options in all other configuration files. On\n"
+" Unix, most of this file will be ignored if it doesn't belong to a\n"
+" trusted user or to a trusted group. See the documentation for the\n"
+" ``[trusted]`` section below for more details."
+msgstr ""
+
+msgid ""
+"| (Unix) ``$HOME/.hgrc``\n"
+"| (Windows) ``%USERPROFILE%\\.hgrc``\n"
+"| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n"
+"| (Windows) ``%HOME%\\.hgrc``\n"
+"| (Windows) ``%HOME%\\Mercurial.ini``"
+msgstr ""
+
+msgid ""
+" Per-user configuration file(s), for the user running Mercurial. On\n"
+" Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these\n"
+" files apply to all Mercurial commands executed by this user in any\n"
+" directory. Options in these files override per-system and per-"
+"installation\n"
+" options."
+msgstr ""
+
+msgid ""
+"| (Unix) ``/etc/mercurial/hgrc``\n"
+"| (Unix) ``/etc/mercurial/hgrc.d/*.rc``"
+msgstr ""
+
+msgid ""
+" Per-system configuration files, for the system on which Mercurial\n"
+" is running. Options in these files apply to all Mercurial commands\n"
+" executed by any user in any directory. Options in these files\n"
+" override per-installation options."
+msgstr ""
+
+msgid ""
+"| (Unix) ``<install-root>/etc/mercurial/hgrc``\n"
+"| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
+msgstr ""
+
+msgid ""
+" Per-installation configuration files, searched for in the\n"
+" directory where Mercurial is installed. ``<install-root>`` is the\n"
+" parent directory of the **hg** executable (or symlink) being run. For\n"
+" example, if installed in ``/shared/tools/bin/hg``, Mercurial will look\n"
+" in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply\n"
+" to all Mercurial commands executed by any user in any directory."
+msgstr ""
+
+msgid ""
+"| (Windows) ``<install-dir>\\Mercurial.ini`` **or**\n"
+"| (Windows) ``<install-dir>\\hgrc.d\\*.rc`` **or**\n"
+"| (Windows) ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``"
+msgstr ""
+
+msgid ""
+" Per-installation/system configuration files, for the system on\n"
+" which Mercurial is running. Options in these files apply to all\n"
+" Mercurial commands executed by any user in any directory. Registry\n"
+" keys contain PATH-like strings, every part of which must reference\n"
+" a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will\n"
+" be read. Mercurial checks each of these locations in the specified\n"
+" order until one or more configuration files are detected. If the\n"
+" pywin32 extensions are not installed, Mercurial will only look for\n"
+" site-wide configuration in ``C:\\Mercurial\\Mercurial.ini``."
+msgstr ""
+
+msgid ""
+"Syntax\n"
+"------"
+msgstr ""
+
+msgid ""
+"A configuration file consists of sections, led by a ``[section]`` header\n"
+"and followed by ``name = value`` entries (sometimes called\n"
+"``configuration keys``)::"
+msgstr ""
+"設定ファイルは、\n"
+"``[セクション名]`` 形式のヘッダによって始まるセクションから構成され、\n"
+"セクションには ``名前 = 値`` 形式の要素 (``設定キー`` と呼称される事も)\n"
+"が列挙されます::"
+
+msgid ""
+" [spam]\n"
+" eggs=ham\n"
+" green=\n"
+" eggs"
+msgstr ""
+
+msgid ""
+"Each line contains one entry. If the lines that follow are indented,\n"
+"they are treated as continuations of that entry. Leading whitespace is\n"
+"removed from values. Empty lines are skipped. Lines beginning with\n"
+"``#`` or ``;`` are ignored and may be used to provide comments."
+msgstr ""
+
+msgid ""
+"Configuration keys can be set multiple times, in which case Mercurial\n"
+"will use the value that was configured last. As an example::"
+msgstr ""
+
+msgid ""
+" [spam]\n"
+" eggs=large\n"
+" ham=serrano\n"
+" eggs=small"
+msgstr ""
+
+msgid "This would set the configuration key named ``eggs`` to ``small``."
+msgstr ""
+
+msgid ""
+"It is also possible to define a section multiple times. A section can\n"
+"be redefined on the same and/or on different configuration files. For\n"
+"example::"
+msgstr ""
+
+msgid ""
+" [foo]\n"
+" eggs=large\n"
+" ham=serrano\n"
+" eggs=small"
+msgstr ""
+
+msgid ""
+" [bar]\n"
+" eggs=ham\n"
+" green=\n"
+" eggs"
+msgstr ""
+
+msgid ""
+" [foo]\n"
+" ham=prosciutto\n"
+" eggs=medium\n"
+" bread=toasted"
+msgstr ""
+
+msgid ""
+"This would set the ``eggs``, ``ham``, and ``bread`` configuration keys\n"
+"of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``,\n"
+"respectively. As you can see there only thing that matters is the last\n"
+"value that was set for each of the configuration keys."
+msgstr ""
+
+msgid ""
+"If a configuration key is set multiple times in different\n"
+"configuration files the final value will depend on the order in which\n"
+"the different configuration files are read, with settings from earlier\n"
+"paths overriding later ones as described on the ``Files`` section\n"
+"above."
+msgstr ""
+
+msgid ""
+"A line of the form ``%include file`` will include ``file`` into the\n"
+"current configuration file. The inclusion is recursive, which means\n"
+"that included files can include other files. Filenames are relative to\n"
+"the configuration file in which the ``%include`` directive is found.\n"
+"Environment variables and ``~user`` constructs are expanded in\n"
+"``file``. This lets you do something like::"
+msgstr ""
+
+msgid " %include ~/.hgrc.d/$HOST.rc"
+msgstr ""
+
+msgid "to include a different configuration file on each computer you use."
+msgstr ""
+
+msgid ""
+"A line with ``%unset name`` will remove ``name`` from the current\n"
+"section, if it has been set previously."
+msgstr ""
+
+msgid ""
+"The values are either free-form text strings, lists of text strings,\n"
+"or Boolean values. Boolean values can be set to true using any of \"1\",\n"
+"\"yes\", \"true\", or \"on\" and to false using \"0\", \"no\", \"false\", or "
+"\"off\"\n"
+"(all case insensitive)."
+msgstr ""
+
+msgid ""
+"List values are separated by whitespace or comma, except when values are\n"
+"placed in double quotation marks::"
+msgstr ""
+
+msgid " allow_read = \"John Doe, PhD\", brian, betty"
+msgstr ""
+
+msgid ""
+"Quotation marks can be escaped by prefixing them with a backslash. Only\n"
+"quotation marks at the beginning of a word is counted as a quotation\n"
+"(e.g., ``foo\"bar baz`` is the list of ``foo\"bar`` and ``baz``)."
+msgstr ""
+
+msgid ""
+"Sections\n"
+"--------"
+msgstr ""
+
+msgid ""
+"This section describes the different sections that may appear in a\n"
+"Mercurial configuration file, the purpose of each section, its possible\n"
+"keys, and their possible values."
+msgstr ""
+
+msgid ""
+"``alias``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Defines command aliases.\n"
+"Aliases allow you to define your own commands in terms of other\n"
+"commands (or aliases), optionally including arguments. Positional\n"
+"arguments in the form of ``$1``, ``$2``, etc in the alias definition\n"
+"are expanded by Mercurial before execution. Positional arguments not\n"
+"already used by ``$N`` in the definition are put at the end of the\n"
+"command to be executed."
+msgstr ""
+
+msgid "Alias definitions consist of lines of the form::"
+msgstr ""
+
+msgid " <alias> = <command> [<argument>]..."
+msgstr ""
+
+msgid "For example, this definition::"
+msgstr ""
+
+msgid " latest = log --limit 5"
+msgstr ""
+
+msgid ""
+"creates a new command ``latest`` that shows only the five most recent\n"
+"changesets. You can define subsequent aliases using earlier ones::"
+msgstr ""
+
+msgid " stable5 = latest -b stable"
+msgstr ""
+
+msgid ""
+".. note:: It is possible to create aliases with the same names as\n"
+" existing commands, which will then override the original\n"
+" definitions. This is almost always a bad idea!"
+msgstr ""
+
+msgid ""
+"An alias can start with an exclamation point (``!``) to make it a\n"
+"shell alias. A shell alias is executed with the shell and will let you\n"
+"run arbitrary commands. As an example, ::"
+msgstr ""
+
+msgid " echo = !echo"
+msgstr ""
+
+msgid ""
+"will let you do ``hg echo foo`` to have ``foo`` printed in your\n"
+"terminal. A better example might be::"
+msgstr ""
+
+msgid " purge = !$HG status --no-status --unknown -0 | xargs -0 rm"
+msgstr ""
+
+msgid ""
+"which will make ``hg purge`` delete all unknown files in the\n"
+"repository in the same manner as the purge extension."
+msgstr ""
+
+msgid ""
+"Shell aliases are executed in an environment where ``$HG`` expand to\n"
+"the path of the Mercurial that was used to execute the alias. This is\n"
+"useful when you want to call further Mercurial commands in a shell\n"
+"alias, as was done above for the purge alias. In addition,\n"
+"``$HG_ARGS`` expand to the arguments given to Mercurial. In the ``hg\n"
+"echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``."
+msgstr ""
+
+msgid ""
+"``auth``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Authentication credentials for HTTP authentication. This section\n"
+"allows you to store usernames and passwords for use when logging\n"
+"*into* HTTP servers. See the ``[web]`` configuration section if\n"
+"you want to configure *who* can login to your HTTP server."
+msgstr ""
+
+msgid "Each line has the following format::"
+msgstr ""
+
+msgid " <name>.<argument> = <value>"
+msgstr ""
+
+msgid ""
+"where ``<name>`` is used to group arguments into authentication\n"
+"entries. Example::"
+msgstr ""
+
+msgid ""
+" foo.prefix = hg.intevation.org/mercurial\n"
+" foo.username = foo\n"
+" foo.password = bar\n"
+" foo.schemes = http https"
+msgstr ""
+
+msgid ""
+" bar.prefix = secure.example.org\n"
+" bar.key = path/to/file.key\n"
+" bar.cert = path/to/file.cert\n"
+" bar.schemes = https"
+msgstr ""
+
+msgid "Supported arguments:"
+msgstr ""
+
+msgid ""
+"``prefix``\n"
+" Either ``*`` or a URI prefix with or without the scheme part.\n"
+" The authentication entry with the longest matching prefix is used\n"
+" (where ``*`` matches everything and counts as a match of length\n"
+" 1). If the prefix doesn't include a scheme, the match is performed\n"
+" against the URI with its scheme stripped as well, and the schemes\n"
+" argument, q.v., is then subsequently consulted."
+msgstr ""
+
+msgid ""
+"``username``\n"
+" Optional. Username to authenticate with. If not given, and the\n"
+" remote site requires basic or digest authentication, the user will\n"
+" be prompted for it. Environment variables are expanded in the\n"
+" username letting you do ``foo.username = $USER``."
+msgstr ""
+
+msgid ""
+"``password``\n"
+" Optional. Password to authenticate with. If not given, and the\n"
+" remote site requires basic or digest authentication, the user\n"
+" will be prompted for it."
+msgstr ""
+
+msgid ""
+"``key``\n"
+" Optional. PEM encoded client certificate key file. Environment\n"
+" variables are expanded in the filename."
+msgstr ""
+
+msgid ""
+"``cert``\n"
+" Optional. PEM encoded client certificate chain file. Environment\n"
+" variables are expanded in the filename."
+msgstr ""
+
+msgid ""
+"``schemes``\n"
+" Optional. Space separated list of URI schemes to use this\n"
+" authentication entry with. Only used if the prefix doesn't include\n"
+" a scheme. Supported schemes are http and https. They will match\n"
+" static-http and static-https respectively, as well.\n"
+" Default: https."
+msgstr ""
+
+msgid ""
+"If no suitable authentication entry is found, the user is prompted\n"
+"for credentials as usual if required by the remote."
+msgstr ""
+
+msgid ""
+"\n"
+"``decode/encode``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Filters for transforming files on checkout/checkin. This would\n"
+"typically be used for newline processing or other\n"
+"localization/canonicalization of files."
+msgstr ""
+
+msgid ""
+"Filters consist of a filter pattern followed by a filter command.\n"
+"Filter patterns are globs by default, rooted at the repository root.\n"
+"For example, to match any file ending in ``.txt`` in the root\n"
+"directory only, use the pattern ``*.txt``. To match any file ending\n"
+"in ``.c`` anywhere in the repository, use the pattern ``**.c``.\n"
+"For each file only the first matching filter applies."
+msgstr ""
+
+msgid ""
+"The filter command can start with a specifier, either ``pipe:`` or\n"
+"``tempfile:``. If no specifier is given, ``pipe:`` is used by default."
+msgstr ""
+
+msgid ""
+"A ``pipe:`` command must accept data on stdin and return the transformed\n"
+"data on stdout."
+msgstr ""
+
+msgid "Pipe example::"
+msgstr ""
+
+msgid ""
+" [encode]\n"
+" # uncompress gzip files on checkin to improve delta compression\n"
+" # note: not necessarily a good idea, just an example\n"
+" *.gz = pipe: gunzip"
+msgstr ""
+
+msgid ""
+" [decode]\n"
+" # recompress gzip files when writing them to the working dir (we\n"
+" # can safely omit \"pipe:\", because it's the default)\n"
+" *.gz = gzip"
+msgstr ""
+
+msgid ""
+"A ``tempfile:`` command is a template. The string ``INFILE`` is replaced\n"
+"with the name of a temporary file that contains the data to be\n"
+"filtered by the command. The string ``OUTFILE`` is replaced with the name\n"
+"of an empty temporary file, where the filtered data must be written by\n"
+"the command."
+msgstr ""
+
+msgid ""
+".. note:: The tempfile mechanism is recommended for Windows systems,\n"
+" where the standard shell I/O redirection operators often have\n"
+" strange effects and may corrupt the contents of your files."
+msgstr ""
+
+msgid ""
+"This filter mechanism is used internally by the ``eol`` extension to\n"
+"translate line ending characters between Windows (CRLF) and Unix (LF)\n"
+"format. We suggest you use the ``eol`` extension for convenience."
+msgstr ""
+
+msgid ""
+"\n"
+"``defaults``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "(defaults are deprecated. Don't use them. Use aliases instead)"
+msgstr ""
+
+msgid ""
+"Use the ``[defaults]`` section to define command defaults, i.e. the\n"
+"default options/arguments to pass to the specified commands."
+msgstr ""
+
+msgid ""
+"The following example makes :hg:`log` run in verbose mode, and\n"
+":hg:`status` show only the modified files, by default::"
+msgstr ""
+
+msgid ""
+" [defaults]\n"
+" log = -v\n"
+" status = -m"
+msgstr ""
+
+msgid ""
+"The actual commands, instead of their aliases, must be used when\n"
+"defining command defaults. The command defaults will also be applied\n"
+"to the aliases of the commands defined."
+msgstr ""
+
+msgid ""
+"\n"
+"``diff``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Settings used when displaying diffs. Everything except for ``unified`` is a\n"
+"Boolean and defaults to False."
+msgstr ""
+
+msgid ""
+"``git``\n"
+" Use git extended diff format."
+msgstr ""
+
+msgid ""
+"``nodates``\n"
+" Don't include dates in diff headers."
+msgstr ""
+
+msgid ""
+"``showfunc``\n"
+" Show which function each change is in."
+msgstr ""
+
+msgid ""
+"``ignorews``\n"
+" Ignore white space when comparing lines."
+msgstr ""
+
+msgid ""
+"``ignorewsamount``\n"
+" Ignore changes in the amount of white space."
+msgstr ""
+
+msgid ""
+"``ignoreblanklines``\n"
+" Ignore changes whose lines are all blank."
+msgstr ""
+
+msgid ""
+"``unified``\n"
+" Number of lines of context to show."
+msgstr ""
+
+msgid ""
+"``email``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Settings for extensions that send email messages."
+msgstr ""
+
+msgid ""
+"``from``\n"
+" Optional. Email address to use in \"From\" header and SMTP envelope\n"
+" of outgoing messages."
+msgstr ""
+
+msgid ""
+"``to``\n"
+" Optional. Comma-separated list of recipients' email addresses."
+msgstr ""
+
+msgid ""
+"``cc``\n"
+" Optional. Comma-separated list of carbon copy recipients'\n"
+" email addresses."
+msgstr ""
+
+msgid ""
+"``bcc``\n"
+" Optional. Comma-separated list of blind carbon copy recipients'\n"
+" email addresses."
+msgstr ""
+
+msgid ""
+"``method``\n"
+" Optional. Method to use to send email messages. If value is ``smtp``\n"
+" (default), use SMTP (see the ``[smtp]`` section for configuration).\n"
+" Otherwise, use as name of program to run that acts like sendmail\n"
+" (takes ``-f`` option for sender, list of recipients on command line,\n"
+" message on stdin). Normally, setting this to ``sendmail`` or\n"
+" ``/usr/sbin/sendmail`` is enough to use sendmail to send messages."
+msgstr ""
+
+msgid ""
+"``charsets``\n"
+" Optional. Comma-separated list of character sets considered\n"
+" convenient for recipients. Addresses, headers, and parts not\n"
+" containing patches of outgoing messages will be encoded in the\n"
+" first character set to which conversion from local encoding\n"
+" (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct\n"
+" conversion fails, the text in question is sent as is. Defaults to\n"
+" empty (explicit) list."
+msgstr ""
+
+msgid " Order of outgoing email character sets:"
+msgstr ""
+
+msgid ""
+" 1. ``us-ascii``: always first, regardless of settings\n"
+" 2. ``email.charsets``: in order given by user\n"
+" 3. ``ui.fallbackencoding``: if not in email.charsets\n"
+" 4. ``$HGENCODING``: if not in email.charsets\n"
+" 5. ``utf-8``: always last, regardless of settings"
+msgstr ""
+
+msgid "Email example::"
+msgstr ""
+
+msgid ""
+" [email]\n"
+" from = Joseph User <joe.user@example.com>\n"
+" method = /usr/sbin/sendmail\n"
+" # charsets for western Europeans\n"
+" # us-ascii, utf-8 omitted, as they are tried first and last\n"
+" charsets = iso-8859-1, iso-8859-15, windows-1252"
+msgstr ""
+
+msgid ""
+"\n"
+"``extensions``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Mercurial has an extension mechanism for adding new features. To\n"
+"enable an extension, create an entry for it in this section."
+msgstr ""
+
+msgid ""
+"If you know that the extension is already in Python's search path,\n"
+"you can give the name of the module, followed by ``=``, with nothing\n"
+"after the ``=``."
+msgstr ""
+
+msgid ""
+"Otherwise, give a name that you choose, followed by ``=``, followed by\n"
+"the path to the ``.py`` file (including the file name extension) that\n"
+"defines the extension."
+msgstr ""
+
+msgid ""
+"To explicitly disable an extension that is enabled in an hgrc of\n"
+"broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``\n"
+"or ``foo = !`` when path is not supplied."
+msgstr ""
+
+msgid "Example for ``~/.hgrc``::"
+msgstr ""
+
+msgid ""
+" [extensions]\n"
+" # (the mq extension will get loaded from Mercurial's path)\n"
+" mq =\n"
+" # (this extension will get loaded from the file specified)\n"
+" myfeature = ~/.hgext/myfeature.py"
+msgstr ""
+
+msgid ""
+"\n"
+"``hostfingerprints``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Fingerprints of the certificates of known HTTPS servers.\n"
+"A HTTPS connection to a server with a fingerprint configured here will\n"
+"only succeed if the servers certificate matches the fingerprint.\n"
+"This is very similar to how ssh known hosts works.\n"
+"The fingerprint is the SHA-1 hash value of the DER encoded certificate.\n"
+"The CA chain and web.cacerts is not used for servers with a fingerprint."
+msgstr ""
+
+msgid "For example::"
+msgstr ""
+
+msgid ""
+" [hostfingerprints]\n"
+" hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:"
+"d6:4b:ee:cc"
+msgstr ""
+
+msgid "This feature is only supported when using Python 2.6 or later."
+msgstr ""
+
+msgid ""
+"\n"
+"``format``\n"
+"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"``usestore``\n"
+" Enable or disable the \"store\" repository format which improves\n"
+" compatibility with systems that fold case or otherwise mangle\n"
+" filenames. Enabled by default. Disabling this option will allow\n"
+" you to store longer filenames in some situations at the expense of\n"
+" compatibility and ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 0.9.4."
+msgstr ""
+
+msgid ""
+"``usefncache``\n"
+" Enable or disable the \"fncache\" repository format which enhances\n"
+" the \"store\" repository format (which has to be enabled to use\n"
+" fncache) to allow longer filenames and avoids using Windows\n"
+" reserved names, e.g. \"nul\". Enabled by default. Disabling this\n"
+" option ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 1.1."
+msgstr ""
+
+msgid ""
+"``dotencode``\n"
+" Enable or disable the \"dotencode\" repository format which enhances\n"
+" the \"fncache\" repository format (which has to be enabled to use\n"
+" dotencode) to avoid issues with filenames starting with ._ on\n"
+" Mac OS X and spaces on Windows. Enabled by default. Disabling this\n"
+" option ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 1.7."
+msgstr ""
+
+msgid ""
+"``merge-patterns``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"This section specifies merge tools to associate with particular file\n"
+"patterns. Tools matched here will take precedence over the default\n"
+"merge tool. Patterns are globs by default, rooted at the repository\n"
+"root."
+msgstr ""
+
+msgid ""
+" [merge-patterns]\n"
+" **.c = kdiff3\n"
+" **.jpg = myimgmerge"
+msgstr ""
+
+msgid ""
+"``merge-tools``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"This section configures external merge tools to use for file-level\n"
+"merges."
+msgstr ""
+
+#, fuzzy
+msgid "Example ``~/.hgrc``::"
+msgstr "記述例::"
+
+msgid ""
+" [merge-tools]\n"
+" # Override stock tool location\n"
+" kdiff3.executable = ~/bin/kdiff3\n"
+" # Specify command line\n"
+" kdiff3.args = $base $local $other -o $output\n"
+" # Give higher priority\n"
+" kdiff3.priority = 1"
+msgstr ""
+
+msgid ""
+" # Define new tool\n"
+" myHtmlTool.args = -m $local $other $base $output\n"
+" myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n"
+" myHtmlTool.priority = 1"
+msgstr ""
+
+msgid ""
+"``priority``\n"
+" The priority in which to evaluate this tool.\n"
+" Default: 0."
+msgstr ""
+
+msgid ""
+"``executable``\n"
+" Either just the name of the executable or its pathname. On Windows,\n"
+" the path can use environment variables with ${ProgramFiles} syntax.\n"
+" Default: the tool name."
+msgstr ""
+
+msgid ""
+"``args``\n"
+" The arguments to pass to the tool executable. You can refer to the\n"
+" files being merged as well as the output file through these\n"
+" variables: ``$base``, ``$local``, ``$other``, ``$output``.\n"
+" Default: ``$local $base $other``"
+msgstr ""
+
+msgid ""
+"``premerge``\n"
+" Attempt to run internal non-interactive 3-way merge tool before\n"
+" launching external tool. Options are ``true``, ``false``, or ``keep``\n"
+" to leave markers in the file if the premerge fails.\n"
+" Default: True"
+msgstr ""
+
+msgid ""
+"``binary``\n"
+" This tool can merge binary files. Defaults to False, unless tool\n"
+" was selected by file pattern match."
+msgstr ""
+
+msgid ""
+"``symlink``\n"
+" This tool can merge symlinks. Defaults to False, even if tool was\n"
+" selected by file pattern match."
+msgstr ""
+
+msgid ""
+"``check``\n"
+" A list of merge success-checking options:"
+msgstr ""
+
+msgid ""
+" ``changed``\n"
+" Ask whether merge was successful when the merged file shows no changes.\n"
+" ``conflicts``\n"
+" Check whether there are conflicts even though the tool reported "
+"success.\n"
+" ``prompt``\n"
+" Always prompt for merge success, regardless of success reported by tool."
+msgstr ""
+
+msgid ""
+"``checkchanged``\n"
+" True is equivalent to ``check = changed``.\n"
+" Default: False"
+msgstr ""
+
+msgid ""
+"``checkconflicts``\n"
+" True is equivalent to ``check = conflicts``.\n"
+" Default: False"
+msgstr ""
+
+msgid ""
+"``fixeol``\n"
+" Attempt to fix up EOL changes caused by the merge tool.\n"
+" Default: False"
+msgstr ""
+
+msgid ""
+"``gui``\n"
+" This tool requires a graphical interface to run. Default: False"
+msgstr ""
+
+msgid ""
+"``regkey``\n"
+" Windows registry key which describes install location of this\n"
+" tool. Mercurial will search for this key first under\n"
+" ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n"
+" Default: None"
+msgstr ""
+
+msgid ""
+"``regkeyalt``\n"
+" An alternate Windows registry key to try if the first key is not\n"
+" found. The alternate key uses the same ``regname`` and ``regappend``\n"
+" semantics of the primary key. The most common use for this key\n"
+" is to search for 32bit applications on 64bit operating systems.\n"
+" Default: None"
+msgstr ""
+
+msgid ""
+"``regname``\n"
+" Name of value to read from specified registry key. Defaults to the\n"
+" unnamed (default) value."
+msgstr ""
+
+msgid ""
+"``regappend``\n"
+" String to append to the value read from the registry, typically\n"
+" the executable name of the tool.\n"
+" Default: None"
+msgstr ""
+
+msgid ""
+"\n"
+"``hooks``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Commands or Python functions that get automatically executed by\n"
+"various actions such as starting or finishing a commit. Multiple\n"
+"hooks can be run for the same action by appending a suffix to the\n"
+"action. Overriding a site-wide hook can be done by changing its\n"
+"value or setting it to an empty string."
+msgstr ""
+
+msgid "Example ``.hg/hgrc``::"
+msgstr ""
+
+msgid ""
+" [hooks]\n"
+" # update working directory after adding changesets\n"
+" changegroup.update = hg update\n"
+" # do not use the site-wide hook\n"
+" incoming =\n"
+" incoming.email = /my/email/hook\n"
+" incoming.autobuild = /my/build/hook"
+msgstr ""
+
+msgid ""
+"Most hooks are run with environment variables set that give useful\n"
+"additional information. For each hook below, the environment\n"
+"variables it is passed are listed with names of the form ``$HG_foo``."
+msgstr ""
+
+msgid ""
+"``changegroup``\n"
+" Run after a changegroup has been added via push, pull or unbundle.\n"
+" ID of the first new changeset is in ``$HG_NODE``. URL from which\n"
+" changes came is in ``$HG_URL``."
+msgstr ""
+
+msgid ""
+"``commit``\n"
+" Run after a changeset has been created in the local repository. ID\n"
+" of the newly created changeset is in ``$HG_NODE``. Parent changeset\n"
+" IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+
+msgid ""
+"``incoming``\n"
+" Run after a changeset has been pulled, pushed, or unbundled into\n"
+" the local repository. The ID of the newly arrived changeset is in\n"
+" ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``."
+msgstr ""
+
+msgid ""
+"``outgoing``\n"
+" Run after sending changes from local repository to another. ID of\n"
+" first changeset sent is in ``$HG_NODE``. Source of operation is in\n"
+" ``$HG_SOURCE``; see \"preoutgoing\" hook for description."
+msgstr ""
+
+msgid ""
+"``post-<command>``\n"
+" Run after successful invocations of the associated command. The\n"
+" contents of the command line are passed as ``$HG_ARGS`` and the result\n"
+" code in ``$HG_RESULT``. Parsed command line arguments are passed as \n"
+" ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of\n"
+" the python data internally passed to <command>. ``$HG_OPTS`` is a \n"
+" dictionary of options (with unspecified options set to their defaults).\n"
+" ``$HG_PATS`` is a list of arguments. Hook failure is ignored."
+msgstr ""
+
+msgid ""
+"``pre-<command>``\n"
+" Run before executing the associated command. The contents of the\n"
+" command line are passed as ``$HG_ARGS``. Parsed command line arguments\n"
+" are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string\n"
+" representations of the data internally passed to <command>. ``$HG_OPTS``\n"
+" is a dictionary of options (with unspecified options set to their\n"
+" defaults). ``$HG_PATS`` is a list of arguments. If the hook returns \n"
+" failure, the command doesn't execute and Mercurial returns the failure\n"
+" code."
+msgstr ""
+
+msgid ""
+"``prechangegroup``\n"
+" Run before a changegroup is added via push, pull or unbundle. Exit\n"
+" status 0 allows the changegroup to proceed. Non-zero status will\n"
+" cause the push, pull or unbundle to fail. URL from which changes\n"
+" will come is in ``$HG_URL``."
+msgstr ""
+
+msgid ""
+"``precommit``\n"
+" Run before starting a local commit. Exit status 0 allows the\n"
+" commit to proceed. Non-zero status will cause the commit to fail.\n"
+" Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+
+msgid ""
+"``prelistkeys``\n"
+" Run before listing pushkeys (like bookmarks) in the\n"
+" repository. Non-zero status will cause failure. The key namespace is\n"
+" in ``$HG_NAMESPACE``."
+msgstr ""
+
+msgid ""
+"``preoutgoing``\n"
+" Run before collecting changes to send from the local repository to\n"
+" another. Non-zero status will cause failure. This lets you prevent\n"
+" pull over HTTP or SSH. Also prevents against local pull, push\n"
+" (outbound) or bundle commands, but not effective, since you can\n"
+" just copy files instead then. Source of operation is in\n"
+" ``$HG_SOURCE``. If \"serve\", operation is happening on behalf of remote\n"
+" SSH or HTTP repository. If \"push\", \"pull\" or \"bundle\", operation\n"
+" is happening on behalf of repository on same system."
+msgstr ""
+
+msgid ""
+"``prepushkey``\n"
+" Run before a pushkey (like a bookmark) is added to the\n"
+" repository. Non-zero status will cause the key to be rejected. The\n"
+" key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,\n"
+" the old value (if any) is in ``$HG_OLD``, and the new value is in\n"
+" ``$HG_NEW``."
+msgstr ""
+
+msgid ""
+"``pretag``\n"
+" Run before creating a tag. Exit status 0 allows the tag to be\n"
+" created. Non-zero status will cause the tag to fail. ID of\n"
+" changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag "
+"is\n"
+" local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``."
+msgstr ""
+
+msgid ""
+"``pretxnchangegroup``\n"
+" Run after a changegroup has been added via push, pull or unbundle,\n"
+" but before the transaction has been committed. Changegroup is\n"
+" visible to hook program. This lets you validate incoming changes\n"
+" before accepting them. Passed the ID of the first new changeset in\n"
+" ``$HG_NODE``. Exit status 0 allows the transaction to commit. Non-zero\n"
+" status will cause the transaction to be rolled back and the push,\n"
+" pull or unbundle will fail. URL that was source of changes is in\n"
+" ``$HG_URL``."
+msgstr ""
+
+msgid ""
+"``pretxncommit``\n"
+" Run after a changeset has been created but the transaction not yet\n"
+" committed. Changeset is visible to hook program. This lets you\n"
+" validate commit message and changes. Exit status 0 allows the\n"
+" commit to proceed. Non-zero status will cause the transaction to\n"
+" be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset\n"
+" IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+
+msgid ""
+"``preupdate``\n"
+" Run before updating the working directory. Exit status 0 allows\n"
+" the update to proceed. Non-zero status will prevent the update.\n"
+" Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID\n"
+" of second new parent is in ``$HG_PARENT2``."
+msgstr ""
+
+msgid ""
+"``listkeys``\n"
+" Run after listing pushkeys (like bookmarks) in the repository. The\n"
+" key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a\n"
+" dictionary containing the keys and values."
+msgstr ""
+
+msgid ""
+"``pushkey``\n"
+" Run after a pushkey (like a bookmark) is added to the\n"
+" repository. The key namespace is in ``$HG_NAMESPACE``, the key is in\n"
+" ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new\n"
+" value is in ``$HG_NEW``."
+msgstr ""
+
+msgid ""
+"``tag``\n"
+" Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.\n"
+" Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in\n"
+" repository if ``$HG_LOCAL=0``."
+msgstr ""
+
+msgid ""
+"``update``\n"
+" Run after updating the working directory. Changeset ID of first\n"
+" new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is\n"
+" in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the\n"
+" update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``."
+msgstr ""
+
+msgid ""
+".. note:: It is generally better to use standard hooks rather than the\n"
+" generic pre- and post- command hooks as they are guaranteed to be\n"
+" called in the appropriate contexts for influencing transactions.\n"
+" Also, hooks like \"commit\" will be called in all contexts that\n"
+" generate a commit (e.g. tag) and not just the commit command."
+msgstr ""
+
+msgid ""
+".. note:: Environment variables with empty values may not be passed to\n"
+" hooks on platforms such as Windows. As an example, ``$HG_PARENT2``\n"
+" will have an empty value under Unix-like platforms for non-merge\n"
+" changesets, while it will not be available at all under Windows."
+msgstr ""
+
+msgid "The syntax for Python hooks is as follows::"
+msgstr ""
+
+msgid ""
+" hookname = python:modulename.submodule.callable\n"
+" hookname = python:/path/to/python/module.py:callable"
+msgstr ""
+
+msgid ""
+"Python hooks are run within the Mercurial process. Each hook is\n"
+"called with at least three keyword arguments: a ui object (keyword\n"
+"``ui``), a repository object (keyword ``repo``), and a ``hooktype``\n"
+"keyword that tells what kind of hook is used. Arguments listed as\n"
+"environment variables above are passed as keyword arguments, with no\n"
+"``HG_`` prefix, and names in lower case."
+msgstr ""
+
+msgid ""
+"If a Python hook returns a \"true\" value or raises an exception, this\n"
+"is treated as a failure."
+msgstr ""
+
+msgid ""
+"\n"
+"``http_proxy``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Used to access web-based Mercurial repositories through a HTTP\n"
+"proxy."
+msgstr ""
+
+msgid ""
+"``host``\n"
+" Host name and (optional) port of the proxy server, for example\n"
+" \"myproxy:8000\"."
+msgstr ""
+
+msgid ""
+"``no``\n"
+" Optional. Comma-separated list of host names that should bypass\n"
+" the proxy."
+msgstr ""
+
+msgid ""
+"``passwd``\n"
+" Optional. Password to authenticate with at the proxy server."
+msgstr ""
+
+msgid ""
+"``user``\n"
+" Optional. User name to authenticate with at the proxy server."
+msgstr ""
+
+msgid ""
+"``always``\n"
+" Optional. Always use the proxy, even for localhost and any entries\n"
+" in ``http_proxy.no``. True or False. Default: False."
+msgstr ""
+
+msgid ""
+"``smtp``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Configuration for extensions that need to send email messages."
+msgstr ""
+
+msgid ""
+"``host``\n"
+" Host name of mail server, e.g. \"mail.example.com\"."
+msgstr ""
+
+msgid ""
+"``port``\n"
+" Optional. Port to connect to on mail server. Default: 25."
+msgstr ""
+
+msgid ""
+"``tls``\n"
+" Optional. Method to enable TLS when connecting to mail server: "
+"starttls,\n"
+" smtps or none. Default: none."
+msgstr ""
+
+msgid ""
+"``username``\n"
+" Optional. User name for authenticating with the SMTP server.\n"
+" Default: none."
+msgstr ""
+
+msgid ""
+"``password``\n"
+" Optional. Password for authenticating with the SMTP server. If not\n"
+" specified, interactive sessions will prompt the user for a\n"
+" password; non-interactive sessions will fail. Default: none."
+msgstr ""
+
+msgid ""
+"``local_hostname``\n"
+" Optional. It's the hostname that the sender can use to identify\n"
+" itself to the MTA."
+msgstr ""
+
+msgid ""
+"\n"
+"``patch``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Settings used when applying patches, for instance through the 'import'\n"
+"command or with Mercurial Queues extension."
+msgstr ""
+
+msgid ""
+"``eol``\n"
+" When set to 'strict' patch content and patched files end of lines\n"
+" are preserved. When set to ``lf`` or ``crlf``, both files end of\n"
+" lines are ignored when patching and the result line endings are\n"
+" normalized to either LF (Unix) or CRLF (Windows). When set to\n"
+" ``auto``, end of lines are again ignored while patching but line\n"
+" endings in patched files are normalized to their original setting\n"
+" on a per-file basis. If target file does not exist or has no end\n"
+" of line, patch line endings are preserved.\n"
+" Default: strict."
+msgstr ""
+
+msgid ""
+"\n"
+"``paths``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Assigns symbolic names to repositories. The left side is the\n"
+"symbolic name, and the right gives the directory or URL that is the\n"
+"location of the repository. Default paths can be declared by setting\n"
+"the following entries."
+msgstr ""
+
+msgid ""
+"``default``\n"
+" Directory or URL to use when pulling if no source is specified.\n"
+" Default is set to repository from which the current repository was\n"
+" cloned."
+msgstr ""
+
+msgid ""
+"``default-push``\n"
+" Optional. Directory or URL to use when pushing if no destination\n"
+" is specified."
+msgstr ""
+
+msgid ""
+"\n"
+"``profiling``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Specifies profiling format and file output. In this section\n"
+"description, 'profiling data' stands for the raw data collected\n"
+"during profiling, while 'profiling report' stands for a statistical\n"
+"text report generated from the profiling data. The profiling is done\n"
+"using lsprof."
+msgstr ""
+
+msgid ""
+"``format``\n"
+" Profiling format.\n"
+" Default: text."
+msgstr ""
+
+msgid ""
+" ``text``\n"
+" Generate a profiling report. When saving to a file, it should be\n"
+" noted that only the report is saved, and the profiling data is\n"
+" not kept.\n"
+" ``kcachegrind``\n"
+" Format profiling data for kcachegrind use: when saving to a\n"
+" file, the generated file can directly be loaded into\n"
+" kcachegrind."
+msgstr ""
+
+msgid ""
+"``output``\n"
+" File path where profiling data or report should be saved. If the\n"
+" file exists, it is replaced. Default: None, data is printed on\n"
+" stderr"
+msgstr ""
+
+msgid ""
+"``revsetalias``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Alias definitions for revsets. See :hg:`help revsets` for details."
+msgstr ""
+
+msgid ""
+"``server``\n"
+"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Controls generic server settings."
+msgstr ""
+
+msgid ""
+"``uncompressed``\n"
+" Whether to allow clients to clone a repository using the\n"
+" uncompressed streaming protocol. This transfers about 40% more\n"
+" data than a regular clone, but uses less memory and CPU on both\n"
+" server and client. Over a LAN (100 Mbps or better) or a very fast\n"
+" WAN, an uncompressed streaming clone is a lot faster (~10x) than a\n"
+" regular clone. Over most WAN connections (anything slower than\n"
+" about 6 Mbps), uncompressed streaming is slower, because of the\n"
+" extra data transfer overhead. This mode will also temporarily hold\n"
+" the write lock while determining what data to transfer.\n"
+" Default is True."
+msgstr ""
+
+msgid ""
+"``validate``\n"
+" Whether to validate the completeness of pushed changesets by\n"
+" checking that all new file revisions specified in manifests are\n"
+" present. Default is False."
+msgstr ""
+
+msgid ""
+"``subpaths``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Defines subrepositories source locations rewriting rules of the form::"
+msgstr ""
+
+msgid " <pattern> = <replacement>"
+msgstr ""
+
+msgid ""
+"Where ``pattern`` is a regular expression matching the source and\n"
+"``replacement`` is the replacement string used to rewrite it. Groups\n"
+"can be matched in ``pattern`` and referenced in ``replacements``. For\n"
+"instance::"
+msgstr ""
+
+msgid " http://server/(.*)-hg/ = http://hg.server/\\1/"
+msgstr ""
+
+msgid "rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``."
+msgstr ""
+
+msgid "All patterns are applied in definition order."
+msgstr ""
+
+msgid ""
+"``trusted``\n"
+"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Mercurial will not use the settings in the\n"
+"``.hg/hgrc`` file from a repository if it doesn't belong to a trusted\n"
+"user or to a trusted group, as various hgrc features allow arbitrary\n"
+"commands to be run. This issue is often encountered when configuring\n"
+"hooks or extensions for shared repositories or servers. However,\n"
+"the web interface will use some safe settings from the ``[web]``\n"
+"section."
+msgstr ""
+
+msgid ""
+"This section specifies what users and groups are trusted. The\n"
+"current user is always trusted. To trust everybody, list a user or a\n"
+"group with name ``*``. These settings must be placed in an\n"
+"*already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the\n"
+"user or service running Mercurial."
+msgstr ""
+
+msgid ""
+"``users``\n"
+" Comma-separated list of trusted users."
+msgstr ""
+
+msgid ""
+"``groups``\n"
+" Comma-separated list of trusted groups."
+msgstr ""
+
+msgid ""
+"\n"
+"``ui``\n"
+"\"\"\"\"\"\""
+msgstr ""
+
+msgid "User interface controls."
+msgstr ""
+
+msgid ""
+"``archivemeta``\n"
+" Whether to include the .hg_archival.txt file containing meta data\n"
+" (hashes for the repository base and for tip) in archives created\n"
+" by the :hg:`archive` command or downloaded via hgweb.\n"
+" Default is True."
+msgstr ""
+
+msgid ""
+"``askusername``\n"
+" Whether to prompt for a username when committing. If True, and\n"
+" neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user "
+"will\n"
+" be prompted to enter a username. If no username is entered, the\n"
+" default ``USER@HOST`` is used instead.\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``commitsubrepos``\n"
+" Whether to commit modified subrepositories when committing the\n"
+" parent repository. If False and one subrepository has uncommitted\n"
+" changes, abort the commit.\n"
+" Default is True."
+msgstr ""
+
+msgid ""
+"``debug``\n"
+" Print debugging information. True or False. Default is False."
+msgstr ""
+
+msgid ""
+"``editor``\n"
+" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
+msgstr ""
+
+msgid ""
+"``fallbackencoding``\n"
+" Encoding to try if it's not possible to decode the changelog using\n"
+" UTF-8. Default is ISO-8859-1."
+msgstr ""
+
+msgid ""
+"``ignore``\n"
+" A file to read per-user ignore patterns from. This file should be\n"
+" in the same format as a repository-wide .hgignore file. This\n"
+" option supports hook syntax, so if you want to specify multiple\n"
+" ignore files, you can do so by setting something like\n"
+" ``ignore.other = ~/.hgignore2``. For details of the ignore file\n"
+" format, see the ``hgignore(5)`` man page."
+msgstr ""
+
+msgid ""
+"``interactive``\n"
+" Allow to prompt the user. True or False. Default is True."
+msgstr ""
+
+msgid ""
+"``logtemplate``\n"
+" Template string for commands that print changesets."
+msgstr ""
+
+msgid ""
+"``merge``\n"
+" The conflict resolution program to use during a manual merge.\n"
+" For more information on merge tools see :hg:`help merge-tools`.\n"
+" For configuring merge tools see the ``[merge-tools]`` section."
+msgstr ""
+
+msgid ""
+"``portablefilenames``\n"
+" Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n"
+" Default is ``warn``.\n"
+" If set to ``warn`` (or ``true``), a warning message is printed on POSIX\n"
+" platforms, if a file with a non-portable filename is added (e.g. a file\n"
+" with a name that can't be created on Windows because it contains "
+"reserved\n"
+" parts like ``AUX``, reserved characters like ``:``, or would cause a "
+"case\n"
+" collision with an existing file).\n"
+" If set to ``ignore`` (or ``false``), no warning is printed.\n"
+" If set to ``abort``, the command is aborted.\n"
+" On Windows, this configuration option is ignored and the command aborted."
+msgstr ""
+
+msgid ""
+"``quiet``\n"
+" Reduce the amount of output printed. True or False. Default is False."
+msgstr ""
+
+msgid ""
+"``remotecmd``\n"
+" remote command to use for clone/push/pull operations. Default is ``hg``."
+msgstr ""
+
+msgid ""
+"``report_untrusted``\n"
+" Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n"
+" trusted user or group. True or False. Default is True."
+msgstr ""
+
+msgid ""
+"``slash``\n"
+" Display paths using a slash (``/``) as the path separator. This\n"
+" only makes a difference on systems where the default path\n"
+" separator is not the slash character (e.g. Windows uses the\n"
+" backslash character (``\\``)).\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``ssh``\n"
+" command to use for SSH connections. Default is ``ssh``."
+msgstr ""
+
+msgid ""
+"``strict``\n"
+" Require exact command names, instead of allowing unambiguous\n"
+" abbreviations. True or False. Default is False."
+msgstr ""
+
+msgid ""
+"``style``\n"
+" Name of style to use for command output."
+msgstr ""
+
+msgid ""
+"``timeout``\n"
+" The timeout used when a lock is held (in seconds), a negative value\n"
+" means no timeout. Default is 600."
+msgstr ""
+
+msgid ""
+"``traceback``\n"
+" Mercurial always prints a traceback when an unknown exception\n"
+" occurs. Setting this to True will make Mercurial print a traceback\n"
+" on all exceptions, even those recognized by Mercurial (such as\n"
+" IOError or MemoryError). Default is False."
+msgstr ""
+
+msgid ""
+"``username``\n"
+" The committer of a changeset created when running \"commit\".\n"
+" Typically a person's name and email address, e.g. ``Fred Widget\n"
+" <fred@example.com>``. Default is ``$EMAIL`` or ``username@hostname``. "
+"If\n"
+" the username in hgrc is empty, it has to be specified manually or\n"
+" in a different hgrc file (e.g. ``$HOME/.hgrc``, if the admin set\n"
+" ``username =`` in the system hgrc). Environment variables in the\n"
+" username are expanded."
+msgstr ""
+
+msgid ""
+"``verbose``\n"
+" Increase the amount of output printed. True or False. Default is False."
+msgstr ""
+
+msgid ""
+"\n"
+"``web``\n"
+"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Web interface configuration. The settings in this section apply to\n"
+"both the builtin webserver (started by :hg:`serve`) and the script you\n"
+"run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI\n"
+"and WSGI)."
+msgstr ""
+
+msgid ""
+"The Mercurial webserver does no authentication (it does not prompt for\n"
+"usernames and passwords to validate *who* users are), but it does do\n"
+"authorization (it grants or denies access for *authenticated users*\n"
+"based on settings in this section). You must either configure your\n"
+"webserver to do authentication for you, or disable the authorization\n"
+"checks."
+msgstr ""
+
+msgid ""
+"For a quick setup in a trusted environment, e.g., a private LAN, where\n"
+"you want it to accept pushes from anybody, you can use the following\n"
+"command line::"
+msgstr ""
+
+msgid " $ hg --config web.allow_push=* --config web.push_ssl=False serve"
+msgstr ""
+
+msgid ""
+"Note that this will allow anybody to push anything to the server and\n"
+"that this should not be used for public servers."
+msgstr ""
+
+msgid "The full set of options is:"
+msgstr ""
+
+msgid ""
+"``accesslog``\n"
+" Where to output the access log. Default is stdout."
+msgstr ""
+
+msgid ""
+"``address``\n"
+" Interface address to bind to. Default is all."
+msgstr ""
+
+msgid ""
+"``allow_archive``\n"
+" List of archive format (bz2, gz, zip) allowed for downloading.\n"
+" Default is empty."
+msgstr ""
+
+msgid ""
+"``allowbz2``\n"
+" (DEPRECATED) Whether to allow .tar.bz2 downloading of repository\n"
+" revisions.\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``allowgz``\n"
+" (DEPRECATED) Whether to allow .tar.gz downloading of repository\n"
+" revisions.\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``allowpull``\n"
+" Whether to allow pulling from the repository. Default is True."
+msgstr ""
+
+msgid ""
+"``allow_push``\n"
+" Whether to allow pushing to the repository. If empty or not set,\n"
+" push is not allowed. If the special value ``*``, any remote user can\n"
+" push, including unauthenticated users. Otherwise, the remote user\n"
+" must have been authenticated, and the authenticated user name must\n"
+" be present in this list. The contents of the allow_push list are\n"
+" examined after the deny_push list."
+msgstr ""
+
+msgid ""
+"``allow_read``\n"
+" If the user has not already been denied repository access due to\n"
+" the contents of deny_read, this list determines whether to grant\n"
+" repository access to the user. If this list is not empty, and the\n"
+" user is unauthenticated or not present in the list, then access is\n"
+" denied for the user. If the list is empty or not set, then access\n"
+" is permitted to all users by default. Setting allow_read to the\n"
+" special value ``*`` is equivalent to it not being set (i.e. access\n"
+" is permitted to all users). The contents of the allow_read list are\n"
+" examined after the deny_read list."
+msgstr ""
+
+msgid ""
+"``allowzip``\n"
+" (DEPRECATED) Whether to allow .zip downloading of repository\n"
+" revisions. Default is False. This feature creates temporary files."
+msgstr ""
+
+msgid ""
+"``baseurl``\n"
+" Base URL to use when publishing URLs in other locations, so\n"
+" third-party tools like email notification hooks can construct\n"
+" URLs. Example: ``http://hgserver/repos/``."
+msgstr ""
+
+msgid ""
+"``cacerts``\n"
+" Path to file containing a list of PEM encoded certificate\n"
+" authority certificates. Environment variables and ``~user``\n"
+" constructs are expanded in the filename. If specified on the\n"
+" client, then it will verify the identity of remote HTTPS servers\n"
+" with these certificates. The form must be as follows::"
+msgstr ""
+
+msgid ""
+" -----BEGIN CERTIFICATE-----\n"
+" ... (certificate in base64 PEM encoding) ...\n"
+" -----END CERTIFICATE-----\n"
+" -----BEGIN CERTIFICATE-----\n"
+" ... (certificate in base64 PEM encoding) ...\n"
+" -----END CERTIFICATE-----"
+msgstr ""
+
+msgid ""
+" This feature is only supported when using Python 2.6 or later. If you "
+"wish\n"
+" to use it with earlier versions of Python, install the backported\n"
+" version of the ssl library that is available from\n"
+" ``http://pypi.python.org``."
+msgstr ""
+
+msgid ""
+" You can use OpenSSL's CA certificate file if your platform has one.\n"
+" On most Linux systems this will be ``/etc/ssl/certs/ca-certificates."
+"crt``.\n"
+" Otherwise you will have to generate this file manually."
+msgstr ""
+
+msgid ""
+" To disable SSL verification temporarily, specify ``--insecure`` from\n"
+" command line."
+msgstr ""
+
+msgid ""
+"``cache``\n"
+" Whether to support caching in hgweb. Defaults to True."
+msgstr ""
+
+msgid ""
+"``contact``\n"
+" Name or email address of the person in charge of the repository.\n"
+" Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty."
+msgstr ""
+
+msgid ""
+"``deny_push``\n"
+" Whether to deny pushing to the repository. If empty or not set,\n"
+" push is not denied. If the special value ``*``, all remote users are\n"
+" denied push. Otherwise, unauthenticated users are all denied, and\n"
+" any authenticated user name present in this list is also denied. The\n"
+" contents of the deny_push list are examined before the allow_push list."
+msgstr ""
+
+msgid ""
+"``deny_read``\n"
+" Whether to deny reading/viewing of the repository. If this list is\n"
+" not empty, unauthenticated users are all denied, and any\n"
+" authenticated user name present in this list is also denied access to\n"
+" the repository. If set to the special value ``*``, all remote users\n"
+" are denied access (rarely needed ;). If deny_read is empty or not set,\n"
+" the determination of repository access depends on the presence and\n"
+" content of the allow_read list (see description). If both\n"
+" deny_read and allow_read are empty or not set, then access is\n"
+" permitted to all users by default. If the repository is being\n"
+" served via hgwebdir, denied users will not be able to see it in\n"
+" the list of repositories. The contents of the deny_read list have\n"
+" priority over (are examined before) the contents of the allow_read\n"
+" list."
+msgstr ""
+
+msgid ""
+"``descend``\n"
+" hgwebdir indexes will not descend into subdirectories. Only "
+"repositories\n"
+" directly in the current path will be shown (other repositories are "
+"still\n"
+" available from the index corresponding to their containing path)."
+msgstr ""
+
+msgid ""
+"``description``\n"
+" Textual description of the repository's purpose or contents.\n"
+" Default is \"unknown\"."
+msgstr ""
+
+msgid ""
+"``encoding``\n"
+" Character encoding name. Default is the current locale charset.\n"
+" Example: \"UTF-8\""
+msgstr ""
+
+msgid ""
+"``errorlog``\n"
+" Where to output the error log. Default is stderr."
+msgstr ""
+
+msgid ""
+"``hidden``\n"
+" Whether to hide the repository in the hgwebdir index.\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``ipv6``\n"
+" Whether to use IPv6. Default is False."
+msgstr ""
+
+msgid ""
+"``logourl``\n"
+" Base URL to use for logos. If unset, ``http://mercurial.selenic.com/``\n"
+" will be used."
+msgstr ""
+
+msgid ""
+"``name``\n"
+" Repository name to use in the web interface. Default is current\n"
+" working directory."
+msgstr ""
+
+msgid ""
+"``maxchanges``\n"
+" Maximum number of changes to list on the changelog. Default is 10."
+msgstr ""
+
+msgid ""
+"``maxfiles``\n"
+" Maximum number of files to list per changeset. Default is 10."
+msgstr ""
+
+msgid ""
+"``port``\n"
+" Port to listen on. Default is 8000."
+msgstr ""
+
+msgid ""
+"``prefix``\n"
+" Prefix path to serve from. Default is '' (server root)."
+msgstr ""
+
+msgid ""
+"``push_ssl``\n"
+" Whether to require that inbound pushes be transported over SSL to\n"
+" prevent password sniffing. Default is True."
+msgstr ""
+
+msgid ""
+"``staticurl``\n"
+" Base URL to use for static files. If unset, static files (e.g. the\n"
+" hgicon.png favicon) will be served by the CGI script itself. Use\n"
+" this setting to serve them directly with the HTTP server.\n"
+" Example: ``http://hgserver/static/``."
+msgstr ""
+
+msgid ""
+"``stripes``\n"
+" How many lines a \"zebra stripe\" should span in multiline output.\n"
+" Default is 1; set to 0 to disable."
+msgstr ""
+
+msgid ""
+"``style``\n"
+" Which template map style to use."
+msgstr ""
+
+msgid ""
+"``templates``\n"
+" Where to find the HTML templates. Default is install path.\n"
+msgstr ""
msgid "Some commands allow the user to specify a date, e.g.:"
msgstr "以下のコマンドで日時指定が可能です:"
@@ -11065,28 +13496,29 @@
msgstr "- ``1165432709 0`` (2006年12月6日 13:18:29 UTC)"
msgid ""
-"This is the internal representation format for dates. unixtime is the\n"
-"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
-"the offset of the local timezone, in seconds west of UTC (negative if\n"
-"the timezone is east of UTC)."
-msgstr ""
-"これは日時の内部表現形式です。 基点となる 1970年1月1日 00:00 UTC からの\n"
-"経過秒数を表す unixtime 形式部分と、 ローカルタイムゾーンのオフセット値\n"
-"(UTC よりも東側の地域は負値)を表すオフセット部分から構成されています。"
+"This is the internal representation format for dates. The first number\n"
+"is the number of seconds since the epoch (1970-01-01 00:00 UTC). The\n"
+"second is the offset of the local timezone, in seconds west of UTC\n"
+"(negative if the timezone is east of UTC)."
+msgstr ""
+"これは日時の内部表現形式です。\n"
+"最初の数値は、 基準時 (1970年1月1日 00:00 UTC) からの経過秒数です。\n"
+"次の数値は、 UTC に対するローカルタイムゾーンのオフセット値\n"
+"(単位: 分) です (UTC よりも東側の地域は負値)"
msgid "The log command also accepts date ranges:"
msgstr "log コマンドには、 日時範囲指定可能です:"
msgid ""
-"- ``<{datetime}`` - at or before a given date/time\n"
-"- ``>{datetime}`` - on or after a given date/time\n"
-"- ``{datetime} to {datetime}`` - a date range, inclusive\n"
-"- ``-{days}`` - within a given number of days of today\n"
-msgstr ""
-"- ``<{datetime}`` - 指定日時以前(指定日時含む)\n"
-"- ``>{datetime}`` - 指定日時以後(指定日時含む)\n"
-"- ``{datetime} to {datetime}`` - 指定日時範囲(指定日時含む)\n"
-"- ``-{days}`` - 本日から指定日数以内\n"
+"- ``<DATE`` - at or before a given date/time\n"
+"- ``>DATE`` - on or after a given date/time\n"
+"- ``DATE to DATE`` - a date range, inclusive\n"
+"- ``-DAYS`` - within a given number of days of today\n"
+msgstr ""
+"- ``<日時指定`` - 指定日時以前(指定日時含む)\n"
+"- ``>日時指定`` - 指定日時以後(指定日時含む)\n"
+"- ``日時指定 to 日時指定`` - 指定日時範囲(指定日時含む)\n"
+"- ``-日数`` - 本日から指定日数以内\n"
msgid ""
"Mercurial's default format for showing changes between two versions of\n"
@@ -11287,6 +13719,18 @@
" 場合には、 こららは無視されません。"
msgid ""
+"HGPLAINEXCEPT\n"
+" This is a comma-separated list of features to preserve when\n"
+" HGPLAIN is enabled. Currently the only value supported is \"i18n\",\n"
+" which preserves internationalization in plain mode."
+msgstr ""
+
+msgid ""
+" Setting HGPLAINEXCEPT to anything (even an empty string) will\n"
+" enable plain mode."
+msgstr ""
+
+msgid ""
"HGUSER\n"
" This is the string used as the author of a commit. If not set,\n"
" available values will be considered in this order:"
@@ -11433,6 +13877,110 @@
" baz = !\n"
msgid ""
+"Mercurial supports a functional language for selecting a set of\n"
+"files. "
+msgstr ""
+"Mercurial は、 複数のファイルを一括指定するための、\n"
+"問い合わせ言語を提供しています。"
+
+msgid ""
+"Like other file patterns, this pattern type is indicated by a prefix,\n"
+"'set:'. The language supports a number of predicates which are joined\n"
+"by infix operators. Parenthesis can be used for grouping."
+msgstr ""
+
+msgid ""
+"Identifiers such as filenames or patterns must be quoted with single\n"
+"or double quotes if they contain characters outside of\n"
+"``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]`` or if they match one of the\n"
+"predefined predicates. This generally applies to file patterns other\n"
+"than globs and arguments for predicates."
+msgstr ""
+
+msgid ""
+"Special characters can be used in quoted identifiers by escaping them,\n"
+"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
+"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
+msgstr ""
+
+msgid "There is a single prefix operator:"
+msgstr ""
+
+msgid ""
+"``not x``\n"
+" Files not in x. Short form is ``! x``."
+msgstr ""
+
+msgid "These are the supported infix operators:"
+msgstr ""
+
+msgid ""
+"``x and y``\n"
+" The intersection of files in x and y. Short form is ``x & y``."
+msgstr ""
+
+msgid ""
+"``x or y``\n"
+" The union of files in x and y. There are two alternative short\n"
+" forms: ``x | y`` and ``x + y``."
+msgstr ""
+
+msgid ""
+"``x - y``\n"
+" Files in x but not in y."
+msgstr ""
+
+msgid "The following predicates are supported:"
+msgstr ""
+
+msgid ".. predicatesmarker"
+msgstr ""
+
+msgid "Some sample queries:"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"- Show status of files that appear to be binary in the working directory::"
+msgstr "作業領域のファイル操作状況の表示"
+
+msgid " hg status -A \"set:binary()\""
+msgstr ""
+
+msgid "- Forget files that are in .hgignore but are already tracked::"
+msgstr ""
+
+msgid " hg forget \"set:hgignore() and not ignored()\""
+msgstr ""
+
+msgid "- Find text files that contain a string::"
+msgstr ""
+
+msgid " hg locate \"set:grep(magic) and not binary()\""
+msgstr ""
+
+msgid "- Find C files in a non-standard encoding::"
+msgstr ""
+
+msgid " hg locate \"set:**.c and not encoding(ascii)\""
+msgstr ""
+
+msgid "- Revert copies of large binary files::"
+msgstr ""
+
+msgid " hg revert \"set:copied() and binary() and size('>1M')\""
+msgstr ""
+
+msgid "- Remove files listed in files.lst that contain the letter a or b::"
+msgstr ""
+
+msgid " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""
+msgstr ""
+
+msgid "See also :hg:`help patterns`.\n"
+msgstr ""
+
+msgid ""
"Ancestor\n"
" Any changeset that can be reached by an unbroken chain of parent\n"
" changesets from a given changeset. More precisely, the ancestors\n"
@@ -11446,6 +13994,29 @@
" 直接の親リビジョンは祖先であり、 祖先(＝直接の親リビジョン含む)の\n"
" 親リビジョンも祖先となります。 'Descendant' も参照のこと。"
+#, fuzzy
+msgid ""
+"Bookmark\n"
+" Bookmarks are pointers to certain commits that move when\n"
+" committing. They are similar to tags in that it is possible to use\n"
+" bookmark names in all places where Mercurial expects a changeset\n"
+" ID, e.g., with :hg:`update`. Unlike tags, bookmarks move along\n"
+" when you make a commit."
+msgstr ""
+" ブックマーク (bookmark) は、 コミット操作に追従して移動する、\n"
+" リビジョン特定用の情報です。\n"
+" ブックマークのリポジトリ間伝播は、 自動的には行われません。\n"
+" ブックマークに対しては、 改名／複製／削除が可能です。\n"
+" :hg:`merge` や :hg:`update` へのリビジョン指定において、\n"
+" ブックマークを使用することが可能です。"
+
+msgid ""
+" Bookmarks can be renamed, copied and deleted. Bookmarks are local,\n"
+" unless they are explicitly pushed or pulled between repositories.\n"
+" Pushing and pulling bookmarks allow you to collaborate with others\n"
+" on a branch without creating a named branch."
+msgstr ""
+
msgid ""
"Branch\n"
" (Noun) A child changeset that has been created from a parent that\n"
@@ -12041,6 +14612,14 @@
msgstr ""
msgid ""
+"Tag\n"
+" An alternative name given to a changeset. Tags can be used in all\n"
+" places where Mercurial expects a changeset ID, e.g., with\n"
+" :hg:`update`. The creation of a tag is stored in the history and\n"
+" will thus automatically be shared with other using push and pull."
+msgstr ""
+
+msgid ""
"Tip\n"
" The changeset with the highest revision number. It is the changeset\n"
" most recently added in a repository."
@@ -12083,6 +14662,122 @@
msgstr ""
msgid ""
+"Synopsis\n"
+"--------"
+msgstr ""
+
+msgid ""
+"The Mercurial system uses a file called ``.hgignore`` in the root\n"
+"directory of a repository to control its behavior when it searches\n"
+"for files that it is not currently tracking."
+msgstr ""
+
+msgid ""
+"Description\n"
+"-----------"
+msgstr ""
+
+msgid ""
+"The working directory of a Mercurial repository will often contain\n"
+"files that should not be tracked by Mercurial. These include backup\n"
+"files created by editors and build products created by compilers.\n"
+"These files can be ignored by listing them in a ``.hgignore`` file in\n"
+"the root of the working directory. The ``.hgignore`` file must be\n"
+"created manually. It is typically put under version control, so that\n"
+"the settings will propagate to other repositories with push and pull."
+msgstr ""
+
+msgid ""
+"An untracked file is ignored if its path relative to the repository\n"
+"root directory, or any prefix path of that path, is matched against\n"
+"any pattern in ``.hgignore``."
+msgstr ""
+
+msgid ""
+"For example, say we have an untracked file, ``file.c``, at\n"
+"``a/b/file.c`` inside our repository. Mercurial will ignore ``file.c``\n"
+"if any pattern in ``.hgignore`` matches ``a/b/file.c``, ``a/b`` or ``a``."
+msgstr ""
+
+msgid ""
+"In addition, a Mercurial configuration file can reference a set of\n"
+"per-user or global ignore files. See the ``ignore`` configuration\n"
+"key on the ``[ui]`` section of :hg:`help config` for details of how to\n"
+"configure these files."
+msgstr ""
+
+msgid ""
+"To control Mercurial's handling of files that it manages, many\n"
+"commands support the ``-I`` and ``-X`` options; see\n"
+":hg:`help <command>` and :hg:`help patterns` for details."
+msgstr ""
+
+msgid ""
+"An ignore file is a plain text file consisting of a list of patterns,\n"
+"with one pattern per line. Empty lines are skipped. The ``#``\n"
+"character is treated as a comment character, and the ``\\`` character\n"
+"is treated as an escape character."
+msgstr ""
+
+msgid ""
+"Mercurial supports several pattern syntaxes. The default syntax used\n"
+"is Python/Perl-style regular expressions."
+msgstr ""
+
+msgid "To change the syntax used, use a line of the following form::"
+msgstr ""
+
+msgid " syntax: NAME"
+msgstr ""
+
+msgid "where ``NAME`` is one of the following:"
+msgstr ""
+
+msgid ""
+"``regexp``\n"
+" Regular expression, Python/Perl syntax.\n"
+"``glob``\n"
+" Shell-style glob."
+msgstr ""
+
+msgid ""
+"The chosen syntax stays in effect when parsing all patterns that\n"
+"follow, until another syntax is selected."
+msgstr ""
+
+msgid ""
+"Neither glob nor regexp patterns are rooted. A glob-syntax pattern of\n"
+"the form ``*.c`` will match a file ending in ``.c`` in any directory,\n"
+"and a regexp pattern of the form ``\\.c$`` will do the same. To root a\n"
+"regexp pattern, start it with ``^``."
+msgstr ""
+
+msgid ""
+"Example\n"
+"-------"
+msgstr ""
+
+msgid "Here is an example ignore file. ::"
+msgstr ""
+
+msgid ""
+" # use glob syntax.\n"
+" syntax: glob"
+msgstr ""
+
+msgid ""
+" *.elc\n"
+" *.pyc\n"
+" *~"
+msgstr ""
+
+msgid ""
+" # switch to regexp syntax.\n"
+" syntax: regexp\n"
+" ^\\.pc/\n"
+msgstr ""
+
+msgid ""
"Mercurial's internal web server, hgweb, can serve either a single\n"
"repository, or a collection of them. In the latter case, a special\n"
"configuration file can be used to specify the repository paths to use\n"
@@ -12090,8 +14785,8 @@
msgstr ""
msgid ""
-"This file uses the same syntax as hgrc configuration files, but only\n"
-"the following sections are recognized:"
+"This file uses the same syntax as other Mercurial configuration files,\n"
+"but only the following sections are recognized:"
msgstr ""
msgid ""
@@ -12102,7 +14797,8 @@
msgid ""
"The ``web`` section can specify all the settings described in the web\n"
-"section of the hgrc documentation."
+"section of the hgrc(5) documentation. See :hg:`help config` for\n"
+"information on where to find the manual page."
msgstr ""
msgid ""
@@ -12466,10 +15162,13 @@
msgid ""
" listfile:list.txt read list from list.txt with one file pattern per line\n"
-" listfile0:list.txt read list from list.txt with null byte delimiters\n"
-msgstr ""
-" listfile:list.txt 1行1 file パターンで list.txt から読み込み\n"
-" listfile0:list.txt null 文字区切りで file パターンを読み込み\n"
+" listfile0:list.txt read list from list.txt with null byte delimiters"
+msgstr ""
+" listfile:list.txt 1行 1 file パターンで list.txt から読み込み\n"
+" listfile0:list.txt null 文字区切りで file パターンを読み込み"
+
+msgid "See also :hg:`help filesets`.\n"
+msgstr ":hg:`help filesets` も参照してください。\n"
msgid "Mercurial supports several ways to specify individual revisions."
msgstr "Mercurial に個々のリビジョン指定する際には複数の記法が使用できます。"
@@ -12553,22 +15252,10 @@
msgstr ""
msgid ""
-"Special characters can be used in quoted identifiers by escaping them,\n"
-"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
-"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
-msgstr ""
-
-msgid "There is a single prefix operator:"
-msgstr ""
-
-msgid ""
"``not x``\n"
" Changesets not in x. Short form is ``! x``."
msgstr ""
-msgid "These are the supported infix operators:"
-msgstr ""
-
msgid ""
"``x::y``\n"
" A DAG range, meaning all changesets that are descendants of x and\n"
@@ -12603,10 +15290,59 @@
" Changesets in x but not in y."
msgstr ""
-msgid "The following predicates are supported:"
-msgstr ""
-
-msgid ".. predicatesmarker"
+msgid ""
+"``x^n``\n"
+" The nth parent of x, n == 0, 1, or 2.\n"
+" For n == 0, x; for n == 1, the first parent of each changeset in x;\n"
+" for n == 2, the second parent of changeset in x."
+msgstr ""
+
+msgid ""
+"``x~n``\n"
+" The nth first ancestor of x; ``x~0`` is x; ``x~3`` is ``x^^^``."
+msgstr ""
+
+msgid "There is a single postfix operator:"
+msgstr ""
+
+msgid ""
+"``x^``\n"
+" Equivalent to ``x^1``, the first parent of each changeset in x."
+msgstr ""
+
+msgid ""
+"\n"
+"The following predicates are supported:"
+msgstr ""
+
+msgid ""
+"New predicates (known as \"aliases\") can be defined, using any combination "
+"of\n"
+"existing predicates or other aliases. An alias definition looks like::"
+msgstr ""
+
+msgid " <alias> = <definition>"
+msgstr ""
+
+msgid ""
+"in the ``revsetalias`` section of a Mercurial configuration file. Arguments\n"
+"of the form `$1`, `$2`, etc. are substituted from the alias into the\n"
+"definition."
+msgstr ""
+
+msgid "For example,"
+msgstr ""
+
+msgid ""
+" [revsetalias]\n"
+" h = heads()\n"
+" d($1) = sort($1, date)\n"
+" rs($1, $2) = reverse(sort($1, $2))"
+msgstr ""
+
+msgid ""
+"defines three aliases, ``h``, ``d``, and ``rs``. ``rs(0:tip, author)`` is\n"
+"exactly equivalent to ``reverse(sort(0:tip, author))``."
msgstr ""
msgid "Command line equivalents for :hg:`log`::"
@@ -12623,9 +15359,6 @@
" -l x -> limit(expr, x)"
msgstr ""
-msgid "Some sample queries:"
-msgstr ""
-
msgid "- Changesets on the default branch::"
msgstr ""
@@ -12652,7 +15385,7 @@
msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
msgstr ""
-msgid "- Changesets in committed May 2008, sorted by user::"
+msgid "- Changesets committed in May 2008, sorted by user::"
msgstr ""
msgid " hg log -r \"sort(date('May 2008'), user)\""
@@ -12906,88 +15639,8 @@
"可否は、 テンプレートの利用される状況に依存します。 以下のキーワードは\n"
"log 的なコマンドでのテンプレート利用の際には常に使用可能です:"
-msgid ":author: String. The unmodified author of the changeset."
-msgstr ":author: 文字列。 リビジョンの作者名(記録情報そのまま)。"
-
-msgid ""
-":branch: String. The name of the branch on which the changeset was\n"
-" committed."
-msgstr ":branch: 文字列。 リビジョンの属するブランチ名。"
-
-msgid ""
-":branches: List of strings. The name of the branch on which the\n"
-" changeset was committed. Will be empty if the branch name was\n"
-" default."
-msgstr ""
-":branches: 文字列列挙。 リビジョンの属するブランチ名。\n"
-" 所属ブランチが default の場合は空。"
-
-msgid ":children: List of strings. The children of the changeset."
-msgstr ":children: 文字列列挙。 リビジョンの子供。"
-
-msgid ":date: Date information. The date when the changeset was committed."
-msgstr ":date: 日時情報。 リビジョンが記録された日時。"
-
-msgid ":desc: String. The text of the changeset description."
-msgstr ":desc: 文字列。 リビジョンのコミットメッセージ。"
-
-msgid ""
-":diffstat: String. Statistics of changes with the following format:\n"
-" \"modified files: +added/-removed lines\""
-msgstr ""
-":diffstat: 文字列。 以下の形式での変更概要。\n"
-" \"変更対象ファイル: +追加行数/-削除行数\""
-
-msgid ""
-":files: List of strings. All files modified, added, or removed by this\n"
-" changeset."
-msgstr ""
-":files: 文字列列挙。 当該リビジョンでの、 変更／追加登録ないし\n"
-" 登録除外ファイルの一覧。"
-
-msgid ":file_adds: List of strings. Files added by this changeset."
-msgstr ":file_adds: 文字列列挙。 当該リビジョンでの追加ファイル一覧。"
-
-msgid ""
-":file_copies: List of strings. Files copied in this changeset with\n"
-" their sources."
-msgstr ":file_copies: 文字列列挙。 当該リビジョンでの複製元ファイル一覧。"
-
-msgid ""
-":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
-" only if the --copied switch is set."
-msgstr ""
-":file_copies_switch: 文字列列挙。 \"file_copies\" と同義だが、\n"
-" --copied 指定のある時のみ表示。"
-
-msgid ":file_mods: List of strings. Files modified by this changeset."
-msgstr ":file_mods: 文字列列挙。 当該リビジョンでの変更ファイル一覧。"
-
-msgid ":file_dels: List of strings. Files removed by this changeset."
-msgstr ":file_dels: 文字列列挙。 当該リビジョンでの登録除外ファイル一覧。"
-
-msgid ""
-":node: String. The changeset identification hash, as a 40 hexadecimal\n"
-" digit string."
-msgstr ":node: 文字列。 リビジョン識別用の 40 桁 16 進数ハッシュ値。"
-
-msgid ":parents: List of strings. The parents of the changeset."
-msgstr ":parents: 文字列列挙。 リビジョンの親。"
-
-msgid ":rev: Integer. The repository-local changeset revision number."
-msgstr ":rev: 整数。 各リポジトリ固有のリビジョン番号。"
-
-msgid ":tags: List of strings. Any tags associated with the changeset."
-msgstr ":tags: 文字列列挙。 当該リビジョンに付与されたタグの一覧。"
-
-msgid ""
-":latesttag: String. Most recent global tag in the ancestors of this\n"
-" changeset."
-msgstr ""
-":latesttag: 文字列。 当該リビジョンの先祖に対して最も最近に付与されたタグ"
-
-msgid ":latesttagdistance: Integer. Longest path to the latest tag."
-msgstr ":latesttagdistance: 整数。 最新タグへの最長パス"
+msgid ".. keywordsmarker"
+msgstr ""
msgid ""
"The \"date\" keyword does not produce human-readable output. If you\n"
@@ -13014,167 +15667,8 @@
msgid "List of filters:"
msgstr "フィルター一覧(入力と、 それに対する出力):"
-msgid ""
-":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
-" every line except the last."
-msgstr ""
-":addbreaks: 文字列。 最終行を除く各行の行末に XHTML の\n"
-" \"<br />\" タグを追加します。"
-
-msgid ""
-":age: Date. Returns a human-readable date/time difference between the\n"
-" given date/time and the current date/time."
-msgstr ""
-":age: 日時情報。 与えられた日時と、 現在日時との差分を表す\n"
-" 可読形式の文字列を生成します。"
-
-msgid ""
-":basename: Any text. Treats the text as a path, and returns the last\n"
-" component of the path after splitting by the path separator\n"
-" (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n"
-" \"baz\" and \"foo/bar//\" becomes \"bar\"."
-msgstr ""
-":basename: 文字列。 与えられた文字列をパスとみなし、 パス区切りで\n"
-" 区切られた最後の要素だけを取り出します(末尾パス\n"
-" 区切りは無視されます)。\n"
-" 例) \"foo/bar/baz\" は \"baz\"、 \"foo/bar//\" は \"bar\""
-
-msgid ""
-":stripdir: Treat the text as path and strip a directory level, if\n"
-" possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"."
-msgstr ""
-":stripdir: 文字列。 与えられた文字列をパスとみなし、 ディレクトリ\n"
-" 階層があればそれを取り除きます。\n"
-" 例) \"foo\" および \"foo/bar\" は \"foo\""
-
-msgid ""
-":date: Date. Returns a date in a Unix date format, including the\n"
-" timezone: \"Mon Sep 04 15:13:13 2006 0700\"."
-msgstr ""
-":date: 日時情報。 タイムゾーン込みの Unix date コマンド形式にします。\n"
-" 例) \"Mon Sep 04 15:13:13 2006 0700\""
-
-msgid ""
-":domain: Any text. Finds the first string that looks like an email\n"
-" address, and extracts just the domain component. Example: ``User\n"
-" <user@example.com>`` becomes ``example.com``."
-msgstr ""
-":domain: 文字列。 メールアドレスと思しき最初の文字列部分から\n"
-" ドメイン部分だけを取り出します。\n"
-" 例) ``User <user@example.com>`` は ``example.com``"
-
-msgid ""
-":email: Any text. Extracts the first string that looks like an email\n"
-" address. Example: ``User <user@example.com>`` becomes\n"
-" ``user@example.com``."
-msgstr ""
-":email: 文字列。 メールアドレスと思しき最初の部分を取り出します。\n"
-" 例) ``User <user@example.com>`` は ``user@example.com``"
-
-msgid ""
-":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
-" and \">\" with XML entities."
-msgstr ""
-":escape: 文字列。 XML/XHTML の特殊文字である \"&\"、 \"<\" および\n"
-" \">\" を XML のエンティティ形式に変換します。"
-
-msgid ""
-":hex: Any text. Convert a binary Mercurial node identifier into\n"
-" its long hexadecimal representation."
-msgstr ""
-":hex: 文字列。 Mercurial の node 情報を 40 桁 16 進文字列に変換します。"
-
-msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
-msgstr ":fill68: 文字列。 68 桁に収まるように文字列を折り返します。"
-
-msgid ":fill76: Any text. Wraps the text to fit in 76 columns."
-msgstr ":fill76: 文字列。 76 桁に収まるように文字列を折り返します。"
-
-msgid ":firstline: Any text. Returns the first line of text."
-msgstr ":firstline: 文字列。 最初の行のみを取り出します。"
-
-msgid ":nonempty: Any text. Returns '(none)' if the string is empty."
-msgstr ":nonempty: 文字列。 与えられた文字列が空の場合 '(none)'となります。"
-
-msgid ""
-":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n"
-" 25200\" (Unix timestamp, timezone offset)."
-msgstr ""
-":hgdate: 日時情報。 Unix タイムスタンプとタイムゾーンオフセットによる\n"
-" 数値対形式で可読化します。\n"
-" 例) \"1157407993 25200\""
-
-msgid ""
-":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n"
-" +0200\"."
-msgstr ""
-":isodate: 日時情報。 ISO 8601 形式で可読化します:\n"
-" 例) \"2009-08-18 13:00 +0200\""
-
-msgid ""
-":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
-" seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n"
-" filter."
-msgstr ""
-":isodatesec: 日時情報。 秒情報付きの ISO 8601 形式で可読化します:\n"
-" 例) \"2009-08-18 13:00:13 +0200\"\n"
-" ※ 後述する rfc3339date フィルタの説明も参照してください。"
-
-msgid ":localdate: Date. Converts a date to local date."
-msgstr ":localdate: 日時情報。 ローカル日時で可読化します。"
-
-msgid ""
-":obfuscate: Any text. Returns the input text rendered as a sequence of\n"
-" XML entities."
-msgstr ":obfuscate: 文字列。 全ての文字を XML エンティティ形式に変換します。"
-
-msgid ":person: Any text. Returns the text before an email address."
-msgstr ":person: 文字列。 メールアドレス直前の部分だけを取り出します。"
-
-msgid ""
-":rfc822date: Date. Returns a date using the same format used in email\n"
-" headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"."
-msgstr ""
-":rfc822date: 日時情報。 メールのヘッダと同形式で可読化します:\n"
-" 例) \"Tue, 18 Aug 2009 13:00:13 +0200\"."
-
-msgid ""
-":rfc3339date: Date. Returns a date using the Internet date format\n"
-" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"."
-msgstr ""
-":rfc3339date: 日付情報。 RFC 3339 で定められた日付形式で可読化します。\n"
-" 例) \"2009-08-18T13:00:13+02:00\"."
-
-msgid ""
-":short: Changeset hash. Returns the short form of a changeset hash,\n"
-" i.e. a 12 hexadecimal digit string."
-msgstr ":short: リビジョンハッシュ 値。 12 桁程度の短縮形式にします。"
-
-msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
-msgstr ":shortdate: 日時情報。 \"2006-09-18\" 形式で可読化します。"
-
-msgid ""
-":stringify: Any type. Turns the value into text by converting values into\n"
-" text and concatenating them."
-msgstr ":stringify: 任意のデータ。 値を文字列化して連結します"
-
-msgid ":strip: Any text. Strips all leading and trailing whitespace."
-msgstr ":strip: 文字列。 先頭／末尾の空白文字を取り除きます。"
-
-msgid ""
-":tabindent: Any text. Returns the text, with every line except the\n"
-" first starting with a tab character."
-msgstr ":tabindent: 文字列。 タブ文字以外で始まる行をタブ文字で字下げします。"
-
-msgid ""
-":urlescape: Any text. Escapes all \"special\" characters. For example,\n"
-" \"foo bar\" becomes \"foo%20bar\"."
-msgstr ""
-":urlescape: 文字列。 全ての「特殊」文字を変換します。\n"
-" 例えば \"foo bar\" は \"foo%20bar\" となります。"
-
-msgid ":user: Any text. Returns the user portion of an email address.\n"
-msgstr ":user: 文字列。 メールアドレスのユーザ名部分を取り出します。\n"
+msgid ".. filtersmarker\n"
+msgstr ""
msgid "Valid URLs are of the form::"
msgstr "有効な URL 指定は以下の形式です::"
@@ -13372,7 +15866,7 @@
#, python-format
msgid ""
"%d files updated, %d files merged, %d files removed, %d files unresolved\n"
-msgstr "ファイル状態: 更新数 %d、 マージ数 %d、 削除数 %d、 衝突未解決数 %d\n"
+msgstr "ファイル状態: 更新数 %d、 マージ数 %d、 削除数 %d、 衝突未解消数 %d\n"
msgid "use 'hg resolve' to retry unresolved file merges\n"
msgstr "'hg resolve' でマージの衝突を解消してください\n"
@@ -13409,6 +15903,10 @@
msgstr "'%s:%d' でのサーバ起動に失敗: %s"
#, python-format
+msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
+msgstr " %d ファイル変更、 追加 %d 行(+)、 削除 %d 行(-)\n"
+
+#, python-format
msgid "calling hook %s: %s\n"
msgstr "フック %s:%s 呼び出し中\n"
@@ -13462,6 +15960,13 @@
msgid "warning: %s hook %s\n"
msgstr "警告: %s フック %s\n"
+msgid "kb"
+msgstr "キロバイト"
+
+#, python-format
+msgid "ignoring invalid [auth] key '%s'\n"
+msgstr "不正な [auth] セクションのキー'%s' を無視します\n"
+
msgid "connection ended unexpectedly"
msgstr "予期せぬ接続終了"
@@ -13502,6 +16007,9 @@
msgid "'%s' uses newer protocol %s"
msgstr "'%s' は新しいプロトコル %s を使います"
+msgid "unexpected response:"
+msgstr "未知の応答:"
+
#, python-format
msgid "push failed: %s"
msgstr "履歴反映に失敗: %s"
@@ -13529,10 +16037,6 @@
msgstr "%sというリポジトリは既に存在しています"
#, python-format
-msgid "requirement '%s' not supported"
-msgstr "必須機能 '%s' が未サポートです"
-
-#, python-format
msgid ".hg/sharedpath points to nonexistent directory %s"
msgstr ".hg/sharedpath の参照先 %s は存在しません"
@@ -13580,7 +16084,7 @@
msgstr "未知のトランザクションの巻き戻し中\n"
#, python-format
-msgid "Named branch could not be reset, current branch still is: %s\n"
+msgid "named branch could not be reset, current branch is still: %s\n"
msgstr "名前つきブランチはリセットできませんので、 %s のままです\n"
#, python-format
@@ -13629,8 +16133,8 @@
msgid "file not tracked!"
msgstr "ファイルは未登録です!"
-msgid "unresolved merge conflicts (see hg resolve)"
-msgstr "未解決の衝突が残っています （hg resolveを参照してください）"
+msgid "unresolved merge conflicts (see hg help resolve)"
+msgstr "未解消の衝突が残っています （hg help resolveを参照してください）"
#, python-format
msgid "committing subrepository %s\n"
@@ -13653,14 +16157,6 @@
msgstr "連携先の changegroupsubset 機能未対応により、 部分取り込みできません。"
#, python-format
-msgid "updating bookmark %s\n"
-msgstr "ブックマーク %s の更新中\n"
-
-#, python-format
-msgid "not updating divergent bookmark %s\n"
-msgstr "衝突するブックマーク %s は更新しません\n"
-
-#, python-format
msgid "%d changesets found\n"
msgstr "%d 個のチェンジセット\n"
@@ -13771,6 +16267,10 @@
msgstr "不正なローカルアドレス: %s"
#, python-format
+msgid "'\\n' and '\\r' disallowed in filenames: %r"
+msgstr "'\\n' と '\\r' はファイル名で使用しないでください: %r"
+
+#, python-format
msgid "failed to remove %s from manifest"
msgstr "マニフェストから %s を削除できませんでした"
@@ -13863,10 +16363,6 @@
msgid "note: possible conflict - %s was renamed multiple times to:\n"
msgstr "備考: 衝突の可能性 - %s が複数のファイルに改名されました:\n"
-#, python-format
-msgid "branch %s not found"
-msgstr "ブランチ %s が見つかりません"
-
msgid "merging with a working directory ancestor has no effect"
msgstr "作業領域の先祖とのマージは意味がありません"
@@ -13884,8 +16380,8 @@
msgstr ""
"ブランチ横断の更新 (マージするか、 --clean 指定で変更を破棄してください)"
-msgid "crosses branches (merge branches or use --check to force update)"
-msgstr "ブランチ横断の更新 (マージするか、 --check 指定で強制更新してください)"
+msgid "crosses branches (merge branches or update --check to force update)"
+msgstr "ブランチ横断の更新 (マージか、 update --check で強制更新してください)"
msgid "Attention:"
msgstr "注意:"
@@ -13915,12 +16411,24 @@
msgstr "警告!"
#, python-format
-msgid "cannot create %s: destination already exists"
-msgstr "%s を作成できません: 作業先にすでに存在します"
-
-#, python-format
-msgid "cannot create %s: unable to create destination directory"
-msgstr "%s を作成できません: ディレクトリを作成できません"
+msgid "unexpected token: %s"
+msgstr "未知の記述: %s"
+
+#, python-format
+msgid "not a prefix: %s"
+msgstr ""
+
+#, python-format
+msgid "not an infix: %s"
+msgstr ""
+
+#, python-format
+msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
+msgstr "%d 個のハンク(総数 %d)が適用失敗 -- 失敗ハンクは %s に保存\n"
+
+#, python-format
+msgid "cannot patch %s: file is not tracked"
+msgstr "%s にパッチ適用出来ません: 構成管理対象ではありません"
#, python-format
msgid "unable to find '%s' for patching\n"
@@ -13931,14 +16439,14 @@
msgstr "ファイル %s をパッチ適用しています\n"
#, python-format
-msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
-msgstr "%d 個のハンク(総数 %d)が適用失敗 -- 失敗ハンクは %s に保存\n"
-
-#, python-format
msgid "bad hunk #%d %s (%d %d %d %d)"
msgstr "不正なハンク: #%d %s (%d %d %d %d)"
#, python-format
+msgid "cannot create %s: destination already exists\n"
+msgstr "%s を作成できません: 作業先にすでに存在します\n"
+
+#, python-format
msgid "file %s already exists\n"
msgstr "ファイル %s は既に存在します\n"
@@ -13977,8 +16485,8 @@
msgstr "パッチ対象のファイル名が指定されていません"
#, python-format
-msgid "malformed patch %s %s"
-msgstr "不正なパッチ: %s %s"
+msgid "cannot create %s: destination already exists"
+msgstr "%s を作成できません: 作業先にすでに存在します"
#, python-format
msgid "unsupported parser state: %s"
@@ -13996,10 +16504,6 @@
msgstr "パッチの適用に失敗"
#, python-format
-msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
-msgstr " %d ファイル変更、 追加 %d 行(+)、 削除 %d 行(-)\n"
-
-#, python-format
msgid "exited with status %d"
msgstr "終了コード %d で終了しました"
@@ -14069,111 +16573,21 @@
msgid "consistency error in delta"
msgstr "差分情報の不整合"
-msgid "unknown base"
-msgstr "未知のベースリビジョン"
-
-msgid "unterminated string"
-msgstr "文字列が終端していません"
-
-msgid "syntax error"
-msgstr "文法エラー"
-
-msgid "missing argument"
-msgstr "引数がありません"
+msgid "unknown delta base"
+msgstr "未知の差分ベース"
#, python-format
msgid "can't use %s here"
msgstr "ここでは %s を使用できません"
-msgid "can't use a list in this context"
-msgstr "ここではリストを使用できません"
-
-#, python-format
-msgid "not a function: %s"
-msgstr "関数ではありません: %s"
-
-msgid ""
-"``id(string)``\n"
-" Revision non-ambiguously specified by the given hex string prefix."
-msgstr ""
-
-#. i18n: "id" is a keyword
-msgid "id requires one argument"
-msgstr "id 指定には1つの引数が必要です"
-
-#. i18n: "id" is a keyword
-msgid "id requires a string"
-msgstr "id 指定は文字列でなければなりません"
-
-msgid ""
-"``rev(number)``\n"
-" Revision with the given numeric identifier."
-msgstr ""
-
-#. i18n: "rev" is a keyword
-msgid "rev requires one argument"
-msgstr "rev 指定には1つの引数が必要です"
-
-#. i18n: "rev" is a keyword
-msgid "rev requires a number"
-msgstr "rev 指定は数値でなければなりません"
-
-#. i18n: "rev" is a keyword
-msgid "rev expects a number"
-msgstr "rev 指定は数値でなければなりません"
-
-msgid ""
-"``p1([set])``\n"
-" First parent of changesets in set, or the working directory."
-msgstr ""
-
-msgid ""
-"``p2([set])``\n"
-" Second parent of changesets in set, or the working directory."
-msgstr ""
-
-msgid ""
-"``parents([set])``\n"
-" The set of all parents for all changesets in set, or the working "
-"directory."
-msgstr ""
-
-msgid ""
-"``max(set)``\n"
-" Changeset with highest revision number in set."
-msgstr ""
-
-msgid ""
-"``min(set)``\n"
-" Changeset with lowest revision number in set."
-msgstr ""
-
-msgid ""
-"``limit(set, n)``\n"
-" First n members of set."
-msgstr ""
-
-#. i18n: "limit" is a keyword
-msgid "limit requires two arguments"
-msgstr "limit 指定には2つの引数が必要です"
-
-#. i18n: "limit" is a keyword
-msgid "limit requires a number"
-msgstr "limit 指定は数値でなければなりません"
-
-#. i18n: "limit" is a keyword
-msgid "limit expects a number"
-msgstr "limit 指定は数値でなければなりません"
-
-msgid ""
-"``children(set)``\n"
-" Child changesets of changesets in set."
-msgstr ""
-
-msgid ""
-"``branch(set)``\n"
-" All changesets belonging to the branches of changesets in set."
-msgstr ""
+msgid ""
+"``adds(pattern)``\n"
+" Changesets that add a file matching pattern."
+msgstr ""
+
+#. i18n: "adds" is a keyword
+msgid "adds requires a pattern"
+msgstr "adds 指定はパターンでなければなりません"
msgid ""
"``ancestor(single, single)``\n"
@@ -14193,19 +16607,72 @@
" Changesets that are ancestors of a changeset in set."
msgstr ""
-msgid ""
-"``descendants(set)``\n"
-" Changesets which are descendants of changesets in set."
-msgstr ""
-
-msgid ""
-"``follow()``\n"
-" An alias for ``::.`` (ancestors of the working copy's first parent)."
-msgstr ""
-
-#. i18n: "follow" is a keyword
-msgid "follow takes no arguments"
-msgstr "follow 指定には引数が指定できません"
+msgid "~ expects a number"
+msgstr ""
+
+msgid ""
+"``author(string)``\n"
+" Alias for ``user(string)``."
+msgstr ""
+
+#. i18n: "author" is a keyword
+msgid "author requires a string"
+msgstr "author 指定は文字列でなければなりません"
+
+msgid ""
+"``bisected(string)``\n"
+" Changesets marked in the specified bisect state (good, bad, skip)."
+msgstr ""
+
+msgid "bisect requires a string"
+msgstr "bisect 指定は文字列でなければなりません"
+
+msgid "invalid bisect state"
+msgstr ""
+
+msgid ""
+"``bookmark([name])``\n"
+" The named bookmark or all bookmarks."
+msgstr ""
+
+#. i18n: "bookmark" is a keyword
+msgid "bookmark takes one or no arguments"
+msgstr "bookmark 指定には1個ないし2個の引数が必要です"
+
+#. i18n: "bookmark" is a keyword
+msgid "the argument to bookmark must be a string"
+msgstr ""
+
+msgid ""
+"``branch(string or set)``\n"
+" All changesets belonging to the given branch or the branches of the "
+"given\n"
+" changesets."
+msgstr ""
+
+msgid ""
+"``children(set)``\n"
+" Child changesets of changesets in set."
+msgstr ""
+
+msgid ""
+"``closed()``\n"
+" Changeset is closed."
+msgstr ""
+
+#. i18n: "closed" is a keyword
+msgid "closed takes no arguments"
+msgstr "closed 指定には引数が指定できません"
+
+msgid ""
+"``contains(pattern)``\n"
+" Revision contains a file matching pattern. See :hg:`help patterns`\n"
+" for information about file patterns."
+msgstr ""
+
+#. i18n: "contains" is a keyword
+msgid "contains requires a pattern"
+msgstr "contains 指定はパターンでなければなりません"
msgid ""
"``date(interval)``\n"
@@ -14217,19 +16684,59 @@
msgstr "date 指定は文字列でなければなりません"
msgid ""
-"``keyword(string)``\n"
-" Search commit message, user name, and names of changed files for\n"
-" string."
-msgstr ""
-
-#. i18n: "keyword" is a keyword
-msgid "keyword requires a string"
-msgstr "keyword 指定は文字列でなければなりません"
+"``desc(string)``\n"
+" Search commit message for string. The match is case-insensitive."
+msgstr ""
+
+#. i18n: "desc" is a keyword
+msgid "desc requires a string"
+msgstr "desc 指定は文字列でなければなりません"
+
+msgid ""
+"``descendants(set)``\n"
+" Changesets which are descendants of changesets in set."
+msgstr ""
+
+msgid ""
+"``filelog(pattern)``\n"
+" Changesets connected to the specified filelog."
+msgstr ""
+
+msgid "filelog requires a pattern"
+msgstr "filelog 指定はパターンでなければなりません"
+
+msgid ""
+"``follow([file])``\n"
+" An alias for ``::.`` (ancestors of the working copy's first parent).\n"
+" If a filename is specified, the history of the given file is followed,\n"
+" including copies."
+msgstr ""
+
+#. i18n: "follow" is a keyword
+msgid "follow takes no arguments or a filename"
+msgstr "follow 指定には引数もファイル名も指定できません"
+
+msgid "follow expected a filename"
+msgstr "follow 指定はファイル名でなければなりません"
+
+#. i18n: "follow" is a keyword
+msgid "follow takes no arguments"
+msgstr "follow 指定には引数が指定できません"
+
+msgid ""
+"``all()``\n"
+" All changesets, the same as ``0:tip``."
+msgstr ""
+
+#. i18n: "all" is a keyword
+msgid "all takes no arguments"
+msgstr "all 指定には引数が指定できません"
msgid ""
"``grep(regex)``\n"
" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n"
-" to ensure special escape characters are handled correctly."
+" to ensure special escape characters are handled correctly. Unlike\n"
+" ``keyword(string)``, the match is case-sensitive."
msgstr ""
#. i18n: "grep" is a keyword
@@ -14241,20 +16748,6 @@
msgstr "不正なマッチングパターン: %s"
msgid ""
-"``author(string)``\n"
-" Alias for ``user(string)``."
-msgstr ""
-
-#. i18n: "author" is a keyword
-msgid "author requires a string"
-msgstr "author 指定は文字列でなければなりません"
-
-msgid ""
-"``user(string)``\n"
-" User name is string."
-msgstr ""
-
-msgid ""
"``file(pattern)``\n"
" Changesets affecting files matched by pattern."
msgstr ""
@@ -14264,13 +16757,81 @@
msgstr "file 指定はパターンでなければなりません"
msgid ""
-"``contains(pattern)``\n"
-" Revision contains pattern."
-msgstr ""
-
-#. i18n: "contains" is a keyword
-msgid "contains requires a pattern"
-msgstr "contains 指定はパターンでなければなりません"
+"``head()``\n"
+" Changeset is a named branch head."
+msgstr ""
+
+#. i18n: "head" is a keyword
+msgid "head takes no arguments"
+msgstr "head 指定には引数が指定できません"
+
+msgid ""
+"``heads(set)``\n"
+" Members of set with no children in set."
+msgstr ""
+
+msgid ""
+"``keyword(string)``\n"
+" Search commit message, user name, and names of changed files for\n"
+" string. The match is case-insensitive."
+msgstr ""
+
+#. i18n: "keyword" is a keyword
+msgid "keyword requires a string"
+msgstr "keyword 指定は文字列でなければなりません"
+
+msgid ""
+"``limit(set, n)``\n"
+" First n members of set."
+msgstr ""
+
+#. i18n: "limit" is a keyword
+msgid "limit requires two arguments"
+msgstr "limit 指定には2つの引数が必要です"
+
+#. i18n: "limit" is a keyword
+msgid "limit requires a number"
+msgstr "limit 指定は数値でなければなりません"
+
+#. i18n: "limit" is a keyword
+msgid "limit expects a number"
+msgstr "limit 指定は数値でなければなりません"
+
+msgid ""
+"``last(set, n)``\n"
+" Last n members of set."
+msgstr ""
+
+#. i18n: "last" is a keyword
+msgid "last requires two arguments"
+msgstr "last 指定には2つの引数が必要です"
+
+#. i18n: "last" is a keyword
+msgid "last requires a number"
+msgstr "last 指定は数値でなければなりません"
+
+#. i18n: "last" is a keyword
+msgid "last expects a number"
+msgstr "last 指定は数値でなければなりません"
+
+msgid ""
+"``max(set)``\n"
+" Changeset with highest revision number in set."
+msgstr ""
+
+msgid ""
+"``merge()``\n"
+" Changeset is a merge changeset."
+msgstr ""
+
+#. i18n: "merge" is a keyword
+msgid "merge takes no arguments"
+msgstr "merge 指定には引数が指定できません"
+
+msgid ""
+"``min(set)``\n"
+" Changeset with lowest revision number in set."
+msgstr ""
msgid ""
"``modifies(pattern)``\n"
@@ -14282,13 +16843,56 @@
msgstr "modifies 指定はパターンでなければなりません"
msgid ""
-"``adds(pattern)``\n"
-" Changesets that add a file matching pattern."
-msgstr ""
-
-#. i18n: "adds" is a keyword
-msgid "adds requires a pattern"
-msgstr "adds 指定はパターンでなければなりません"
+"``id(string)``\n"
+" Revision non-ambiguously specified by the given hex string prefix."
+msgstr ""
+
+#. i18n: "id" is a keyword
+msgid "id requires one argument"
+msgstr "id 指定には1つの引数が必要です"
+
+#. i18n: "id" is a keyword
+msgid "id requires a string"
+msgstr "id 指定は文字列でなければなりません"
+
+msgid ""
+"``outgoing([path])``\n"
+" Changesets not found in the specified destination repository, or the\n"
+" default push location."
+msgstr ""
+
+#. i18n: "outgoing" is a keyword
+msgid "outgoing takes one or no arguments"
+msgstr ""
+
+#. i18n: "outgoing" is a keyword
+msgid "outgoing requires a repository path"
+msgstr "outgoing 指定はリポジトリのパスでなければなりません"
+
+msgid ""
+"``p1([set])``\n"
+" First parent of changesets in set, or the working directory."
+msgstr ""
+
+msgid ""
+"``p2([set])``\n"
+" Second parent of changesets in set, or the working directory."
+msgstr ""
+
+msgid ""
+"``parents([set])``\n"
+" The set of all parents for all changesets in set, or the working "
+"directory."
+msgstr ""
+
+msgid "^ expects a number 0, 1, or 2"
+msgstr ""
+
+msgid ""
+"``present(set)``\n"
+" An empty set, if any revision in set isn't found; otherwise,\n"
+" all revisions in set."
+msgstr ""
msgid ""
"``removes(pattern)``\n"
@@ -14300,31 +16904,21 @@
msgstr "removes 指定はパターンでなければなりません"
msgid ""
-"``merge()``\n"
-" Changeset is a merge changeset."
-msgstr ""
-
-#. i18n: "merge" is a keyword
-msgid "merge takes no arguments"
-msgstr "merge 指定には引数が指定できません"
-
-msgid ""
-"``closed()``\n"
-" Changeset is closed."
-msgstr ""
-
-#. i18n: "closed" is a keyword
-msgid "closed takes no arguments"
-msgstr "closed 指定には引数が指定できません"
-
-msgid ""
-"``head()``\n"
-" Changeset is a named branch head."
-msgstr ""
-
-#. i18n: "head" is a keyword
-msgid "head takes no arguments"
-msgstr "head 指定には引数が指定できません"
+"``rev(number)``\n"
+" Revision with the given numeric identifier."
+msgstr ""
+
+#. i18n: "rev" is a keyword
+msgid "rev requires one argument"
+msgstr "rev 指定には1つの引数が必要です"
+
+#. i18n: "rev" is a keyword
+msgid "rev requires a number"
+msgstr "rev 指定は数値でなければなりません"
+
+#. i18n: "rev" is a keyword
+msgid "rev expects a number"
+msgstr "rev 指定は数値でなければなりません"
msgid ""
"``reverse(set)``\n"
@@ -14332,9 +16926,8 @@
msgstr ""
msgid ""
-"``present(set)``\n"
-" An empty set, if any revision in set isn't found; otherwise,\n"
-" all revisions in set."
+"``roots(set)``\n"
+" Changesets with no parent changeset in set."
msgstr ""
msgid ""
@@ -14366,36 +16959,7 @@
msgstr "未知の整列方式 %r"
msgid ""
-"``all()``\n"
-" All changesets, the same as ``0:tip``."
-msgstr ""
-
-#. i18n: "all" is a keyword
-msgid "all takes no arguments"
-msgstr "all 指定には引数が指定できません"
-
-msgid ""
-"``heads(set)``\n"
-" Members of set with no children in set."
-msgstr ""
-
-msgid ""
-"``roots(set)``\n"
-" Changesets with no parent changeset in set."
-msgstr ""
-
-msgid ""
-"``outgoing([path])``\n"
-" Changesets not found in the specified destination repository, or the\n"
-" default push location."
-msgstr ""
-
-#. i18n: "outgoing" is a keyword
-msgid "outgoing requires a repository path"
-msgstr "outgoing 指定はリポジトリのパスでなければなりません"
-
-msgid ""
-"``tag(name)``\n"
+"``tag([name])``\n"
" The specified tag by name, or all tagged revisions if no name is given."
msgstr ""
@@ -14408,16 +16972,8 @@
msgstr "tag 指定は文字列でなければなりません"
msgid ""
-"``bookmark([name])``\n"
-" The named bookmark or all bookmarks."
-msgstr ""
-
-#. i18n: "bookmark" is a keyword
-msgid "bookmark takes one or no arguments"
-msgstr "bookmark 指定には1個ないし2個の引数が必要です"
-
-#. i18n: "bookmark" is a keyword
-msgid "the argument to bookmark must be a string"
+"``user(string)``\n"
+" User name contains string. The match is case-insensitive."
msgstr ""
msgid "can't negate that"
@@ -14426,9 +16982,71 @@
msgid "not a symbol"
msgstr "シンボル以外が指定されました"
+#, python-format
+msgid "invalid number of arguments: %s"
+msgstr ""
+
msgid "empty query"
msgstr "問い合わせが空です"
+#, python-format
+msgid "ui.portablefilenames value is invalid ('%s')"
+msgstr "ui.portablefilenames 値が不正です ('%s')"
+
+#, python-format
+msgid "possible case-folding collision for %s"
+msgstr "ファイル名の文字大小の問題で %s が衝突します"
+
+#, python-format
+msgid "path ends in directory separator: %s"
+msgstr "パスの末尾が区切り文字です: %s"
+
+#, python-format
+msgid "path contains illegal component: %s"
+msgstr "パスに不正な要素が含まれています: %s"
+
+#, python-format
+msgid "path %r is inside nested repo %r"
+msgstr "パス %r は入れ子リポジトリ %r 内にあります"
+
+#, python-format
+msgid "path %r traverses symbolic link %r"
+msgstr "パス %r はシンボリックリンク '%r' が含まれています"
+
+#, python-format
+msgid "could not symlink to %r: %s"
+msgstr "%r に対してシンボリックリンクできません: %s"
+
+#, python-format
+msgid "recording removal of %s as rename to %s (%d%% similar)\n"
+msgstr "%s の削除を %s へのファイル名変更として記録中 (類似度 %d%%)\n"
+
+#, python-format
+msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
+msgstr "%s は未コミットなので、 %s のコピーデータは残りません\n"
+
+msgid ".hg/requires file is corrupt"
+msgstr ".hg/requires ファイルが破損しています"
+
+#, python-format
+msgid "unknown repository format: requires features '%s' (upgrade Mercurial)"
+msgstr "未知のリポジトリ形式です: '%s' サポートが必要 (要 Mercurial 更新)"
+
+msgid "searching for changes\n"
+msgstr "変更点を探索中\n"
+
+msgid "queries"
+msgstr "問い合わせ"
+
+msgid "searching"
+msgstr "検索中"
+
+msgid "repository is unrelated"
+msgstr "無関係なリポジトリです"
+
+msgid "warning: repository is unrelated\n"
+msgstr "警告: 無関係なリポジトリです\n"
+
msgid "searching for exact renames"
msgstr "厳密な改名を探索中"
@@ -14461,13 +17079,54 @@
msgid "remote: "
msgstr "遠隔ホスト: "
-msgid "unexpected response:"
-msgstr "未知の応答:"
-
#, python-format
msgid "push refused: %s"
msgstr "履歴反映が拒否されました: %s"
+msgid "certificate checking requires Python 2.6"
+msgstr "証明書検証には Python 2.6 が必要です"
+
+msgid "no certificate received"
+msgstr "証明書が指定されていません"
+
+#, python-format
+msgid "certificate is for %s"
+msgstr "%s 用の証明書ファイル"
+
+msgid "IDN in certificate not supported"
+msgstr "証明書の IDN は未サポートです"
+
+msgid "no commonName or subjectAltName found in certificate"
+msgstr "証明書に commonName や subjectAltName が含まれていません"
+
+#, python-format
+msgid "could not find web.cacerts: %s"
+msgstr "web.cacerts が見つかりません: %s"
+
+#, python-format
+msgid "%s certificate error: %s (use --insecure to connect insecurely)"
+msgstr "%s の証明書不正: %s (非セキュア接続で継続するなら --insecure 指定)"
+
+#, python-format
+msgid "invalid certificate for %s with fingerprint %s"
+msgstr "%s の証明書(fingerprint は %s)が不正"
+
+#, python-format
+msgid ""
+"warning: %s certificate with fingerprint %s not verified (check "
+"hostfingerprints or web.cacerts config setting)\n"
+msgstr ""
+"警告: %s の証明書(fingerprint は %s)検証は省略 (設定ファイルの "
+"hostfingerprints ないし web.cacerts 設定を確認のこと)\n"
+
+#, python-format
+msgid "host fingerprint for %s can't be verified (Python too old)"
+msgstr "ホスト %s のフィンガープリントが検証出来ません (Python が古いため)"
+
+#, python-format
+msgid "warning: certificate for %s can't be verified (Python too old)\n"
+msgstr "警告: %s の証明書は検証出来ません (Python が古いため)\n"
+
#, python-format
msgid "'%s' does not appear to be an hg repository"
msgstr "'%s' は Mercurial リポジトリ形式とは思われません"
@@ -14561,6 +17220,10 @@
msgstr "副リポジトリの %s を登録除外中\n"
#, python-format
+msgid "cloning subrepo %s from %s\n"
+msgstr "副リポジトリ %s に %s から複製中\n"
+
+#, python-format
msgid "pulling subrepo %s from %s\n"
msgstr "副リポジトリ %s に %s から取り込み中\n"
@@ -14568,6 +17231,9 @@
msgid "pushing subrepo %s to %s\n"
msgstr "副リポジトリ %s から %s へ反映中\n"
+msgid "cannot retrieve svn tool version"
+msgstr "svn ツールのバージョンが取得出来ません"
+
msgid "cannot commit svn externals"
msgstr "svn 外部リポジトリに commit できません"
@@ -14576,14 +17242,6 @@
msgstr "変更が含まれているため、 リポジトリ %s は削除されません\n"
#, python-format
-msgid "cloning subrepo %s\n"
-msgstr "副リポジトリ %s を複製中\n"
-
-#, python-format
-msgid "pulling subrepo %s\n"
-msgstr "副リポジトリ %s の更新取り込み中\n"
-
-#, python-format
msgid "revision %s does not exist in subrepo %s\n"
msgstr "リビジョン %s は副リポジトリ %s には存在しません\n"
@@ -14595,6 +17253,10 @@
msgstr ""
#, python-format
+msgid "subrepo %s is missing"
+msgstr ""
+
+#, python-format
msgid "unrelated git branch checked out in subrepo %s\n"
msgstr "副リポジトリ %s は、 無関係な git ブランチで更新されています\n"
@@ -14671,6 +17333,9 @@
msgid "rollback failed - please run hg recover\n"
msgstr "ロールバックに失敗しました - 'hg recover' してください\n"
+msgid "already have changeset "
+msgstr "既にチェンジセットがあります "
+
#, python-format
msgid "Not trusting file %s from untrusted user %s, group %s\n"
msgstr "信頼できないファイル %s (所有者 %s, グループ %s)\n"
@@ -14684,12 +17349,12 @@
msgstr "(パス定義 %s=%s(%s 由来) において、 非推奨な '%%' が使用)\n"
#, python-format
-msgid "ignoring untrusted configuration option %s.%s = %s\n"
-msgstr "信頼できない設定ファイル中の '%s.%s = %s' 設定を無視\n"
-
-#, python-format
-msgid "%s.%s not a boolean ('%s')"
-msgstr "%s.%s の値 '%s' は真偽値ではありません"
+msgid "%s.%s is not a boolean ('%s')"
+msgstr "%s.%s の値 ('%s') は真偽値ではありません"
+
+#, python-format
+msgid "%s.%s is not an integer ('%s')"
+msgstr "%s.%s の値 ('%s') は整数値ではありません"
msgid "enter a commit username:"
msgstr "コミットするユーザ名を入力してください:"
@@ -14717,10 +17382,6 @@
msgid "edit failed"
msgstr "編集に失敗"
-#, python-format
-msgid "ignoring invalid [auth] key '%s'\n"
-msgstr "不正な [auth] セクションのキー'%s' を無視します\n"
-
msgid "http authorization required"
msgstr "HTTP 認証に失敗"
@@ -14742,75 +17403,21 @@
msgid "http auth: user %s, password %s\n"
msgstr "HTTP 認証: ユーザ名 %s, パスワード %s\n"
-msgid "kb"
-msgstr "キロバイト"
-
-msgid "certificate checking requires Python 2.6"
-msgstr "証明書検証には Python 2.6 が必要です"
-
-msgid "no certificate received"
-msgstr "証明書が指定されていません"
-
-#, python-format
-msgid "certificate is for %s"
-msgstr "%s 用の証明書ファイル"
-
-msgid "IDN in certificate not supported"
-msgstr "証明書の IDN は未サポートです"
-
-msgid "no commonName or subjectAltName found in certificate"
-msgstr "証明書に commonName や subjectAltName が含まれていません"
-
-#, python-format
-msgid "%s certificate error: %s (use --insecure to connect insecurely)"
-msgstr "%s の証明書不正: %s (非セキュア接続で継続するなら --insecure 指定)"
-
-#, python-format
-msgid "invalid certificate for %s with fingerprint %s"
-msgstr "%s の証明書(fingerprint は %s)が不正"
-
-#, python-format
-msgid ""
-"warning: %s certificate with fingerprint %s not verified (check "
-"hostfingerprints or web.cacerts config setting)\n"
-msgstr ""
-"警告: %s の証明書(fingerprint は %s)検証は省略 (設定ファイルの "
-"hostfingerprints ないし web.cacerts 設定を確認のこと)\n"
-
-#, python-format
-msgid "no certificate for %s with configured hostfingerprint"
-msgstr "hostfingerprint 設定された %s の証明書が取得できません"
-
-#, python-format
-msgid ""
-"warning: %s certificate not verified (check web.cacerts config setting)\n"
-msgstr ""
-"警告: %s の証明書検証は省略 (設定ファイルの hostfingerprints ないし web."
-"cacerts 設定を確認のこと)\n"
-
#, python-format
msgid "command '%s' failed: %s"
msgstr "コマンド '%s' 失敗: %s"
#, python-format
-msgid "path ends in directory separator: %s"
-msgstr "パスの末尾が区切り文字です: %s"
-
-#, python-format
-msgid "path contains illegal component: %s"
-msgstr "パスに不正な要素が含まれています: %s"
-
-#, python-format
-msgid "path %r is inside repo %r"
-msgstr "パス %r はリポジトリ %r 内にあります"
-
-#, python-format
-msgid "path %r traverses symbolic link %r"
-msgstr "パス %r はシンボリックリンク '%r' が含まれています"
-
-#, python-format
-msgid "could not symlink to %r: %s"
-msgstr "%r に対してシンボリックリンクできません: %s"
+msgid "filename contains '%s', which is reserved on Windows"
+msgstr "ファイル名に、Windows で予約されている '%s' が含まれます"
+
+#, python-format
+msgid "filename contains %r, which is invalid on Windows"
+msgstr "ファイル名に、Windows 上で不正な %r が含まれます"
+
+#, python-format
+msgid "filename ends with '%s', which is not allowed on Windows"
+msgstr "ファイル名の末尾が、 Windows 上で不正な '%s' です"
msgid "check your clock"
msgstr "システムの時刻設定を確認してください"
@@ -14835,11 +17442,24 @@
msgid "impossible time zone offset: %d"
msgstr "あり得ないタイムゾーン: %d"
+msgid "dates cannot consist entirely of whitespace"
+msgstr "空白文字だけで構成された日時指定は不正です"
+
+msgid "invalid day spec, use '<DATE'"
+msgstr "不正な日付の指定です。 '<DATE' 形式で記述してください。"
+
+msgid "invalid day spec, use '>DATE'"
+msgstr "不正な日付の指定です。 '>DATE' 形式で記述してください。"
+
#, python-format
msgid "invalid day spec: %s"
msgstr "不正な日付の指定です: %s"
#, python-format
+msgid "%s must be nonnegative (see 'hg help dates')"
+msgstr "%s は正の値でなければなりません ('hg help dates' 参照)"
+
+#, python-format
msgid "%.0f GB"
msgstr "%.0f GB"
@@ -14883,6 +17503,9 @@
msgid "no port number associated with service '%s'"
msgstr "サービス '%s' 用のポート番号が不明"
+msgid "file:// URLs can only refer to localhost"
+msgstr "file:// URL が参照出来るのはローカルホストのみです"
+
msgid "cannot verify bundle or remote repos"
msgstr "ローカルリポジトリ以外は検証できません"
--- a/i18n/pt_BR.po Wed Jun 29 12:54:34 2011 +0200
+++ b/i18n/pt_BR.po Wed Jun 29 16:05:41 2011 -0500
@@ -1,6 +1,6 @@
# Brazilian Portuguese translations for Mercurial
# Traduções do Mercurial para português do Brasil
-# Copyright (C) 2009 Matt Mackall and others
+# Copyright (C) 2011 Matt Mackall and others
#
# Translators:
# Diego Oliveira <diego@diegooliveira.com>
@@ -31,8 +31,8 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2010-03-02 10:55-0300\n"
-"PO-Revision-Date: 2010-06-19 17:18+0200\n"
+"POT-Creation-Date: 2011-06-20 16:55-0300\n"
+"PO-Revision-Date: 2011-06-28 09:55+0200\n"
"Last-Translator: Wagner Bruna <wbruna@yahoo.com>\n"
"Language-Team: Brazilian Portuguese\n"
"MIME-Version: 1.0\n"
@@ -401,217 +401,349 @@
msgid ""
"This hook extension adds comments on bugs in Bugzilla when changesets\n"
-"that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
-"bug status."
+"that refer to bugs by Bugzilla ID are seen. The comment is formatted using\n"
+"the Mercurial template mechanism."
msgstr ""
"Essa extensão adiciona comentários a bugs do Bugzilla quando\n"
"forem encontradas revisões que se refiram a esses bugs pelo ID.\n"
-"Esse gancho não muda o estado do bug."
-
-msgid ""
-"The hook updates the Bugzilla database directly. Only Bugzilla\n"
-"installations using MySQL are supported."
-msgstr ""
-"Esse gancho atualiza diretamente o banco de dados do Bugzilla.\n"
-"Apenas instalações do Bugzilla utilizando MySQL são suportadas."
-
-msgid ""
-"The hook relies on a Bugzilla script to send bug change notification\n"
-"emails. That script changes between Bugzilla versions; the\n"
-"'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
-"subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
-"be run by Mercurial as the user pushing the change; you will need to\n"
-"ensure the Bugzilla install file permissions are set appropriately."
-msgstr ""
-"O gancho se baseia em um script do Bugzilla para enviar emails de\n"
-"notificação de alterações de bugs. Esse script muda entre versões do\n"
-"Bugzilla; o script 'processmail' usado antes da 2.18 é substituído na\n"
-"2.18 e subsequentes por 'config/sendbugmail.pl'. Note que esse script\n"
-"será executado pelo Mercurial assim que o usuário enviar a revisão;\n"
-"você terá que assegurar que as permissões de arquivo da instalação\n"
-"do Bugzilla estejam configuradas apropriadamente."
-
-msgid ""
-"The extension is configured through three different configuration\n"
-"sections. These keys are recognized in the [bugzilla] section:"
-msgstr ""
-"Esta extensão é configurada através de três diferentes seções de\n"
-"configuração. As seguintes chaves são reconhecidas na seção\n"
-"[bugzilla]:"
-
-msgid ""
-"host\n"
-" Hostname of the MySQL server holding the Bugzilla database."
-msgstr ""
-"host\n"
-" Nome do servidor do MySQL que contém o banco de dados do Bugzilla."
-
-msgid ""
-"db\n"
-" Name of the Bugzilla database in MySQL. Default 'bugs'."
-msgstr ""
-"db\n"
-" Nome do banco de dados do Bugzilla no MySQL. O padrão é 'bugs'."
-
-msgid ""
-"user\n"
-" Username to use to access MySQL server. Default 'bugs'."
-msgstr ""
-"user\n"
-" Nome de usuário para acessar o servidor MySQL. O padrão é 'bugs'."
-
-msgid ""
-"password\n"
+"Os comentários são formatados usando o mecanismo de templates\n"
+"do Mercurial."
+
+msgid "The hook does not change bug status."
+msgstr "Esse gancho não muda o estado do bug."
+
+msgid "Three basic modes of access to Bugzilla are provided:"
+msgstr "Três modos básicos de acesso ao Bugzilla são fornecidos:"
+
+msgid "1. Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later."
+msgstr ""
+"1. Acesso através da interface XMLRPC do Bugzilla. Exige a versão\n"
+"3.4 ou posterior do Bugzilla."
+
+msgid ""
+"2. Check data via the Bugzilla XMLRPC interface and submit bug change\n"
+" via email to Bugzilla email interface. Requires Bugzilla 3.4 or later."
+msgstr ""
+"2. Verifica os dados pela interface XMLRPC do Bugzilla, e envia mudanças\n"
+"de bug por email para a interface de email do Bugzilla. Exige a versão\n"
+"3.4 ou posterior do Bugzilla."
+
+msgid ""
+"3. Writing directly to the Bugzilla database. Only Bugzilla installations\n"
+" using MySQL are supported. Requires Python MySQLdb."
+msgstr ""
+"3. Escreve diretamente na base de dados do Bugzilla. São suportadas\n"
+"apenas instalações do Bugzilla usando o MySQL. Exige o módulo\n"
+"MySQLdb do Python."
+
+msgid ""
+"Writing directly to the database is susceptible to schema changes, and\n"
+"relies on a Bugzilla contrib script to send out bug change\n"
+"notification emails. This script runs as the user running Mercurial,\n"
+"must be run on the host with the Bugzilla install, and requires\n"
+"permission to read Bugzilla configuration details and the necessary\n"
+"MySQL user and password to have full access rights to the Bugzilla\n"
+"database. For these reasons this access mode is now considered\n"
+"deprecated, and will not be updated for new Bugzilla versions going\n"
+"forward."
+msgstr ""
+"A escita direta na base de dados é suscetível a mudanças de schema,\n"
+"e se baseia em um script Bugzilla para enviar notificações de mudança\n"
+"de bug por email. Este script é executado pelo usuário que executa o\n"
+"Mercurial, deve ser executado no host contendo a instalação do\n"
+"Bugzilla, exige permissões de leitura de detalhes de configuração\n"
+"do Bugzilla e um usuário e senha do MySQL que tenha acesso completo\n"
+"à base de dados do Bugzilla.\n"
+"Por essas razões, este modo de acesso é considerado obsoleto, e\n"
+"não será atualizado para novas versões do Bugzilla."
+
+msgid ""
+"Access via XMLRPC needs a Bugzilla username and password to be specified\n"
+"in the configuration. Comments are added under that username. Since the\n"
+"configuration must be readable by all Mercurial users, it is recommended\n"
+"that the rights of that user are restricted in Bugzilla to the minimum\n"
+"necessary to add comments."
+msgstr ""
+"O acesso por XMLRPC necessita de um nome de usuário e senha do\n"
+"Bugzilla especificados na configuração. Comentários são adicionados\n"
+"sob tal nome de usuário. Como a configuração deve ser legível por\n"
+"todos os usuários do Mercurial, recomenda-se que os direitos desse\n"
+"usuário sejam restritos ao mínimo necessário para adicionar\n"
+"comentários."
+
+msgid ""
+"Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends\n"
+"email to the Bugzilla email interface to submit comments to bugs.\n"
+"The From: address in the email is set to the email address of the Mercurial\n"
+"user, so the comment appears to come from the Mercurial user. In the event\n"
+"that the Mercurial user email is not recognised by Bugzilla as a Bugzilla\n"
+"user, the email associated with the Bugzilla username used to log into\n"
+"Bugzilla is used instead as the source of the comment."
+msgstr ""
+"O acesso por XMLRPC/email usa XMLRPC para consultar o Bugzilla,\n"
+"mas envia um email para a interface de emails do Bugzilla para\n"
+"adicionar comentários aos bugs. O endereço de email do usuário\n"
+"do Mercurial é usado como endereço From: no email, de modo que o\n"
+"comentário parecerá vir do usuário do Mercurial. Se o email do\n"
+"usuário não for reconhecido pelo Bugzilla como um usuário do\n"
+"Bugzilla, a origem do comentário será o email associado ao nome\n"
+"de usuário do Bugzilla usado para entrar no Bugzilla."
+
+msgid "Configuration items common to all access modes:"
+msgstr "Itens de configuração comuns a todos os modos de acesso:"
+
+msgid ""
+"bugzilla.version\n"
+" This access type to use. Values recognised are:"
+msgstr ""
+"bugzilla.version\n"
+" O tipo de acesso a ser usado. Os valores reconhecidos são:"
+
+msgid ""
+" :``xmlrpc``: Bugzilla XMLRPC interface.\n"
+" :``xmlrpc+email``: Bugzilla XMLRPC and email interfaces.\n"
+" :``3.0``: MySQL access, Bugzilla 3.0 and later.\n"
+" :``2.18``: MySQL access, Bugzilla 2.18 and up to but not\n"
+" including 3.0.\n"
+" :``2.16``: MySQL access, Bugzilla 2.16 and up to but not\n"
+" including 2.18."
+msgstr ""
+" :``xmlrpc``: interface XMLRPC do Bugzilla.\n"
+" :``xmlrpc+email``: interfaces XMLRPC e email do Bugzilla.\n"
+" :``3.0``: acesso MySQL, Bugzilla 3.0 e posterior.\n"
+" :``2.18``: acesso MySQL, Bugzilla 2.18 até (sem incluir) 3.0\n"
+" :``2.16``: acesso MySQL, Bugzilla 2.16 até (sem incluir) 2.18."
+
+msgid ""
+"bugzilla.regexp\n"
+" Regular expression to match bug IDs in changeset commit message.\n"
+" Must contain one \"()\" group. The default expression matches ``Bug\n"
+" 1234``, ``Bug no. 1234``, ``Bug number 1234``, ``Bugs 1234,5678``,\n"
+" ``Bug 1234 and 5678`` and variations thereof. Matching is case\n"
+" insensitive."
+msgstr ""
+"bugzilla.regexp\n"
+" Expressão regular para encontrar os IDs dos bugs na mensagem de\n"
+" consolidação da revisão. Deve conter um grupo de \"()\". A\n"
+" expressão padrão encontra ``Bug 1234``, ``Bug no. 1234``, ``Bug number\n"
+" 1234``, ``Bugs 1234,5678``, ``Bug 1234 and 5678`` e variações. A\n"
+" equivalência não é sensível a maiúsculas e minúsculas."
+
+msgid ""
+"bugzilla.style\n"
+" The style file to use when formatting comments."
+msgstr ""
+"bugzilla.style\n"
+" O arquivo de estilo usado para formatar os comentários."
+
+msgid ""
+"bugzilla.template\n"
+" Template to use when formatting comments. Overrides style if\n"
+" specified. In addition to the usual Mercurial keywords, the\n"
+" extension specifies:"
+msgstr ""
+"bugzilla.template\n"
+" O template usado para formatar os comentários. Sobrepõe style se\n"
+" especificado. Além das palavras chave do Mercurial, a extensão\n"
+" especifica:"
+
+msgid ""
+" :``{bug}``: The Bugzilla bug ID.\n"
+" :``{root}``: The full pathname of the Mercurial repository.\n"
+" :``{webroot}``: Stripped pathname of the Mercurial repository.\n"
+" :``{hgweb}``: Base URL for browsing Mercurial repositories."
+msgstr ""
+" :``{bug}``: O ID do bug no Bugzilla.\n"
+" :``{root}``: O caminho completo do repositório do Mercurial.\n"
+" :``{webroot}``: O caminho do repositório do Mercurial.\n"
+" :``{hgweb}``: URL base para visualizar o repositório do Mercurial via http."
+
+msgid ""
+" Default ``changeset {node|short} in repo {root} refers to bug\n"
+" {bug}.\\ndetails:\\n\\t{desc|tabindent}``"
+msgstr ""
+" O valor padrão é ``changeset {node|short} in repo {root} refers ``\n"
+" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}``"
+
+msgid ""
+"bugzilla.strip\n"
+" The number of path separator characters to strip from the front of\n"
+" the Mercurial repository path (``{root}`` in templates) to produce\n"
+" ``{webroot}``. For example, a repository with ``{root}``\n"
+" ``/var/local/my-project`` with a strip of 2 gives a value for\n"
+" ``{webroot}`` of ``my-project``. Default 0."
+msgstr ""
+"bugzilla.strip\n"
+" O número de separadores de caminho que devem ser retirados do\n"
+" início do caminho para o repositório do Mercurial (``{root}``\n"
+" nos templates) para produzir ``{webroot}``. Por exemplo, um\n"
+" repositório com ``{root}`` ``/var/local/my-project`` com valor\n"
+" de strip 2 gera ``my-project`` como valor de ``{webroot}``.\n"
+" O padrão é 0."
+
+msgid ""
+"web.baseurl\n"
+" Base URL for browsing Mercurial repositories. Referenced from\n"
+" templates as ``{hgweb}``."
+msgstr ""
+"web.baseurl\n"
+" URL base para visualização de repositórios do Mercurial. Usada\n"
+" em modelos como ``{hgweb}``."
+
+msgid "Configuration items common to XMLRPC+email and MySQL access modes:"
+msgstr "Itens de configuração comuns aos modos de acesso XMLRPC+email e MySQL:"
+
+msgid ""
+"bugzilla.usermap\n"
+" Path of file containing Mercurial committer email to Bugzilla user email\n"
+" mappings. If specified, the file should contain one mapping per\n"
+" line::"
+msgstr ""
+"bugzilla.usermap\n"
+" Caminho para o arquivo que contem o mapeamento do consolidador do\n"
+" Mercurial para o ID do usuário do Bugzilla. Se especificado, o\n"
+" arquivo deve conter um mapeamento por linha::"
+
+msgid " committer = Bugzilla user"
+msgstr " consolidador = usuário do Bugzilla"
+
+msgid " See also the ``[usermap]`` section."
+msgstr " Veja também a seção [usermap]."
+
+msgid ""
+"The ``[usermap]`` section is used to specify mappings of Mercurial\n"
+"committer email to Bugzilla user email. See also ``bugzilla.usermap``.\n"
+"Contains entries of the form ``committer = Bugzilla user``."
+msgstr ""
+"A seção ``[usermap]`` é usada para especificar mapeamentos de emails dos\n"
+"consolidadores do Mercurial para emails de usuários do Bugzilla. Veja\n"
+"também ``bugzilla.usermap``.\n"
+"Contém entradas com o formato ``consolidador = usuário do Bugzilla``."
+
+msgid "XMLRPC access mode configuration:"
+msgstr "Configuração do modo de acesso XMLRPC:"
+
+msgid ""
+"bugzilla.bzurl\n"
+" The base URL for the Bugzilla installation.\n"
+" Default ``http://localhost/bugzilla``."
+msgstr ""
+"bugzilla.bzurl\n"
+" A URL base para a instalação do Bugzilla.\n"
+" O padrão é ``http://localhost/bugzilla``."
+
+msgid ""
+"bugzilla.user\n"
+" The username to use to log into Bugzilla via XMLRPC. Default\n"
+" ``bugs``."
+msgstr ""
+"bugzilla.user\n"
+" O nome de usuário a ser usado para entrar no Bugzilla via XMLRPC.\n"
+" O padrão é ``bugs``."
+
+msgid ""
+"bugzilla.password\n"
+" The password for Bugzilla login."
+msgstr ""
+"bugzilla.password\n"
+" A senha de login do Bugzilla."
+
+msgid ""
+"XMLRPC+email access mode uses the XMLRPC access mode configuration items,\n"
+"and also:"
+msgstr ""
+"O modo de acesso XMLRPC+email usa os itens de configuração do modo\n"
+"XMLRPC, além de:"
+
+msgid ""
+"bugzilla.bzemail\n"
+" The Bugzilla email address."
+msgstr ""
+"bugzilla.bzemail\n"
+" O endereço de email do Bugzilla."
+
+msgid ""
+"In addition, the Mercurial email settings must be configured. See the\n"
+"documentation in hgrc(5), sections ``[email]`` and ``[smtp]``."
+msgstr ""
+"Adicionalmente, as opções de email do Mercurial devem ser configuradas.\n"
+"Veja a documentação em hgrc(5), seções ``[email]`` e ``[smtp]``."
+
+msgid "MySQL access mode configuration:"
+msgstr "Configuração do modo de acesso MySQL:"
+
+msgid ""
+"bugzilla.host\n"
+" Hostname of the MySQL server holding the Bugzilla database.\n"
+" Default ``localhost``."
+msgstr ""
+"bugzilla.host\n"
+" Nome do servidor do MySQL que contém o banco de dados do Bugzilla.\n"
+" O padrão é ``localhost``."
+
+msgid ""
+"bugzilla.db\n"
+" Name of the Bugzilla database in MySQL. Default ``bugs``."
+msgstr ""
+"bugzilla.db\n"
+" Nome do banco de dados do Bugzilla no MySQL. O padrão é ``bugs``."
+
+msgid ""
+"bugzilla.user\n"
+" Username to use to access MySQL server. Default ``bugs``."
+msgstr ""
+"bugzilla.user\n"
+" Nome de usuário para acessar o servidor MySQL. O padrão é ``bugs``."
+
+msgid ""
+"bugzilla.password\n"
" Password to use to access MySQL server."
msgstr ""
-"password\n"
+"bugzilla.password\n"
" Senha para acessar o servidor MySQL."
msgid ""
-"timeout\n"
+"bugzilla.timeout\n"
" Database connection timeout (seconds). Default 5."
msgstr ""
-"timeout\n"
+"bugzilla.timeout\n"
" Tempo de espera limite para conexão com o banco de dados (em\n"
" segundos). O padrão é 5."
msgid ""
-"version\n"
-" Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
-" '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
-" to 2.18."
-msgstr ""
-"version\n"
-" Versão do Bugzilla. Especifique '3.0' para versões do Bugzilla 3.0\n"
-" e posteriores, '2.18' para a versão 2.18 e '2.16' para versões\n"
-" anteriores à 2.18."
-
-msgid ""
-"bzuser\n"
+"bugzilla.bzuser\n"
" Fallback Bugzilla user name to record comments with, if changeset\n"
" committer cannot be found as a Bugzilla user."
msgstr ""
-"bzuser\n"
+"bugzilla.bzuser\n"
" Nome de usuário no Bugzilla utilizado para gravar os comentários\n"
" se o autor da revisão não for encontrado como um usuário do\n"
" Bugzilla."
msgid ""
-"bzdir\n"
+"bugzilla.bzdir\n"
" Bugzilla install directory. Used by default notify. Default\n"
-" '/var/www/html/bugzilla'."
-msgstr ""
-"bzdir\n"
+" ``/var/www/html/bugzilla``."
+msgstr ""
+"bugzilla.bzdir\n"
" Diretório de instalação do Bugzilla. Usado pelo notify padrão. Seu\n"
-" valor padrão é '/var/www/html/bugzilla'."
-
-msgid ""
-"notify\n"
+" valor padrão é ``/var/www/html/bugzilla``."
+
+msgid ""
+"bugzilla.notify\n"
" The command to run to get Bugzilla to send bug change notification\n"
-" emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
-" and 'user' (committer bugzilla email). Default depends on version;\n"
-" from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
-" %(id)s %(user)s\"."
-msgstr ""
-"notify\n"
+" emails. Substitutes from a map with 3 keys, ``bzdir``, ``id`` (bug\n"
+" id) and ``user`` (committer bugzilla email). Default depends on\n"
+" version; from 2.18 it is \"cd %(bzdir)s && perl -T\n"
+" contrib/sendbugmail.pl %(id)s %(user)s\"."
+msgstr ""
+"bugzilla.notify\n"
" O comando que deve ser executado para o Bugzilla enviar o email\n"
" de notificação de alterações. É realizada a substituição de 3\n"
-" entradas: 'bzdir', 'id' (bug id) e 'user' (email do submetedor\n"
+" entradas: ``bzdir``, ``id`` (bug id) e ``user`` (email do submetedor\n"
" do bugzilla). O padrão depende da versão; na 2.18 é\n"
" \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %(user)s\"."
-msgid ""
-"regexp\n"
-" Regular expression to match bug IDs in changeset commit message.\n"
-" Must contain one \"()\" group. The default expression matches 'Bug\n"
-" 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
-" 1234 and 5678' and variations thereof. Matching is case insensitive."
-msgstr ""
-"regexp\n"
-" Expressão regular para encontrar os IDs dos bugs na mensagem de\n"
-" consolidação da revisão. Deve conter um grupo de \"()\". A\n"
-" expressão padrão encontra 'Bug 1234', 'Bug no. 1234', 'Bug number\n"
-" 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' e variações. A\n"
-" equivalência não é sensível a maiúsculas e minúsculas."
-
-msgid ""
-"style\n"
-" The style file to use when formatting comments."
-msgstr ""
-"style\n"
-" O arquivo de estilo usado para formatar os comentários."
-
-msgid ""
-"template\n"
-" Template to use when formatting comments. Overrides style if\n"
-" specified. In addition to the usual Mercurial keywords, the\n"
-" extension specifies::"
-msgstr ""
-"template\n"
-" O template usado para formatar os comentários. Sobrepõe style se\n"
-" especificado. Além das palavras chave do Mercurial, a extensão\n"
-" especifica::"
-
-msgid ""
-" {bug} The Bugzilla bug ID.\n"
-" {root} The full pathname of the Mercurial repository.\n"
-" {webroot} Stripped pathname of the Mercurial repository.\n"
-" {hgweb} Base URL for browsing Mercurial repositories."
-msgstr ""
-" {bug} O ID do bug no Bugzilla.\n"
-" {root} O caminho completo do repositório do Mercurial.\n"
-" {webroot} O caminho do repositório do Mercurial.\n"
-" {hgweb} URL base para visualizar o repositório do Mercurial via http."
-
-msgid ""
-" Default 'changeset {node|short} in repo {root} refers '\n"
-" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'"
-msgstr ""
-" O valor padrão é 'changeset {node|short} in repo {root} refers '\n"
-" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'"
-
-msgid ""
-"strip\n"
-" The number of slashes to strip from the front of {root} to produce\n"
-" {webroot}. Default 0."
-msgstr ""
-"strip\n"
-" O número de barras que devem ser retiradas do início do {root} para\n"
-" produzir o {webroot}. Padrão 0."
-
-msgid ""
-"usermap\n"
-" Path of file containing Mercurial committer ID to Bugzilla user ID\n"
-" mappings. If specified, the file should contain one mapping per\n"
-" line, \"committer\"=\"Bugzilla user\". See also the [usermap] section."
-msgstr ""
-"usermap\n"
-" Caminho para o arquivo que contem o mapeamento do consolidador do\n"
-" Mercurial para o ID do usuário do Bugzilla. Se especificado, o\n"
-" arquivo deve conter um mapeamento por linha,\n"
-" \"committer\"=\"Bugzilla user\". Veja também a sessão [usermap]."
-
-msgid ""
-"The [usermap] section is used to specify mappings of Mercurial\n"
-"committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
-"\"committer\"=\"Bugzilla user\""
-msgstr ""
-"A seção [usermap] é usada para especificar mapeamentos de IDs dos\n"
-"consolidadores do Mercurial para IDs de usuário do Bugzilla. Veja\n"
-"também [bugzilla].usermap.\"committer\"=\"Bugzilla user\""
-
-msgid "Finally, the [web] section supports one entry:"
-msgstr "Por fim, a seção [web] suporta uma entrada:"
-
-msgid ""
-"baseurl\n"
-" Base URL for browsing Mercurial repositories. Reference from\n"
-" templates as {hgweb}."
-msgstr ""
-"baseurl\n"
-" URL base para visualização de repositórios do Mercurial. Usada\n"
-" em modelos como {hgweb}."
-
msgid "Activating the extension::"
msgstr "Para ativar a extensão::"
@@ -631,17 +763,111 @@
" # executa o gancho bugzilla a cada mudança trazida para cá\n"
" incoming.bugzilla = python:hgext.bugzilla.hook"
-msgid "Example configuration:"
-msgstr "Exemplo de configuração:"
-
-msgid ""
-"This example configuration is for a collection of Mercurial\n"
-"repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
-"installation in /opt/bugzilla-3.2. ::"
-msgstr ""
-"Este exemplo de configuração é para uma coleção de repositórios do\n"
-"Mercurial em /var/local/hg/repos/ usada com uma instalação local do\n"
-"Bugzilla 3.2 em /opt/bugzilla-3.2 ::"
+msgid "Example configurations:"
+msgstr "Exemplos de configuração:"
+
+msgid ""
+"XMLRPC example configuration. This uses the Bugzilla at\n"
+"``http://my-project.org/bugzilla``, logging in as user\n"
+"``bugmail@my-project.org`` with password ``plugh``. It is used with a\n"
+"collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
+"with a web interface at ``http://my-project.org/hg``. ::"
+msgstr ""
+"Exemplo de configuração XMLRPC. Usa o Bugzilla em\n"
+"``http://my-project.org/bugzilla``, entrando como usuário\n"
+"``bugmail@my-project.org`` com senha ``plugh``. É usado com uma\n"
+"coleção de repositórios do Mercurial em ``/var/local/hg/repos/``,\n"
+"com uma interface web em ``http://my-project.org/hg``. ::"
+
+msgid ""
+" [bugzilla]\n"
+" bzurl=http://my-project.org/bugzilla\n"
+" user=bugmail@my-project.org\n"
+" password=plugh\n"
+" version=xmlrpc\n"
+" template=Changeset {node|short} in {root|basename}.\n"
+" {hgweb}/{webroot}/rev/{node|short}\\n\n"
+" {desc}\\n\n"
+" strip=5"
+msgstr ""
+" [bugzilla]\n"
+" bzurl=http://my-project.org/bugzilla\n"
+" user=bugmail@my-project.org\n"
+" password=plugh\n"
+" version=xmlrpc\n"
+" template=Changeset {node|short} in {root|basename}.\n"
+" {hgweb}/{webroot}/rev/{node|short}\\n\n"
+" {desc}\\n\n"
+" strip=5"
+
+msgid ""
+" [web]\n"
+" baseurl=http://my-project.org/hg"
+msgstr ""
+" [web]\n"
+" baseurl=http://my-project.org/hg"
+
+msgid ""
+"XMLRPC+email example configuration. This uses the Bugzilla at\n"
+"``http://my-project.org/bugzilla``, logging in as user\n"
+"``bugmail@my-project.org`` with password ``plugh``. It is used with a\n"
+"collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
+"with a web interface at ``http://my-project.org/hg``. Bug comments\n"
+"are sent to the Bugzilla email address\n"
+"``bugzilla@my-project.org``. ::"
+msgstr ""
+"Exemplo de configuração XMLRPC+email. Usa o Bugzilla em\n"
+"``http://my-project.org/bugzilla``, entrando como usuário\n"
+"``bugmail@my-project.org`` com a senha ``plugh``. É usado com uma\n"
+"coleção de repositórios do Mercurial em ``/var/local/hg/repos/``,\n"
+"com uma interface web em ``http://my-project.org/hg``. Comentários\n"
+"para bugs são enviados para o endereço de email do Bugzilla\n"
+"``bugzilla@my-project.org``. ::"
+
+msgid ""
+" [bugzilla]\n"
+" bzurl=http://my-project.org/bugzilla\n"
+" user=bugmail@my-project.org\n"
+" password=plugh\n"
+" version=xmlrpc\n"
+" bzemail=bugzilla@my-project.org\n"
+" template=Changeset {node|short} in {root|basename}.\n"
+" {hgweb}/{webroot}/rev/{node|short}\\n\n"
+" {desc}\\n\n"
+" strip=5"
+msgstr ""
+" [bugzilla]\n"
+" bzurl=http://my-project.org/bugzilla\n"
+" user=bugmail@my-project.org\n"
+" password=plugh\n"
+" version=xmlrpc\n"
+" bzemail=bugzilla@my-project.org\n"
+" template=Changeset {node|short} in {root|basename}.\n"
+" {hgweb}/{webroot}/rev/{node|short}\\n\n"
+" {desc}\\n\n"
+" strip=5"
+
+msgid ""
+" [usermap]\n"
+" user@emaildomain.com=user.name@bugzilladomain.com"
+msgstr ""
+" [usermap]\n"
+" user@emaildomain.com=user.name@bugzilladomain.com"
+
+msgid ""
+"MySQL example configuration. This has a local Bugzilla 3.2 installation\n"
+"in ``/opt/bugzilla-3.2``. The MySQL database is on ``localhost``,\n"
+"the Bugzilla database name is ``bugs`` and MySQL is\n"
+"accessed with MySQL username ``bugs`` password ``XYZZY``. It is used\n"
+"with a collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
+"with a web interface at ``http://my-project.org/hg``. ::"
+msgstr ""
+"Exemplo de configuração MySQL. Usa uma instalação local do Bugzilla 3.2\n"
+"em ``/opt/bugzilla-3.2``. A base de dados MySQL está em ``localhost``,\n"
+"o nome da base de dados Bugzilla é ``bugs`` e o MySQL é acessado\n"
+"com o nome de usuário MySQL ``bugs`` e a senha ``XYZZY``. É usado\n"
+"com uma coleção de repositórios do Mercurial em ``/var/local/hg/repos/``,\n"
+"com uma interface web em ``http://my-project.org/hg``. ::"
msgid ""
" [bugzilla]\n"
@@ -666,36 +892,26 @@
" {desc}\\n\n"
" strip=5"
-msgid ""
-" [web]\n"
-" baseurl=http://dev.domain.com/hg"
-msgstr ""
-" [web]\n"
-" baseurl=http://dev.domain.com/hg"
-
-msgid ""
-" [usermap]\n"
-" user@emaildomain.com=user.name@bugzilladomain.com"
-msgstr ""
-" [usermap]\n"
-" user@emaildomain.com=user.name@bugzilladomain.com"
-
-msgid "Commits add a comment to the Bugzilla bug record of the form::"
-msgstr ""
-"Consolidações adicionam um comentário ao registro de bug do Bugzilla\n"
-"com a forma::"
+msgid "All the above add a comment to the Bugzilla bug record of the form::"
+msgstr ""
+"Todas as configurações acima adicionam um comentário ao registro de bug\n"
+"do Bugzilla com a forma::"
msgid ""
" Changeset 3b16791d6642 in repository-name.\n"
-" http://dev.domain.com/hg/repository-name/rev/3b16791d6642"
+" http://my-project.org/hg/repository-name/rev/3b16791d6642"
msgstr ""
" Changeset 3b16791d6642 in repository-name.\n"
-" http://dev.domain.com/hg/repository-name/rev/3b16791d6642"
+" http://my-project.org/hg/repository-name/rev/3b16791d6642"
msgid " Changeset commit comment. Bug 1234.\n"
msgstr " Changeset commit comment. Bug 1234.\n"
#, python-format
+msgid "python mysql support not available: %s"
+msgstr "indisponível suporte ao mysql no python: %s"
+
+#, python-format
msgid "connecting to %s:%s as %s, password %s\n"
msgstr "conectando a %s:%s como %s, senha %s\n"
@@ -744,6 +960,13 @@
msgid "cannot find bugzilla user id for %s or %s"
msgstr "não é possível encontrar o id do usuário no bugzilla para %s ou %s"
+msgid "configuration 'bzemail' missing"
+msgstr "a configuração 'bzemail' está faltando"
+
+#, python-format
+msgid "default bugzilla user %s email not found"
+msgstr "o email do usuário padrão do bugzilla %s não foi encontrado"
+
#, python-format
msgid "bugzilla version %s not supported"
msgstr "versão %s do bugzilla não suportada"
@@ -758,16 +981,12 @@
"\t{desc|tabindent}"
#, python-format
-msgid "python mysql support not available: %s"
-msgstr "indisponível suporte ao mysql no python: %s"
-
-#, python-format
msgid "hook type %s does not pass a changeset id"
msgstr "gancho do tipo %s não passa um id de revisão"
#, python-format
-msgid "database error: %s"
-msgstr "erro de banco de dados: %s"
+msgid "Bugzilla error: %s"
+msgstr "Erro do Bugzilla: %s"
msgid "command to display child changesets"
msgstr "comando para exibir revisões filhas"
@@ -933,27 +1152,32 @@
msgstr "colore a saída de alguns comandos"
msgid ""
-"This extension modifies the status and resolve commands to add color to their\n"
-"output to reflect file status, the qseries command to add color to reflect\n"
-"patch status (applied, unapplied, missing), and to diff-related\n"
-"commands to highlight additions, removals, diff headers, and trailing\n"
-"whitespace."
-msgstr ""
-"Esta extensão colore a saída de certos comandos para realçar diversas\n"
-"informações: nos comandos status e resolve, reflete os estados dos\n"
-"arquivos; no comando qseries, reflete os estados dos patches (aplicado,\n"
-"não-aplicado, faltando); e para comandos relacionados com diff,\n"
-"destaca adições, remoções, cabeçalhos de diffs e espaços em branco\n"
-"no final das linhas."
+"This extension modifies the status and resolve commands to add color\n"
+"to their output to reflect file status, the qseries command to add\n"
+"color to reflect patch status (applied, unapplied, missing), and to\n"
+"diff-related commands to highlight additions, removals, diff headers,\n"
+"and trailing whitespace."
+msgstr ""
+"Esta extensão modifica os comandos status e resolve para adicionar\n"
+"coloração às suas respectivas saídas para refletir estado de arquivos,\n"
+"o comando qseries para adicionar coloração para refletir os estados dos\n"
+"patches (aplicado, não-aplicado, faltando), e comandos relacionados com\n"
+"diff para destacar adições, remoções, cabeçalhos de diffs e espaços em\n"
+"branco no final das linhas."
msgid ""
"Other effects in addition to color, like bold and underlined text, are\n"
-"also available. Effects are rendered with the ECMA-48 SGR control\n"
+"also available. By default, the terminfo database is used to find the\n"
+"terminal codes used to change color and effect. If terminfo is not\n"
+"available, then effects are rendered with the ECMA-48 SGR control\n"
"function (aka ANSI escape codes)."
msgstr ""
"Outros efeitos adicionais às cores, como negrito e sublinhado,\n"
-"também estão disponíveis. Os efeitos são desenhados com a função de\n"
-"controle ECMA-48 SGR (também conhecidos como códigos de escape ANSI)."
+"também estão disponíveis. Por padrão, a base de dados terminfo\n"
+"é usada para determinar os códigos de terminal usados para mudar\n"
+"cores e efeitos. Se terminfo não estiver disponível, os efeitos\n"
+"serão desenhados com a função de controle ECMA-48 SGR (também\n"
+"conhecidos como códigos de escape ANSI)."
msgid "Default effects may be overridden from your configuration file::"
msgstr "Os efeitos padrão podem ser redefinidos pelo seu arquivo de configuração::"
@@ -1036,11 +1260,60 @@
" branches.inactive = none"
msgid ""
-"The color extension will try to detect whether to use ANSI codes or\n"
-"Win32 console APIs, unless it is made explicit::"
-msgstr ""
-"A extensão color tentará detectar se deve usar códigos ANSI ou as APIs\n"
-"do console Win32, a não ser que isso seja configurado explicitamente::"
+"The available effects in terminfo mode are 'blink', 'bold', 'dim',\n"
+"'inverse', 'invisible', 'italic', 'standout', and 'underline'; in\n"
+"ECMA-48 mode, the options are 'bold', 'inverse', 'italic', and\n"
+"'underline'. How each is rendered depends on the terminal emulator.\n"
+"Some may not be available for a given terminal type, and will be\n"
+"silently ignored."
+msgstr ""
+"Os efeitos disponíveis em modo terminfo são 'blink', 'bold', 'dim',\n"
+"'inverse', 'invisible', 'italic', 'standout', e 'underline'; em modo\n"
+"ECMA-48 mode, as opções são 'bold', 'inverse', 'italic' e\n"
+"'underline'. O modo como cada um é desenhado dependerá do emulador\n"
+"de terminal. Alguns efeitos podem não estar disponíveis para um\n"
+"determinado tipo de terminal, e serão silenciosamente ignorados."
+
+msgid ""
+"Because there are only eight standard colors, this module allows you\n"
+"to define color names for other color slots which might be available\n"
+"for your terminal type, assuming terminfo mode. For instance::"
+msgstr ""
+"Como existem apenas oito cores padronizadas, este módulo permite que\n"
+"você defina nomes de cores para outras entradas de cores que podem\n"
+"estar disponíveis para o seu tipo de terminal, assumindo modo terminfo.\n"
+"Por exemplo::"
+
+msgid ""
+" color.brightblue = 12\n"
+" color.pink = 207\n"
+" color.orange = 202"
+msgstr ""
+" color.brightblue = 12\n"
+" color.pink = 207\n"
+" color.orange = 202"
+
+msgid ""
+"to set 'brightblue' to color slot 12 (useful for 16 color terminals\n"
+"that have brighter colors defined in the upper eight) and, 'pink' and\n"
+"'orange' to colors in 256-color xterm's default color cube. These\n"
+"defined colors may then be used as any of the pre-defined eight,\n"
+"including appending '_background' to set the background to that color."
+msgstr ""
+"para definir 'brightblue' para a entrada de cor 12 (útil para terminais\n"
+"de 16 cores que possuam cores mais brilhantes definidas para as oito\n"
+"entradas superiores) e 'pink' e 'orange' para cores no cubo padrão de 256\n"
+"cores de terminais xterm. Estas cores definidas podem então ser usadas\n"
+"da mesma forma que as oito pré-definidas, inclusive anexando '_background'\n"
+"para definir o plano de fundo para tal cor."
+
+msgid ""
+"The color extension will try to detect whether to use terminfo, ANSI\n"
+"codes or Win32 console APIs, unless it is made explicit; e.g.::"
+msgstr ""
+"A extensão color tentará detectar se deve usar terminfo, códigos ANSI\n"
+"ou as APIs do console Win32, a não ser que isso seja configurado\n"
+"explicitamente, como em::"
msgid ""
" [color]\n"
@@ -1049,19 +1322,24 @@
" [color]\n"
" mode = ansi"
-msgid "Any value other than 'ansi', 'win32', or 'auto' will disable color."
-msgstr ""
-"Qualquer valor diferente de 'ansi', 'win32' ou 'auto' desabilitará\n"
-"a coloração."
+msgid ""
+"Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will\n"
+"disable color."
+msgstr ""
+"Qualquer valor diferente de 'ansi', 'win32', 'terminfo' ou 'auto'\n"
+"desabilitará a coloração."
+
+msgid "no terminfo entry for setab/setaf: reverting to ECMA-48 color\n"
+msgstr "nenhuma entrada terminfo para setab/setaf: revertendo para cores ECMA-48\n"
+
+#, python-format
+msgid "warning: failed to set color mode to %s\n"
+msgstr "aviso: falha ao definir modo de coloração para %s\n"
#, python-format
msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
msgstr "ignorando cor/efeito desconhecido %r (configurado em color.%s)\n"
-#, python-format
-msgid "warning: failed to set color mode to %s\n"
-msgstr "aviso: falha ao definir modo de coloração para %s\n"
-
#. i18n: 'always', 'auto', and 'never' are keywords and should
#. not be translated
msgid "when to colorize (boolean, always, auto, or never)"
@@ -1709,6 +1987,15 @@
msgid "hg debugcvsps [OPTION]... [PATH]..."
msgstr "hg debugcvsps [OPÇÃO]... [CAMINHO]..."
+msgid ":svnrev: String. Converted subversion revision number."
+msgstr ":svnrev: String. Número da revisão do Subversion convertida."
+
+msgid ":svnpath: String. Converted subversion revision project path."
+msgstr ":svnpath: String. Caminho do projeto Subversion convertido."
+
+msgid ":svnuuid: String. Converted subversion revision repository identifier."
+msgstr ":svnuuid: String. Identificador do repositório do Subversion da revisão convertida."
+
#, python-format
msgid "%s does not look like a Bazaar repository"
msgstr "%s não parece ser um repositório do Bazaar"
@@ -2036,6 +2323,9 @@
msgid "updating tags\n"
msgstr "atualizando tags\n"
+msgid "updating bookmarks\n"
+msgstr "atualizando marcadores\n"
+
#, python-format
msgid "%s is not a valid start revision"
msgstr "%s não é uma revisão inicial válida"
@@ -2048,10 +2338,45 @@
msgid "%s does not look like a monotone repository"
msgstr "%s não parece ser um repositório do Monotone"
+msgid "bad mtn packet - no end of commandnbr"
+msgstr "bad mtn packet - no end of commandnbr"
+
+#, python-format
+msgid "bad mtn packet - bad stream type %s"
+msgstr "bad mtn packet - bad stream type %s"
+
+msgid "bad mtn packet - no divider before size"
+msgstr "bad mtn packet - no divider before size"
+
+msgid "bad mtn packet - no end of packet size"
+msgstr "bad mtn packet - no end of packet size"
+
+#, python-format
+msgid "bad mtn packet - bad packet size %s"
+msgstr "bad mtn packet - bad packet size %s"
+
+#, python-format
+msgid "bad mtn packet - unable to read full packet read %s of %s"
+msgstr "bad mtn packet - unable to read full packet read %s of %s"
+
+#, python-format
+msgid "mtn command '%s' returned %s"
+msgstr "o comando mtn '%s' devolveu %s"
+
#, python-format
msgid "copying file in renamed directory from '%s' to '%s'"
msgstr "copiando arquivo em diretório renomeado de '%s' para '%s'"
+msgid "unable to determine mtn automate interface version"
+msgstr "incapaz de determinar versão da interface mtn automate"
+
+#, python-format
+msgid "mtn automate stdio header unexpected: %s"
+msgstr "cabeçalho stdio do mtn automate inesperado: %s"
+
+msgid "failed to reach end of mtn automate stdio headers"
+msgstr "fim de cabeçalhos stdio do mtn automate não atingido"
+
#, python-format
msgid "%s does not look like a P4 repository"
msgstr "%s não parece ser um repositório do P4"
@@ -2320,18 +2645,24 @@
msgid ""
"The ``win32text.forbid*`` hooks provided by the win32text extension\n"
-"have been unified into a single hook named ``eol.hook``. The hook will\n"
-"lookup the expected line endings from the ``.hgeol`` file, which means\n"
-"you must migrate to a ``.hgeol`` file first before using the hook.\n"
-"Remember to enable the eol extension in the repository where you\n"
-"install the hook."
+"have been unified into a single hook named ``eol.checkheadshook``. The\n"
+"hook will lookup the expected line endings from the ``.hgeol`` file,\n"
+"which means you must migrate to a ``.hgeol`` file first before using\n"
+"the hook. ``eol.checkheadshook`` only checks heads, intermediate\n"
+"invalid revisions will be pushed. To forbid them completely, use the\n"
+"``eol.checkallhook`` hook. These hooks are best used as\n"
+"``pretxnchangegroup`` hooks."
msgstr ""
"Os ganchos ``win32text.forbid*`` fornecidos pela extensão win32text\n"
-"foram unificados em um único gancho chamado ``eol.hook``. Esse\n"
+"foram unificados em um único gancho chamado ``eol.checkheadshook``. Esse\n"
"gancho procura pela configuração de quebra de linha no arquivo\n"
"``.hgeol``, de modo que você precisa migrar para um arquivo\n"
"``.hgeol`` para poder usar o gancho. Lembre-se de habilitar a\n"
-"extensão eol no repositório onde você tiver instalado o gancho."
+"extensão eol no repositório onde você tiver instalado o gancho.\n"
+"``eol.checkheadshook`` verifica apenas cabeças; revisões intermediárias\n"
+"inválidas serão enviadas. Para proibi-las completamente, use o gancho\n"
+"``eol.checkallhook``. Estes ganchos são mais eficazes como ganchos\n"
+"``pretxnchangegroup``."
msgid ""
"See :hg:`help patterns` for more information about the glob patterns\n"
@@ -2341,25 +2672,24 @@
"arquivo usados.\n"
#, python-format
-msgid "%s should not have CRLF line endings"
-msgstr "%s não deve ter quebras de linha CRLF"
-
-#, python-format
-msgid "%s should not have LF line endings"
-msgstr "%s não deve ter quebras de linha LF"
+msgid "ignoring unknown EOL style '%s' from %s\n"
+msgstr "ignorado estilo de quebra de linha desconhecido '%s' de %s\n"
#, python-format
msgid "warning: ignoring .hgeol file due to parse error at %s: %s\n"
msgstr "aviso: arquivo .hgeol ignorado por erro de leitura em %s: %s\n"
+#, python-format
+msgid " %s in %s should not have %s line endings"
+msgstr " %s em %s não deveria ter quebras de linha %s"
+
+msgid "end-of-line check failed:\n"
+msgstr "a verificação de quebras de linha falhou:\n"
+
msgid "the eol extension is incompatible with the win32text extension\n"
msgstr "a extensão eol é incompatível com a extensão win32text\n"
#, python-format
-msgid "ignoring unknown EOL style '%s' from %s\n"
-msgstr "ignorado estilo de quebra de linha desconhecido '%s' de %s\n"
-
-#, python-format
msgid "inconsistent newline style in %s\n"
msgstr "estilo de quebra de linha inconsistente em %s\n"
@@ -2380,10 +2710,10 @@
"dos arquivos a serem comparados."
msgid ""
-"The extdiff extension also allows to configure new diff commands, so\n"
+"The extdiff extension also allows you to configure new diff commands, so\n"
"you do not need to type :hg:`extdiff -p kdiff3` always. ::"
msgstr ""
-"A extensão extdiff também permite configurar novos comandos\n"
+"A extensão extdiff também permite a você configurar novos comandos\n"
"de diff, de modo que você não precise sempre digitar\n"
":hg:`extdiff -p kdiff3`. ::"
@@ -2439,11 +2769,13 @@
" $parent1, $plabel1 - filename, descriptive label of first parent\n"
" $child, $clabel - filename, descriptive label of child revision\n"
" $parent2, $plabel2 - filename, descriptive label of second parent\n"
+" $root - repository root\n"
" $parent is an alias for $parent1."
msgstr ""
" $parent1, $plabel1 - nome de arquivo, rótulo descritivo do primeiro pai\n"
" $child, $clabel - nome de arquivo, rótulo descritivo da revisão filha\n"
" $parent2, $plabel2 - nome de arquivo, rótulo descritivo do segundo pai\n"
+" $root - raiz do repositório\n"
" $parent é um apelido para $parent1."
msgid ""
@@ -2686,6 +3018,9 @@
msgid "%s Note: This key has expired (signed by: \"%s\")\n"
msgstr "%s Nota: Esta chave expirou (assinada por: \"%s\")\n"
+msgid "hg sigs"
+msgstr "hg sigs"
+
msgid "list signed changesets"
msgstr "lista as revisões assinadas"
@@ -2693,6 +3028,9 @@
msgid "%s:%d node does not exist\n"
msgstr "nó %s:%d não existe\n"
+msgid "hg sigcheck REVISION"
+msgstr "hg sigcheck REVISÃO"
+
msgid "verify all the signatures there may be for a particular revision"
msgstr "verifica todas as assinaturas que podem existir para uma revisão em particular"
@@ -2700,6 +3038,30 @@
msgid "No valid signature for %s\n"
msgstr "Assinatura inválida para %s\n"
+msgid "make the signature local"
+msgstr "torna a assinatura local"
+
+msgid "sign even if the sigfile is modified"
+msgstr "assina mesmo se o arquivo de assinatura está modificado"
+
+msgid "do not commit the sigfile after signing"
+msgstr "não consolida o arquivo de assinaturas após assinar"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "the key id to sign with"
+msgstr "o id da chave com a qual assinar"
+
+msgid "TEXT"
+msgstr "TEXTO"
+
+msgid "commit message"
+msgstr "mensagem de consolidação"
+
+msgid "hg sign [OPTION]... [REVISION]..."
+msgstr "hg sign [OPÇÃO]... [REVISÃO]..."
+
msgid "add a signature for the current or given revision"
msgstr "adiciona uma assinatura para a revisão atual ou pedida"
@@ -2735,36 +3097,6 @@
msgid "unknown signature version"
msgstr "versão de assinatura desconhecida"
-msgid "make the signature local"
-msgstr "torna a assinatura local"
-
-msgid "sign even if the sigfile is modified"
-msgstr "assina mesmo se o arquivo de assinatura está modificado"
-
-msgid "do not commit the sigfile after signing"
-msgstr "não consolida o arquivo de assinaturas após assinar"
-
-msgid "ID"
-msgstr "ID"
-
-msgid "the key id to sign with"
-msgstr "o id da chave com a qual assinar"
-
-msgid "TEXT"
-msgstr "TEXTO"
-
-msgid "commit message"
-msgstr "mensagem de consolidação"
-
-msgid "hg sign [OPTION]... [REVISION]..."
-msgstr "hg sign [OPÇÃO]... [REVISÃO]..."
-
-msgid "hg sigcheck REVISION"
-msgstr "hg sigcheck REVISÃO"
-
-msgid "hg sigs"
-msgstr "hg sigs"
-
msgid "command to view revision graphs from a shell"
msgstr "comando para exibir grafos de revisão em terminais modo texto"
@@ -2778,8 +3110,26 @@
"uma representação ASCII do grafo de revisões.\n"
#, python-format
-msgid "--graph option is incompatible with --%s"
-msgstr "a opção --graph é incompatível com --%s"
+msgid "-G/--graph option is incompatible with --%s"
+msgstr "a opção -G/--graph é incompatível com --%s"
+
+msgid "-G/--graph option is incompatible with --follow with file argument"
+msgstr "a opção -G/--graph é incompatível com --follow com a opção de arquivo"
+
+msgid "NUM"
+msgstr "NÚMERO"
+
+msgid "limit number of changes displayed"
+msgstr "número limite de mudanças exibidas"
+
+msgid "show patch"
+msgstr "mostra o patch"
+
+msgid "show the specified revision or range"
+msgstr "mostra a revisão ou sequência de revisões especificada"
+
+msgid "hg glog [OPTION]... [FILE]"
+msgstr "hg glog [OPÇÃO]... [ARQUIVO]"
msgid "show revision history alongside an ASCII revision graph"
msgstr "mostra histórico de revisões ao lado de um grafo ASCII de revisões"
@@ -2800,27 +3150,9 @@
" trabalho.\n"
" "
-msgid "--graph option allows at most one file"
-msgstr "a opção --graph permite no máximo um arquivo"
-
msgid "show the revision DAG"
msgstr "mostra o grafo de revisões"
-msgid "NUM"
-msgstr "NÚMERO"
-
-msgid "limit number of changes displayed"
-msgstr "número limite de mudanças exibidas"
-
-msgid "show patch"
-msgstr "mostra o patch"
-
-msgid "show the specified revision or range"
-msgstr "mostra a revisão ou sequência de revisões especificada"
-
-msgid "hg glog [OPTION]... [FILE]"
-msgstr "hg glog [OPÇÃO]... [ARQUIVO]"
-
msgid "hooks for integrating with the CIA.vc notification service"
msgstr "ganchos para integração com o serviço de notificação CIA.vc"
@@ -2842,7 +3174,7 @@
" # Append a diffstat to the log message (optional)\n"
" #diffstat = False\n"
" # Template to use for log messages (optional)\n"
-" #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
+" #template = {desc}\\n{baseurl}{webroot}/rev/{node}-- {diffstat}\n"
" # Style to use (optional)\n"
" #style = foo\n"
" # The URL of the CIA notification service (optional)\n"
@@ -2851,7 +3183,9 @@
" # Make sure to set email.from if you do this.\n"
" #url = http://cia.vc/\n"
" # print message instead of sending it (optional)\n"
-" #test = False"
+" #test = False\n"
+" # number of slashes to strip for url paths\n"
+" #strip = 0"
msgstr ""
" [cia]\n"
" # seu nome de usuário CIA registrado\n"
@@ -2863,7 +3197,7 @@
" # Anexa um diffstat à mensagem de log (opcional)\n"
" #diffstat = False\n"
" # Modelo a ser usado em mensagens de log (opcional)\n"
-" #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
+" #template = {desc}\\n{baseurl}{webroot}/rev/{node}-- {diffstat}\n"
" # Estilo a ser usado (opcional)\n"
" #style = foo\n"
" # A URL do serviço de notificação CIA (opcional)\n"
@@ -2872,7 +3206,9 @@
" # Certifique-se de definir email.from se você fizer isso.\n"
" #url = http://cia.vc/\n"
" # imprime a mensagem ao invés de enviá-la (opcional)\n"
-" #test = False"
+" #test = False\n"
+" # número de barras a serem removidas de caminhos url\n"
+" #strip = 0"
msgid ""
" [hooks]\n"
@@ -3351,17 +3687,17 @@
"[keywordmaps] execute :hg:`kwdemo`. Veja :hg:`help templates`\n"
"para uma lista dos modelos e filtros disponíveis."
-msgid "Three additional date template filters are provided::"
-msgstr "Três filtros de data são fornecidos::"
-
-msgid ""
-" utcdate \"2006/09/18 15:13:13\"\n"
-" svnutcdate \"2006-09-18 15:13:13Z\"\n"
-" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
-msgstr ""
-" utcdate \"2006/09/18 15:13:13\"\n"
-" svnutcdate \"2006-09-18 15:13:13Z\"\n"
-" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
+msgid "Three additional date template filters are provided:"
+msgstr "Três filtros de modelos de data adicionais são fornecidos:"
+
+msgid ""
+":``utcdate``: \"2006/09/18 15:13:13\"\n"
+":``svnutcdate``: \"2006-09-18 15:13:13Z\"\n"
+":``svnisodate``: \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
+msgstr ""
+":``utcdate``: \"2006/09/18 15:13:13\"\n"
+":``svnutcdate``: \"2006-09-18 15:13:13Z\"\n"
+":``svnisodate``: \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
msgid ""
"The default template mappings (view with :hg:`kwdemo -d`) can be\n"
@@ -3369,7 +3705,7 @@
":hg:`kwdemo` to control the results of your configuration changes."
msgstr ""
"Os mapeamentos de modelo padrões (veja com :hg:`kwdemo -d`) podem\n"
-"ser substituídos com palavras chave customizáveis e modelos.\n"
+"ser substituídos com palavras chave personalizáveis e modelos.\n"
"Novamente, execute :hg:`kwdemo` para controlar os resultados de\n"
"suas mudanças na configuração."
@@ -3412,6 +3748,15 @@
msgid "no [keyword] patterns configured"
msgstr "nenhum padrão [keyword] configurado"
+msgid "show default keyword template maps"
+msgstr "exibe os mapas de modelos de teclado padrão"
+
+msgid "read maps from rcfile"
+msgstr "lê o mapeamento do arquivo rc"
+
+msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
+msgstr "hg kwdemo [-d] [-f ARQUIVORC] [MAPADEMODELOS]..."
+
msgid "print [keywordmaps] configuration and an expansion example"
msgstr "imprime a configuração [keywordmaps] e um exemplo de expansão"
@@ -3503,6 +3848,9 @@
"\n"
"\tpalavras chave expandidas\n"
+msgid "hg kwexpand [OPTION]... [FILE]..."
+msgstr "hg kwexpand [OPÇÃO]... [ARQUIVO]..."
+
msgid "expand keywords in the working directory"
msgstr "expande palavras chave no diretório de trabalho"
@@ -3517,6 +3865,18 @@
" mudanças locais.\n"
" "
+msgid "show keyword status flags of all files"
+msgstr "mostra indicadores de estado de palavras chave para todos os arquivos"
+
+msgid "show files excluded from expansion"
+msgstr "mostra arquivos excluídos da expansão"
+
+msgid "only show unknown (not tracked) files"
+msgstr "mostra apenas arquivos desconhecidos (não rastreados)"
+
+msgid "hg kwfiles [OPTION]... [FILE]..."
+msgstr "hg kwfiles [OPÇÃO]... [ARQUIVO]..."
+
msgid "show files configured for keyword expansion"
msgstr "mostra arquivos configurados para expansão de palavras chave"
@@ -3563,6 +3923,9 @@
" i = ignorado (não rastreado)\n"
" "
+msgid "hg kwshrink [OPTION]... [FILE]..."
+msgstr "hg kwshrink [OPÇÃO]... [ARQUIVO]..."
+
msgid "revert expanded keywords in the working directory"
msgstr "reverte palavras chave expandidas no diretório de trabalho"
@@ -3577,33 +3940,6 @@
" mudanças locais.\n"
" "
-msgid "show default keyword template maps"
-msgstr "exibe os mapas de modelos de teclado padrão"
-
-msgid "read maps from rcfile"
-msgstr "lê o mapeamento do arquivo rc"
-
-msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
-msgstr "hg kwdemo [-d] [-f ARQUIVORC] [MAPADEMODELOS]..."
-
-msgid "hg kwexpand [OPTION]... [FILE]..."
-msgstr "hg kwexpand [OPÇÃO]... [ARQUIVO]..."
-
-msgid "show keyword status flags of all files"
-msgstr "mostra indicadores de estado de palavras chave para todos os arquivos"
-
-msgid "show files excluded from expansion"
-msgstr "mostra arquivos excluídos da expansão"
-
-msgid "only show unknown (not tracked) files"
-msgstr "mostra apenas arquivos desconhecidos (não rastreados)"
-
-msgid "hg kwfiles [OPTION]... [FILE]..."
-msgstr "hg kwfiles [OPÇÃO]... [ARQUIVO]..."
-
-msgid "hg kwshrink [OPTION]... [FILE]..."
-msgstr "hg kwshrink [OPÇÃO]... [ARQUIVO]..."
-
msgid "manage a stack of patches"
msgstr "gerencia uma pilha de patches"
@@ -3687,6 +4023,9 @@
"Você gerenciará por padrão uma fila de patches chamada \"patches\". Você\n"
"pode criar outras filas independentes usando o comando :hg:`qqueue`.\n"
+msgid "print first line of patch header"
+msgstr "imprime a primeira linha do cabeçalho do patch"
+
#, python-format
msgid "malformated mq status line: %s\n"
msgstr "linha de status da mq malformada: %s\n"
@@ -3727,12 +4066,12 @@
msgstr "permitindo %s - nenhuma guarda negativa que case\n"
#, python-format
-msgid "allowing %s - guarded by %r\n"
-msgstr "permitindo %s - guardada por %r\n"
-
-#, python-format
-msgid "skipping %s - guarded by %r\n"
-msgstr "omitindo %s - guardada por %r\n"
+msgid "allowing %s - guarded by %s\n"
+msgstr "permitindo %s - guardada por %s\n"
+
+#, python-format
+msgid "skipping %s - guarded by %s\n"
+msgstr "omitindo %s - guardada por %s\n"
#, python-format
msgid "skipping %s - no matching guards\n"
@@ -3794,6 +4133,14 @@
msgstr "discrepância encontrada ao aplicar patch, parando\n"
#, python-format
+msgid "revision %s refers to unknown patches: %s\n"
+msgstr "a revisão %s se refere a patches desconhecidos: %s\n"
+
+#, python-format
+msgid "unknown patches: %s\n"
+msgstr "patches desconhecidos: %s\n"
+
+#, python-format
msgid "revision %d is not managed"
msgstr "a revisão %d não é gerenciada"
@@ -3837,6 +4184,14 @@
msgstr "\"%s\" não pode ser usado como nome de um patch"
#, python-format
+msgid "patch name cannot begin with \"%s\""
+msgstr "o nome do patch não pode começar com \"%s\""
+
+#, python-format
+msgid "\"%s\" cannot be used in the name of a patch"
+msgstr "\"%s\" não pode ser usado em um nome de patch"
+
+#, python-format
msgid "\"%s\" already exists as a directory"
msgstr "\"%s\" já existe, e é um diretório"
@@ -3878,8 +4233,8 @@
msgstr "não se pode empilhar para um patch anterior: %s"
#, python-format
-msgid "guarded by %r"
-msgstr "guardado por %r"
+msgid "guarded by %s"
+msgstr "guardado por %s"
msgid "no matching guards"
msgstr "nenhuma guarda com nome semelhante"
@@ -4054,6 +4409,15 @@
msgid "adding %s to series file\n"
msgstr "adicionando %s ao arquivo series\n"
+msgid "keep patch file"
+msgstr "mantém o arquivo de patch"
+
+msgid "stop managing a revision (DEPRECATED)"
+msgstr "deixa de gerenciar uma revisão (OBSOLETO)"
+
+msgid "hg qdelete [-k] [PATCH]..."
+msgstr "hg qdelete [-k] [PATCH]..."
+
msgid "remove patches from queue"
msgstr "remove patches da fila"
@@ -4072,6 +4436,12 @@
" Para parar de gerenciar um patch e movê-lo para o histórico\n"
" permanente, use o comando :hg:`qfinish` ."
+msgid "show only the last patch"
+msgstr "mostra apenas o último patch"
+
+msgid "hg qapplied [-1] [-s] [PATCH]"
+msgstr "hg qapplied [-1] [-s] [PATCH]"
+
msgid "print the patches already applied"
msgstr "imprime os patches já aplicados"
@@ -4081,12 +4451,42 @@
msgid "only one patch applied\n"
msgstr "apenas um patch aplicado\n"
+msgid "show only the first patch"
+msgstr "mostra apenas o primeiro patch"
+
+msgid "hg qunapplied [-1] [-s] [PATCH]"
+msgstr "hg qunapplied [-1] [-s] [PATCH]"
+
msgid "print the patches not yet applied"
msgstr "imprime os patches ainda não aplicados"
msgid "all patches applied\n"
msgstr "todos os patches aplicados\n"
+msgid "import file in patch directory"
+msgstr "importa um arquivo do diretório de patches"
+
+msgid "NAME"
+msgstr "NOME"
+
+msgid "name of patch file"
+msgstr "nome do arquivo de patch"
+
+msgid "overwrite existing files"
+msgstr "sobrescreve arquivos existentes"
+
+msgid "place existing revisions under mq control"
+msgstr "põe revisões existentes sob controle da mq"
+
+msgid "use git extended diff format"
+msgstr "usa o formato estendido de diff do git"
+
+msgid "qpush after importing"
+msgstr "executa qpush após importar"
+
+msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
+msgstr "hg qimport [-e] [-n NOME] [-f] [-g] [-P] [-r REV]... ARQUIVO..."
+
msgid "import a patch"
msgstr "importa um patch"
@@ -4126,14 +4526,15 @@
" With -g/--git, patches imported with --rev will use the git diff\n"
" format. See the diffs help topic for information on why this is\n"
" important for preserving rename/copy information and permission\n"
-" changes."
+" changes. Use :hg:`qfinish` to remove changesets from mq control."
msgstr ""
" Uma revisão existente pode ser colocada sob o controle da mq\n"
" com -r/--rev (por exemplo, qimport --rev tip -n patch colocará a\n"
" tip sob o controle da mq). Com -g/--git, os patches importados\n"
" com --rev usarão o formato git diff. Veja o tópico de ajuda diff\n"
" para informações sobre por que isso é importante para preservar\n"
-" informação de cópia e renomeação e mudanças de permissão."
+" informação de cópia e renomeação e mudanças de permissão.\n"
+" Use :hg:`qfinish` para tirar revisões do controle da mq."
msgid ""
" To import a patch from standard input, pass - as the patch file.\n"
@@ -4157,6 +4558,12 @@
" Devolve 0 se a importação teve sucesso.\n"
" "
+msgid "create queue repository"
+msgstr "cria o repositório da fila"
+
+msgid "hg qinit [-c]"
+msgstr "hg qinit [-c]"
+
msgid "init a new queue repository (DEPRECATED)"
msgstr "cria um novo repositório de fila (OBSOLETO)"
@@ -4181,6 +4588,24 @@
" Este comando é obsoleto. Sem -c, é subentendido em outros comandos\n"
" relevantes. E ao invés de -c, use :hg:`init --mq`."
+msgid "use pull protocol to copy metadata"
+msgstr "usa o protocolo pull para copiar metadados"
+
+msgid "do not update the new working directories"
+msgstr "não atualiza os novos diretórios de trabalho"
+
+msgid "use uncompressed transfer (fast over LAN)"
+msgstr "usa transferência não comprimida (mais rápido em LANs)"
+
+msgid "REPO"
+msgstr "REPOSITÓRIO"
+
+msgid "location of source patch repository"
+msgstr "localização do repositório de origem de patches"
+
+msgid "hg qclone [OPTION]... SOURCE [DEST]"
+msgstr "hg qclone [OPÇÃO]... ORIGEM [DEST]"
+
msgid "clone main and patch repository at same time"
msgstr "clona os repositórios principal e de fila ao mesmo tempo"
@@ -4234,24 +4659,63 @@
msgid "updating destination repository\n"
msgstr "atualizando repositório de destino\n"
+msgid "hg qcommit [OPTION]... [FILE]..."
+msgstr "hg qcommit [OPÇÃO]... [ARQUIVO]..."
+
msgid "commit changes in the queue repository (DEPRECATED)"
msgstr "consolida mudanças no repositório da fila de patches (OBSOLETO)"
msgid " This command is deprecated; use :hg:`commit --mq` instead."
msgstr " Este comando é obsoleto; use :hg:`commit --mq` em seu lugar."
+msgid "print patches not in series"
+msgstr "imprime os patches que não estão na série"
+
+msgid "hg qseries [-ms]"
+msgstr "hg qseries [-ms]"
+
msgid "print the entire series file"
msgstr "imprime todo o arquivo series"
+msgid "hg qtop [-s]"
+msgstr "hg qtop [-s]"
+
msgid "print the name of the current patch"
msgstr "imprime o nome do patch atual"
+msgid "hg qnext [-s]"
+msgstr "hg qnext [-s]"
+
msgid "print the name of the next patch"
msgstr "imprime o nome do próximo patch"
+msgid "hg qprev [-s]"
+msgstr "hg qprev [-s]"
+
msgid "print the name of the previous patch"
msgstr "imprime o nome do patch anterior"
+msgid "import uncommitted changes (DEPRECATED)"
+msgstr "importa mudanças não consolidadas (OBSOLETO)"
+
+msgid "add \"From: <current user>\" to patch"
+msgstr "adiciona \"From: <usuário atual>\" ao patch"
+
+msgid "USER"
+msgstr "USUÁRIO"
+
+msgid "add \"From: <USER>\" to patch"
+msgstr "adiciona \"From: <USUÁRIO>\" ao patch"
+
+msgid "add \"Date: <current date>\" to patch"
+msgstr "adiciona \"Date: <data atual>\" ao patch"
+
+msgid "add \"Date: <DATE>\" to patch"
+msgstr "adiciona \"Date: <DATA>\" ao patch"
+
+msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
+msgstr "hg qnew [-e] [-m TEXTO] [-l ARQUIVO] PATCH [ARQUIVO]..."
+
msgid "create a new patch"
msgstr "cria um novo patch"
@@ -4309,6 +4773,24 @@
" Devolve 0 para indicar sucesso na criação de um novo patch.\n"
" "
+msgid "refresh only files already in the patch and specified files"
+msgstr "renova apenas os arquivos especificados ou que já estão no patch"
+
+msgid "add/update author field in patch with current user"
+msgstr "adiciona/atualiza a entrada de autor no patch com o usuário atual"
+
+msgid "add/update author field in patch with given user"
+msgstr "adiciona/atualiza a entrada de autor no patch com o usuário pedido"
+
+msgid "add/update date field in patch with current date"
+msgstr "adiciona/atualiza a entrada de data no patch com a data atual"
+
+msgid "add/update date field in patch with given date"
+msgstr "adiciona/atualiza a entrada de data no patch com a data pedida"
+
+msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
+msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXTO] [-l ARQUIVO] [-s] [ARQUIVO]..."
+
msgid "update the current patch"
msgstr "atualiza o patch atual"
@@ -4354,6 +4836,9 @@
msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
msgstr "opção \"-e\" incompatível com \"-m\" ou \"-l\""
+msgid "hg qdiff [OPTION]... [FILE]..."
+msgstr "hg qdiff [OPÇÃO]... [ARQUIVO]..."
+
msgid "diff of the current patch and subsequent modifications"
msgstr "diff do patch atual e modificações subsequentes"
@@ -4379,6 +4864,15 @@
" mudanças feitas pelo patch atual sem incluir as mudanças feitas\n"
" desde o último qrefresh."
+msgid "edit patch header"
+msgstr "edita o cabeçalho do patch"
+
+msgid "keep folded patch files"
+msgstr "mantém os arquivos dos patches incorporados"
+
+msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
+msgstr "hg qfold [-e] [-k] [-m TEXTO] [-l ARQUIVO] PATCH..."
+
msgid "fold the named patches into the current patch"
msgstr "incorpora os patches pedidos no patch atual"
@@ -4419,9 +4913,24 @@
msgid "error folding patch %s"
msgstr "erro incorporando patch %s"
+msgid "overwrite any local changes"
+msgstr "sobrescreve qualquer alteração local"
+
+msgid "hg qgoto [OPTION]... PATCH"
+msgstr "hg qgoto [OPÇÃO]... PATCH"
+
msgid "push or pop patches until named patch is at top of stack"
msgstr "empilha ou desempilha patches até que o patch nomeado esteja no topo"
+msgid "list all patches and guards"
+msgstr "lista todos os patches e guardas"
+
+msgid "drop all guards"
+msgstr "descarta todas as guardas"
+
+msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
+msgstr "hg qguard [-l] [-n] [PATCH] [-- [+GUARDA]... [-GUARDA]...]"
+
msgid "set or print guards for a patch"
msgstr "define ou imprime guardas para um patch"
@@ -4469,9 +4978,36 @@
msgid "no patch named %s"
msgstr "nenhum patch de nome %s"
+msgid "hg qheader [PATCH]"
+msgstr "hg qheader [PATCH]"
+
msgid "print the header of the topmost or specified patch"
msgstr "imprime o cabeçalho do último patch ou do patch pedido"
+msgid "apply on top of local changes"
+msgstr "aplica por cima das mudanças locais"
+
+msgid "apply the target patch to its recorded parent"
+msgstr "aplica o patch alvo em seu pai armazenado"
+
+msgid "list patch name in commit text"
+msgstr "lista o nome do patch no texto de consolidação"
+
+msgid "apply all patches"
+msgstr "aplica todos os patches"
+
+msgid "merge from another queue (DEPRECATED)"
+msgstr "mescla com outra fila (OBSOLETO)"
+
+msgid "merge queue name (DEPRECATED)"
+msgstr "nome da fila de mesclagem (OBSOLETO)"
+
+msgid "reorder patch series and apply only the patch"
+msgstr "reordena a fila de patches e aplica apenas o patch"
+
+msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
+msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | ÍNDICE]"
+
msgid "push the next patch onto the stack"
msgstr "empilha o próximo patch na pilha"
@@ -4489,6 +5025,18 @@
msgid "merging with queue at: %s\n"
msgstr "mesclando com fila em: %s\n"
+msgid "pop all patches"
+msgstr "desempilha todos os patches"
+
+msgid "queue name to pop (DEPRECATED)"
+msgstr "nome da fila para desempilhar (OBSOLETO)"
+
+msgid "forget any local changes to patched files"
+msgstr "descarta qualquer mudança local a arquivos modificados pelo patch"
+
+msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
+msgstr "hg qpop [-a] [-f] [PATCH | ÍNDICE]"
+
msgid "pop the current patch off the stack"
msgstr "desempilha o patch atual da pilha"
@@ -4505,6 +5053,9 @@
msgid "using patch queue: %s\n"
msgstr "usando fila de patches: %s\n"
+msgid "hg qrename PATCH1 [PATCH2]"
+msgstr "hg qrename PATCH1 [PATCH2]"
+
msgid "rename a patch"
msgstr "renomeia um patch"
@@ -4515,13 +5066,14 @@
" Com um argumento, renomeia o patch atual para PATCH1.\n"
" Com dois argumentos, renomeia PATCH1 para PATCH2."
-#, python-format
-msgid "%s already exists"
-msgstr "%s já existe"
-
-#, python-format
-msgid "A patch named %s already exists in the series file"
-msgstr "Um patch de nome %s já existe no arquivo series"
+msgid "delete save entry"
+msgstr "apaga entrada salva"
+
+msgid "update queue working directory"
+msgstr "atualiza o diretório de trabalho da fila"
+
+msgid "hg qrestore [-d] [-u] REV"
+msgstr "hg qrestore [-d] [-u] REV"
msgid "restore the queue state saved by a revision (DEPRECATED)"
msgstr "restaura o estado da fila salvo por uma revisão (OBSOLETO)"
@@ -4529,6 +5081,21 @@
msgid " This command is deprecated, use :hg:`rebase` instead."
msgstr " Este comando é obsoleto, use :hg:`rebase` em seu lugar."
+msgid "copy patch directory"
+msgstr "copia o diretório do patch"
+
+msgid "copy directory name"
+msgstr "copia o nome do diretório"
+
+msgid "clear queue status file"
+msgstr "limpa o arquivo de estado da fila"
+
+msgid "force copy"
+msgstr "força a cópia"
+
+msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
+msgstr "hg qsave [-m TEXTO] [-l ARQUIVO] [-c] [-n NOME] [-e] [-f]"
+
msgid "save current queue state (DEPRECATED)"
msgstr "salva o estado atual da fila (OBSOLETO)"
@@ -4544,18 +5111,38 @@
msgid "copy %s to %s\n"
msgstr "copia %s para %s\n"
+msgid "force removal of changesets, discard uncommitted changes (no backup)"
+msgstr "força a remoção de revisões, descarta mudanças não consolidadas (sem backup)"
+
+msgid "bundle only changesets with local revision number greater than REV which are not descendants of REV (DEPRECATED)"
+msgstr "adiciona ao bundle apenas revisões cujo número local de revisão for maior que REV e que não forem seus descendentes (OBSOLETA)"
+
+msgid "no backups"
+msgstr "nenhuma cópia de segurança"
+
+msgid "no backups (DEPRECATED)"
+msgstr "sem cópias de segurança (OBSOLETO)"
+
+msgid "do not modify working copy during strip"
+msgstr "não modifica a cópia de trabalho durante o strip"
+
+msgid "hg strip [-k] [-f] [-n] REV..."
+msgstr "hg strip [-k] [-f] [-n] REV..."
+
msgid "strip changesets and all their descendants from the repository"
msgstr "remove do repositório revisões e todos os seus descendentes"
msgid ""
" The strip command removes the specified changesets and all their\n"
-" descendants. If the working directory has uncommitted changes,\n"
-" the operation is aborted unless the --force flag is supplied."
+" descendants. If the working directory has uncommitted changes, the\n"
+" operation is aborted unless the --force flag is supplied, in which\n"
+" case changes will be discarded."
msgstr ""
" O comando strip remove as revisões pedidas e todos os seus\n"
" descendentes. Se o diretório de trabalho tiver mudanças\n"
" pendentes, essa operação será abortada, a não ser que seja\n"
-" usada a opção --force."
+" usada a opção --force; nesse caso, as mudanças serão\n"
+" descartadas."
msgid ""
" If a parent of the working directory is stripped, then the working\n"
@@ -4593,6 +5180,21 @@
msgid "empty revision set"
msgstr "conjunto vazio de revisões"
+msgid "disable all guards"
+msgstr "desabilita todas as guardas"
+
+msgid "list all guards in series file"
+msgstr "lista todas as guardas no arquivo series"
+
+msgid "pop to before first guarded applied patch"
+msgstr "desempilha até antes do primeiro patch aplicado com guarda"
+
+msgid "pop, then reapply patches"
+msgstr "desempilha, e em seguida reaplica os patches"
+
+msgid "hg qselect [OPTION]... [GUARD]..."
+msgstr "hg qselect [OPÇÃO]... [GUARDA]..."
+
msgid "set or print guarded patches to push"
msgstr "define ou imprime guardas de empilhamento de patches"
@@ -4694,6 +5296,12 @@
msgid "reapplying unguarded patches\n"
msgstr "reaplicando patches sem guarda\n"
+msgid "finish all applied changesets"
+msgstr "encerra todas as revisões aplicadas"
+
+msgid "hg qfinish [-a] [REV]..."
+msgstr "hg qfinish [-a] [REV]..."
+
msgid "move applied patches into repository history"
msgstr "move patches aplicados para o histórico do repositório"
@@ -4729,6 +5337,24 @@
msgid "no revisions specified"
msgstr "nenhuma revisão especificada"
+msgid "list all available queues"
+msgstr "lista todas as filas disponíveis"
+
+msgid "create new queue"
+msgstr "cria uma nova fila"
+
+msgid "rename active queue"
+msgstr "renomeia a fila ativa"
+
+msgid "delete reference to queue"
+msgstr "remove referência para uma fila"
+
+msgid "delete queue, and remove patch dir"
+msgstr "apaga a fila e remove o diretório de patches"
+
+msgid "[OPTION] [QUEUE]"
+msgstr "[OPÇÃO] [FILA]"
+
msgid "manage multiple patch queues"
msgstr "gerencia múltiplas filas de patches"
@@ -4817,8 +5443,8 @@
msgid "only a local queue repository may be initialized"
msgstr "apenas um repositório de fila local pode ser inicializado"
-msgid "no repository found in %r (.hg not found)"
-msgstr "não foi encontrado um repositório em %r (.hg não encontrado)"
+msgid "there is no Mercurial repository here (.hg not found)"
+msgstr "não há um repositório do Mercurial aqui (.hg não encontrado)"
msgid "no queue repository"
msgstr "repositório da fila não existente"
@@ -4834,288 +5460,19 @@
msgid "mq: (empty queue)\n"
msgstr "mq: (fila vazia)\n"
+msgid ""
+"``mq()``\n"
+" Changesets managed by MQ."
+msgstr ""
+"``mq()``\n"
+" Revisões gerenciadas pela MQ."
+
+msgid "mq takes no arguments"
+msgstr "mq não tem argumentos"
+
msgid "operate on patch repository"
msgstr "opera no repositório de patches"
-msgid "print first line of patch header"
-msgstr "imprime a primeira linha do cabeçalho do patch"
-
-msgid "show only the last patch"
-msgstr "mostra apenas o último patch"
-
-msgid "hg qapplied [-1] [-s] [PATCH]"
-msgstr "hg qapplied [-1] [-s] [PATCH]"
-
-msgid "use pull protocol to copy metadata"
-msgstr "usa o protocolo pull para copiar metadados"
-
-msgid "do not update the new working directories"
-msgstr "não atualiza os novos diretórios de trabalho"
-
-msgid "use uncompressed transfer (fast over LAN)"
-msgstr "usa transferência não comprimida (mais rápido em LANs)"
-
-msgid "REPO"
-msgstr "REPOSITÓRIO"
-
-msgid "location of source patch repository"
-msgstr "localização do repositório de origem de patches"
-
-msgid "hg qclone [OPTION]... SOURCE [DEST]"
-msgstr "hg qclone [OPÇÃO]... ORIGEM [DEST]"
-
-msgid "hg qcommit [OPTION]... [FILE]..."
-msgstr "hg qcommit [OPÇÃO]... [ARQUIVO]..."
-
-msgid "hg qdiff [OPTION]... [FILE]..."
-msgstr "hg qdiff [OPÇÃO]... [ARQUIVO]..."
-
-msgid "keep patch file"
-msgstr "mantém o arquivo de patch"
-
-msgid "stop managing a revision (DEPRECATED)"
-msgstr "deixa de gerenciar uma revisão (OBSOLETO)"
-
-msgid "hg qdelete [-k] [PATCH]..."
-msgstr "hg qdelete [-k] [PATCH]..."
-
-msgid "edit patch header"
-msgstr "edita o cabeçalho do patch"
-
-msgid "keep folded patch files"
-msgstr "mantém os arquivos dos patches incorporados"
-
-msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
-msgstr "hg qfold [-e] [-k] [-m TEXTO] [-l ARQUIVO] PATCH..."
-
-msgid "overwrite any local changes"
-msgstr "sobrescreve qualquer alteração local"
-
-msgid "hg qgoto [OPTION]... PATCH"
-msgstr "hg qgoto [OPÇÃO]... PATCH"
-
-msgid "list all patches and guards"
-msgstr "lista todos os patches e guardas"
-
-msgid "drop all guards"
-msgstr "descarta todas as guardas"
-
-msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
-msgstr "hg qguard [-l] [-n] [PATCH] [-- [+GUARDA]... [-GUARDA]...]"
-
-msgid "hg qheader [PATCH]"
-msgstr "hg qheader [PATCH]"
-
-msgid "import file in patch directory"
-msgstr "importa um arquivo do diretório de patches"
-
-msgid "NAME"
-msgstr "NOME"
-
-msgid "name of patch file"
-msgstr "nome do arquivo de patch"
-
-msgid "overwrite existing files"
-msgstr "sobrescreve arquivos existentes"
-
-msgid "place existing revisions under mq control"
-msgstr "põe revisões existentes sob controle da mq"
-
-msgid "use git extended diff format"
-msgstr "usa o formato estendido de diff do git"
-
-msgid "qpush after importing"
-msgstr "executa qpush após importar"
-
-msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
-msgstr "hg qimport [-e] [-n NOME] [-f] [-g] [-P] [-r REV]... ARQUIVO..."
-
-msgid "create queue repository"
-msgstr "cria o repositório da fila"
-
-msgid "hg qinit [-c]"
-msgstr "hg qinit [-c]"
-
-msgid "import uncommitted changes (DEPRECATED)"
-msgstr "importa mudanças não consolidadas (OBSOLETO)"
-
-msgid "add \"From: <current user>\" to patch"
-msgstr "adiciona \"From: <usuário atual>\" ao patch"
-
-msgid "USER"
-msgstr "USUÁRIO"
-
-msgid "add \"From: <USER>\" to patch"
-msgstr "adiciona \"From: <USUÁRIO>\" ao patch"
-
-msgid "add \"Date: <current date>\" to patch"
-msgstr "adiciona \"Date: <data atual>\" ao patch"
-
-msgid "add \"Date: <DATE>\" to patch"
-msgstr "adiciona \"Date: <DATA>\" ao patch"
-
-msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
-msgstr "hg qnew [-e] [-m TEXTO] [-l ARQUIVO] PATCH [ARQUIVO]..."
-
-msgid "hg qnext [-s]"
-msgstr "hg qnext [-s]"
-
-msgid "hg qprev [-s]"
-msgstr "hg qprev [-s]"
-
-msgid "pop all patches"
-msgstr "desempilha todos os patches"
-
-msgid "queue name to pop (DEPRECATED)"
-msgstr "nome da fila para desempilhar (OBSOLETO)"
-
-msgid "forget any local changes to patched files"
-msgstr "descarta qualquer mudança local a arquivos modificados pelo patch"
-
-msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
-msgstr "hg qpop [-a] [-f] [PATCH | ÍNDICE]"
-
-msgid "apply on top of local changes"
-msgstr "aplica por cima das mudanças locais"
-
-msgid "apply the target patch to its recorded parent"
-msgstr "aplica o patch alvo em seu pai armazenado"
-
-msgid "list patch name in commit text"
-msgstr "lista o nome do patch no texto de consolidação"
-
-msgid "apply all patches"
-msgstr "aplica todos os patches"
-
-msgid "merge from another queue (DEPRECATED)"
-msgstr "mescla com outra fila (OBSOLETO)"
-
-msgid "merge queue name (DEPRECATED)"
-msgstr "nome da fila de mesclagem (OBSOLETO)"
-
-msgid "reorder patch series and apply only the patch"
-msgstr "reordena a fila de patches e aplica apenas o patch"
-
-msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
-msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | ÍNDICE]"
-
-msgid "refresh only files already in the patch and specified files"
-msgstr "renova apenas os arquivos especificados ou que já estão no patch"
-
-msgid "add/update author field in patch with current user"
-msgstr "adiciona/atualiza a entrada de autor no patch com o usuário atual"
-
-msgid "add/update author field in patch with given user"
-msgstr "adiciona/atualiza a entrada de autor no patch com o usuário pedido"
-
-msgid "add/update date field in patch with current date"
-msgstr "adiciona/atualiza a entrada de data no patch com a data atual"
-
-msgid "add/update date field in patch with given date"
-msgstr "adiciona/atualiza a entrada de data no patch com a data pedida"
-
-msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
-msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXTO] [-l ARQUIVO] [-s] [ARQUIVO]..."
-
-msgid "hg qrename PATCH1 [PATCH2]"
-msgstr "hg qrename PATCH1 [PATCH2]"
-
-msgid "delete save entry"
-msgstr "apaga entrada salva"
-
-msgid "update queue working directory"
-msgstr "atualiza o diretório de trabalho da fila"
-
-msgid "hg qrestore [-d] [-u] REV"
-msgstr "hg qrestore [-d] [-u] REV"
-
-msgid "copy patch directory"
-msgstr "copia o diretório do patch"
-
-msgid "copy directory name"
-msgstr "copia o nome do diretório"
-
-msgid "clear queue status file"
-msgstr "limpa o arquivo de estado da fila"
-
-msgid "force copy"
-msgstr "força a cópia"
-
-msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
-msgstr "hg qsave [-m TEXTO] [-l ARQUIVO] [-c] [-n NOME] [-e] [-f]"
-
-msgid "disable all guards"
-msgstr "desabilita todas as guardas"
-
-msgid "list all guards in series file"
-msgstr "lista todas as guardas no arquivo series"
-
-msgid "pop to before first guarded applied patch"
-msgstr "desempilha até antes do primeiro patch aplicado com guarda"
-
-msgid "pop, then reapply patches"
-msgstr "desempilha, e em seguida reaplica os patches"
-
-msgid "hg qselect [OPTION]... [GUARD]..."
-msgstr "hg qselect [OPÇÃO]... [GUARDA]..."
-
-msgid "print patches not in series"
-msgstr "imprime os patches que não estão na série"
-
-msgid "hg qseries [-ms]"
-msgstr "hg qseries [-ms]"
-
-msgid "force removal of changesets even if the working directory has uncommitted changes"
-msgstr "força a remoção de revisões mesmo se o diretório de trabalho tiver mudanças pendentes"
-
-msgid "bundle only changesets with local revision number greater than REV which are not descendants of REV (DEPRECATED)"
-msgstr "adiciona ao bundle apenas revisões cujo número local de revisão for maior que REV e que não forem seus descendentes (OBSOLETA)"
-
-msgid "no backups"
-msgstr "nenhuma cópia de segurança"
-
-msgid "no backups (DEPRECATED)"
-msgstr "sem cópias de segurança (OBSOLETO)"
-
-msgid "do not modify working copy during strip"
-msgstr "não modifica a cópia de trabalho durante o strip"
-
-msgid "hg strip [-k] [-f] [-n] REV..."
-msgstr "hg strip [-k] [-f] [-n] REV..."
-
-msgid "hg qtop [-s]"
-msgstr "hg qtop [-s]"
-
-msgid "show only the first patch"
-msgstr "mostra apenas o primeiro patch"
-
-msgid "hg qunapplied [-1] [-s] [PATCH]"
-msgstr "hg qunapplied [-1] [-s] [PATCH]"
-
-msgid "finish all applied changesets"
-msgstr "encerra todas as revisões aplicadas"
-
-msgid "hg qfinish [-a] [REV]..."
-msgstr "hg qfinish [-a] [REV]..."
-
-msgid "list all available queues"
-msgstr "lista todas as filas disponíveis"
-
-msgid "create new queue"
-msgstr "cria uma nova fila"
-
-msgid "rename active queue"
-msgstr "renomeia a fila ativa"
-
-msgid "delete reference to queue"
-msgstr "remove referência para uma fila"
-
-msgid "delete queue, and remove patch dir"
-msgstr "apaga a fila e remove o diretório de patches"
-
-msgid "[OPTION] [QUEUE]"
-msgstr "[OPÇÃO] [FILA]"
-
msgid "hooks for sending email notifications at commit/push time"
msgstr "gancho para enviar notificações por e-mail em commit/push"
@@ -5145,13 +5502,18 @@
" # one email for each incoming changeset\n"
" incoming.notify = python:hgext.notify.hook\n"
" # batch emails when many changesets incoming at one time\n"
-" changegroup.notify = python:hgext.notify.hook"
-msgstr ""
-" [hooks]\n"
-" # um e-mail para cada revisão que chegar\n"
-" incoming.notify = python:hgext.notify.hook\n"
-" # e-mails em lote quando muitas revisões chegarem de uma vez\n"
-" changegroup.notify = python:hgext.notify.hook"
+" changegroup.notify = python:hgext.notify.hook\n"
+" # batch emails when many changesets outgoing at one time (client side)\n"
+" outgoing.notify = python:hgext.notify.hook"
+msgstr ""
+" [hooks]\n"
+" # um e-mail para cada revisão que chegar\n"
+" incoming.notify = python:hgext.notify.hook\n"
+" # e-mails em lote quando muitas revisões chegarem de uma vez\n"
+" changegroup.notify = python:hgext.notify.hook\n"
+" # e-mails em lote quando muitas revisões saírem de uma vez\n"
+" # (lado do cliente)\n"
+" outgoing.notify = python:hgext.notify.hook"
msgid ""
" [notify]\n"
@@ -5176,7 +5538,8 @@
" style = ... # style file to use when formatting email\n"
" template = ... # template to use when formatting email\n"
" incoming = ... # template to use when run as incoming hook\n"
-" changegroup = ... # template when run as changegroup hook\n"
+" outgoing = ... # template to use when run as outgoing hook\n"
+" changegroup = ... # template to use when run as changegroup hook\n"
" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
" maxsubject = 67 # truncate subject line longer than this\n"
" diffstat = True # add a diffstat before the diff content\n"
@@ -5194,6 +5557,7 @@
" style = ... # arquivo de estilo para formatar o e-mail\n"
" template = ... # modelo para formatar o e-mail\n"
" incoming = ... # modelo ao rodar como gancho de entrada\n"
+" outgoing = ... # modelo ao rodar como gancho de saída\n"
" changegroup = ... # modelo ao rodar como gancho changegroup\n"
" maxdiff = 300 # no. máximo de linhas de diff incluídas\n"
" # (0=nenhuma, -1=todas)\n"
@@ -5371,45 +5735,6 @@
msgid "when to paginate (boolean, always, auto, or never)"
msgstr "quando paginar (booleana, ou \"always\" (sempre), \"never\" (nunca) ou \"auto\" (automaticamente))"
-msgid "interpret suffixes to refer to ancestor revisions"
-msgstr "interpreta sufixos para referência a revisões ancestrais"
-
-msgid ""
-"This extension allows you to use git-style suffixes to refer to the\n"
-"ancestors of a specific revision."
-msgstr ""
-"Esta extensão lhe permite usar sufixos estilo git para se referir\n"
-"aos ancestrais de uma revisão específica."
-
-msgid "For example, if you can refer to a revision as \"foo\", then::"
-msgstr ""
-"Por exemplo, se você puder se referir a uma revisão com \"foo\",\n"
-"então::"
-
-msgid ""
-" foo^N = Nth parent of foo\n"
-" foo^0 = foo\n"
-" foo^1 = first parent of foo\n"
-" foo^2 = second parent of foo\n"
-" foo^ = foo^1"
-msgstr ""
-" foo^N = N-ésimo pai de foo\n"
-" foo^0 = foo\n"
-" foo^1 = primeiro pai de foo\n"
-" foo^2 = segundo pai de foo\n"
-" foo^ = foo^1"
-
-msgid ""
-" foo~N = Nth first grandparent of foo\n"
-" foo~0 = foo\n"
-" foo~1 = foo^1 = foo^ = first parent of foo\n"
-" foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
-msgstr ""
-" foo~N = N-ésimo avô de foo\n"
-" foo~0 = foo\n"
-" foo~1 = foo^1 = foo^ = primeiro pai de foo\n"
-" foo~2 = foo^1^1 = foo^^ = primeiro pai do primeiro pai de foo\n"
-
msgid "command to send changesets as (a series of) patch emails"
msgstr "comando para enviar revisões como uma série de e-mails de patch"
@@ -5506,6 +5831,81 @@
msgid "Please enter a valid value.\n"
msgstr "Por favor, entre um valor válido.\n"
+msgid "send patches as attachments"
+msgstr "envia patches como anexos"
+
+msgid "send patches as inline attachments"
+msgstr "envia patches como anexos embutidos"
+
+msgid "email addresses of blind carbon copy recipients"
+msgstr "endereços de e-mail de destinatários para cópia oculta"
+
+msgid "email addresses of copy recipients"
+msgstr "endereços de e-mail de destinatários para cópia"
+
+msgid "ask for confirmation before sending"
+msgstr "pede confirmação antes do envio"
+
+msgid "add diffstat output to messages"
+msgstr "adiciona a saída do diffstat a mensagens"
+
+msgid "use the given date as the sending date"
+msgstr "usa a data dada como data de envio"
+
+msgid "use the given file as the series description"
+msgstr "usa o arquivo dado como descrição da série"
+
+msgid "email address of sender"
+msgstr "endereço de email do remetente"
+
+msgid "print messages that would be sent"
+msgstr "imprime mensagens que seriam enviadas"
+
+msgid "write messages to mbox file instead of sending them"
+msgstr "escreve mensagens para arquivo mbox ao invés de enviá-las"
+
+msgid "email addresses replies should be sent to"
+msgstr "endereços para resposta"
+
+msgid "subject of first message (intro or single patch)"
+msgstr "assunto da primeira mensagem (introdução ou único patch)"
+
+msgid "message identifier to reply to"
+msgstr "identificador de mensagem para a qual responder"
+
+msgid "flags to add in subject prefixes"
+msgstr "indicador adicionado no prefixo de assunto"
+
+msgid "email addresses of recipients"
+msgstr "endereços de e-mail dos destinatários"
+
+msgid "omit hg patch header"
+msgstr "omite o cabeçalho do hg patch"
+
+msgid "send changes not found in the target repository"
+msgstr "envia mudanças não encontradas no repositório alvo"
+
+msgid "send changes not in target as a binary bundle"
+msgstr "envia mudanças que não estão no alvo como um bundle binário"
+
+msgid "name of the bundle attachment file"
+msgstr "nome do arquivo bundle anexado"
+
+msgid "a revision to send"
+msgstr "a revisão a enviar"
+
+msgid "run even when remote repository is unrelated (with -b/--bundle)"
+msgstr "executa mesmo se o repositório não for relacionado (com -b/--bundle)"
+
+msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
+msgstr "uma revisão base especificada ao invés de um destino (com -b/--bundle)"
+
+msgid "send an introduction email for a single patch"
+msgstr "manda um e-mail introdutório para um patch único"
+
+msgid "hg email [OPTION]... [DEST]..."
+msgstr "hg email [OPÇÃO]... [DEST]..."
+
msgid "send changesets by email"
msgstr "envia revisões por e-mail"
@@ -5742,81 +6142,6 @@
msgid "sending"
msgstr "enviando"
-msgid "send patches as attachments"
-msgstr "envia patches como anexos"
-
-msgid "send patches as inline attachments"
-msgstr "envia patches como anexos embutidos"
-
-msgid "email addresses of blind carbon copy recipients"
-msgstr "endereços de e-mail de destinatários para cópia oculta"
-
-msgid "email addresses of copy recipients"
-msgstr "endereços de e-mail de destinatários para cópia"
-
-msgid "ask for confirmation before sending"
-msgstr "pede confirmação antes do envio"
-
-msgid "add diffstat output to messages"
-msgstr "adiciona a saída do diffstat a mensagens"
-
-msgid "use the given date as the sending date"
-msgstr "usa a data dada como data de envio"
-
-msgid "use the given file as the series description"
-msgstr "usa o arquivo dado como descrição da série"
-
-msgid "email address of sender"
-msgstr "endereço de email do remetente"
-
-msgid "print messages that would be sent"
-msgstr "imprime mensagens que seriam enviadas"
-
-msgid "write messages to mbox file instead of sending them"
-msgstr "escreve mensagens para arquivo mbox ao invés de enviá-las"
-
-msgid "email addresses replies should be sent to"
-msgstr "endereços para resposta"
-
-msgid "subject of first message (intro or single patch)"
-msgstr "assunto da primeira mensagem (introdução ou único patch)"
-
-msgid "message identifier to reply to"
-msgstr "identificador de mensagem para a qual responder"
-
-msgid "flags to add in subject prefixes"
-msgstr "indicador adicionado no prefixo de assunto"
-
-msgid "email addresses of recipients"
-msgstr "endereços de e-mail dos destinatários"
-
-msgid "omit hg patch header"
-msgstr "omite o cabeçalho do hg patch"
-
-msgid "send changes not found in the target repository"
-msgstr "envia mudanças não encontradas no repositório alvo"
-
-msgid "send changes not in target as a binary bundle"
-msgstr "envia mudanças que não estão no alvo como um bundle binário"
-
-msgid "name of the bundle attachment file"
-msgstr "nome do arquivo bundle anexado"
-
-msgid "a revision to send"
-msgstr "a revisão a enviar"
-
-msgid "run even when remote repository is unrelated (with -b/--bundle)"
-msgstr "executa mesmo se o repositório não for relacionado (com -b/--bundle)"
-
-msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
-msgstr "uma revisão base especificada ao invés de um destino (com -b/--bundle)"
-
-msgid "send an introduction email for a single patch"
-msgstr "manda um e-mail introdutório para um patch único"
-
-msgid "hg email [OPTION]... [DEST]..."
-msgstr "hg email [OPÇÃO]... [DEST]..."
-
msgid "show progress bars for some actions"
msgstr "mostra barras de progresso para algumas ações"
@@ -5861,13 +6186,14 @@
msgid ""
"Valid entries for the format field are topic, bar, number, unit,\n"
-"estimate, and item. item defaults to the last 20 characters of the\n"
-"item, but this can be changed by adding either ``-<num>`` which would\n"
-"take the last num characters, or ``+<num>`` for the first num\n"
+"estimate, speed, and item. item defaults to the last 20 characters of\n"
+"the item, but this can be changed by adding either ``-<num>`` which\n"
+"would take the last num characters, or ``+<num>`` for the first num\n"
"characters.\n"
msgstr ""
"Entradas válidas para o campo format são topic (tópico), bar (barra),\n"
-"number (número), unit (unidade), estimate (estimativa) e item (item).\n"
+"number (número), unit (unidade), estimate (estimativa), speed (velocidade)\n"
+"e item (item).\n"
"item por padrão são os\n"
"últimos caracteres do item, mas isto pode ser modificado adicionando ou\n"
"``-<num>``, que consideraria os últimos num caracteres, ou ``+<num>``\n"
@@ -5903,9 +6229,28 @@
msgid "%dy%02dw"
msgstr "%dy%02dw"
+#, python-format
+msgid "%d %s/sec"
+msgstr "%d %s/seg"
+
msgid "command to delete untracked files from the working directory"
msgstr "comando para apagar do diretório de trabalho arquivos não rastreados"
+msgid "abort if an error occurs"
+msgstr "aborta se ocorrer um erro"
+
+msgid "purge ignored files too"
+msgstr "remove também arquivos ignorados"
+
+msgid "print filenames instead of deleting them"
+msgstr "imprime os nomes de arquivo ao invés de removê-los"
+
+msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
+msgstr "termina nomes de arquivo com NUL, para uso com xargs (implica -p/--print)"
+
+msgid "hg purge [OPTION]... [DIR]..."
+msgstr "hg purge [OPÇÃO]... [DIR]..."
+
msgid "removes files not tracked by Mercurial"
msgstr "remove arquivos não rastreados pelo Mercurial"
@@ -5978,21 +6323,6 @@
msgid "Removing directory %s\n"
msgstr "Removendo diretório %s\n"
-msgid "abort if an error occurs"
-msgstr "aborta se ocorrer um erro"
-
-msgid "purge ignored files too"
-msgstr "remove também arquivos ignorados"
-
-msgid "print filenames instead of deleting them"
-msgstr "imprime os nomes de arquivo ao invés de removê-los"
-
-msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
-msgstr "termina nomes de arquivo com NUL, para uso com xargs (implica -p/--print)"
-
-msgid "hg purge [OPTION]... [DIR]..."
-msgstr "hg purge [OPÇÃO]... [DIR]..."
-
msgid "command to move sets of revisions to a different ancestor"
msgstr "comando para mover conjuntos de revisões para um ancestral diferente"
@@ -6010,6 +6340,49 @@
"Para mais informações:\n"
"http://mercurial.selenic.com/wiki/RebaseExtension\n"
+msgid "rebase from the specified changeset"
+msgstr "rebaseia a partir da revisão especificada"
+
+msgid "rebase from the base of the specified changeset (up to greatest common ancestor of base and dest)"
+msgstr "rebaseia a partir da base da revisão especificada (até o maior ancestral comum de base e dest)"
+
+msgid "rebase onto the specified changeset"
+msgstr "rebaseia sobre a revisão especificada"
+
+msgid "collapse the rebased changesets"
+msgstr "colapsa as revisões rebaseadas"
+
+msgid "use text as collapse commit message"
+msgstr "usa o texto como mensagem de consolidação da revisão colapsada"
+
+msgid "read collapse commit message from file"
+msgstr "lê de um arquivo a mensagem de consolidação da revisão colapsada"
+
+msgid "keep original changesets"
+msgstr "mantém revisões originais"
+
+msgid "keep original branch names"
+msgstr "mantém nomes de ramos originais"
+
+msgid "force detaching of source from its original branch"
+msgstr "força desacoplamento da origem de seu ramo original"
+
+msgid "specify merge tool"
+msgstr "especifica o utilitário de mesclagem"
+
+msgid "continue an interrupted rebase"
+msgstr "continua um rebaseamento interrompido"
+
+msgid "abort an interrupted rebase"
+msgstr "aborta um rebaseamento interrompido"
+
+msgid ""
+"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
+"hg rebase {-a|-c}"
+msgstr ""
+"hg rebase [-s REV | -b REV] [-d REV] [opções]\n"
+"hg rebase {-a|-c}"
+
msgid "move changeset (and descendants) to a different branch"
msgstr "move a revisão (e descendentes) para um ramo diferente"
@@ -6117,6 +6490,9 @@
" Devolve 0 para indicar sucesso, 1 se não houver nada para rebasear.\n"
" "
+msgid "message can only be specified with collapse"
+msgstr "a mensagem só pode ser especificada ao usar --collapse"
+
msgid "cannot use both abort and continue"
msgstr "não se pode usar abort e continue simultaneamente"
@@ -6129,6 +6505,9 @@
msgid "abort and continue do not allow specifying revisions"
msgstr "abort e continue não permitem especificar revisões"
+msgid "tool option will be ignored\n"
+msgstr "a opção tool será ignorada\n"
+
msgid "cannot specify both a revision and a base"
msgstr "não se pode especificar ao mesmo tempo uma revisão e uma base"
@@ -6141,9 +6520,6 @@
msgid "nothing to rebase\n"
msgstr "nada para rebasear\n"
-msgid "cannot use both keepbranches and extrafn"
-msgstr "não se pode usar keepbranches e extrafn simultaneamente"
-
msgid "rebasing"
msgstr "rebaseando"
@@ -6195,46 +6571,27 @@
msgid "source is descendant of destination"
msgstr "origem é descendente do destino"
+msgid "--tool can only be used with --rebase"
+msgstr "--tool só pode ser usada em conjunto com --rebase"
+
msgid "rebase working directory to branch head"
msgstr "rebaseia o diretório de trabalho para a cabeça do ramo"
-msgid "rebase from the specified changeset"
-msgstr "rebaseia a partir da revisão especificada"
-
-msgid "rebase from the base of the specified changeset (up to greatest common ancestor of base and dest)"
-msgstr "rebaseia a partir da base da revisão especificada (até o maior ancestral comum de base e dest)"
-
-msgid "rebase onto the specified changeset"
-msgstr "rebaseia sobre a revisão especificada"
-
-msgid "collapse the rebased changesets"
-msgstr "colapsa as revisões rebaseadas"
-
-msgid "keep original changesets"
-msgstr "mantém revisões originais"
-
-msgid "keep original branch names"
-msgstr "mantém nomes de ramos originais"
-
-msgid "force detaching of source from its original branch"
-msgstr "força desacoplamento da origem de seu ramo original"
-
-msgid "continue an interrupted rebase"
-msgstr "continua um rebaseamento interrompido"
-
-msgid "abort an interrupted rebase"
-msgstr "aborta um rebaseamento interrompido"
-
-msgid ""
-"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
-"hg rebase {-a|-c}"
-msgstr ""
-"hg rebase [-s REV | -b REV] [-d REV] [opções]\n"
-"hg rebase {-a|-c}"
+msgid "specify merge tool for rebase"
+msgstr "especifica o utilitário de mesclagem para o rebaseamento"
msgid "commands to interactively select changes for commit/qrefresh"
msgstr "comandos para selecionar interativamente mudanças em um commit ou qrefresh"
+msgid "ignore white space when comparing lines"
+msgstr "ignora espaços em branco ao comparar linhas"
+
+msgid "ignore changes in the amount of white space"
+msgstr "ignora mudanças na quantidade de espaços em branco"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "ignora mudanças cujas linhas sejam todas brancas"
+
msgid "this modifies a binary file (all or nothing)\n"
msgstr "isto modifica um arquivo binário (tudo ou nada)\n"
@@ -6290,6 +6647,9 @@
msgid "record change %d/%d to %r?"
msgstr "gravar mudança %d/%d em %r?"
+msgid "hg record [OPTION]... [FILE]..."
+msgstr "hg record [OPÇÃO]... [ARQUIVO]..."
+
msgid "interactively select changes to commit"
msgstr "seleção interativa de alterações para consolidação"
@@ -6340,11 +6700,24 @@
msgid " This command is not available when committing a merge."
msgstr " Este comando não está disponível para a consolidação de uma mesclagem."
+msgid "interactively record a new patch"
+msgstr "grava um novo patch interativamente"
+
+msgid ""
+" See :hg:`help qnew` & :hg:`help record` for more information and\n"
+" usage.\n"
+" "
+msgstr ""
+" Veja :hg:`help qnew` & :hg:`help record` para forma de uso\n"
+" e mais informações.\n"
+" "
+
msgid "'mq' extension not loaded"
msgstr "extensão 'mq' não carregada"
-msgid "running non-interactively, use commit instead"
-msgstr "não está executando interativamente, use commit"
+#, python-format
+msgid "running non-interactively, use %s instead"
+msgstr "não está executando interativamente, use %s"
msgid "cannot partially commit a merge (use \"hg commit\" instead)"
msgstr "não é possível consolidar parcialmente uma mesclagem (use \"hg commit\")"
@@ -6352,12 +6725,12 @@
msgid "no changes to record\n"
msgstr "nenhuma mudança a ser gravada\n"
-msgid "hg record [OPTION]... [FILE]..."
-msgstr "hg record [OPÇÃO]... [ARQUIVO]..."
-
msgid "hg qrecord [OPTION]... PATCH [FILE]..."
msgstr "hg qrecord [OPÇÃO]... PATCH [ARQUIVO]..."
+msgid "interactively select changes to refresh"
+msgstr "seleciona interativamente alterações para atualização do patch"
+
msgid "recreates hardlinks between repository clones"
msgstr "recria hardlinks entre clones de repositórios"
@@ -6447,10 +6820,6 @@
msgid "source and destination are on different devices"
msgstr "arquivos de origem e destino estão em dispositivos diferentes"
-#, python-format
-msgid "not linkable: %s\n"
-msgstr "não é possível criar link: %s\n"
-
msgid "pruning"
msgstr "podando"
@@ -6462,8 +6831,8 @@
msgstr "restaurando hardlinks"
#, python-format
-msgid "relinked %d files (%d bytes reclaimed)\n"
-msgstr "restaurados hardlinks de %d arquivos (%d bytes recuperados)\n"
+msgid "relinked %d files (%s reclaimed)\n"
+msgstr "restaurados hardlinks de %d arquivos (%s recuperados)\n"
msgid "[ORIGIN]"
msgstr "[ORIGEM]"
@@ -6543,6 +6912,10 @@
"Você pode sobrepor um protocolo pré-definido definindo um novo com o\n"
"mesmo nome.\n"
+#, python-format
+msgid "custom scheme %s:// conflicts with drive letter %s:\\\n"
+msgstr "esquema personalizado %s:// conflita com a letra de unidade %s:\\\n"
+
msgid "share a common history between several working directories"
msgstr "compartilha histórico comum entre vários diretórios de trabalho"
@@ -6649,6 +7022,9 @@
msgid "commit failed"
msgstr "falha ao consolidar"
+msgid "filter corrupted changeset (no user or date)"
+msgstr "filtra revisões corrompidas (sem usuário ou data)"
+
msgid ""
"y: transplant this changeset\n"
"n: skip this changeset\n"
@@ -6672,6 +7048,36 @@
msgid "no such option\n"
msgstr "não existe tal opção\n"
+msgid "pull patches from REPO"
+msgstr "traz patches do REPOSITÓRIO"
+
+msgid "BRANCH"
+msgstr "RAMO"
+
+msgid "pull patches from branch BRANCH"
+msgstr "traz patches do ramo RAMO"
+
+msgid "pull all changesets up to BRANCH"
+msgstr "traz todas as revisões até RAMO"
+
+msgid "skip over REV"
+msgstr "omite revisão REV"
+
+msgid "merge at REV"
+msgstr "mesclagem em REV"
+
+msgid "append transplant info to log message"
+msgstr "anexa informações de transplante à mensagem de log"
+
+msgid "continue last transplant session after repair"
+msgstr "continua a última sessão de transplante após reparos"
+
+msgid "filter changesets through command"
+msgstr "filtra revisões através do comando"
+
+msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
+msgstr "hg transplant [-s REPOSITÓRIO] [-b RAMO [-a]] [-p REV] [-m REV] [REV]..."
+
msgid "transplant changesets from another branch"
msgstr "transplanta revisões de outro ramo"
@@ -6789,35 +7195,12 @@
"``transplanted([set])``\n"
" Revisões transplantadas no conjunto, ou todas as revisões transplantadas."
-msgid "pull patches from REPO"
-msgstr "traz patches do REPOSITÓRIO"
-
-msgid "BRANCH"
-msgstr "RAMO"
-
-msgid "pull patches from branch BRANCH"
-msgstr "traz patches do ramo RAMO"
-
-msgid "pull all changesets up to BRANCH"
-msgstr "traz todas as revisões até RAMO"
-
-msgid "skip over REV"
-msgstr "omite revisão REV"
-
-msgid "merge at REV"
-msgstr "mesclagem em REV"
-
-msgid "append transplant info to log message"
-msgstr "anexa informações de transplante à mensagem de log"
-
-msgid "continue last transplant session after repair"
-msgstr "continua a última sessão de transplante após reparos"
-
-msgid "filter changesets through command"
-msgstr "filtra revisões através do comando"
-
-msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
-msgstr "hg transplant [-s REPOSITÓRIO] [-b RAMO [-a]] [-p REV] [-m REV] [REV]..."
+msgid ""
+":transplanted: String. The node identifier of the transplanted\n"
+" changeset if any."
+msgstr ""
+":transplanted: String. O identificador de nó da revisão\n"
+" transplantada, se existir."
msgid "allow the use of MBCS paths with problematic encodings"
msgstr "permite o uso de caminhos MBCS com codificação problemática."
@@ -7094,15 +7477,24 @@
msgid "bookmark '%s' contains illegal character"
msgstr "o marcador '%s' contém um caractere ilegal"
+#, python-format
+msgid "branch %s not found"
+msgstr "ramo %s não encontrado"
+
+#, python-format
+msgid "updating bookmark %s\n"
+msgstr "atualizando marcador %s\n"
+
+#, python-format
+msgid "not updating divergent bookmark %s\n"
+msgstr "marcador divergente %s não atualizado\n"
+
msgid "searching for changed bookmarks\n"
msgstr "procurando por marcadores modificados\n"
msgid "no changed bookmarks found\n"
msgstr "nenhum marcador modificado encontrado\n"
-msgid "invalid changegroup"
-msgstr "changegroup inválido"
-
msgid "unknown parent"
msgstr "pai desconhecido"
@@ -7157,21 +7549,21 @@
msgid "invalid format spec '%%%s' in output filename"
msgstr "especificador inválido de formato '%%%s' no nome de arquivo de saída"
-#, python-format
-msgid "adding %s\n"
-msgstr "adicionando %s\n"
-
-#, python-format
-msgid "removing %s\n"
-msgstr "removendo %s\n"
-
-#, python-format
-msgid "recording removal of %s as rename to %s (%d%% similar)\n"
-msgstr "gravando remoção de %s como renomeação para %s (%d%% de similaridade)\n"
-
-#, python-format
-msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
-msgstr "%s ainda não foi consolidado, então dados de cópia não serão guardados para %s.\n"
+msgid "cannot specify --changelog and --manifest at the same time"
+msgstr "não é possível especificar simultaneamente --changelog e --manifest"
+
+msgid "cannot specify filename with --changelog or --manifest"
+msgstr "não é possível especificar um nome de arquivo com --changelog ou --manifest"
+
+msgid "cannot specify --changelog or --manifest without a repository"
+msgstr "não é possível especificar --changelog ou --manifest sem um repositório"
+
+msgid "invalid arguments"
+msgstr "argumentos inválidos"
+
+#, python-format
+msgid "revlog '%s' not found"
+msgstr "revlog '%s' não encontrado"
#, python-format
msgid "%s: not copying - file is not managed\n"
@@ -7314,6 +7706,10 @@
msgstr "é possível acompanhar cópias/renomeações apenas para nomes de arquivo explícitos"
#, python-format
+msgid "adding %s\n"
+msgstr "adicionando %s\n"
+
+#, python-format
msgid "skipping missing subrepository: %s\n"
msgstr "desconsiderando sub-repositório faltando: %s\n"
@@ -7358,6 +7754,138 @@
msgid "empty commit message"
msgstr "mensagem de consolidação vazia"
+msgid "repository root directory or name of overlay bundle file"
+msgstr "diretório raiz do repositório ou nome de arquivo de bundle para sobreposição"
+
+msgid "DIR"
+msgstr "DIR"
+
+msgid "change working directory"
+msgstr "muda o diretório de trabalho"
+
+msgid "do not prompt, assume 'yes' for any required answers"
+msgstr "não solicita entrada, assume 'sim' para qualquer resposta necessária"
+
+msgid "suppress output"
+msgstr "suprime saída"
+
+msgid "enable additional output"
+msgstr "habilita saída adicional"
+
+msgid "set/override config option (use 'section.name=value')"
+msgstr "define/sobrepõe opção de configuração (use 'seção.nome=valor')"
+
+msgid "CONFIG"
+msgstr "CONFIG"
+
+msgid "enable debugging output"
+msgstr "habilita saída de depuração"
+
+msgid "start debugger"
+msgstr "inicia depurador"
+
+msgid "set the charset encoding"
+msgstr "define a codificação de caracteres"
+
+msgid "ENCODE"
+msgstr "CODIFICAÇÃO"
+
+msgid "MODE"
+msgstr "MODO"
+
+msgid "set the charset encoding mode"
+msgstr "define o modo de codificação de conjunto de caracteres"
+
+msgid "always print a traceback on exception"
+msgstr "sempre imprime traceback em exceções"
+
+msgid "time how long the command takes"
+msgstr "mede o tempo de execução de cada comando"
+
+msgid "print command execution profile"
+msgstr "exibe profile de execução de comando"
+
+msgid "output version information and exit"
+msgstr "exibe informação de versão e sai"
+
+msgid "display help and exit"
+msgstr "exibe ajuda e sai"
+
+msgid "do not perform actions, just print output"
+msgstr "não realiza ações, apenas imprime a saída"
+
+msgid "specify ssh command to use"
+msgstr "especifica comando ssh a ser usado"
+
+msgid "specify hg command to run on the remote side"
+msgstr "especifica comando hg para executar do lado remoto"
+
+msgid "do not verify server certificate (ignoring web.cacerts config)"
+msgstr "não verifica o certificado do servidor (ignorando a opção de configuração web.cacerts)"
+
+msgid "PATTERN"
+msgstr "PADRÃO"
+
+msgid "include names matching the given patterns"
+msgstr "inclui nomes que casem com os padrões fornecidos"
+
+msgid "exclude names matching the given patterns"
+msgstr "exclui nomes que casem com os padrões fornecidos"
+
+msgid "use text as commit message"
+msgstr "usa o texto como mensagem de consolidação"
+
+msgid "read commit message from file"
+msgstr "lê de um arquivo a mensagem de consolidação"
+
+msgid "record the specified date as commit date"
+msgstr "grava a data especificada como data da consolidação"
+
+msgid "record the specified user as committer"
+msgstr "grava o usuário pedido como autor da consolidação"
+
+msgid "STYLE"
+msgstr "ESTILO"
+
+msgid "display using template map file"
+msgstr "exibe usando arquivo de mapeamento de modelo"
+
+msgid "display with template"
+msgstr "exibe usando modelo"
+
+msgid "do not show merges"
+msgstr "não mostra mesclagens"
+
+msgid "output diffstat-style summary of changes"
+msgstr "imprime sumário de mudanças no estilo diffstat"
+
+msgid "treat all files as text"
+msgstr "trata todos os arquivos como texto"
+
+msgid "omit dates from diff headers"
+msgstr "omite datas dos cabeçalhos de diff"
+
+msgid "show which function each change is in"
+msgstr "mostra em qual função está cada mudança"
+
+msgid "produce a diff that undoes the changes"
+msgstr "produz um diff que desfaz as mudanças"
+
+msgid "number of lines of context to show"
+msgstr "número de linhas de contexto a serem mostradas"
+
+msgid "SIMILARITY"
+msgstr "SIMILARIDADE"
+
+msgid "guess renamed files by similarity (0<=s<=100)"
+msgstr "infere arquivos renomeados por similaridade (0<=s<=100)"
+
+msgid "recurse into subrepositories"
+msgstr "trabalha em sub-repositórios recursivamente"
+
+msgid "[OPTION]... [FILE]..."
+msgstr "[OPÇÃO]... [ARQUIVO]..."
+
msgid "add the specified files on the next commit"
msgstr "adiciona os arquivos especificados na próxima consolidação"
@@ -7461,6 +7989,36 @@
msgid "similarity must be between 0 and 100"
msgstr "similaridade deve ser um número entre 0 e 100"
+msgid "annotate the specified revision"
+msgstr "faz um annotate da revisão especificada"
+
+msgid "follow copies/renames and list the filename (DEPRECATED)"
+msgstr "segue cópias e renomeações e lista o nome de arquivo (OBSOLETA)"
+
+msgid "don't follow copies and renames"
+msgstr "não segue cópias e renomeações"
+
+msgid "list the author (long with -v)"
+msgstr "lista o autor (formato longo com -v)"
+
+msgid "list the filename"
+msgstr "lista o nome de arquivo"
+
+msgid "list the date (short with -q)"
+msgstr "lista a data (formato curto com -q)"
+
+msgid "list the revision number (default)"
+msgstr "lista o número de revisão (padrão)"
+
+msgid "list the changeset"
+msgstr "lista a revisão"
+
+msgid "show line number at the first appearance"
+msgstr "exibe números de linha na primeira ocorrência"
+
+msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
+msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
+
msgid "show changeset information by line for each file"
msgstr "mostra informação de revisão por linha para cada arquivo"
@@ -7499,6 +8057,24 @@
msgid "%s: binary file\n"
msgstr "%s: arquivo binário\n"
+msgid "do not pass files through decoders"
+msgstr "não passar arquivos por decodificadores"
+
+msgid "directory prefix for files in archive"
+msgstr "prefixo de diretório para arquivos armazenados"
+
+msgid "PREFIX"
+msgstr "PREFIXO"
+
+msgid "revision to distribute"
+msgstr "revisão a ser distribuída"
+
+msgid "type of distribution to create"
+msgstr "tipo de distribuição a ser criada"
+
+msgid "[OPTION]... DEST"
+msgstr "[OPÇÃO]... DEST"
+
msgid "create an unversioned archive of a repository revision"
msgstr "cria um pacote não versionado contendo uma revisão do repositório"
@@ -7562,6 +8138,18 @@
msgid "cannot archive plain files to stdout"
msgstr "não se pode empacotar arquivos simples na saída padrão"
+msgid "merge with old dirstate parent after backout"
+msgstr "mesclar com pai do dirstate anterior após o backout"
+
+msgid "parent to choose when backing out merge"
+msgstr "pai a ser escolhido ao fazer o backout de mesclagem"
+
+msgid "revision to backout"
+msgstr "revisão para fazer o backout"
+
+msgid "[OPTION]... [-r] REV"
+msgstr "[OPÇÃO]... [-r] REV"
+
msgid "reverse effect of earlier changeset"
msgstr "anula o efeito de uma revisão anterior"
@@ -7634,6 +8222,30 @@
msgid "merging with changeset %s\n"
msgstr "mesclando com revisão %s\n"
+msgid "reset bisect state"
+msgstr "reinicia estado do bisect"
+
+msgid "mark changeset good"
+msgstr "marca revisão boa"
+
+msgid "mark changeset bad"
+msgstr "marca revisão ruim"
+
+msgid "skip testing changeset"
+msgstr "descartando revisão de teste"
+
+msgid "extend the bisect range"
+msgstr "amplia o alcance do bisect"
+
+msgid "use command to check changeset state"
+msgstr "usa o comando para verificar o estado da revisão"
+
+msgid "do not update to target"
+msgstr "não atualiza para o alvo"
+
+msgid "[-gbsr] [-U] [-c CMD] [REV]"
+msgstr "[-gbsr] [-U] [-c CMD] [REV]"
+
msgid "subdivision search of changesets"
msgstr "busca revisões por subdivisão"
@@ -7687,11 +8299,12 @@
#, python-format
msgid ""
"Not all ancestors of this changeset have been checked.\n"
-"To check the other ancestors, start from the common ancestor, %s.\n"
+"Use bisect --extend to continue the bisection from\n"
+"the common ancestor, %s.\n"
msgstr ""
"Nem todos os ancestrais desta revisão foram verificados.\n"
-"Para verificar os outros ancestrais, comece do ancestral comum,\n"
-"%s.\n"
+"Use bisect --extend para continuar a bissecção a partir do\n"
+"ancestral comum, %s.\n"
msgid "Due to skipped revisions, the first good revision could be any of:\n"
msgstr "Devido a revisões omitidas, a primeira revisão boa pode ser qualquer uma entre:\n"
@@ -7724,9 +8337,31 @@
msgstr "Revisão %d:%s: %s\n"
#, python-format
+msgid "Extending search to changeset %d:%s\n"
+msgstr "Ampliando a busca até a revisão %d:%s\n"
+
+msgid "nothing to extend"
+msgstr "nada para ampliar"
+
+#, python-format
msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
msgstr "Testando a revisão %d:%s (%d revisões restando, ~%d testes)\n"
+msgid "force"
+msgstr "forçar"
+
+msgid "delete a given bookmark"
+msgstr "apaga o marcador pedido"
+
+msgid "rename a given bookmark"
+msgstr "renomeia um marcador"
+
+msgid "do not mark a new bookmark active"
+msgstr "não marca como ativo um novo marcador"
+
+msgid "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]"
+msgstr "hg bookmarks [-f] [-d] [-i] [-m NOME] [-r REV] [NOME]"
+
msgid "track a line of development with movable markers"
msgstr "rastreia uma linha de desenvolvimento com marcadores móveis"
@@ -7767,11 +8402,13 @@
" precisa ser habilitada.\n"
" "
-msgid "a bookmark of this name does not exist"
-msgstr "não existe um marcador com esse nome"
-
-msgid "a bookmark of the same name already exists"
-msgstr "já existe um marcador com o mesmo nome"
+#, python-format
+msgid "bookmark '%s' does not exist"
+msgstr "o marcador '%s' não existe"
+
+#, python-format
+msgid "bookmark '%s' already exists (use -f to force)"
+msgstr "o marcador '%s' já existe (use -f para forçar)"
msgid "new bookmark name required"
msgstr "requerido nome do novo marcador"
@@ -7791,6 +8428,15 @@
msgid "no bookmarks set\n"
msgstr "nenhum marcador definido\n"
+msgid "set branch name even if it shadows an existing branch"
+msgstr "especifica nome do ramo mesmo se ocultar um ramo existente"
+
+msgid "reset branch name to parent branch name"
+msgstr "especifica o nome do ramo como o nome do ramo do pai"
+
+msgid "[-fC] [NAME]"
+msgstr "[-fC] [NOME]"
+
msgid "set or show the current branch name"
msgstr "define ou mostra o nome de ramo atual"
@@ -7832,17 +8478,42 @@
" fechado.\n"
" "
+msgid " .. note::"
+msgstr " .. note::"
+
+msgid ""
+" Branch names are permanent. Use :hg:`bookmark` to create a\n"
+" light-weight bookmark instead. See :hg:`help glossary` for more\n"
+" information about named branches and bookmarks."
+msgstr ""
+" Nomes de ramos são permanentes. Alternativamente, Use :hg:`bookmark`\n"
+" para criar um marcador leve temporário. Veja :hg:`help glossary`\n"
+" para mais informações sobre ramos nomeados e marcadores."
+
#, python-format
msgid "reset working directory to branch %s\n"
msgstr "redefine o diretório de trabalho para o ramo %s\n"
-msgid "a branch of the same name already exists (use 'hg update' to switch to it)"
-msgstr "um ramo de mesmo nome já existe (use 'hg update' para mudar para ele)"
+msgid "a branch of the same name already exists"
+msgstr "já existe um ramo com o mesmo nome"
+
+#. i18n: "it" refers to an existing branch
+msgid "use 'hg update' to switch to it"
+msgstr "use 'hg update' para mudar para ele"
#, python-format
msgid "marked working directory as branch %s\n"
msgstr "diretório de trabalho marcado como ramo %s\n"
+msgid "show only branches that have unmerged heads"
+msgstr "mostra apenas ramos que possuem cabeças não mescladas"
+
+msgid "show normal and closed branches"
+msgstr "mostra ramos normais e fechados"
+
+msgid "[-ac]"
+msgstr "[-ac]"
+
msgid "list repository named branches"
msgstr "lista os ramos nomeados do repositório"
@@ -7878,6 +8549,27 @@
msgid " (inactive)"
msgstr " (inativo)"
+msgid "run even when the destination is unrelated"
+msgstr "execute mesmo se o destino não for relacionado"
+
+msgid "a changeset intended to be added to the destination"
+msgstr "uma revisão que deve ser adicionada ao destino"
+
+msgid "a specific branch you would like to bundle"
+msgstr "um ramo específico que você gostaria de incluir no bundle"
+
+msgid "a base changeset assumed to be available at the destination"
+msgstr "uma revisão base que se assume estar presente no destino"
+
+msgid "bundle all changesets in the repository"
+msgstr "cria um bundle com todas as revisões no repositório"
+
+msgid "bundle compression type to use"
+msgstr "tipo de compressão de bundle a ser usada"
+
+msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
+msgstr "[-f] [-t TIPO] [-a] [-r REV]... [--base REV]... ARQUIVO [DEST]"
+
msgid "create a changegroup file"
msgstr "cria um arquivo de changegroup (coleção de revisões)"
@@ -7942,6 +8634,18 @@
msgid "unknown bundle type specified with --type"
msgstr "tipo de bundle especificado por --type desconhecido"
+msgid "print output to file with formatted name"
+msgstr "imprime a saída para o arquivo com o nome formatado"
+
+msgid "print the given revision"
+msgstr "imprime a revisão dada"
+
+msgid "apply any matching decode filter"
+msgstr "aplica qualquer filtro de decodificação que case"
+
+msgid "[OPTION]... FILE..."
+msgstr "[OPÇÃO]... ARQUIVO..."
+
msgid "output the current or given revision of files"
msgstr "mostra o conteúdo de um arquivo na revisão atual ou pedida"
@@ -7972,6 +8676,21 @@
" :``%d``: diretório do arquivo impresso, ou '.' se no raiz do repositório\n"
" :``%p``: caminho do arquivo impresso relativo à raiz"
+msgid "the clone will include an empty working copy (only a repository)"
+msgstr "o clone irá conter uma cópia de trabalho vazia (apenas o repositório)"
+
+msgid "revision, tag or branch to check out"
+msgstr "revisão, etiqueta ou ramo a ser obtido"
+
+msgid "include the specified changeset"
+msgstr "inclui a revisão especificada"
+
+msgid "clone only the specified branch"
+msgstr "clona apenas o ramo especificado"
+
+msgid "[OPTION]... SOURCE [DEST]"
+msgstr "[OPÇÃO]... ORIGEM [DEST]"
+
msgid "make a copy of an existing repository"
msgstr "cria uma cópia de um repositório existente"
@@ -8109,6 +8828,12 @@
msgid "cannot specify both --noupdate and --updaterev"
msgstr "não se pode especificar ao mesmo tempo ---noupdate e --updaterev"
+msgid "mark new/missing files as added/removed before committing"
+msgstr "marca arquivos novos/ausentes como adicionados/removidos antes da consolidação"
+
+msgid "mark a branch as closed, hiding it from the branch list"
+msgstr "marca um ramo como fechado, escondendo-o da lista de ramos"
+
msgid "commit the specified files or all outstanding changes"
msgstr "consolida os arquivos pedidos ou todas as mudanças por gravar"
@@ -8157,6 +8882,10 @@
msgid "can only close branch heads"
msgstr "só pode fechar cabeças de ramo"
+#, python-format
+msgid "nothing changed (%d missing files, see 'hg status')\n"
+msgstr "nada mudou (%d arquivos faltando, veja 'hg status')\n"
+
msgid "nothing changed\n"
msgstr "nada mudou\n"
@@ -8171,6 +8900,15 @@
msgid "committed changeset %d:%s\n"
msgstr "consolidada a revisão %d:%s\n"
+msgid "record a copy that has already occurred"
+msgstr "grava uma cópia que já ocorreu"
+
+msgid "forcibly copy over an existing managed file"
+msgstr "força cópia sobre um arquivo não gerenciado existente"
+
+msgid "[OPTION]... [SOURCE]... DEST"
+msgstr "[OPÇÃO]... [ORIGEM]... DEST"
+
msgid "mark files as copied for the next commit"
msgstr "marca arquivos como copiados para a próxima consolidação"
@@ -8206,14 +8944,36 @@
" Devolve 0 para indicar sucesso, 1 se erros forem encontrados.\n"
" "
+msgid "[INDEX] REV1 REV2"
+msgstr "[ÍNDICE] REV1 REV2"
+
msgid "find the ancestor revision of two revisions in a given index"
msgstr "encontra a revisão ancestral de duas revisões no índice dado"
msgid "either two or three arguments required"
msgstr "ou dois ou três argumentos necessários"
-msgid "builds a repo with a given dag from scratch in the current empty repo"
-msgstr "constrói um repositório com o dag dado em um repositório vazio existente"
+msgid "add single file mergeable changes"
+msgstr "adiciona mudanças mescláveis em arquivos únicos"
+
+msgid "add single file all revs overwrite"
+msgstr "adiciona um único arquivo que todas as revisões sobrescrevem"
+
+msgid "add new file at each rev"
+msgstr "adiciona um arquivo novo a cada revisão"
+
+msgid "[OPTION]... [TEXT]"
+msgstr "[OPÇÃO]... [TEXTO]"
+
+msgid "builds a repo with a given DAG from scratch in the current empty repo"
+msgstr "constrói um repositório do zero com um DAG dado em um repositório vazio existente"
+
+msgid ""
+" The description of the DAG is read from stdin if not given on the\n"
+" command line."
+msgstr ""
+" Se não for passada na linha de comando, a descrição do DAG é lida\n"
+" da entrada padrão."
msgid " Elements:"
msgstr " Elementos:"
@@ -8229,8 +8989,6 @@
" - \"/p2\" is a merge of the preceding node and p2\n"
" - \":tag\" defines a local tag for the preceding node\n"
" - \"@branch\" sets the named branch for subsequent nodes\n"
-" - \"!command\" runs the command using your shell\n"
-" - \"!!my command\\n\" is like \"!\", but to the end of the line\n"
" - \"#...\\n\" is a comment up to the end of the line"
msgstr ""
" - \"+n\" é uma sequência linear de n nós baseada no pai default atual\n"
@@ -8243,8 +9001,6 @@
" - \"/p2\" é uma mesclagem do nó anterior e p2\n"
" - \":tag\" define uma etiqueta local para o nó anterior\n"
" - \"@branch\" define o nome de ramo para nós subsequentes\n"
-" - \"!command\" executa o comando usando o shell\n"
-" - \"!!my command\\n\" é semelhante a \"!\", mas até o fim da linha\n"
" - \"#...\\n\" é um comentário até o fim da linha"
msgid " Whitespace between the above elements is ignored."
@@ -8265,42 +9021,28 @@
msgid ""
" All string valued-elements are either strictly alphanumeric, or must\n"
-" be enclosed in double quotes (\"...\"), with \"\\\" as escape character."
+" be enclosed in double quotes (\"...\"), with \"\\\" as escape character.\n"
+" "
msgstr ""
" Todos os elementos com valores string devem ser ou estritamente\n"
" alfanuméricos, ou devem estar entre aspas duplas (\"...\"), usando\n"
-" \"\\\" como caractere de escape."
-
-msgid ""
-" Note that the --overwritten-file and --appended-file options imply the\n"
-" use of \"HGMERGE=internal:local\" during DAG buildup.\n"
-" "
-msgstr ""
-" Note que as opções --overwritten-file e --appended-file implicam\n"
-" no uso de \"HGMERGE=internal:local\" durante a construção do DAG.\n"
-" "
-
-msgid "need at least one of -m, -a, -o, -n"
-msgstr "é necessária ao menos uma das opções -m, -a, -o, -n"
+" \"\\\" como caractere de escape.\n"
+" "
+
+msgid "reading DAG from stdin\n"
+msgstr "lendo DAG da entrada padrão\n"
msgid "repository is not empty"
msgstr "repositório não está vazio"
-#, python-format
-msgid "%s command %s"
-msgstr "%s comando %s"
-
-msgid "list all available commands and options"
-msgstr "exibe todas as opções e comandos disponíveis"
-
-msgid "returns the completion list associated with the given command"
-msgstr "devolve a lista de complementos associada ao comando dado"
-
-msgid "show information detected about current filesystem"
-msgstr "mostra informações detectadas sobre o sistema de arquivos atual"
-
-msgid "rebuild the dirstate as it would look like for the given revision"
-msgstr "reconstrói o dirstate como ele pareceria para a revisão dada"
+msgid "building"
+msgstr "construindo"
+
+msgid "show all details"
+msgstr "mostra todos os detalhes"
+
+msgid "lists the contents of a bundle"
+msgstr "lista o conteúdo de um bundle"
msgid "validate the correctness of the current dirstate"
msgstr "valida a exatidão do dirstate atual"
@@ -8324,77 +9066,35 @@
msgid ".hg/dirstate inconsistent with current parent's manifest"
msgstr ".hg/dirstate inconsistente com manifesto do pai atual"
-msgid "show combined config settings from all hgrc files"
-msgstr "exibe opções de configuração de todos os arquivos hgrc combinados"
-
-msgid " With no arguments, print names and values of all config items."
-msgstr ""
-" Sem argumentos, imprime nomes e valores de todos os itens de\n"
-" configuração."
-
-msgid ""
-" With one argument of the form section.name, print just the value\n"
-" of that config item."
-msgstr ""
-" Com um argumento da forma 'seção.nome', imprime apenas o valor\n"
-" desse item de configuração."
-
-msgid ""
-" With multiple arguments, print names and values of all config\n"
-" items with matching section names."
-msgstr ""
-" Com múltiplos argumentos, imprime nomes e valores de todos os\n"
-" itens de configuração que casarem com os nomes de seção."
-
-msgid ""
-" With --debug, the source (filename and line number) is printed\n"
-" for each config item."
-msgstr ""
-" Com --debug, é mostrada a origem (nome de arquivo e número da\n"
-" linha) para cada item de configuração."
-
-#, python-format
-msgid "read config from: %s\n"
-msgstr "configuração lida de: %s\n"
-
-msgid "only one config item permitted"
-msgstr "apenas um item de configuração permitido"
-
-msgid "access the pushkey key/value protocol"
-msgstr "acessa o protocolo pushkey de pares chave/valor"
-
-msgid " With two args, list the keys in the given namespace."
-msgstr " Com dois argumentos, lista as chaves no espaço de nomes dado."
-
-msgid ""
-" With five args, set a key to new if it currently is set to old.\n"
-" Reports success or failure.\n"
-" "
-msgstr ""
-" Com cinco argumentos, redefine uma chave para o novo valor se\n"
-" estiver no momento definida para o valor antigo.\n"
-" Informa sobre sucesso ou falha.\n"
-" "
-
-msgid "parse and apply a revision specification"
-msgstr "interpreta e aplica uma especificação de revisões"
-
-msgid "manually set the parents of the current working directory"
-msgstr "muda manualmente os pais do diretório de trabalho atual"
-
-msgid ""
-" This is useful for writing repository conversion tools, but should\n"
-" be used with care."
-msgstr ""
-" Isto é útil para escrever utilitários de conversão de repositórios, mas\n"
-" deve ser usado com cuidado."
-
-msgid "show the contents of the current dirstate"
-msgstr "mostra o conteúdo do dirstate atual"
-
-#, python-format
-msgid "copy: %s -> %s\n"
-msgstr "cópia: %s -> %s\n"
+msgid "[COMMAND]"
+msgstr "[COMANDO]"
+
+msgid "list all available commands and options"
+msgstr "exibe todas as opções e comandos disponíveis"
+
+msgid "show the command options"
+msgstr "exibe opções dos comandos"
+
+msgid "[-o] CMD"
+msgstr "[-o] CMD"
+
+msgid "returns the completion list associated with the given command"
+msgstr "devolve a lista de complementos associada ao comando dado"
+
+msgid "use tags as labels"
+msgstr "usa etiquetas como rótulos"
+
+msgid "annotate with branch names"
+msgstr "comenta com nomes de ramos"
+
+msgid "use dots for runs"
+msgstr "usar pontos para representar sequências"
+
+msgid "separate elements by spaces"
+msgstr "separa elementos usando espaços"
+
+msgid "[OPTION]... [FILE [REV]...]"
+msgstr "[OPÇÃO]... [ARQUIVO [REVISÃO]...]"
msgid "format the changelog or an index DAG as a concise textual description"
msgstr "formata o changelog ou um índice DAG como uma representação textual concisa"
@@ -8417,6 +9117,15 @@
msgid "need repo for changelog dag"
msgstr "é necessário um repositório para o DAG do changelog"
+msgid "open changelog"
+msgstr "abre o changelog"
+
+msgid "open manifest"
+msgstr "abre o manifesto"
+
+msgid "-c|-m|FILE REV"
+msgstr "-c|-m|ARQUIVO REV"
+
msgid "dump the contents of a data file revision"
msgstr "exibe o conteúdo de uma revisão de dados de arquivo"
@@ -8424,15 +9133,69 @@
msgid "invalid revision identifier %s"
msgstr "identificador de revisão inválido %s"
+msgid "try extended date formats"
+msgstr "tenta formatos de data estendidos"
+
+msgid "[-e] DATE [RANGE]"
+msgstr "[-e] DATA [INTERVALO]"
+
msgid "parse and display a date"
msgstr "decodifica e exibe uma data"
+msgid "use old-style discovery"
+msgstr "usa descoberta de nós antiga"
+
+msgid "use old-style discovery with non-heads included"
+msgstr "usa descoberta de nós antiga com não-cabeças incluídas"
+
+msgid "[-l REV] [-r REV] [-b BRANCH]... [OTHER]"
+msgstr "[-l REV] [-r REV] [-b RAMO]... [OUTRO]"
+
+msgid "runs the changeset discovery protocol in isolation"
+msgstr "executa o protocolo discovery isoladamente"
+
+msgid "parse and apply a fileset specification"
+msgstr "interpreta e aplica uma especificação de fileset"
+
+msgid "[PATH]"
+msgstr "[CAMINHO]"
+
+msgid "show information detected about current filesystem"
+msgstr "mostra informações detectadas sobre o sistema de arquivos atual"
+
+msgid "id of head node"
+msgstr "id do nó cabeça"
+
+msgid "id of common node"
+msgstr "id do nó comum"
+
+msgid "REPO FILE [-H|-C ID]..."
+msgstr "REPO ARQUIVO [-H|-C ID]..."
+
+msgid "retrieves a bundle from a repo"
+msgstr "obtém um bundle de um repositório"
+
+msgid ""
+" Every ID must be a full-length hex node id string. Saves the bundle to the\n"
+" given file.\n"
+" "
+msgstr ""
+" Todo ID deve ser uma string hexadecimal completa.\n"
+" Grava o bundle no arquivo pedido.\n"
+" "
+
msgid "display the combined ignore pattern"
msgstr "exibe o padrão combinado de arquivos ignorados"
msgid "no ignore patterns found"
msgstr "nenhum padrão de arquivos ignorados encontrado"
+msgid "revlog format"
+msgstr "formato do revlog"
+
+msgid "[-f FORMAT] -c|-m|FILE"
+msgstr "[-f FORMATO] -c|-m|ARQUIVO"
+
msgid "dump the contents of an index file"
msgstr "extrai o conteúdo de um arquivo de índice"
@@ -8469,24 +9232,6 @@
msgid " (templates seem to have been installed incorrectly)\n"
msgstr " (modelos parecem ter sido instalados incorretamente)\n"
-msgid "Checking patch...\n"
-msgstr "Verificando patch...\n"
-
-msgid " patch call failed:\n"
-msgstr " chamada de patch falhou:\n"
-
-msgid " unexpected patch output!\n"
-msgstr " saída de patch inesperada!\n"
-
-msgid " patch test failed!\n"
-msgstr " patch de teste falhou!\n"
-
-msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your configuration file)\n"
-msgstr " (O utilitário de patch atual pode ser incompatível com o patch, ou pode estar configurado incorretamente. Por favor verifique seu arquivo de configuração)\n"
-
-msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/wiki/BugTracker\n"
-msgstr " Falha do sistema interno de patches, por favor informe esse erro em http://mercurial.selenic.com/wiki/BugTracker\n"
-
msgid "Checking commit editor...\n"
msgstr "Verificando editor para consolidação...\n"
@@ -8513,6 +9258,56 @@
msgid "%s problems detected, please check your install!\n"
msgstr "%s problemas detectados, por favor verifique sua instalação!\n"
+msgid "REPO ID..."
+msgstr "REPO ID..."
+
+msgid "test whether node ids are known to a repo"
+msgstr "testa se os ids dos nós são conhecidos em um repositório"
+
+msgid ""
+" Every ID must be a full-length hex node id string. Returns a list of 0s and 1s\n"
+" indicating unknown/known.\n"
+" "
+msgstr ""
+" Todo ID deve ser uma string hexadecimal completa.\n"
+" Devolve uma lista de 0s e 1s indicando respectivamente\n"
+" desconhecidos e conhecidos.\n"
+" "
+
+msgid "REPO NAMESPACE [KEY OLD NEW]"
+msgstr "REPOSITÓRIO NAMESPACE [CHAVE ANTIGO NOVO]"
+
+msgid "access the pushkey key/value protocol"
+msgstr "acessa o protocolo pushkey de pares chave/valor"
+
+msgid " With two args, list the keys in the given namespace."
+msgstr " Com dois argumentos, lista as chaves no espaço de nomes dado."
+
+msgid ""
+" With five args, set a key to new if it currently is set to old.\n"
+" Reports success or failure.\n"
+" "
+msgstr ""
+" Com cinco argumentos, redefine uma chave para o novo valor se\n"
+" estiver no momento definida para o valor antigo.\n"
+" Informa sobre sucesso ou falha.\n"
+" "
+
+msgid "revision to rebuild to"
+msgstr "revisão para a qual reconstruir"
+
+msgid "[-r REV] [REV]"
+msgstr "[-r REV] [REV]"
+
+msgid "rebuild the dirstate as it would look like for the given revision"
+msgstr "reconstrói o dirstate como ele pareceria para a revisão dada"
+
+msgid "revision to debug"
+msgstr "revisão a ser depurada"
+
+msgid "[-r REV] FILE"
+msgstr "[-r REV] ARQUIVO"
+
msgid "dump rename information"
msgstr "exibe informações de renomeação"
@@ -8524,9 +9319,59 @@
msgid "%s not renamed\n"
msgstr "%s não renomeado\n"
+msgid "dump index data"
+msgstr "imprime diretamente dados do índice"
+
+msgid "-c|-m|FILE"
+msgstr "-c|-m|ARQUIVO"
+
+msgid "show data and statistics about a revlog"
+msgstr "mostra dados e estatísticas sobre um revlog"
+
+msgid "parse and apply a revision specification"
+msgstr "interpreta e aplica uma especificação de revisões"
+
+msgid "REV1 [REV2]"
+msgstr "REV1 [REV2]"
+
+msgid "manually set the parents of the current working directory"
+msgstr "muda manualmente os pais do diretório de trabalho atual"
+
+msgid ""
+" This is useful for writing repository conversion tools, but should\n"
+" be used with care."
+msgstr ""
+" Isto é útil para escrever utilitários de conversão de repositórios, mas\n"
+" deve ser usado com cuidado."
+
+msgid "do not display the saved mtime"
+msgstr "não exibe o mtime armazenado"
+
+msgid "sort by saved mtime"
+msgstr "ordena por mtime armazenado"
+
+msgid "[OPTION]..."
+msgstr "[OPÇÃO]..."
+
+msgid "show the contents of the current dirstate"
+msgstr "mostra o conteúdo do dirstate atual"
+
+#, python-format
+msgid "copy: %s -> %s\n"
+msgstr "cópia: %s -> %s\n"
+
+msgid "revision to check"
+msgstr "revisão para verificar"
+
msgid "show how files match on given patterns"
msgstr "mostra como os arquivos casam com os padrões pedidos"
+msgid "REPO [OPTIONS]... [ONE [TWO]]"
+msgstr "REPO [OPÇÕES]... [UM [DOIS]]"
+
+msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
+msgstr "[OPÇÃO]... ([-c REV] | [-r REV1 [-r REV2]]) [ARQUIVO]..."
+
msgid "diff repository (or selected files)"
msgstr "exibe um diff do repositório (ou arquivos selecionados)"
@@ -8572,6 +9417,15 @@
" Use a opção -g/--git para gerar diffs no formato estendido\n"
" \"git diff\". Leia :hg:`help diffs` para mais informações."
+msgid "diff against the second parent"
+msgstr "faz o diff com o segundo pai"
+
+msgid "revisions to export"
+msgstr "revisões a serem exportadas"
+
+msgid "[OPTION]... [-o OUTFILESPEC] REV..."
+msgstr "[OPÇÃO]... [-o PADRÃOARQSAÍDA] REV..."
+
msgid "dump the header and diffs for one or more changesets"
msgstr "exibe o cabeçalho e diffs para uma ou mais revisões"
@@ -8687,6 +9541,34 @@
msgid "not removing %s: file is already untracked\n"
msgstr "%s não removido: arquivo já não é rastreado\n"
+#, python-format
+msgid "removing %s\n"
+msgstr "removendo %s\n"
+
+msgid "end fields with NUL"
+msgstr "termina campos com NUL"
+
+msgid "print all revisions that match"
+msgstr "imprime todas as revisões que casarem"
+
+msgid "follow changeset history, or file history across copies and renames"
+msgstr "acompanha histórico de revisões, ou histórico de arquivo através de cópias e renomeações"
+
+msgid "ignore case when matching"
+msgstr "ignora maiúsculas/minúsculas ao casar"
+
+msgid "print only filenames and revisions that match"
+msgstr "imprime apenas nomes de arquivo e revisões que casarem"
+
+msgid "print matching line numbers"
+msgstr "imprime número de linhas que casarem"
+
+msgid "only search files changed within revision range"
+msgstr "procura apenas por arquivos que mudaram dentro do intervalo pedido"
+
+msgid "[OPTION]... PATTERN [FILE]..."
+msgstr "[OPÇÃO]... PADRÃO [ARQUIVO]..."
+
msgid "search for a pattern in specified files and revisions"
msgstr "procura por um padrão nos arquivos e revisões especificados"
@@ -8729,6 +9611,24 @@
msgid "grep: invalid match pattern: %s\n"
msgstr "grep: padrão de busca inválido: %s\n"
+msgid "STARTREV"
+msgstr "REVINICIAL"
+
+msgid "show only heads which are descendants of STARTREV"
+msgstr "mostra apenas cabeças descendentes de REVINICIAL"
+
+msgid "show topological heads only"
+msgstr "mostra apenas cabeças topológicas"
+
+msgid "show active branchheads only (DEPRECATED)"
+msgstr "mostra apenas cabeças de ramo ativas (OBSOLETA)"
+
+msgid "show normal and closed branch heads"
+msgstr "mostra cabeças de ramo normais e fechadas"
+
+msgid "[-ac] [-r STARTREV] [REV]..."
+msgstr "[-ac] [-r REVINICIAL] [REV]..."
+
msgid "show current repository heads or show branch heads"
msgstr "mostra as cabeças atuais do repositório ou cabeças de ramo"
@@ -8792,6 +9692,15 @@
msgid " (started at %s)"
msgstr " (iniciado em %s)"
+msgid "show only help for extensions"
+msgstr "mostra apenas a ajuda para extensões"
+
+msgid "show only help for commands"
+msgstr "mostra apenas a ajuda para comandos"
+
+msgid "[-ec] [TOPIC]"
+msgstr "[-ec] [TÓPICO]"
+
msgid "show help for a given topic or a help overview"
msgstr "exibe o texto de ajuda geral ou de um tópico pedido"
@@ -8824,6 +9733,10 @@
msgstr "use \"hg help\" para a lista completa de comandos ou \"hg -v\" para detalhes"
#, python-format
+msgid "use \"hg help %s\" to show the full help text"
+msgstr "use \"hg help %s\" para mostrar o texto completo de ajuda"
+
+#, python-format
msgid "use \"hg -v help%s\" to show builtin aliases and global options"
msgstr "use \"hg -v help%s\" para mostrar apelidos pré-definidos de comandos e opções globais"
@@ -8872,9 +9785,21 @@
msgid "options:\n"
msgstr "opções:\n"
+#, python-format
+msgid "use \"hg help -e %s\" to show help for the %s extension"
+msgstr "use \"hg help -e %s\" para mostrar a ajuda para a extensão %s"
+
msgid "no commands defined\n"
msgstr "nenhum comando definido\n"
+#, python-format
+msgid ""
+"\n"
+"use \"hg help -c %s\" to see help for the %s command\n"
+msgstr ""
+"\n"
+"use \"hg help -c %s\" para mostrar a ajuda do comando %s\n"
+
msgid "no help text available"
msgstr "texto de ajuda não disponível"
@@ -8918,6 +9843,27 @@
"\n"
"tópicos adicionais de ajuda:"
+msgid "identify the specified revision"
+msgstr "identifica a revisão especificada"
+
+msgid "show local revision number"
+msgstr "exibe número local de revisão"
+
+msgid "show global revision id"
+msgstr "exibe identificador global de revisão"
+
+msgid "show branch"
+msgstr "exibe ramo"
+
+msgid "show tags"
+msgstr "exibe etiquetas"
+
+msgid "show bookmarks"
+msgstr "exibe marcadores"
+
+msgid "[-nibtB] [-r REV] [SOURCE]"
+msgstr "[-nibtB] [-r REV] [ORIGEM]"
+
msgid "identify the working copy or specified revision"
msgstr "identifica a cópia de trabalho ou revisão especificada"
@@ -8948,8 +9894,35 @@
" arquivo bundle do Mercurial faz com que a busca opere em tal\n"
" repositório ou bundle."
-msgid "can't query remote revision number, branch, tags, or bookmarks"
-msgstr "não é possível consultar o número de revisão, ramo, etiquetas ou marcadores remotos"
+msgid "can't query remote revision number, branch, or tags"
+msgstr "não é possível consultar o número de revisão, ramo ou etiquetas remotos"
+
+msgid "directory strip option for patch. This has the same meaning as the corresponding patch option"
+msgstr "opção de remoção de diretório para o patch. Tem o mesmo significado da opção correspondente do utilitário patch"
+
+msgid "PATH"
+msgstr "CAMINHO"
+
+msgid "base path (DEPRECATED)"
+msgstr "caminho base (OBSOLETO)"
+
+msgid "skip check for outstanding uncommitted changes"
+msgstr "não faz verificação de mudanças ainda não consolidadas"
+
+msgid "don't commit, just update the working directory"
+msgstr "não consolida, apenas atualiza o diretório de trabalho"
+
+msgid "apply patch without touching the working directory"
+msgstr "aplica o patch sem alterar o diretório de trabalho"
+
+msgid "apply patch to the nodes from which it was generated"
+msgstr "aplica o patch aos nós a partir dos quais ele foi gerado"
+
+msgid "use any branch information in patch (implied by --exact)"
+msgstr "usa qualquer informação de ramo no patch (implicada por --exact)"
+
+msgid "[OPTION]... PATCH..."
+msgstr "[OPÇÃO]... PATCH..."
msgid "import an ordered set of patches"
msgstr "importa um conjunto ordenado de patches"
@@ -9009,6 +9982,17 @@
" caracteres ou outras deficiências no formato de texto de patch."
msgid ""
+" Use --bypass to apply and commit patches directly to the\n"
+" repository, not touching the working directory. Without --exact,\n"
+" patches will be applied on top of the working directory parent\n"
+" revision."
+msgstr ""
+" Use --bypass para aplicar e consolidar patches diretamente no\n"
+" repositório, sem alterar arquivos no diretório de trabalho. Sem\n"
+" --exact, patches serão aplicados sobre a revisão do pai do\n"
+" diretório de trabalho."
+
+msgid ""
" With -s/--similarity, hg will attempt to discover renames and\n"
" copies in the patch in the same way as 'addremove'."
msgstr ""
@@ -9026,15 +10010,21 @@
" para -d/--date.\n"
" "
+msgid "cannot use --no-commit with --bypass"
+msgstr "não se pode usar --no-commit com --bypass"
+
+msgid "cannot use --similarity with --bypass"
+msgstr "não se pode usar --similarity com --bypass"
+
+msgid "patch is damaged or loses information"
+msgstr "o patch está danificado ou perde informação"
+
msgid "to working directory"
msgstr "para o diretório de trabalho"
msgid "not a Mercurial patch"
msgstr "não é um patch do Mercurial"
-msgid "patch is damaged or loses information"
-msgstr "o patch está danificado ou perde informação"
-
msgid "applying patch from stdin\n"
msgstr "aplicando patch da entrada padrão\n"
@@ -9045,6 +10035,27 @@
msgid "no diffs found"
msgstr "nenhum diff encontrado"
+msgid "run even if remote repository is unrelated"
+msgstr "execute mesmo se o repositório remoto não for relacionado"
+
+msgid "show newest record first"
+msgstr "mostra registros mais novos primeiro"
+
+msgid "file to store the bundles into"
+msgstr "arquivo no qual armazenar os bundles"
+
+msgid "a remote changeset intended to be added"
+msgstr "uma revisão remota que se deva adicionar"
+
+msgid "compare bookmarks"
+msgstr "compara marcadores"
+
+msgid "a specific branch you would like to pull"
+msgstr "um ramo específico que você gostaria de trazer"
+
+msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
+msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle ARQUIVO] [ORIGEM]"
+
msgid "show new changesets found in source"
msgstr "mostra novas revisões encontradas na origem"
@@ -9081,6 +10092,9 @@
msgid "remote doesn't support bookmarks\n"
msgstr "o repositório remoto não suporta marcadores\n"
+msgid "[-e CMD] [--remotecmd CMD] [DEST]"
+msgstr "[-e CMD] [--remotecmd CMD] [DEST]"
+
msgid "create a new repository in the given directory"
msgstr "cria um novo repositório no diretório pedido"
@@ -9102,6 +10116,18 @@
" Veja :hg:`help urls` para mais informações.\n"
" "
+msgid "search the repository as it is in REV"
+msgstr "procura no repositório como se estivesse em REV"
+
+msgid "end filenames with NUL, for use with xargs"
+msgstr "termina nomes de arquivo com NUL, para uso com xargs"
+
+msgid "print complete paths from the filesystem root"
+msgstr "imprime caminhos completos a partir do raiz do sistema de arquivos"
+
+msgid "[OPTION]... [PATTERN]..."
+msgstr "[OPÇÃO]... [PADRÃO]..."
+
msgid "locate files matching specific patterns"
msgstr "localiza arquivos que casem com os padrões especificados"
@@ -9141,6 +10167,42 @@
" \"xargs\". Isso irá evitar que \"xargs\" trate nomes de arquivo\n"
" contendo espaços como múltiplos nomes de arquivo."
+msgid "only follow the first parent of merge changesets"
+msgstr "acompanha apenas o primeiro pai de revisões de mesclagem"
+
+msgid "show revisions matching date spec"
+msgstr "mostra revisões que casem com a especificação de data"
+
+msgid "show copied files"
+msgstr "mostra arquivos copiados"
+
+msgid "do case-insensitive search for a given text"
+msgstr "faz uma busca insensível a maiúsculas / minúsculas por um texto dado"
+
+msgid "include revisions where files were removed"
+msgstr "inclui revisões nas quais arquivos foram removidos"
+
+msgid "show only merges"
+msgstr "mostra apenas mesclagens"
+
+msgid "revisions committed by user"
+msgstr "revisões de autoria do usuário"
+
+msgid "show only changesets within the given named branch (DEPRECATED)"
+msgstr "mostra apenas revisões dentro do ramo nomeado especificado (OBSOLETA)"
+
+msgid "show changesets within the given named branch"
+msgstr "mostra apenas revisões dentro do ramo nomeado especificado"
+
+msgid "do not display revision or any of its ancestors"
+msgstr "não exibe revisão ou qualquer de seus ancestrais"
+
+msgid "show hidden changesets"
+msgstr "exibe revisões ocultas"
+
+msgid "[OPTION]... [FILE]"
+msgstr "[OPÇÃO]... [ARQUIVO]"
+
msgid "show revision history of entire repository or files"
msgstr "mostra o histórico de revisões do repositório ou de arquivos"
@@ -9202,6 +10264,15 @@
" com seu primeiro pai. Além disso, apenas arquivos diferentes\n"
" de AMBOS os pais aparecerão na lista de arquivos."
+msgid "revision to display"
+msgstr "revisão a ser exibida"
+
+msgid "list files from all revisions"
+msgstr "lista os arquivos de todas as revisões"
+
+msgid "[-r REV]"
+msgstr "[-r REV]"
+
msgid "output the current or given revision of the project manifest"
msgstr "mostra a revisão atual ou pedida do manifesto do projeto"
@@ -9223,6 +10294,29 @@
" e bits de execução. Com a opção --debug, imprime os hashes de\n"
" revisão de arquivo."
+msgid ""
+" If option --all is specified, the list of all files from all revisions\n"
+" is printed. This includes deleted and renamed files."
+msgstr ""
+" Se a opção --all for especificada, será impressa a lista de todos\n"
+" os arquivos de todas as revisões, inclusive arquivos apagados e\n"
+" renomeados."
+
+msgid "can't specify a revision with --all"
+msgstr "você não pode especificar uma revisão com --all"
+
+msgid "force a merge with outstanding changes"
+msgstr "força uma mesclagem com mudanças ainda não consideradas"
+
+msgid "revision to merge"
+msgstr "revisão a ser mesclada"
+
+msgid "review revisions to merge (no merge is performed)"
+msgstr "avalia revisões a serem mescladas (a mesclagem não é executada)"
+
+msgid "[-P] [-f] [[-r] REV]"
+msgstr "[-P] [-f] [[-r] REV]"
+
msgid "merge working directory with another revision"
msgstr "mescla o diretório de trabalho com outra revisão"
@@ -9247,12 +10341,12 @@
msgid ""
" ``--tool`` can be used to specify the merge tool used for file\n"
" merges. It overrides the HGMERGE environment variable and your\n"
-" configuration files."
+" configuration files. See :hg:`help merge-tools` for options."
msgstr ""
" ``--tool`` pode ser usado pra especificar o utilitário de\n"
" mesclagem usado para mesclagens de arquivo. Esta opção sobrepõe\n"
" a variável de ambiente HGMERGE e os valores especificados nos\n"
-" arquivos de configuração."
+" arquivos de configuração. Veja :hg:`help merge-tools` para opções."
msgid ""
" If no revision is specified, the working directory's parent is a\n"
@@ -9286,20 +10380,18 @@
" "
#, python-format
-msgid ""
-"branch '%s' has %d heads - please merge with an explicit rev\n"
-"(run 'hg heads .' to see heads)"
-msgstr ""
-"o ramo '%s' tem %d cabeças - por favor mescle com uma revisão explícita\n"
-"(execute 'hg heads .' para exibir as cabeças)"
-
-#, python-format
-msgid ""
-"branch '%s' has one head - please merge with an explicit rev\n"
-"(run 'hg heads' to see all heads)"
-msgstr ""
-"o ramo '%s' tem apenas uma cabeça - por favor mescle com uma revisão explícita\n"
-"(execute 'hg heads' para exibir todas as cabeças)"
+msgid "branch '%s' has %d heads - please merge with an explicit rev"
+msgstr "o ramo '%s' tem %d cabeças - por favor mescle com uma revisão explícita"
+
+msgid "run 'hg heads .' to see heads"
+msgstr "execute 'hg heads .' para ver as cabeças"
+
+#, python-format
+msgid "branch '%s' has one head - please merge with an explicit rev"
+msgstr "o ramo '%s' tem apenas uma cabeça - por favor mescle com uma revisão explícita"
+
+msgid "run 'hg heads' to see all heads"
+msgstr "execute 'hg heads' para ver todas as cabeças"
msgid "there is nothing to merge"
msgstr "não há nada para mesclar"
@@ -9308,8 +10400,20 @@
msgid "%s - use \"hg update\" instead"
msgstr "%s - use \"hg update\""
-msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev"
-msgstr "diretório de trabalho não está em uma cabeça - use \"hg update\" ou mescle com uma revisão explícita"
+msgid "working directory not at a head revision"
+msgstr "o diretório de trabalho não está em uma cabeça"
+
+msgid "use 'hg update' or merge with an explicit revision"
+msgstr "use 'hg update' ou mescle com uma revisão explícita"
+
+msgid "a changeset intended to be included in the destination"
+msgstr "uma revisão que se deva incluir no destino"
+
+msgid "a specific branch you would like to push"
+msgstr "um ramo específico que você gostaria de enviar"
+
+msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
+msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
msgid "show changesets not found in the destination"
msgstr "mostra revisões não encontradas no destino"
@@ -9333,6 +10437,12 @@
" Devolve 0 para indicar mudanças de saída, 1 se não houver mudanças.\n"
" "
+msgid "show parents of the specified revision"
+msgstr "mostra pais da revisão especificada"
+
+msgid "[-r REV] [FILE]"
+msgstr "[-r REV] [ARQUIVO]"
+
msgid "show the parents of the working directory or revision"
msgstr "mostra os pais do diretório de trabalho ou da revisão"
@@ -9356,6 +10466,9 @@
msgid "'%s' not found in manifest!"
msgstr "'%s' não encontrado no manifesto!"
+msgid "[NAME]"
+msgstr "[NOME]"
+
msgid "show aliases for remote repositories"
msgstr "mostra apelidos de repositórios remotos"
@@ -9367,6 +10480,13 @@
" fornecido, mostra todas as definições de nomes disponíveis."
msgid ""
+" Option -q/--quiet suppresses all output when searching for NAME\n"
+" and shows only the path names when listing all definitions."
+msgstr ""
+" A opção -q/--quiet suprime toda a saída ao procurar por NOME, e\n"
+" mostra apenas os nomes de caminhos ao listar todas as definições."
+
+msgid ""
" Path names are defined in the [paths] section of your\n"
" configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n"
" repository, ``.hg/hgrc`` is used, too."
@@ -9404,15 +10524,37 @@
msgid "not found!\n"
msgstr "não encontrado!\n"
-msgid "not updating, since new heads added\n"
-msgstr "não foi feita a atualização, já que novas cabeças foram acrescentadas\n"
+#, python-format
+msgid "not updating: %s\n"
+msgstr "atualização não realizada: %s\n"
msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
msgstr "(execute 'hg heads' para ver cabeças, 'hg merge' para mesclar)\n"
+msgid "(run 'hg heads .' to see heads, 'hg merge' to merge)\n"
+msgstr "(execute 'hg heads .' para ver cabeças, 'hg merge' para mesclar)\n"
+
+msgid "(run 'hg heads' to see heads)\n"
+msgstr "(execute 'hg heads' para ver cabeças)\n"
+
msgid "(run 'hg update' to get a working copy)\n"
msgstr "(execute 'hg update' para obter uma cópia de trabalho)\n"
+msgid "update to new branch head if changesets were pulled"
+msgstr "atualiza para nova cabeça de ramo se revisões forem trazidas"
+
+msgid "run even when remote repository is unrelated"
+msgstr "execute mesmo se o repositório remoto não for relacionado"
+
+msgid "BOOKMARK"
+msgstr "MARCADOR"
+
+msgid "bookmark to pull"
+msgstr "marcador a ser trazido"
+
+msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
+msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [ORIGEM]"
+
msgid "pull changes from the specified source"
msgstr "traz mudanças da origem especificada"
@@ -9468,6 +10610,18 @@
msgid "importing bookmark %s\n"
msgstr "importando marcador %s\n"
+msgid "force push"
+msgstr "força um push"
+
+msgid "bookmark to push"
+msgstr "marcador a ser enviado"
+
+msgid "allow pushing a new branch"
+msgstr "permite o envio de um novo ramo nomeado"
+
+msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
+msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
+
msgid "push changes to the specified destination"
msgstr "envia mudanças para o destino especificado"
@@ -9577,6 +10731,12 @@
" corrigido ou se a verificação falhar.\n"
" "
+msgid "record delete for missing files"
+msgstr "grava remoção de arquivos faltando"
+
+msgid "remove (and delete) file even if added or modified"
+msgstr "remove (e apaga) o arquivo mesmo se foi adicionado ou modificado"
+
msgid "remove the specified files on the next commit"
msgstr "remove os arquivos pedidos na próxima consolidação"
@@ -9625,6 +10785,13 @@
" -Af R R R R"
msgid ""
+" Note that remove never deletes files in Added [A] state from the\n"
+" working directory, not even if option --force is specified."
+msgstr ""
+" Note que remove nunca apaga do diretório de trabalho arquivos no\n"
+" estado adicionado [A], nem mesmo se a opção --force for especificada."
+
+msgid ""
" This command schedules the files to be removed at the next commit.\n"
" To undo a remove before that, see :hg:`revert`."
msgstr ""
@@ -9655,6 +10822,12 @@
msgid "not removing %s: file has been marked for add (use -f to force removal)\n"
msgstr "%s não removido: o arquivo foi marcado para adição (use -f para forçar a remoção)\n"
+msgid "record a rename that has already occurred"
+msgstr "grava uma renomeação que já ocorreu"
+
+msgid "[OPTION]... SOURCE... DEST"
+msgstr "[OPÇÃO]... ORIGEM... DESTINO"
+
msgid "rename files; equivalent of copy + remove"
msgstr "renomeia arquivos; equivalente a uma cópia seguida de remoção"
@@ -9674,6 +10847,21 @@
" Este comando faz efeito na próxima consolidação. Para desfazer\n"
" uma renomeação antes disso, veja :hg:`revert`."
+msgid "select all unresolved files"
+msgstr "seleciona todos os arquivos não resolvidos"
+
+msgid "list state of files needing merge"
+msgstr "lista estado de arquivos que precisam ser mesclados"
+
+msgid "mark files as resolved"
+msgstr "marca arquivos como resolvidos"
+
+msgid "mark files as unresolved"
+msgstr "marca arquivos como não resolvidos"
+
+msgid "hide status prefix"
+msgstr "esconde prefixo de status"
+
msgid "redo merges or set/view the merge status of files"
msgstr "refaz mesclagens e exibe ou muda o estado da mesclagem de arquivos"
@@ -9765,78 +10953,60 @@
msgid "no files or directories specified; use --all to remerge all files"
msgstr "nenhum arquivo ou diretório especificado; use --all para refazer a mesclagem de todos os arquivos"
-msgid "restore individual files or directories to an earlier state"
-msgstr "restaura arquivos ou diretórios para um estado anterior"
+msgid "revert all changes when no arguments given"
+msgstr "se parâmetros não forem fornecidos, reverte todas as mudanças"
+
+msgid "tipmost revision matching date"
+msgstr "revisão mais recente que casa com a data"
+
+msgid "revert to the specified revision"
+msgstr "reverte para a revisão especificada"
+
+msgid "do not save backup copies of files"
+msgstr "não grava backups de arquivos"
+
+msgid "[OPTION]... [-r REV] [NAME]..."
+msgstr "[OPÇÃO]... [-r REV] [NOME]..."
+
+msgid "restore files to their checkout state"
+msgstr "restaura arquivos para o estado correspondente a uma cópia de trabalho"
msgid ""
" .. note::\n"
-" This command is most likely not what you are looking for.\n"
-" Revert will partially overwrite content in the working\n"
-" directory without changing the working directory parents. Use\n"
-" :hg:`update -r rev` to check out earlier revisions, or\n"
-" :hg:`update --clean .` to undo a merge which has added another\n"
-" parent."
+" To check out earlier revisions, you should use :hg:`update REV`.\n"
+" To cancel a merge (and lose your changes), use :hg:`update --clean .`."
msgstr ""
" .. note::\n"
-" revert sobrescreve parcialmente o conteúdo do diretório de\n"
-" trabalho sem mudar os pais do diretório de trabalho. Use\n"
-" :hg:`update -r rev` para obter revisões anteriores, ou\n"
-" :hg:`update --clean .` para cancelar uma mesclagem (retirando\n"
-" o segundo pai adicionado por ela)."
-
-msgid ""
-" With no revision specified, revert the named files or directories\n"
-" to the contents they had in the parent of the working directory.\n"
-" This restores the contents of the affected files to an unmodified\n"
-" state and unschedules adds, removes, copies, and renames. If the\n"
-" working directory has two parents, you must explicitly specify a\n"
-" revision."
+" Para obter revisões anteriores, você deve usar :hg:`update REV`.\n"
+" Para cancelar uma mesclagem (e perder suas modificações), use\n"
+" :hg:`update --clean .`."
+
+msgid ""
+" With no revision specified, revert the specified files or directories\n"
+" to the state they had in the first parent of the working directory.\n"
+" This restores the contents of files to an unmodified\n"
+" state and unschedules adds, removes, copies, and renames."
msgstr ""
" Se não for pedida uma revisão, reverte os arquivos ou diretórios\n"
-" pedidos para o conteúdo que eles possuíam no pai do diretório de\n"
+" pedidos para o estado que eles possuíam no primeiro pai do diretório de\n"
" trabalho. Isto restaura o conteúdo do arquivos afetados para um\n"
-" estado inalterado e reverte adições, remoções, cópias e\n"
-" renomeações. Se o diretório de trabalho tiver dois pais, você\n"
-" deve especificar explicitamente a revisão para a qual reverter."
-
-msgid ""
-" Using the -r/--rev option, revert the given files or directories\n"
-" to their contents as of a specific revision. This can be helpful\n"
-" to \"roll back\" some or all of an earlier change. See :hg:`help\n"
-" dates` for a list of formats valid for -d/--date."
-msgstr ""
-" Com a opção -r/--rev, reverte os arquivos ou diretórios dados\n"
-" para seus conteúdos na revisão pedida. Isso pode ser útil para\n"
-" \"desfazer\" algumas ou todas as mudanças anteriores. Veja\n"
-" :hg:`help dates` para uma lista de formatos válidos para -d/--date."
-
-msgid ""
-" Revert modifies the working directory. It does not commit any\n"
-" changes, or change the parent of the working directory. If you\n"
-" revert to a revision other than the parent of the working\n"
-" directory, the reverted files will thus appear modified\n"
-" afterwards."
-msgstr ""
-" O comando revert apenas modifica o diretório de trabalho. Ele não\n"
-" grava nenhuma mudança, nem muda o pai do diretório de trabalho.\n"
-" Se você reverter para uma revisão diferente do pai do diretório\n"
-" de trabalho, os arquivos revertidos irão portanto aparecer como\n"
-" modificados."
-
-msgid ""
-" If a file has been deleted, it is restored. If the executable mode\n"
-" of a file was changed, it is reset."
-msgstr ""
-" Se um arquivo tiver sido removido, será restaurado. Se o bit de\n"
-" execução de um arquivo tiver sido modificado, ele será restaurado."
-
-msgid ""
-" If names are given, all files matching the names are reverted.\n"
-" If no arguments are given, no files are reverted."
-msgstr ""
-" Se nomes forem fornecidos, todos os arquivos que casarem com\n"
-" esses nomes serão revertidos. Se não forem passados argumentos,\n"
-" nenhum arquivo será revertido."
+" estado inalterado e reverte operações de adição, remoção, cópia e\n"
+" renomeação."
+
+msgid ""
+" Using the -r/--rev or -d/--date options, revert the given files or\n"
+" directories to their states as of a specific revision. Because\n"
+" revert does not change the working directory parents, this will\n"
+" cause these files to appear modified. This can be helpful to \"back\n"
+" out\" some or all of an earlier change. See :hg:`backout` for a\n"
+" related method."
+msgstr ""
+" Com a opção -r/--rev ou -d/--date, reverte os arquivos ou diretórios\n"
+" dados para seus conteúdos em uma revisão específica. Como revert não\n"
+" muda os pais do diretório de trabalho, isto fará com que estes\n"
+" arquivos apareçam como modificados na cópia de trabalho. Isso pode\n"
+" ser útil para \"desfazer\" no todo ou em parte alguma mudança anterior.\n"
+" Veja :hg:`backout` para um método relacionado."
msgid ""
" Modified files are saved with a .orig suffix before reverting.\n"
@@ -9848,11 +11018,25 @@
msgid "you can't specify a revision and a date"
msgstr "você não pode especificar uma revisão e uma data"
-msgid "uncommitted merge - use \"hg update\", see \"hg help revert\""
-msgstr "mesclagem não consolidada - use \"hg update\", veja \"hg help revert\""
-
-msgid "no files or directories specified; use --all to revert the whole repo"
-msgstr "nenhum arquivo ou diretório especificado; use --all para reverter o repositório todo"
+msgid "no files or directories specified"
+msgstr "nenhum arquivo ou diretório especificados"
+
+msgid "uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge"
+msgstr "mesclagem não consolidada, use --all para descartar todas as mudanças locais, ou 'hg update -C .' para abortar a mesclagem"
+
+#, python-format
+msgid "uncommitted changes, use --all to discard all changes, or 'hg update %s' to update"
+msgstr "mudanças não consolidadas, use --all para descartar todas as mudanças locais, ou 'hg update %s' para atualizar"
+
+#, python-format
+msgid "use --all to revert all files, or 'hg update %s' to update"
+msgstr "use --all para reverter todos os arquivos, ou 'hg update %s' para atualizar a revisão"
+
+msgid "uncommitted changes, use --all to discard all changes"
+msgstr "mudanças não consolidadas, use --all para descartar todas as mudanças locais"
+
+msgid "use --all to revert all files"
+msgstr "use --all para reverter todos os arquivos"
#, python-format
msgid "forgetting %s\n"
@@ -9947,6 +11131,51 @@
msgid " Print the root directory of the current repository."
msgstr " Imprime o diretório raiz do repositório atual."
+msgid "name of access log file to write to"
+msgstr "nome do arquivo de log de acesso a ser escrito"
+
+msgid "name of error log file to write to"
+msgstr "nome do arquivo de log de erros a ser escrito"
+
+msgid "PORT"
+msgstr "PORTA"
+
+msgid "port to listen on (default: 8000)"
+msgstr "porta onde escutar (padrão: 8000)"
+
+msgid "address to listen on (default: all interfaces)"
+msgstr "endereço onde escutar (padrão: todas as interfaces)"
+
+msgid "ADDR"
+msgstr "ENDEREÇO"
+
+msgid "prefix path to serve from (default: server root)"
+msgstr "prefixo dos caminhos a serem servidos (padrão: raiz do servidor)"
+
+msgid "name to show in web pages (default: working directory)"
+msgstr "nome a ser exibido em páginas web (padrão: diretório de trabalho)"
+
+msgid "name of the hgweb config file (see \"hg help hgweb\")"
+msgstr "nome do arquivo de configuração do hgweb (veja \"hg help hgweb\")"
+
+msgid "name of the hgweb config file (DEPRECATED)"
+msgstr "nome do arquivo de configuração do hgweb (OBSOLETA)"
+
+msgid "for remote clients"
+msgstr "para clientes remotos"
+
+msgid "web templates to use"
+msgstr "modelo web a ser usado"
+
+msgid "template style to use"
+msgstr "estilo de modelo a ser usado"
+
+msgid "use IPv6 in addition to IPv4"
+msgstr "usa IPv6 além de IPv4"
+
+msgid "SSL certificate file"
+msgstr "arquivo de certificado de SSL"
+
msgid "start stand-alone webserver"
msgstr "inicia um servidor web auto-suficiente"
@@ -9993,6 +11222,9 @@
" especifique a porta como 0; nesse caso, o servidor irá imprimir\n"
" o número da porta que ele usar."
+msgid "cannot use --stdio with --cmdserver"
+msgstr "não se pode usar --stdio com --cmdserver"
+
msgid "There is no Mercurial repository here (.hg not found)"
msgstr "Não há um repositório do Mercurial aqui (.hg não encontrado)"
@@ -10000,6 +11232,77 @@
msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
msgstr "ouvindo em http://%s%s/%s (associado a %s:%d)\n"
+msgid "show untrusted configuration options"
+msgstr "mostra opções de configuração não confiáveis"
+
+msgid "[-u] [NAME]..."
+msgstr "[-u] [NOME]..."
+
+msgid "show combined config settings from all hgrc files"
+msgstr "exibe opções de configuração de todos os arquivos hgrc combinados"
+
+msgid " With no arguments, print names and values of all config items."
+msgstr ""
+" Sem argumentos, imprime nomes e valores de todos os itens de\n"
+" configuração."
+
+msgid ""
+" With one argument of the form section.name, print just the value\n"
+" of that config item."
+msgstr ""
+" Com um argumento da forma 'seção.nome', imprime apenas o valor\n"
+" desse item de configuração."
+
+msgid ""
+" With multiple arguments, print names and values of all config\n"
+" items with matching section names."
+msgstr ""
+" Com múltiplos argumentos, imprime nomes e valores de todos os\n"
+" itens de configuração que casarem com os nomes de seção."
+
+msgid ""
+" With --debug, the source (filename and line number) is printed\n"
+" for each config item."
+msgstr ""
+" Com --debug, é mostrada a origem (nome de arquivo e número da\n"
+" linha) para cada item de configuração."
+
+msgid "only one config item permitted"
+msgstr "apenas um item de configuração permitido"
+
+msgid "show status of all files"
+msgstr "mostra status de todos os arquivos"
+
+msgid "show only modified files"
+msgstr "mostra apenas arquivos modificados"
+
+msgid "show only added files"
+msgstr "mostra apenas arquivos adicionados"
+
+msgid "show only removed files"
+msgstr "mostra apenas arquivos removidos"
+
+msgid "show only deleted (but tracked) files"
+msgstr "mostra apenas arquivos removidos (mas rastreados)"
+
+msgid "show only files without changes"
+msgstr "mostra apenas arquivos sem mudanças"
+
+msgid "show only unknown (not tracked) files"
+msgstr "mostra apenas arquivos desconhecidos (não rastreados)"
+
+msgid "show only ignored files"
+msgstr "mostra apenas arquivos ignorados"
+
+msgid "show source of copied files"
+msgstr "mostra a origem de arquivos copiados"
+
+msgid "show difference from revision"
+msgstr "mostra diferença a partir da revisão"
+
+msgid "list the changed files of a revision"
+msgstr "lista os arquivos modificados por uma revisão"
+
msgid "show changed files in the working directory"
msgstr "exibe arquivos alterados no diretório de trabalho"
@@ -10075,6 +11378,9 @@
" I = ignorado\n"
" = origem do arquivo anterior listado como A (adicionado)"
+msgid "check for push and pull"
+msgstr "verifica push e pull"
+
msgid "summarize working directory state"
msgstr "sumariza o estado do diretório de trabalho"
@@ -10199,6 +11505,24 @@
msgid "remote: (synced)\n"
msgstr "remoto: (sincronizado)\n"
+msgid "force tag"
+msgstr "força a mudança da etiqueta"
+
+msgid "make the tag local"
+msgstr "torna a etiqueta local"
+
+msgid "revision to tag"
+msgstr "revisão a receber a etiqueta"
+
+msgid "remove a tag"
+msgstr "remove uma etiqueta"
+
+msgid "use <text> as commit message"
+msgstr "usa <texto> como mensagem de consolidação"
+
+msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
+msgstr "[-f] [-l] [-m TEXTO] [-d DATA] [-u USUÁRIO] [-r REV] NOME..."
+
msgid "add one or more tags for the current or given revision"
msgstr "adiciona uma ou mais etiquetas à revisão atual ou pedida"
@@ -10303,6 +11627,9 @@
" -v/--verbose for usada, uma terceira coluna \"local\" é impressa\n"
" para etiquetas locais."
+msgid "[-p] [-g]"
+msgstr "[-p] [-g]"
+
msgid "show the tip revision"
msgstr "exibe a revisão mais recente"
@@ -10327,6 +11654,12 @@
" especial e não pode ser renomeada ou atribuída a outra\n"
" revisão."
+msgid "update to new branch head if changesets were unbundled"
+msgstr "atualiza para nova cabeça de ramo se revisões forem extraídas do bundle"
+
+msgid "[-u] FILE..."
+msgstr "[-u] ARQUIVO..."
+
msgid "apply one or more changegroup files"
msgstr "aplica um ou mais arquivos de changegroup"
@@ -10345,6 +11678,15 @@
" em arquivos não resolvidos.\n"
" "
+msgid "discard uncommitted changes (no backup)"
+msgstr "descarta mudanças não consolidadas (sem backup)"
+
+msgid "update across branches if no uncommitted changes"
+msgstr "atualiza através de ramos, se não houverem mudanças pendentes"
+
+msgid "[-c] [-C] [-d DATE] [[-r] REV]"
+msgstr "[-c] [-C] [-d DATA] [[-r] REV]"
+
msgid "update working directory (or switch revisions)"
msgstr "atualiza o diretório de trabalho (ou muda para outra revisão)"
@@ -10371,6 +11713,13 @@
" atualizado para a revisão pedida."
msgid ""
+" Update sets the working directory's parent revison to the specified\n"
+" changeset (see :hg:`help parents`)."
+msgstr ""
+" Update muda o pai do diretório de trabalho para a revisão especificada\n"
+" (veja :hg:`help parents`)."
+
+msgid ""
" The following rules apply when the working directory contains\n"
" uncommitted changes:"
msgstr ""
@@ -10418,11 +11767,11 @@
" resultado semelhante a :hg:`clone -U`)."
msgid ""
-" If you want to update just one file to an older changeset, use\n"
-" :hg:`revert`."
-msgstr ""
-" Se você quiser atualizar apenas um arquivo para uma revisão\n"
-" anterior, use :hg:`revert`."
+" If you want to revert just one file to an older revision, use\n"
+" :hg:`revert [-r REV] NAME`."
+msgstr ""
+" Se você quiser reverter apenas um arquivo para seu conteúdo em\n"
+" uma revisão anterior, use :hg:`revert [-r REV] NOME`."
msgid "cannot specify both -c/--check and -C/--clean"
msgstr "não se pode especificar ao mesmo tempo -c/--check e -C/--clean"
@@ -10467,806 +11816,13 @@
"há garantias, nem mesmo de adequação para qualquer propósito em\n"
"particular.\n"
-msgid "repository root directory or name of overlay bundle file"
-msgstr "diretório raiz do repositório ou nome de arquivo de bundle para sobreposição"
-
-msgid "DIR"
-msgstr "DIR"
-
-msgid "change working directory"
-msgstr "muda o diretório de trabalho"
-
-msgid "do not prompt, assume 'yes' for any required answers"
-msgstr "não solicita entrada, assume 'sim' para qualquer resposta necessária"
-
-msgid "suppress output"
-msgstr "suprime saída"
-
-msgid "enable additional output"
-msgstr "habilita saída adicional"
-
-msgid "set/override config option (use 'section.name=value')"
-msgstr "define/sobrepõe opção de configuração (use 'seção.nome=valor')"
-
-msgid "CONFIG"
-msgstr "CONFIG"
-
-msgid "enable debugging output"
-msgstr "habilita saída de depuração"
-
-msgid "start debugger"
-msgstr "inicia depurador"
-
-msgid "set the charset encoding"
-msgstr "define a codificação de caracteres"
-
-msgid "ENCODE"
-msgstr "CODIFICAÇÃO"
-
-msgid "MODE"
-msgstr "MODO"
-
-msgid "set the charset encoding mode"
-msgstr "define o modo de codificação de conjunto de caracteres"
-
-msgid "always print a traceback on exception"
-msgstr "sempre imprime traceback em exceções"
-
-msgid "time how long the command takes"
-msgstr "mede o tempo de execução de cada comando"
-
-msgid "print command execution profile"
-msgstr "exibe profile de execução de comando"
-
-msgid "output version information and exit"
-msgstr "exibe informação de versão e sai"
-
-msgid "display help and exit"
-msgstr "exibe ajuda e sai"
-
-msgid "do not perform actions, just print output"
-msgstr "não realiza ações, apenas imprime a saída"
-
-msgid "specify ssh command to use"
-msgstr "especifica comando ssh a ser usado"
-
-msgid "specify hg command to run on the remote side"
-msgstr "especifica comando hg para executar do lado remoto"
-
-msgid "do not verify server certificate (ignoring web.cacerts config)"
-msgstr "não verifica o certificado do servidor (ignorando a opção de configuração web.cacerts)"
-
-msgid "PATTERN"
-msgstr "PADRÃO"
-
-msgid "include names matching the given patterns"
-msgstr "inclui nomes que casem com os padrões fornecidos"
-
-msgid "exclude names matching the given patterns"
-msgstr "exclui nomes que casem com os padrões fornecidos"
-
-msgid "use text as commit message"
-msgstr "usa o texto como mensagem de consolidação"
-
-msgid "read commit message from file"
-msgstr "lê de um arquivo a mensagem de consolidação"
-
-msgid "record the specified date as commit date"
-msgstr "grava a data especificada como data da consolidação"
-
-msgid "record the specified user as committer"
-msgstr "grava o usuário pedido como autor da consolidação"
-
-msgid "STYLE"
-msgstr "ESTILO"
-
-msgid "display using template map file"
-msgstr "exibe usando arquivo de mapeamento de modelo"
-
-msgid "display with template"
-msgstr "exibe usando modelo"
-
-msgid "do not show merges"
-msgstr "não mostra mesclagens"
-
-msgid "output diffstat-style summary of changes"
-msgstr "imprime sumário de mudanças no estilo diffstat"
-
-msgid "treat all files as text"
-msgstr "trata todos os arquivos como texto"
-
-msgid "omit dates from diff headers"
-msgstr "omite datas dos cabeçalhos de diff"
-
-msgid "show which function each change is in"
-msgstr "mostra em qual função está cada mudança"
-
-msgid "produce a diff that undoes the changes"
-msgstr "produz um diff que desfaz as mudanças"
-
-msgid "ignore white space when comparing lines"
-msgstr "ignora espaços em branco ao comparar linhas"
-
-msgid "ignore changes in the amount of white space"
-msgstr "ignora mudanças na quantidade de espaços em branco"
-
-msgid "ignore changes whose lines are all blank"
-msgstr "ignora mudanças cujas linhas sejam todas brancas"
-
-msgid "number of lines of context to show"
-msgstr "número de linhas de contexto a serem mostradas"
-
-msgid "SIMILARITY"
-msgstr "SIMILARIDADE"
-
-msgid "guess renamed files by similarity (0<=s<=100)"
-msgstr "infere arquivos renomeados por similaridade (0<=s<=100)"
-
-msgid "recurse into subrepositories"
-msgstr "trabalha em sub-repositórios recursivamente"
-
-msgid "[OPTION]... [FILE]..."
-msgstr "[OPÇÃO]... [ARQUIVO]..."
-
-msgid "annotate the specified revision"
-msgstr "faz um annotate da revisão especificada"
-
-msgid "follow copies/renames and list the filename (DEPRECATED)"
-msgstr "segue cópias e renomeações e lista o nome de arquivo (OBSOLETA)"
-
-msgid "don't follow copies and renames"
-msgstr "não segue cópias e renomeações"
-
-msgid "list the author (long with -v)"
-msgstr "lista o autor (formato longo com -v)"
-
-msgid "list the filename"
-msgstr "lista o nome de arquivo"
-
-msgid "list the date (short with -q)"
-msgstr "lista a data (formato curto com -q)"
-
-msgid "list the revision number (default)"
-msgstr "lista o número de revisão (padrão)"
-
-msgid "list the changeset"
-msgstr "lista a revisão"
-
-msgid "show line number at the first appearance"
-msgstr "exibe números de linha na primeira ocorrência"
-
-msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
-msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
-
-msgid "do not pass files through decoders"
-msgstr "não passar arquivos por decodificadores"
-
-msgid "PREFIX"
-msgstr "PREFIXO"
-
-msgid "directory prefix for files in archive"
-msgstr "prefixo de diretório para arquivos armazenados"
-
-msgid "revision to distribute"
-msgstr "revisão a ser distribuída"
-
-msgid "type of distribution to create"
-msgstr "tipo de distribuição a ser criada"
-
-msgid "[OPTION]... DEST"
-msgstr "[OPÇÃO]... DEST"
-
-msgid "merge with old dirstate parent after backout"
-msgstr "mesclar com pai do dirstate anterior após o backout"
-
-msgid "parent to choose when backing out merge"
-msgstr "pai a ser escolhido ao fazer o backout de mesclagem"
-
-msgid "specify merge tool"
-msgstr "especifica o utilitário de mesclagem"
-
-msgid "revision to backout"
-msgstr "revisão para fazer o backout"
-
-msgid "[OPTION]... [-r] REV"
-msgstr "[OPÇÃO]... [-r] REV"
-
-msgid "reset bisect state"
-msgstr "reinicia estado do bisect"
-
-msgid "mark changeset good"
-msgstr "marca revisão boa"
-
-msgid "mark changeset bad"
-msgstr "marca revisão ruim"
-
-msgid "skip testing changeset"
-msgstr "descartando revisão de teste"
-
-msgid "use command to check changeset state"
-msgstr "usa o comando para verificar o estado da revisão"
-
-msgid "do not update to target"
-msgstr "não atualiza para o alvo"
-
-msgid "[-gbsr] [-U] [-c CMD] [REV]"
-msgstr "[-gbsr] [-U] [-c CMD] [REV]"
-
-msgid "force"
-msgstr "forçar"
-
-msgid "delete a given bookmark"
-msgstr "apaga o marcador pedido"
-
-msgid "rename a given bookmark"
-msgstr "renomeia um marcador"
-
-msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
-msgstr "hg bookmarks [-f] [-d] [-m NOME] [-r REV] [NOME]"
-
-msgid "set branch name even if it shadows an existing branch"
-msgstr "especifica nome do ramo mesmo se ocultar um ramo existente"
-
-msgid "reset branch name to parent branch name"
-msgstr "especifica o nome do ramo como o nome do ramo do pai"
-
-msgid "[-fC] [NAME]"
-msgstr "[-fC] [NOME]"
-
-msgid "show only branches that have unmerged heads"
-msgstr "mostra apenas ramos que possuem cabeças não mescladas"
-
-msgid "show normal and closed branches"
-msgstr "mostra ramos normais e fechados"
-
-msgid "[-ac]"
-msgstr "[-ac]"
-
-msgid "run even when the destination is unrelated"
-msgstr "execute mesmo se o destino não for relacionado"
-
-msgid "a changeset intended to be added to the destination"
-msgstr "uma revisão que deve ser adicionada ao destino"
-
-msgid "a specific branch you would like to bundle"
-msgstr "um ramo específico que você gostaria de incluir no bundle"
-
-msgid "a base changeset assumed to be available at the destination"
-msgstr "uma revisão base que se assume estar presente no destino"
-
-msgid "bundle all changesets in the repository"
-msgstr "cria um bundle com todas as revisões no repositório"
-
-msgid "bundle compression type to use"
-msgstr "tipo de compressão de bundle a ser usada"
-
-msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
-msgstr "[-f] [-t TIPO] [-a] [-r REV]... [--base REV]... ARQUIVO [DEST]"
-
-msgid "print output to file with formatted name"
-msgstr "imprime a saída para o arquivo com o nome formatado"
-
-msgid "print the given revision"
-msgstr "imprime a revisão dada"
-
-msgid "apply any matching decode filter"
-msgstr "aplica qualquer filtro de decodificação que case"
-
-msgid "[OPTION]... FILE..."
-msgstr "[OPÇÃO]... ARQUIVO..."
-
-msgid "the clone will include an empty working copy (only a repository)"
-msgstr "o clone irá conter uma cópia de trabalho vazia (apenas o repositório)"
-
-msgid "revision, tag or branch to check out"
-msgstr "revisão, etiqueta ou ramo a ser obtido"
-
-msgid "include the specified changeset"
-msgstr "inclui a revisão especificada"
-
-msgid "clone only the specified branch"
-msgstr "clona apenas o ramo especificado"
-
-msgid "[OPTION]... SOURCE [DEST]"
-msgstr "[OPÇÃO]... ORIGEM [DEST]"
-
-msgid "mark new/missing files as added/removed before committing"
-msgstr "marca arquivos novos/ausentes como adicionados/removidos antes da consolidação"
-
-msgid "mark a branch as closed, hiding it from the branch list"
-msgstr "marca um ramo como fechado, escondendo-o da lista de ramos"
-
-msgid "record a copy that has already occurred"
-msgstr "grava uma cópia que já ocorreu"
-
-msgid "forcibly copy over an existing managed file"
-msgstr "força cópia sobre um arquivo não gerenciado existente"
-
-msgid "[OPTION]... [SOURCE]... DEST"
-msgstr "[OPÇÃO]... [ORIGEM]... DEST"
-
-msgid "[INDEX] REV1 REV2"
-msgstr "[ÍNDICE] REV1 REV2"
-
-msgid "add single file mergeable changes"
-msgstr "adiciona mudanças mescláveis em arquivos únicos"
-
-msgid "add single file all revs append to"
-msgstr "adiciona um único arquivo ao qual todas as revisões anexam"
-
-msgid "add single file all revs overwrite"
-msgstr "adiciona um único arquivo que todas as revisões sobrescrevem"
-
-msgid "add new file at each rev"
-msgstr "adiciona um arquivo novo a cada revisão"
-
-msgid "[OPTION]... TEXT"
-msgstr "[OPÇÃO]... TEXTO"
-
-msgid "[COMMAND]"
-msgstr "[COMANDO]"
-
-msgid "show the command options"
-msgstr "exibe opções dos comandos"
-
-msgid "[-o] CMD"
-msgstr "[-o] CMD"
-
-msgid "use tags as labels"
-msgstr "usa etiquetas como rótulos"
-
-msgid "annotate with branch names"
-msgstr "comenta com nomes de ramos"
-
-msgid "use dots for runs"
-msgstr "usar pontos para representar sequências"
-
-msgid "separate elements by spaces"
-msgstr "separa elementos usando espaços"
-
-msgid "[OPTION]... [FILE [REV]...]"
-msgstr "[OPÇÃO]... [ARQUIVO [REVISÃO]...]"
-
-msgid "try extended date formats"
-msgstr "tenta formatos de data estendidos"
-
-msgid "[-e] DATE [RANGE]"
-msgstr "[-e] DATA [INTERVALO]"
-
-msgid "FILE REV"
-msgstr "ARQUIVO REV"
-
-msgid "[PATH]"
-msgstr "[CAMINHO]"
-
-msgid "revlog format"
-msgstr "formato do revlog"
-
-msgid "REPO NAMESPACE [KEY OLD NEW]"
-msgstr "REPOSITÓRIO NAMESPACE [CHAVE ANTIGO NOVO]"
-
-msgid "revision to rebuild to"
-msgstr "revisão para a qual reconstruir"
-
-msgid "[-r REV] [REV]"
-msgstr "[-r REV] [REV]"
-
-msgid "revision to debug"
-msgstr "revisão a ser depurada"
-
-msgid "[-r REV] FILE"
-msgstr "[-r REV] ARQUIVO"
-
-msgid "REV1 [REV2]"
-msgstr "REV1 [REV2]"
-
-msgid "do not display the saved mtime"
-msgstr "não exibe o mtime armazenado"
-
-msgid "[OPTION]..."
-msgstr "[OPÇÃO]..."
-
-msgid "revision to check"
-msgstr "revisão para verificar"
-
-msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
-msgstr "[OPÇÃO]... ([-c REV] | [-r REV1 [-r REV2]]) [ARQUIVO]..."
-
-msgid "diff against the second parent"
-msgstr "faz o diff com o segundo pai"
-
-msgid "revisions to export"
-msgstr "revisões a serem exportadas"
-
-msgid "[OPTION]... [-o OUTFILESPEC] REV..."
-msgstr "[OPÇÃO]... [-o PADRÃOARQSAÍDA] REV..."
-
-msgid "end fields with NUL"
-msgstr "termina campos com NUL"
-
-msgid "print all revisions that match"
-msgstr "imprime todas as revisões que casarem"
-
-msgid "follow changeset history, or file history across copies and renames"
-msgstr "acompanha histórico de revisões, ou histórico de arquivo através de cópias e renomeações"
-
-msgid "ignore case when matching"
-msgstr "ignora maiúsculas/minúsculas ao casar"
-
-msgid "print only filenames and revisions that match"
-msgstr "imprime apenas nomes de arquivo e revisões que casarem"
-
-msgid "print matching line numbers"
-msgstr "imprime número de linhas que casarem"
-
-msgid "only search files changed within revision range"
-msgstr "procura apenas por arquivos que mudaram dentro do intervalo pedido"
-
-msgid "[OPTION]... PATTERN [FILE]..."
-msgstr "[OPÇÃO]... PADRÃO [ARQUIVO]..."
-
-msgid "show only heads which are descendants of STARTREV"
-msgstr "mostra apenas cabeças descendentes de REVINICIAL"
-
-msgid "STARTREV"
-msgstr "REVINICIAL"
-
-msgid "show topological heads only"
-msgstr "mostra apenas cabeças topológicas"
-
-msgid "show active branchheads only (DEPRECATED)"
-msgstr "mostra apenas cabeças de ramo ativas (OBSOLETA)"
-
-msgid "show normal and closed branch heads"
-msgstr "mostra cabeças de ramo normais e fechadas"
-
-msgid "[-ac] [-r STARTREV] [REV]..."
-msgstr "[-ac] [-r REVINICIAL] [REV]..."
-
-msgid "[TOPIC]"
-msgstr "[TÓPICO]"
-
-msgid "identify the specified revision"
-msgstr "identifica a revisão especificada"
-
-msgid "show local revision number"
-msgstr "exibe número local de revisão"
-
-msgid "show global revision id"
-msgstr "exibe identificador global de revisão"
-
-msgid "show branch"
-msgstr "exibe ramo"
-
-msgid "show tags"
-msgstr "exibe etiquetas"
-
-msgid "show bookmarks"
-msgstr "exibe marcadores"
-
-msgid "[-nibtB] [-r REV] [SOURCE]"
-msgstr "[-nibtB] [-r REV] [ORIGEM]"
-
-msgid "directory strip option for patch. This has the same meaning as the corresponding patch option"
-msgstr "opção de remoção de diretório para o patch. Tem o mesmo significado da opção correspondente do utilitário patch"
-
-msgid "PATH"
-msgstr "CAMINHO"
-
-msgid "base path"
-msgstr "caminho base"
-
-msgid "skip check for outstanding uncommitted changes"
-msgstr "não faz verificação de mudanças ainda não consolidadas"
-
-msgid "don't commit, just update the working directory"
-msgstr "não consolida, apenas atualiza o diretório de trabalho"
-
-msgid "apply patch to the nodes from which it was generated"
-msgstr "aplica o patch aos nós a partir dos quais ele foi gerado"
-
-msgid "use any branch information in patch (implied by --exact)"
-msgstr "usa qualquer informação de ramo no patch (implicada por --exact)"
-
-msgid "[OPTION]... PATCH..."
-msgstr "[OPÇÃO]... PATCH..."
-
-msgid "run even if remote repository is unrelated"
-msgstr "execute mesmo se o repositório remoto não for relacionado"
-
-msgid "show newest record first"
-msgstr "mostra registros mais novos primeiro"
-
-msgid "file to store the bundles into"
-msgstr "arquivo no qual armazenar os bundles"
-
-msgid "a remote changeset intended to be added"
-msgstr "uma revisão remota que se deva adicionar"
-
-msgid "compare bookmarks"
-msgstr "compara marcadores"
-
-msgid "a specific branch you would like to pull"
-msgstr "um ramo específico que você gostaria de trazer"
-
-msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
-msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle ARQUIVO] [ORIGEM]"
-
-msgid "[-e CMD] [--remotecmd CMD] [DEST]"
-msgstr "[-e CMD] [--remotecmd CMD] [DEST]"
-
-msgid "search the repository as it is in REV"
-msgstr "procura no repositório como se estivesse em REV"
-
-msgid "end filenames with NUL, for use with xargs"
-msgstr "termina nomes de arquivo com NUL, para uso com xargs"
-
-msgid "print complete paths from the filesystem root"
-msgstr "imprime caminhos completos a partir do raiz do sistema de arquivos"
-
-msgid "[OPTION]... [PATTERN]..."
-msgstr "[OPÇÃO]... [PADRÃO]..."
-
-msgid "only follow the first parent of merge changesets"
-msgstr "acompanha apenas o primeiro pai de revisões de mesclagem"
-
-msgid "show revisions matching date spec"
-msgstr "mostra revisões que casem com a especificação de data"
-
-msgid "show copied files"
-msgstr "mostra arquivos copiados"
-
-msgid "do case-insensitive search for a given text"
-msgstr "faz uma busca insensível a maiúsculas / minúsculas por um texto dado"
-
-msgid "include revisions where files were removed"
-msgstr "inclui revisões nas quais arquivos foram removidos"
-
-msgid "show only merges"
-msgstr "mostra apenas mesclagens"
-
-msgid "revisions committed by user"
-msgstr "revisões de autoria do usuário"
-
-msgid "show only changesets within the given named branch (DEPRECATED)"
-msgstr "mostra apenas revisões dentro do ramo nomeado especificado (OBSOLETA)"
-
-msgid "show changesets within the given named branch"
-msgstr "mostra apenas revisões dentro do ramo nomeado especificado"
-
-msgid "do not display revision or any of its ancestors"
-msgstr "não exibe revisão ou qualquer de seus ancestrais"
-
-msgid "[OPTION]... [FILE]"
-msgstr "[OPÇÃO]... [ARQUIVO]"
-
-msgid "revision to display"
-msgstr "revisão a ser exibida"
-
-msgid "[-r REV]"
-msgstr "[-r REV]"
-
-msgid "force a merge with outstanding changes"
-msgstr "força uma mesclagem com mudanças ainda não consideradas"
-
-msgid "revision to merge"
-msgstr "revisão a ser mesclada"
-
-msgid "review revisions to merge (no merge is performed)"
-msgstr "avalia revisões a serem mescladas (a mesclagem não é executada)"
-
-msgid "[-P] [-f] [[-r] REV]"
-msgstr "[-P] [-f] [[-r] REV]"
-
-msgid "a changeset intended to be included in the destination"
-msgstr "uma revisão que se deva incluir no destino"
-
-msgid "a specific branch you would like to push"
-msgstr "um ramo específico que você gostaria de enviar"
-
-msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
-msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
-
-msgid "show parents of the specified revision"
-msgstr "mostra pais da revisão especificada"
-
-msgid "[-r REV] [FILE]"
-msgstr "[-r REV] [ARQUIVO]"
-
-msgid "[NAME]"
-msgstr "[NOME]"
-
-msgid "update to new branch head if changesets were pulled"
-msgstr "atualiza para nova cabeça de ramo se revisões forem trazidas"
-
-msgid "run even when remote repository is unrelated"
-msgstr "execute mesmo se o repositório remoto não for relacionado"
-
-msgid "BOOKMARK"
-msgstr "MARCADOR"
-
-msgid "bookmark to pull"
-msgstr "marcador a ser trazido"
-
-msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
-msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [ORIGEM]"
-
-msgid "force push"
-msgstr "força um push"
-
-msgid "bookmark to push"
-msgstr "marcador a ser enviado"
-
-msgid "allow pushing a new branch"
-msgstr "permite o envio de um novo ramo nomeado"
-
-msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
-msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
-
-msgid "record delete for missing files"
-msgstr "grava remoção de arquivos faltando"
-
-msgid "remove (and delete) file even if added or modified"
-msgstr "remove (e apaga) o arquivo mesmo se foi adicionado ou modificado"
-
-msgid "record a rename that has already occurred"
-msgstr "grava uma renomeação que já ocorreu"
-
-msgid "[OPTION]... SOURCE... DEST"
-msgstr "[OPÇÃO]... ORIGEM... DESTINO"
-
-msgid "select all unresolved files"
-msgstr "seleciona todos os arquivos não resolvidos"
-
-msgid "list state of files needing merge"
-msgstr "lista estado de arquivos que precisam ser mesclados"
-
-msgid "mark files as resolved"
-msgstr "marca arquivos como resolvidos"
-
-msgid "mark files as unresolved"
-msgstr "marca arquivos como não resolvidos"
-
-msgid "hide status prefix"
-msgstr "esconde prefixo de status"
-
-msgid "revert all changes when no arguments given"
-msgstr "se parâmetros não forem fornecidos, reverte todas as mudanças"
-
-msgid "tipmost revision matching date"
-msgstr "revisão mais recente que casa com a data"
-
-msgid "revert to the specified revision"
-msgstr "reverte para a revisão especificada"
-
-msgid "do not save backup copies of files"
-msgstr "não grava backups de arquivos"
-
-msgid "[OPTION]... [-r REV] [NAME]..."
-msgstr "[OPÇÃO]... [-r REV] [NOME]..."
-
-msgid "name of access log file to write to"
-msgstr "nome do arquivo de log de acesso a ser escrito"
-
-msgid "name of error log file to write to"
-msgstr "nome do arquivo de log de erros a ser escrito"
-
-msgid "PORT"
-msgstr "PORTA"
-
-msgid "port to listen on (default: 8000)"
-msgstr "porta onde escutar (padrão: 8000)"
-
-msgid "ADDR"
-msgstr "ENDEREÇO"
-
-msgid "address to listen on (default: all interfaces)"
-msgstr "endereço onde escutar (padrão: todas as interfaces)"
-
-msgid "prefix path to serve from (default: server root)"
-msgstr "caminho de prefixo a ser servido (padrão: raiz do servidor)"
-
-msgid "name to show in web pages (default: working directory)"
-msgstr "nome a ser exibido em páginas web (padrão: diretório de trabalho)"
-
-msgid "name of the hgweb config file (see \"hg help hgweb\")"
-msgstr "nome do arquivo de configuração do hgweb (veja \"hg help hgweb\")"
-
-msgid "name of the hgweb config file (DEPRECATED)"
-msgstr "nome do arquivo de configuração do hgweb (OBSOLETA)"
-
-msgid "for remote clients"
-msgstr "para clientes remotos"
-
-msgid "web templates to use"
-msgstr "modelo web a ser usado"
-
-msgid "template style to use"
-msgstr "estilo de modelo a ser usado"
-
-msgid "use IPv6 in addition to IPv4"
-msgstr "usa IPv6 além de IPv4"
-
-msgid "SSL certificate file"
-msgstr "arquivo de certificado de SSL"
-
-msgid "show untrusted configuration options"
-msgstr "mostra opções de configuração não confiáveis"
-
-msgid "[-u] [NAME]..."
-msgstr "[-u] [NOME]..."
-
-msgid "check for push and pull"
-msgstr "verifica push e pull"
-
-msgid "show status of all files"
-msgstr "mostra status de todos os arquivos"
-
-msgid "show only modified files"
-msgstr "mostra apenas arquivos modificados"
-
-msgid "show only added files"
-msgstr "mostra apenas arquivos adicionados"
-
-msgid "show only removed files"
-msgstr "mostra apenas arquivos removidos"
-
-msgid "show only deleted (but tracked) files"
-msgstr "mostra apenas arquivos removidos (mas rastreados)"
-
-msgid "show only files without changes"
-msgstr "mostra apenas arquivos sem mudanças"
-
-msgid "show only unknown (not tracked) files"
-msgstr "mostra apenas arquivos desconhecidos (não rastreados)"
-
-msgid "show only ignored files"
-msgstr "mostra apenas arquivos ignorados"
-
-msgid "show source of copied files"
-msgstr "mostra a origem de arquivos copiados"
-
-msgid "show difference from revision"
-msgstr "mostra diferença a partir da revisão"
-
-msgid "list the changed files of a revision"
-msgstr "lista os arquivos modificados por uma revisão"
-
-msgid "force tag"
-msgstr "força a mudança da etiqueta"
-
-msgid "make the tag local"
-msgstr "torna a etiqueta local"
-
-msgid "revision to tag"
-msgstr "revisão a receber a etiqueta"
-
-msgid "remove a tag"
-msgstr "remove uma etiqueta"
-
-msgid "use <text> as commit message"
-msgstr "usa <texto> como mensagem de consolidação"
-
-msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
-msgstr "[-f] [-l] [-m TEXTO] [-d DATA] [-u USUÁRIO] [-r REV] NOME..."
-
-msgid "[-p] [-g]"
-msgstr "[-p] [-g]"
-
-msgid "update to new branch head if changesets were unbundled"
-msgstr "atualiza para nova cabeça de ramo se revisões forem extraídas do bundle"
-
-msgid "[-u] FILE..."
-msgstr "[-u] ARQUIVO..."
-
-msgid "discard uncommitted changes (no backup)"
-msgstr "descarta mudanças não consolidadas (sem backup)"
-
-msgid "update across branches if no uncommitted changes"
-msgstr "atualiza através de ramos, se não houverem mudanças pendentes"
-
-msgid "[-c] [-C] [-d DATE] [[-r] REV]"
-msgstr "[-c] [-C] [-d DATA] [[-r] REV]"
+#, python-format
+msgid "unknown mode %s"
+msgstr "modo %s desconhecido"
+
+#, python-format
+msgid "unknown command %s"
+msgstr "comando %s desconhecido"
#, python-format
msgid "cannot include %s (%s)"
@@ -11303,14 +11859,6 @@
msgstr "%s já rastreado!\n"
#, python-format
-msgid "%s not added!\n"
-msgstr "%s não adicionado!\n"
-
-#, python-format
-msgid "%s still exists!\n"
-msgstr "%s ainda existe!\n"
-
-#, python-format
msgid "%s not tracked!\n"
msgstr "%s não rastreado!\n"
@@ -11338,14 +11886,13 @@
msgid "invalid event type in dag: %s"
msgstr "tipo de entrada inválido no dag: %s"
+msgid "nullid"
+msgstr "nullid"
+
msgid "working directory state appears damaged!"
msgstr "estado do diretório de trabalho parece danificado!"
#, python-format
-msgid "'\\n' and '\\r' disallowed in filenames: %r"
-msgstr "'\\n' e '\\r' proibidos em nomes de arquivos: %r"
-
-#, python-format
msgid "directory %r already in dirstate"
msgstr "diretório %r já está em dirstate"
@@ -11357,10 +11904,6 @@
msgid "setting %r to other parent only allowed in merges"
msgstr "definir %r para outro pai é permitido apenas em mesclagens"
-#, python-format
-msgid "not in dirstate: %s\n"
-msgstr "não em dirstate: %s\n"
-
msgid "unknown"
msgstr "desconhecido"
@@ -11383,24 +11926,6 @@
msgid "unsupported file type (type is %s)"
msgstr "tipo de arquivo não suportado (o tipo é %s)"
-msgid "searching for changes\n"
-msgstr "procurando por mudanças\n"
-
-msgid "queries"
-msgstr "consultas"
-
-msgid "searching"
-msgstr "procurando"
-
-msgid "already have changeset "
-msgstr "já possui a revisão "
-
-msgid "warning: repository is unrelated\n"
-msgstr "aviso: repositório não é relacionado\n"
-
-msgid "repository is unrelated"
-msgstr "repositório não é relacionado"
-
#, python-format
msgid "push creates new remote branches: %s!"
msgstr "push cria novos ramos remotos: '%s'!"
@@ -11409,11 +11934,12 @@
msgstr "use 'hg push --new-branch' para criar novos ramos remotos"
#, python-format
-msgid "push creates new remote heads on branch '%s'!"
-msgstr "push cria novas cabeças remotas no ramo '%s'!"
-
-msgid "push creates new remote heads!"
-msgstr "push cria novas cabeças remotas!"
+msgid "push creates new remote head %s on branch '%s'!"
+msgstr "push cria uma nova cabeça remota %s no ramo '%s'!"
+
+#, python-format
+msgid "push creates new remote head %s!"
+msgstr "push cria uma nova cabeça remota %s!"
msgid "you should pull and merge or use push -f to force"
msgstr "você deve fazer o pull e mesclar ou usar push -f para forçar"
@@ -11542,10 +12068,6 @@
msgstr "nenhuma definição para o apelido '%s'\n"
#, python-format
-msgid "No argument found for substitution of %i variable in alias '%s' definition."
-msgstr "Nenhum argumento encontrado para a substituição da variável %i na definição do apelido '%s'."
-
-#, python-format
msgid "error in definition for alias '%s': %s may only be given on the command line\n"
msgstr "erro na definição do apelido '%s': %s pode ser passado apenas na linha de comando\n"
@@ -11586,12 +12108,13 @@
msgid "repository '%s' is not local"
msgstr "o repositório '%s' não é local"
+#, python-format
+msgid "no repository found in %r (.hg not found)"
+msgstr "não foi encontrado um repositório em %r (.hg não encontrado)"
+
msgid "warning: --repository ignored\n"
msgstr "aviso: opção --repository ignorada\n"
-msgid "invalid arguments"
-msgstr "argumentos inválidos"
-
#, python-format
msgid "unrecognized profiling format '%s' - Ignored\n"
msgstr "formato de profiling '%s' não reconhecido - Ignorado\n"
@@ -11669,6 +12192,239 @@
msgid "merging %s failed!\n"
msgstr "mesclagem de %s falhou!\n"
+msgid "unterminated string"
+msgstr "string não terminada"
+
+msgid "syntax error"
+msgstr "erro de sintaxe"
+
+msgid "missing argument"
+msgstr "argumento faltando"
+
+msgid "can't use a list in this context"
+msgstr "não se pode usar uma lista nesse contexto"
+
+msgid ""
+"``modified()``\n"
+" File that is modified according to status."
+msgstr ""
+"``modified()``\n"
+" Arquivo com status modificado (M)."
+
+#. i18n: "modified" is a keyword
+msgid "modified takes no arguments"
+msgstr "modified não tem argumentos"
+
+msgid ""
+"``added()``\n"
+" File that is added according to status."
+msgstr ""
+"``added()``\n"
+" Arquivo com status adicionado (A)."
+
+#. i18n: "added" is a keyword
+msgid "added takes no arguments"
+msgstr "added não tem argumentos"
+
+msgid ""
+"``removed()``\n"
+" File that is removed according to status."
+msgstr ""
+"``removed()``\n"
+" Arquivo com status removido (R)."
+
+#. i18n: "removed" is a keyword
+msgid "removed takes no arguments"
+msgstr "removed não tem argumentos"
+
+msgid ""
+"``deleted()``\n"
+" File that is deleted according to status."
+msgstr ""
+"``deleted()``\n"
+" Arquivo com status apagado (!)."
+
+#. i18n: "deleted" is a keyword
+msgid "deleted takes no arguments"
+msgstr "deleted não tem argumentos"
+
+msgid ""
+"``unknown()``\n"
+" File that is unknown according to status. These files will only be\n"
+" considered if this predicate is used."
+msgstr ""
+"``unknown()``\n"
+" Arquivo com status desconhecido (?). Tais arquivos só serão\n"
+" considerados se este predicado for usado."
+
+#. i18n: "unknown" is a keyword
+msgid "unknown takes no arguments"
+msgstr "unknown não tem argumentos"
+
+msgid ""
+"``ignored()``\n"
+" File that is ignored according to status. These files will only be\n"
+" considered if this predicate is used."
+msgstr ""
+"``ignored()``\n"
+" Arquivo com status ignorado (I). Tais arquivos só serão\n"
+" considerados se este predicado for usado."
+
+#. i18n: "ignored" is a keyword
+msgid "ignored takes no arguments"
+msgstr "ignored não tem argumentos"
+
+msgid ""
+"``clean()``\n"
+" File that is clean according to status."
+msgstr ""
+"``clean()``\n"
+" Arquivo com status limpo (C)."
+
+#. i18n: "clean" is a keyword
+msgid "clean takes no arguments"
+msgstr "clean não tem argumentos"
+
+#, python-format
+msgid "not a function: %s"
+msgstr "não é uma função: %s"
+
+msgid ""
+"``binary()``\n"
+" File that appears to be binary (contails NUL bytes)."
+msgstr ""
+"``binary()``\n"
+" O arquivo parece ser binário (contém bytes NUL)."
+
+#. i18n: "binary" is a keyword
+msgid "binary takes no arguments"
+msgstr "binary não tem argumentos"
+
+msgid ""
+"``exec()``\n"
+" File that is marked as executable."
+msgstr ""
+"``exec()``\n"
+" O arquivo foi marcado como executável."
+
+#. i18n: "exec" is a keyword
+msgid "exec takes no arguments"
+msgstr "exec não tem argumentos"
+
+msgid ""
+"``symlink()``\n"
+" File that is marked as a symlink."
+msgstr ""
+"``symlink()``\n"
+" O arquivo foi marcado como link simbólico."
+
+#. i18n: "symlink" is a keyword
+msgid "symlink takes no arguments"
+msgstr "symlink não tem argumentos"
+
+msgid ""
+"``resolved()``\n"
+" File that is marked resolved according to the resolve state."
+msgstr ""
+"``resolved()``\n"
+" O arquivo foi marcado como resolvido de acordo com o estado de\n"
+" resolução (comando resolve)."
+
+#. i18n: "resolved" is a keyword
+msgid "resolved takes no arguments"
+msgstr "resolved não tem argumentos"
+
+msgid ""
+"``unresolved()``\n"
+" File that is marked unresolved according to the resolve state."
+msgstr ""
+"``unresolved()``\n"
+" O arquivo foi marcado como não resolvido de acordo com o estado de\n"
+" resolução (comando resolve)."
+
+#. i18n: "unresolved" is a keyword
+msgid "unresolved takes no arguments"
+msgstr "unresolved não tem argumentos"
+
+msgid ""
+"``hgignore()``\n"
+" File that matches the active .hgignore pattern."
+msgstr ""
+"``hgignore()``\n"
+" O nome do arquivo combina com um padrão do arquivo .hgignore ativo."
+
+msgid "hgignore takes no arguments"
+msgstr "hgignore não tem argumentos"
+
+msgid ""
+"``grep(regex)``\n"
+" File contains the given regular expression."
+msgstr ""
+"``grep(regex)``\n"
+" O arquivo contém a expressão regular fornecida."
+
+msgid "grep requires a pattern"
+msgstr "grep requer um padrão"
+
+#, python-format
+msgid "couldn't parse size: %s"
+msgstr "não foi possível decodificar o tamanho: %s"
+
+msgid ""
+"``size(expression)``\n"
+" File size matches the given expression. Examples:"
+msgstr ""
+"``size(expression)``\n"
+" O tamanho do arquivo combina com a expressão fornecida. Por exemplo:"
+
+msgid ""
+" - 1k (files from 1024 to 2047 bytes)\n"
+" - < 20k (files less than 20480 bytes)\n"
+" - >= .5MB (files at least 524288 bytes)\n"
+" - 4k - 1MB (files from 4096 bytes to 1048576 bytes)"
+msgstr ""
+" - 1k (arquivos com tamanho de 1024 a 2047 bytes)\n"
+" - < 20k (arquivos com tamanho menor que 20480 bytes)\n"
+" - >= .5MB (arquivos com pelo menos 524288 bytes)\n"
+" - 4k - 1MB (arquivos com tamanho entre 4096 bytes e 1048576 bytes)"
+
+#. i18n: "size" is a keyword
+msgid "size requires an expression"
+msgstr "size requer uma expressão"
+
+msgid ""
+"``encoding(name)``\n"
+" File can be successfully decoded with the given character\n"
+" encoding. May not be useful for encodings other than ASCII and\n"
+" UTF-8."
+msgstr ""
+"``encoding(name)``\n"
+" O arquivo pode ser decodificado com sucesso com a codificação de\n"
+" caracteres fornecida. Pode não ser muito útil para codificações\n"
+" diferentes de ASCII e UTF-8."
+
+#. i18n: "encoding" is a keyword
+msgid "encoding requires an encoding name"
+msgstr "encoding requer um nome de codificação"
+
+#, python-format
+msgid "unknown encoding '%s'"
+msgstr "codificação desconhecida '%s'"
+
+msgid ""
+"``copied()``\n"
+" File that is recorded as being copied."
+msgstr ""
+"``copied()``\n"
+" O arquivo foi registrado como cópia."
+
+#. i18n: "copied" is a keyword
+msgid "copied takes no arguments"
+msgstr "copied não tem argumentos"
+
+msgid "invalid token"
+msgstr "token inválido"
+
msgid "starting revisions are not directly related"
msgstr "as revisões iniciais não são diretamente relacionadas"
@@ -11704,6 +12460,9 @@
msgid "Specifying Revision Sets"
msgstr "Especificação de Conjuntos de Revisões"
+msgid "Specifying File Sets"
+msgstr "Especificação de Conjuntos de Arquivos"
+
msgid "Diff Formats"
msgstr "Formatos de Diff"
@@ -11728,103 +12487,22 @@
msgid "Glossary"
msgstr "Glossário"
-msgid ""
-"Mercurial reads configuration data from several files, if they exist.\n"
-"Below we list the most specific file first."
-msgstr ""
-"O Mercurial lê dados de configuração de vários arquivos, se existirem.\n"
-"Abaixo listamos os arquivos mais específicos primeiro."
-
-msgid "On Windows, these configuration files are read:"
-msgstr "No Windows, estes arquivos de configuração são lidos:"
-
-msgid ""
-"- ``<repo>\\.hg\\hgrc``\n"
-"- ``%USERPROFILE%\\.hgrc``\n"
-"- ``%USERPROFILE%\\mercurial.ini``\n"
-"- ``%HOME%\\.hgrc``\n"
-"- ``%HOME%\\mercurial.ini``\n"
-"- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial.ini found)\n"
-"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial.ini found)\n"
-"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n"
-"- ``<hg.exe-dir>\\mercurial.ini``"
-msgstr ""
-"- ``<repo>\\.hg\\hgrc``\n"
-"- ``%USERPROFILE%\\.hgrc``\n"
-"- ``%USERPROFILE%\\mercurial.ini``\n"
-"- ``%HOME%\\.hgrc``\n"
-"- ``%HOME%\\mercurial.ini``\n"
-"- ``C:\\mercurial\\mercurial.ini`` (se chave no registro, hgrc.d\\ ou mercurial.ini não forem encontrados)\n"
-"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (se hgrc.d\\ ou mercurial.ini não forem encontrados)\n"
-"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (se mercurial.ini não for encontrado)\n"
-"- ``<hg.exe-dir>\\mercurial.ini``"
-
-msgid "On Unix, these files are read:"
-msgstr "No Unix, estes arquivos são lidos:"
-
-msgid ""
-"- ``<repo>/.hg/hgrc``\n"
-"- ``$HOME/.hgrc``\n"
-"- ``/etc/mercurial/hgrc``\n"
-"- ``/etc/mercurial/hgrc.d/*.rc``\n"
-"- ``<install-root>/etc/mercurial/hgrc``\n"
-"- ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
-msgstr ""
-"- ``<repo>/.hg/hgrc``\n"
-"- ``$HOME/.hgrc``\n"
-"- ``/etc/mercurial/hgrc``\n"
-"- ``/etc/mercurial/hgrc.d/*.rc``\n"
-"- ``<install-root>/etc/mercurial/hgrc``\n"
-"- ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
-
-msgid ""
-"These files do not exist by default and you will have to create the\n"
-"appropriate configuration files yourself: global configuration like\n"
-"the username setting is typically put into\n"
-"``%USERPROFILE%\\mercurial.ini`` or ``$HOME/.hgrc`` and local\n"
-"configuration is put into the per-repository ``<repo>/.hg/hgrc`` file."
-msgstr ""
-"Estes arquivos por padrão não existem, e você mesmo precisa criar os\n"
-"arquivos de configuração apropriados: configurações globais, como por\n"
-"exemplo seu nome de usuário, são tipicamente colocadas em\n"
-"``%USERPROFILE%\\mercurial.ini`` ou ``$HOME/.hgrc``, e configurações\n"
-"específicas de um repositório são colocadas no arquivo\n"
-"``<repositório>/.hg/hgrc``."
-
-msgid ""
-"If there is a per-repository configuration file which is not owned by\n"
-"the active user, Mercurial will warn you that the file is skipped::"
-msgstr ""
-"Se houver um arquivo de configuração de repositório que não tenha como\n"
-"dono o usuário ativo, o Mercurial avisará que o arquivo é ignorado::"
-
-msgid " not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP"
-msgstr " não confiando em arquivo <repo>/.hg/hgrc de usuário não confiável USUÁRIO, grupo GRUPO"
-
-msgid ""
-"If this bothers you, the warning can be silenced (the file would still\n"
-"be ignored) or trust can be established. Use one of the following\n"
-"settings, the syntax is explained below:"
-msgstr ""
-"Este aviso pode ser silenciado (o arquivo ainda seria ignorado) ou\n"
-"você pode especificar que confia no conteúdo desse arquivo. Use uma\n"
-"das definições seguintes, a sintaxe é explicada em seguida:"
-
-msgid ""
-"- ``ui.report_untrusted = False``\n"
-"- ``trusted.users = USER``\n"
-"- ``trusted.groups = GROUP``"
-msgstr ""
-"- ``ui.report_untrusted = False``\n"
-"- ``trusted.users = USER``\n"
-"- ``trusted.groups = GROUP``"
-
-msgid ""
-"The configuration files for Mercurial use a simple ini-file format. A\n"
-"configuration file consists of sections, led by a ``[section]`` header\n"
-"and followed by ``name = value`` entries::"
-msgstr ""
-"Os arquivos de configuração do Mercurial usam um simples formato ini.\n"
+msgid "syntax for Mercurial ignore files"
+msgstr "sintaxe dos arquivos de padrões de arquivos ignorados"
+
+msgid ""
+"The Mercurial system uses a set of configuration files to control\n"
+"aspects of its behavior."
+msgstr ""
+"O Mercurial usa um conjunto de arquivos de configuração para controlar\n"
+"aspectos de seu comportamento."
+
+msgid ""
+"The configuration files use a simple ini-file format. A configuration\n"
+"file consists of sections, led by a ``[section]`` header and followed\n"
+"by ``name = value`` entries::"
+msgstr ""
+"Os arquivos de configuração usam um simples formato ini.\n"
"Um arquivo de configuração consiste de seções iniciadas por um\n"
"cabeçalho ``[seção]`` seguidas por entradas ``nome = valor``::"
@@ -11839,19 +12517,2884 @@
msgid ""
"The above entries will be referred to as ``ui.username`` and\n"
-"``ui.verbose``, respectively. Please see the hgrc man page for a full\n"
-"description of the possible configuration values:"
+"``ui.verbose``, respectively. See the Syntax section below."
msgstr ""
"As entradas acima são referidas como ``ui.username`` e\n"
-"``ui.verbose``, respectivamente. Por favor veja a página de manual hgrc\n"
-"para uma descrição completa dos possíveis valores de configuração:"
-
-msgid ""
-"- on Unix-like systems: ``man hgrc``\n"
-"- online: http://www.selenic.com/mercurial/hgrc.5.html\n"
-msgstr ""
-"- em sistemas semelhantes ao Unix: ``man hgrc``\n"
-"- na Internet: http://www.selenic.com/mercurial/hgrc.5.html\n"
+"``ui.verbose``, respectivamente. Veja a seção Sintaxe abaixo."
+
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+"Arquivos\n"
+"--------"
+
+msgid ""
+"Mercurial reads configuration data from several files, if they exist.\n"
+"These files do not exist by default and you will have to create the\n"
+"appropriate configuration files yourself: global configuration like\n"
+"the username setting is typically put into\n"
+"``%USERPROFILE%\\mercurial.ini`` or ``$HOME/.hgrc`` and local\n"
+"configuration is put into the per-repository ``<repo>/.hg/hgrc`` file."
+msgstr ""
+"O Mercurial lê dados de configuração de diversos arquivos, se existirem.\n"
+"Estes arquivos por padrão não existem, e você mesmo precisa criar os\n"
+"arquivos de configuração apropriados: configurações globais, como por\n"
+"exemplo seu nome de usuário, são tipicamente colocadas em\n"
+"``%USERPROFILE%\\mercurial.ini`` ou ``$HOME/.hgrc``, e configurações\n"
+"específicas de um repositório são colocadas no arquivo\n"
+"``<repositório>/.hg/hgrc``."
+
+msgid ""
+"The names of these files depend on the system on which Mercurial is\n"
+"installed. ``*.rc`` files from a single directory are read in\n"
+"alphabetical order, later ones overriding earlier ones. Where multiple\n"
+"paths are given below, settings from earlier paths override later\n"
+"ones."
+msgstr ""
+"Os nomes desses arquivos dependem do sistema no qual o Mercurial\n"
+"está instalado. Arquivos ``*.rc`` de um único diretório são lidos em\n"
+"ordem alfabética, e definições em arquivos posteriores sobrepõe\n"
+"definições em arquivos anteriores. Onde múltiplos caminhos forem\n"
+"mencionados abaixo, definições de caminhos anteriores sobrepõe\n"
+"definições de caminhos posteriores."
+
+msgid "| (Unix, Windows) ``<repo>/.hg/hgrc``"
+msgstr "| (Unix, Windows) ``<repo>/.hg/hgrc``"
+
+msgid ""
+" Per-repository configuration options that only apply in a\n"
+" particular repository. This file is not version-controlled, and\n"
+" will not get transferred during a \"clone\" operation. Options in\n"
+" this file override options in all other configuration files. On\n"
+" Unix, most of this file will be ignored if it doesn't belong to a\n"
+" trusted user or to a trusted group. See the documentation for the\n"
+" ``[trusted]`` section below for more details."
+msgstr ""
+" Configurações específicas do repositório <repo>. Este arquivo\n"
+" não é versionado, e não é transferido durante uma operação\n"
+" \"clone\". Opções neste arquivo sobrepõe opções em qualquer outro\n"
+" arquivo de configuração. Em Unix, a maior parte deste arquivo\n"
+" será ignorada se ele não pertencer a um usuário ou grupo\n"
+" confiável; veja abaixo a documentação sobre a seção [trusted]\n"
+" para maiores detalhes."
+
+msgid ""
+"| (Unix) ``$HOME/.hgrc``\n"
+"| (Windows) ``%USERPROFILE%\\.hgrc``\n"
+"| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n"
+"| (Windows) ``%HOME%\\.hgrc``\n"
+"| (Windows) ``%HOME%\\Mercurial.ini``"
+msgstr ""
+"| (Unix) ``$HOME/.hgrc``\n"
+"| (Windows) ``%USERPROFILE%\\.hgrc``\n"
+"| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n"
+"| (Windows) ``%HOME%\\.hgrc``\n"
+"| (Windows) ``%HOME%\\Mercurial.ini``"
+
+msgid ""
+" Per-user configuration file(s), for the user running Mercurial. On\n"
+" Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these\n"
+" files apply to all Mercurial commands executed by this user in any\n"
+" directory. Options in these files override per-system and per-installation\n"
+" options."
+msgstr ""
+" Arquivos de configuração específicos do usuário que executa o Mercurial.\n"
+" No Windows 9x, ``%HOME%`` é substituído por ``%APPDATA%``. Opções nestes\n"
+" arquivos se aplicam a todos os comandos do Mercurial executados por este\n"
+" usuário em qualquer diretório. Opções nestes arquivos sobrepõe opções\n"
+" por sistema e por instalação."
+
+msgid ""
+"| (Unix) ``/etc/mercurial/hgrc``\n"
+"| (Unix) ``/etc/mercurial/hgrc.d/*.rc``"
+msgstr ""
+"| (Unix) ``/etc/mercurial/hgrc``\n"
+"| (Unix) ``/etc/mercurial/hgrc.d/*.rc``"
+
+msgid ""
+" Per-system configuration files, for the system on which Mercurial\n"
+" is running. Options in these files apply to all Mercurial commands\n"
+" executed by any user in any directory. Options in these files\n"
+" override per-installation options."
+msgstr ""
+" Arquivos de configuração por sistema, específicos do sistema no qual\n"
+" o Mercurial é executado. Opções nestes arquivos se aplicam a todos\n"
+" os comandos do Mercurial executados por qualquer usuário em qualquer\n"
+" diretório. Opções nestes arquivos sobrepõe opções por instalação."
+
+msgid ""
+"| (Unix) ``<install-root>/etc/mercurial/hgrc``\n"
+"| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
+msgstr ""
+"| (Unix) ``<install-root>/etc/mercurial/hgrc``\n"
+"| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
+
+msgid ""
+" Per-installation configuration files, searched for in the\n"
+" directory where Mercurial is installed. ``<install-root>`` is the\n"
+" parent directory of the **hg** executable (or symlink) being run. For\n"
+" example, if installed in ``/shared/tools/bin/hg``, Mercurial will look\n"
+" in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply\n"
+" to all Mercurial commands executed by any user in any directory."
+msgstr ""
+" Arquivos de configuração por instalação, procurados no diretório onde\n"
+" o Mercurial está instalado. ``<install-root>`` é o diretório pai do\n"
+" executável **hg** (ou link simbólico) executado.\n"
+" Por exemplo, se instalado em ``/shared/tools/bin/hg``, o Mercurial\n"
+" procurará em ``/shared/tools/etc/mercurial/hgrc``.\n"
+" Opções nestes arquivos se aplicam a todos os comandos do Mercurial\n"
+" executados por qualquer usuário em qualquer diretório."
+
+msgid ""
+"| (Windows) ``<install-dir>\\Mercurial.ini`` **or**\n"
+"| (Windows) ``<install-dir>\\hgrc.d\\*.rc`` **or**\n"
+"| (Windows) ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``"
+msgstr ""
+"| (Windows) ``<install-dir>\\Mercurial.ini`` **or**\n"
+"| (Windows) ``<install-dir>\\hgrc.d\\*.rc`` **or**\n"
+"| (Windows) ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``"
+
+msgid ""
+" Per-installation/system configuration files, for the system on\n"
+" which Mercurial is running. Options in these files apply to all\n"
+" Mercurial commands executed by any user in any directory. Registry\n"
+" keys contain PATH-like strings, every part of which must reference\n"
+" a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will\n"
+" be read. Mercurial checks each of these locations in the specified\n"
+" order until one or more configuration files are detected. If the\n"
+" pywin32 extensions are not installed, Mercurial will only look for\n"
+" site-wide configuration in ``C:\\Mercurial\\Mercurial.ini``."
+msgstr ""
+" Arquivos de configuração por instalação e sistema, para o sistema\n"
+" no qual o Mercurial está instalado.\n"
+" Opções nestes arquivos se aplicam a todos os comandos do Mercurial\n"
+" executados por qualquer usuário em qualquer diretório.\n"
+" As chaves do registro contém strings semelhantes ao PATH; cada parte\n"
+" delas deve fazer referência a um arquivo ``Mercurial.ini`` ou a um\n"
+" diretório do qual arquivos ``*.rc`` serão lidos.\n"
+" O Mercurial verifica cada uma destas localizações na ordem\n"
+" especificada até que um ou mais arquivos de configuração sejam\n"
+" encontrados.\n"
+" Se as extensões pywin32 não estiverem instaladas, o Mercurial\n"
+" procurará por arquivos de configuração de sistema apenas em\n"
+" ``C:\\Mercurial\\Mercurial.ini``."
+
+msgid ""
+"Syntax\n"
+"------"
+msgstr ""
+"Sintaxe\n"
+"-------"
+
+msgid ""
+"A configuration file consists of sections, led by a ``[section]`` header\n"
+"and followed by ``name = value`` entries (sometimes called\n"
+"``configuration keys``)::"
+msgstr ""
+"Um arquivo de configuração consiste de seções iniciadas por um\n"
+"cabeçalho ``[seção]`` seguidas por entradas ``nome = valor``\n"
+"(por vezes chamadas de ``chaves de configuração``)::"
+
+msgid ""
+" [spam]\n"
+" eggs=ham\n"
+" green=\n"
+" eggs"
+msgstr ""
+" [spam]\n"
+" eggs=ham\n"
+" green=\n"
+" eggs"
+
+msgid ""
+"Each line contains one entry. If the lines that follow are indented,\n"
+"they are treated as continuations of that entry. Leading whitespace is\n"
+"removed from values. Empty lines are skipped. Lines beginning with\n"
+"``#`` or ``;`` are ignored and may be used to provide comments."
+msgstr ""
+"Cada linha contém uma entrada. Se as linhas seguintes estiverem\n"
+"indentadas, elas serão tratadas como continuações dessa entrada.\n"
+"Espaços em branco no início do valor são descartados. Linhas\n"
+"vazias são ignoradas. Linhas começadas por ``#`` ou ``;`` são\n"
+"ignoradas e podem ser usadas para comentários."
+
+msgid ""
+"Configuration keys can be set multiple times, in which case Mercurial\n"
+"will use the value that was configured last. As an example::"
+msgstr ""
+"Chaves de configuração podem ser definidas múltiplas vezes; nesse\n"
+"caso, o Mercurial usará o valor que tiver sido definido por último.\n"
+"Por exemplo::"
+
+msgid ""
+" [spam]\n"
+" eggs=large\n"
+" ham=serrano\n"
+" eggs=small"
+msgstr ""
+" [spam]\n"
+" eggs=large\n"
+" ham=serrano\n"
+" eggs=small"
+
+msgid "This would set the configuration key named ``eggs`` to ``small``."
+msgstr "Isto definirá a chave de configuração ``eggs`` com o valor ``small``."
+
+msgid ""
+"It is also possible to define a section multiple times. A section can\n"
+"be redefined on the same and/or on different configuration files. For\n"
+"example::"
+msgstr ""
+"Também é possível definir múltiplas vezes uma seção. Uma seção pode ser\n"
+"redefinida no mesmo ou em diferentes arquivos de configuração. Por exemplo::"
+
+msgid ""
+" [foo]\n"
+" eggs=large\n"
+" ham=serrano\n"
+" eggs=small"
+msgstr ""
+" [foo]\n"
+" eggs=large\n"
+" ham=serrano\n"
+" eggs=small"
+
+msgid ""
+" [bar]\n"
+" eggs=ham\n"
+" green=\n"
+" eggs"
+msgstr ""
+" [bar]\n"
+" eggs=ham\n"
+" green=\n"
+" eggs"
+
+msgid ""
+" [foo]\n"
+" ham=prosciutto\n"
+" eggs=medium\n"
+" bread=toasted"
+msgstr ""
+" [foo]\n"
+" ham=prosciutto\n"
+" eggs=medium\n"
+" bread=toasted"
+
+msgid ""
+"This would set the ``eggs``, ``ham``, and ``bread`` configuration keys\n"
+"of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``,\n"
+"respectively. As you can see there only thing that matters is the last\n"
+"value that was set for each of the configuration keys."
+msgstr ""
+"Isto definiria as chaves de configuração ``eggs``, ``ham`` e ``bread``\n"
+"da seção ``foo`` com os valores ``medium``, ``prosciutto`` e ``toasted``,\n"
+"respectivamente. Note que a única coisa que importa é o último valor\n"
+"definido para cada chave de configuração."
+
+msgid ""
+"If a configuration key is set multiple times in different\n"
+"configuration files the final value will depend on the order in which\n"
+"the different configuration files are read, with settings from earlier\n"
+"paths overriding later ones as described on the ``Files`` section\n"
+"above."
+msgstr ""
+"Se uma chave de configuração for definida múltiplas vezes em diferentes\n"
+"arquivos de configuração, o valor final dependerá da ordem na qual os\n"
+"diferentes arquivos de configuração forem lidos, sendo que definições\n"
+"de caminhos anteriores sobrepõe definições de caminhos posteriores, como\n"
+"descrito na seção ``Arquivos`` acima."
+
+msgid ""
+"A line of the form ``%include file`` will include ``file`` into the\n"
+"current configuration file. The inclusion is recursive, which means\n"
+"that included files can include other files. Filenames are relative to\n"
+"the configuration file in which the ``%include`` directive is found.\n"
+"Environment variables and ``~user`` constructs are expanded in\n"
+"``file``. This lets you do something like::"
+msgstr ""
+"Uma linha da forma ``%include arquivo`` incluirá ``arquivo`` no\n"
+"arquivo de configuração atual.\n"
+"A inclusão é recursiva, ou seja, os arquivos incluídos podem\n"
+"incluir outros arquivos.\n"
+"O caminho de um arquivo incluído é relativo ao próprio arquivo de\n"
+"configuração que o incluiu.\n"
+"Variáveis de ambiente e construções ``~usuário`` são expandidos em\n"
+"``arquivo``. Assim, você pode fazer algo como::"
+
+msgid " %include ~/.hgrc.d/$HOST.rc"
+msgstr " %include ~/.hgrc.d/$HOST.rc"
+
+msgid "to include a different configuration file on each computer you use."
+msgstr ""
+"para incluir um arquivo de configuração diferente em cada computador\n"
+"que você usar."
+
+msgid ""
+"A line with ``%unset name`` will remove ``name`` from the current\n"
+"section, if it has been set previously."
+msgstr ""
+"Uma linha ``%unset nome`` removerá ``nome`` da seção atual, se tiver\n"
+"sido definido previamente."
+
+msgid ""
+"The values are either free-form text strings, lists of text strings,\n"
+"or Boolean values. Boolean values can be set to true using any of \"1\",\n"
+"\"yes\", \"true\", or \"on\" and to false using \"0\", \"no\", \"false\", or \"off\"\n"
+"(all case insensitive)."
+msgstr ""
+"Os valores podem ser strings de texto, listas de strings de texto, ou\n"
+"valores booleanos. Valores booleanos podem ser definidos como verdadeiros\n"
+"usando \"1\", \"yes\", \"true\" ou \"on\", e como falsos usando \"0\",\n"
+"\"no\", \"false\" ou \"off\" (sem considerar maiúsculas ou minúsculas)."
+
+msgid ""
+"List values are separated by whitespace or comma, except when values are\n"
+"placed in double quotation marks::"
+msgstr ""
+"Listas são separadas por espaços em branco ou vírgulas, exceto se os\n"
+"valores estiverem entre aspas duplas::"
+
+msgid " allow_read = \"John Doe, PhD\", brian, betty"
+msgstr " allow_read = \"John Doe, PhD\", brian, betty"
+
+msgid ""
+"Quotation marks can be escaped by prefixing them with a backslash. Only\n"
+"quotation marks at the beginning of a word is counted as a quotation\n"
+"(e.g., ``foo\"bar baz`` is the list of ``foo\"bar`` and ``baz``)."
+msgstr ""
+"Aspas duplas podem ser colocadas nos valores se prefixadas por uma\n"
+"barra invertida (\"\\\"). Apenas aspas duplas no começo de uma\n"
+"palavra iniciam uma citação literal (por exemplo, ``foo\"bar baz``\n"
+"é uma lista contendo ``foo\"bar`` e ``baz``)."
+
+msgid ""
+"Sections\n"
+"--------"
+msgstr ""
+"Seções\n"
+"------"
+
+msgid ""
+"This section describes the different sections that may appear in a\n"
+"Mercurial configuration file, the purpose of each section, its possible\n"
+"keys, and their possible values."
+msgstr ""
+"Esta seção descreve as diversas seções que podem aparecer em um arquivo\n"
+"de configuração do Mercurial, o propósito de cada seção, suas chaves e\n"
+"seus valores possíveis."
+
+msgid ""
+"``alias``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"``alias``\n"
+"\"\"\"\"\"\"\"\"\""
+
+msgid ""
+"Defines command aliases.\n"
+"Aliases allow you to define your own commands in terms of other\n"
+"commands (or aliases), optionally including arguments. Positional\n"
+"arguments in the form of ``$1``, ``$2``, etc in the alias definition\n"
+"are expanded by Mercurial before execution. Positional arguments not\n"
+"already used by ``$N`` in the definition are put at the end of the\n"
+"command to be executed."
+msgstr ""
+"Define apelidos para comandos.\n"
+"Apelidos são novos comandos definidos em termos de outros comandos\n"
+"(ou outros apelidos), opcionalmente incluindo argumentos. Argumentos\n"
+"posicionais na forma de ``$1``, ``$2``, etc na definição do apelido\n"
+"são expandidos pelo Mercurial antes da execução. Argumentos posicionais\n"
+"não utilizados como ``$N`` na definição são colocados ao final do\n"
+"comando a ser executado."
+
+msgid "Alias definitions consist of lines of the form::"
+msgstr "Definições de apelidos consistem de linhas da seguinte forma::"
+
+msgid " <alias> = <command> [<argument>]..."
+msgstr " <apelido> = <comando> [<argumento>]..."
+
+msgid "For example, this definition::"
+msgstr "Por exemplo, esta definição::"
+
+msgid " latest = log --limit 5"
+msgstr " ultimos = log --limit 5"
+
+msgid ""
+"creates a new command ``latest`` that shows only the five most recent\n"
+"changesets. You can define subsequent aliases using earlier ones::"
+msgstr ""
+"cria um novo comando ``ultimos`` que mostra apenas as cinco revisões\n"
+"mais recentes. Você pode definir apelidos a partir de outros apelidos\n"
+"definidos anteriormente::"
+
+msgid " stable5 = latest -b stable"
+msgstr " stable5 = ultimos -b stable"
+
+msgid ""
+".. note:: It is possible to create aliases with the same names as\n"
+" existing commands, which will then override the original\n"
+" definitions. This is almost always a bad idea!"
+msgstr ""
+".. note:: É possível criar apelidos com os mesmos nomes que comandos\n"
+" existentes, o que irá sobrepôr suas definições originais. Isto é\n"
+" quase sempre uma má ideia!"
+
+msgid ""
+"An alias can start with an exclamation point (``!``) to make it a\n"
+"shell alias. A shell alias is executed with the shell and will let you\n"
+"run arbitrary commands. As an example, ::"
+msgstr ""
+"Um apelido pode começar com um ponto de exclamação (``!``) para torná-lo\n"
+"um apelido de shell. Um apelido de shell é executado pelo shell, e pode\n"
+"ser usado para executar comandos arbitrários. Por exemplo, ::"
+
+msgid " echo = !echo"
+msgstr " echo = !echo"
+
+msgid ""
+"will let you do ``hg echo foo`` to have ``foo`` printed in your\n"
+"terminal. A better example might be::"
+msgstr ""
+"fará com que ``hg echo foo`` imprima ``foo`` em seu terminal.\n"
+"Um exemplo melhor (em um Unix) poderia ser::"
+
+msgid " purge = !$HG status --no-status --unknown -0 | xargs -0 rm"
+msgstr " purge = !$HG status --no-status --unknown -0 | xargs -0 rm"
+
+msgid ""
+"which will make ``hg purge`` delete all unknown files in the\n"
+"repository in the same manner as the purge extension."
+msgstr ""
+"que fará com que ``hg purge`` apague todos os arquivos desconhecidos no\n"
+"repositório da mesma maneira que a extensão purge."
+
+msgid ""
+"Shell aliases are executed in an environment where ``$HG`` expand to\n"
+"the path of the Mercurial that was used to execute the alias. This is\n"
+"useful when you want to call further Mercurial commands in a shell\n"
+"alias, as was done above for the purge alias. In addition,\n"
+"``$HG_ARGS`` expand to the arguments given to Mercurial. In the ``hg\n"
+"echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``."
+msgstr ""
+"Apelidos de shell são executados em um ambiente no qual ``$HG``\n"
+"expande para o caminho do Mercurial que foi usado para executar o\n"
+"apelido. Isto pode ser usado para invocar novos comandos do\n"
+"Mercurial em um apelido de shell, como foi feito acima para o\n"
+"apelido purge. Adicionalmente, ``$HG_ARGS`` expande para os\n"
+"argumentos passados para o Mercurial. Na chamada ``hg echo foo``\n"
+"acima, ``$HG_ARGS`` expandiria para ``echo foo``."
+
+msgid ""
+"``auth``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+"``auth``\n"
+"\"\"\"\"\"\"\"\""
+
+msgid ""
+"Authentication credentials for HTTP authentication. This section\n"
+"allows you to store usernames and passwords for use when logging\n"
+"*into* HTTP servers. See the ``[web]`` configuration section if\n"
+"you want to configure *who* can login to your HTTP server."
+msgstr ""
+"Credenciais de autenticação HTTP. Esta seção pode ser usada para\n"
+"armazenar nomes de usuário e senhas usados para acessar servidores\n"
+"HTTP remotos. Veja a seção de configuração ``[web]`` para configurar\n"
+"*quem* pode acessar o seu servidor HTTP local."
+
+msgid "Each line has the following format::"
+msgstr "Cada linha tem o seguinte formato::"
+
+msgid " <name>.<argument> = <value>"
+msgstr " <nome>.<argumento> = <valor>"
+
+msgid ""
+"where ``<name>`` is used to group arguments into authentication\n"
+"entries. Example::"
+msgstr ""
+"onde ``<nome>`` é usado para agrupar argumentos em entradas de\n"
+"autenticação. Por exemplo::"
+
+msgid ""
+" foo.prefix = hg.intevation.org/mercurial\n"
+" foo.username = foo\n"
+" foo.password = bar\n"
+" foo.schemes = http https"
+msgstr ""
+" foo.prefix = hg.intevation.org/mercurial\n"
+" foo.username = foo\n"
+" foo.password = bar\n"
+" foo.schemes = http https"
+
+msgid ""
+" bar.prefix = secure.example.org\n"
+" bar.key = path/to/file.key\n"
+" bar.cert = path/to/file.cert\n"
+" bar.schemes = https"
+msgstr ""
+" bar.prefix = secure.example.org\n"
+" bar.key = path/to/file.key\n"
+" bar.cert = path/to/file.cert\n"
+" bar.schemes = https"
+
+msgid "Supported arguments:"
+msgstr "Argumentos suportados:"
+
+msgid ""
+"``prefix``\n"
+" Either ``*`` or a URI prefix with or without the scheme part.\n"
+" The authentication entry with the longest matching prefix is used\n"
+" (where ``*`` matches everything and counts as a match of length\n"
+" 1). If the prefix doesn't include a scheme, the match is performed\n"
+" against the URI with its scheme stripped as well, and the schemes\n"
+" argument, q.v., is then subsequently consulted."
+msgstr ""
+"``prefix``\n"
+" Ou ``*`` ou um prefixo URI com ou sem a parte do esquema.\n"
+" Será usada a entrada de autenticação com o maior prefixo que\n"
+" combine (onde ``*`` combina com qualquer coisa, e conta como um\n"
+" prefixo de comprimento 1). Se o prefixo não incluir um esquema,\n"
+" a URL também terá seu esquema removido para a verificação, e o\n"
+" argumento schemes será então consultado em seguida."
+
+msgid ""
+"``username``\n"
+" Optional. Username to authenticate with. If not given, and the\n"
+" remote site requires basic or digest authentication, the user will\n"
+" be prompted for it. Environment variables are expanded in the\n"
+" username letting you do ``foo.username = $USER``."
+msgstr ""
+"``username``\n"
+" Opcional. Nome do usuário usado para a autenticação. Se não for\n"
+" fornecido, e o servidor remoto solicitar autenticação básica ou\n"
+" digest, o usuário do Mercurial será consultado interativamente para\n"
+" fornecê-lo. Variáveis de ambiente são expandidas no nome de usuário,\n"
+" de forma a suportar ``foo.username = $USER``."
+
+msgid ""
+"``password``\n"
+" Optional. Password to authenticate with. If not given, and the\n"
+" remote site requires basic or digest authentication, the user\n"
+" will be prompted for it."
+msgstr ""
+"``password``\n"
+" Opcional. Senha usada para autenticação. Se não for fornecida, e o\n"
+" servidor remoto solicitar autenticação básica ou digest, o usuário\n"
+" do Mercurial será consultado interativamente para fornecê-la."
+
+msgid ""
+"``key``\n"
+" Optional. PEM encoded client certificate key file. Environment\n"
+" variables are expanded in the filename."
+msgstr ""
+"``key``\n"
+" Opcional. Arquivo certificado de cliente codificado em formato PEM.\n"
+" Variáveis de ambiente serão expandidas no caminho do arquivo."
+
+msgid ""
+"``cert``\n"
+" Optional. PEM encoded client certificate chain file. Environment\n"
+" variables are expanded in the filename."
+msgstr ""
+"``cert``\n"
+" Opcional. Arquivo certificado de cadeia codificado em formato PEM.\n"
+" Variáveis de ambiente serão expandidas no caminho do arquivo."
+
+msgid ""
+"``schemes``\n"
+" Optional. Space separated list of URI schemes to use this\n"
+" authentication entry with. Only used if the prefix doesn't include\n"
+" a scheme. Supported schemes are http and https. They will match\n"
+" static-http and static-https respectively, as well.\n"
+" Default: https."
+msgstr ""
+"``schemes``\n"
+" Opcional. Lista separada por espaços de esquemas URI com os quais\n"
+" usar esta entrada de autenticação. Só será usado se o prefixo não\n"
+" incluir um esquema. Os esquemas suportados são http e https. Eles\n"
+" também combinarão com static-http e static-https, respectivamente.\n"
+" O padrão é: https."
+
+msgid ""
+"If no suitable authentication entry is found, the user is prompted\n"
+"for credentials as usual if required by the remote."
+msgstr ""
+"Se nenhuma entrada de autenticação apropriada for encontrada, o usuário\n"
+"será consultado interativamente para fornecer credenciais normalmente,\n"
+"se forem solicitadas pelo servidor remoto."
+
+msgid ""
+"\n"
+"``decode/encode``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"\n"
+"``decode/encode``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+
+msgid ""
+"Filters for transforming files on checkout/checkin. This would\n"
+"typically be used for newline processing or other\n"
+"localization/canonicalization of files."
+msgstr ""
+"Filtros para transformar arquivos durante update/commit. São\n"
+"tipicamente utilizados para processar quebras de linha ou outro\n"
+"tipo de localização ou padronização de arquivos."
+
+msgid ""
+"Filters consist of a filter pattern followed by a filter command.\n"
+"Filter patterns are globs by default, rooted at the repository root.\n"
+"For example, to match any file ending in ``.txt`` in the root\n"
+"directory only, use the pattern ``*.txt``. To match any file ending\n"
+"in ``.c`` anywhere in the repository, use the pattern ``**.c``.\n"
+"For each file only the first matching filter applies."
+msgstr ""
+"Filtros consistem de um padrão de arquivos filtrados seguido por um\n"
+"comando de filtragem. Por padrão, o padrão de arquivos usa globs,\n"
+"a partir da raiz do repositório. Por exemplo, para combinar com qualquer\n"
+"arquivo terminado por ``.txt`` apenas no diretório raiz, use o padrão\n"
+"``*.txt``. Para combinar com qualquer arquivo terminado em ``.c`` em\n"
+"qualquer ponto do repositório, use o padrão ``**.c``.\n"
+"Para cada arquivo, apenas o primeiro filtro que combine será usado."
+
+msgid ""
+"The filter command can start with a specifier, either ``pipe:`` or\n"
+"``tempfile:``. If no specifier is given, ``pipe:`` is used by default."
+msgstr ""
+"O comando de filtragem pode começar com um especificador ``pipe:`` ou\n"
+"``tempfile:``. Se nenhum for fornecido, ``pipe:`` será usado."
+
+msgid ""
+"A ``pipe:`` command must accept data on stdin and return the transformed\n"
+"data on stdout."
+msgstr ""
+"Um comando ``pipe:`` deve aceitar dados na entrada padrão e devolver os\n"
+"dados transformados na saída padrão."
+
+msgid "Pipe example::"
+msgstr "Exemplo de pipe::"
+
+msgid ""
+" [encode]\n"
+" # uncompress gzip files on checkin to improve delta compression\n"
+" # note: not necessarily a good idea, just an example\n"
+" *.gz = pipe: gunzip"
+msgstr ""
+" [encode]\n"
+" # descompacta arquivos gzip no commit para melhorar a\n"
+" # compressão em delta\n"
+" # obs: não é necessariamente uma boa ideia, este é apenas\n"
+" # um exemplo\n"
+" *.gz = pipe: gunzip"
+
+msgid ""
+" [decode]\n"
+" # recompress gzip files when writing them to the working dir (we\n"
+" # can safely omit \"pipe:\", because it's the default)\n"
+" *.gz = gzip"
+msgstr ""
+" [decode]\n"
+" # recomprime arquivos gzip ao escrevê-los no diretório de trabalho\n"
+" # (podemos seguramente omitir \"pipe:\", por ser o padrão)\n"
+" *.gz = gzip"
+
+msgid ""
+"A ``tempfile:`` command is a template. The string ``INFILE`` is replaced\n"
+"with the name of a temporary file that contains the data to be\n"
+"filtered by the command. The string ``OUTFILE`` is replaced with the name\n"
+"of an empty temporary file, where the filtered data must be written by\n"
+"the command."
+msgstr ""
+"Um comando ``tempfile:`` é um modelo. A string ``INFILE`` é substituída\n"
+"pelo nome de um arquivo temporário que conterá os dados a serem filtrados\n"
+"pelo comando. A string ``OUTFILE`` será substituída pelo nome de um\n"
+"arquivo temporário vazio, no qual os dados devam ser escritos pelo comando."
+
+msgid ""
+".. note:: The tempfile mechanism is recommended for Windows systems,\n"
+" where the standard shell I/O redirection operators often have\n"
+" strange effects and may corrupt the contents of your files."
+msgstr ""
+".. note:: O mecanismo tempfile é recomendado para sistemas Windows,\n"
+" no qual os operadores padrão do shell de redirecionamento de comandos\n"
+" por vezes causam efeitos estranhos e podem corromper o conteúdo de\n"
+" seus arquivos."
+
+msgid ""
+"This filter mechanism is used internally by the ``eol`` extension to\n"
+"translate line ending characters between Windows (CRLF) and Unix (LF)\n"
+"format. We suggest you use the ``eol`` extension for convenience."
+msgstr ""
+"Este mecanismo de filtragem é usado internamente pela extensão\n"
+"``eol`` para traduzir quebras de linha entre os formatos Windows (CRLF)\n"
+"e Unix (LF). Por conveniência, sugerimos que você utilize a extensão\n"
+"``eol`` se esse tipo de conversão for necessária."
+
+msgid ""
+"\n"
+"``defaults``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"\n"
+"``defaults``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
+
+msgid "(defaults are deprecated. Don't use them. Use aliases instead)"
+msgstr ""
+"(defaults são obsoletos, e não devem ser utilizados. Use apelidos no\n"
+"lugar deles; veja a seção ``[alias]``)"
+
+msgid ""
+"Use the ``[defaults]`` section to define command defaults, i.e. the\n"
+"default options/arguments to pass to the specified commands."
+msgstr ""
+"Você pode usar a seção ``[defaults]`` para definir padrões de comandos,\n"
+"isto é, as opções ou argumentos a serem passadas para comandos\n"
+"especificados por padrão."
+
+msgid ""
+"The following example makes :hg:`log` run in verbose mode, and\n"
+":hg:`status` show only the modified files, by default::"
+msgstr ""
+"O seguinte exemplo faz com que :hg:`log` execute em modo verboso,\n"
+"e :hg:`status` mostre apenas arquivos modificados, por padrão::"
+
+msgid ""
+" [defaults]\n"
+" log = -v\n"
+" status = -m"
+msgstr ""
+" [defaults]\n"
+" log = -v\n"
+" status = -m"
+
+msgid ""
+"The actual commands, instead of their aliases, must be used when\n"
+"defining command defaults. The command defaults will also be applied\n"
+"to the aliases of the commands defined."
+msgstr ""
+"Os próprios comandos (e não apelidos) devem ser usados ao definir padrões\n"
+"de comandos. Os padrões também serão aplicados aos apelidos que usarem\n"
+"esses comandos."
+
+msgid ""
+"\n"
+"``diff``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+"\n"
+"``diff``\n"
+"\"\"\"\"\"\"\"\""
+
+msgid ""
+"Settings used when displaying diffs. Everything except for ``unified`` is a\n"
+"Boolean and defaults to False."
+msgstr ""
+"Definições usadas ao exibir diffs. Exceto por ``unified``, todas são\n"
+"booleanas, por padrão False."
+
+msgid ""
+"``git``\n"
+" Use git extended diff format."
+msgstr ""
+"``git``\n"
+" usa o formato estendido de diff do git"
+
+msgid ""
+"``nodates``\n"
+" Don't include dates in diff headers."
+msgstr ""
+"``nodates``\n"
+" Não inclui datas nos cabeçalhos de diff."
+
+msgid ""
+"``showfunc``\n"
+" Show which function each change is in."
+msgstr ""
+"``showfunc``\n"
+" mostra em qual função está cada mudança"
+
+msgid ""
+"``ignorews``\n"
+" Ignore white space when comparing lines."
+msgstr ""
+"``ignorews``\n"
+" ignora espaços em branco ao comparar linhas"
+
+msgid ""
+"``ignorewsamount``\n"
+" Ignore changes in the amount of white space."
+msgstr ""
+"``ignorewsamount``\n"
+" ignora mudanças na quantidade de espaços em branco"
+
+msgid ""
+"``ignoreblanklines``\n"
+" Ignore changes whose lines are all blank."
+msgstr ""
+"``ignoreblanklines``\n"
+" ignora mudanças cujas linhas sejam todas brancas"
+
+msgid ""
+"``unified``\n"
+" Number of lines of context to show."
+msgstr ""
+"``unified``\n"
+" número de linhas de contexto a serem mostradas"
+
+msgid ""
+"``email``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"``email``\n"
+"\"\"\"\"\"\"\"\"\""
+
+msgid "Settings for extensions that send email messages."
+msgstr "Definições para extensões que enviam mensagens de email."
+
+msgid ""
+"``from``\n"
+" Optional. Email address to use in \"From\" header and SMTP envelope\n"
+" of outgoing messages."
+msgstr ""
+"``from``\n"
+" Opcional. Endereço de email usado no cabeçalho \"From\" e envelope\n"
+" SMTP de mensagens enviadas."
+
+msgid ""
+"``to``\n"
+" Optional. Comma-separated list of recipients' email addresses."
+msgstr ""
+"``to``\n"
+" Opcional. Lista separada por vírgulas de endereços de email\n"
+" destinatários."
+
+msgid ""
+"``cc``\n"
+" Optional. Comma-separated list of carbon copy recipients'\n"
+" email addresses."
+msgstr ""
+"``cc``\n"
+" Opcional. Lista separada por vírgulas de destinatários especificados\n"
+" em cópia-carbono."
+
+msgid ""
+"``bcc``\n"
+" Optional. Comma-separated list of blind carbon copy recipients'\n"
+" email addresses."
+msgstr ""
+"``bcc``\n"
+" Opcional. Lista separada por vírgulas de destinatários especificados\n"
+" em cópia-carbono oculta."
+
+msgid ""
+"``method``\n"
+" Optional. Method to use to send email messages. If value is ``smtp``\n"
+" (default), use SMTP (see the ``[smtp]`` section for configuration).\n"
+" Otherwise, use as name of program to run that acts like sendmail\n"
+" (takes ``-f`` option for sender, list of recipients on command line,\n"
+" message on stdin). Normally, setting this to ``sendmail`` or\n"
+" ``/usr/sbin/sendmail`` is enough to use sendmail to send messages."
+msgstr ""
+"``method``\n"
+" Opcional. Método usado para enviar mensagens de email. Se o valor\n"
+" for ``smtp`` (o padrão), usa SMTP (veja a seção de configuração\n"
+" ``[smtp]``). Caso contrário, o valor será interpretado como o nome\n"
+" de um programa a ser executado que atue como o sendmail\n"
+" (que use a opção ``-f`` para remetente, leia a lista de\n"
+" destinatários na linha de comando, e a mensagem da entrada padrão).\n"
+" Normalmente, definir esta chave como ``sendmail`` ou\n"
+" ``/usr/sbin/sendmail`` basta para usar o sendmail para enviar mensagens."
+
+msgid ""
+"``charsets``\n"
+" Optional. Comma-separated list of character sets considered\n"
+" convenient for recipients. Addresses, headers, and parts not\n"
+" containing patches of outgoing messages will be encoded in the\n"
+" first character set to which conversion from local encoding\n"
+" (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct\n"
+" conversion fails, the text in question is sent as is. Defaults to\n"
+" empty (explicit) list."
+msgstr ""
+"``charsets``\n"
+" Opcional. Lista separada por vírgulas de conjuntos de caracteres\n"
+" considerados convenientes para destinatários. Endereços, cabeçalhos\n"
+" e partes de mensagens que não contiverem patches serão codificadas\n"
+" no primeiro conjunto de caracteres para o qual a conversão da\n"
+" codificação local (``$HGENCODING``, ``ui.fallbackencoding``) seja\n"
+" realizada com sucesso. Se a conversão correta falhar, o texto em\n"
+" questão será enviado sem modificações. O valor padrão é uma lista\n"
+" (explicitamente) vazia."
+
+msgid " Order of outgoing email character sets:"
+msgstr " Ordem de conjuntos de caracteres para emails:"
+
+msgid ""
+" 1. ``us-ascii``: always first, regardless of settings\n"
+" 2. ``email.charsets``: in order given by user\n"
+" 3. ``ui.fallbackencoding``: if not in email.charsets\n"
+" 4. ``$HGENCODING``: if not in email.charsets\n"
+" 5. ``utf-8``: always last, regardless of settings"
+msgstr ""
+" 1. ``us-ascii``: sempre usado primeiro, independente de configuração\n"
+" 2. ``email.charsets``: na ordem dada pelo usuário\n"
+" 3. ``ui.fallbackencoding``: se não estiver em email.charsets\n"
+" 4. ``$HGENCODING``: se não estiver em email.charsets\n"
+" 5. ``utf-8``: sempre por último, independente de configuração"
+
+msgid "Email example::"
+msgstr "Exemplo de email::"
+
+msgid ""
+" [email]\n"
+" from = Joseph User <joe.user@example.com>\n"
+" method = /usr/sbin/sendmail\n"
+" # charsets for western Europeans\n"
+" # us-ascii, utf-8 omitted, as they are tried first and last\n"
+" charsets = iso-8859-1, iso-8859-15, windows-1252"
+msgstr ""
+" [email]\n"
+" from = Joseph User <joe.user@example.com>\n"
+" method = /usr/sbin/sendmail\n"
+" # caracteres para a Europa Ocidental\n"
+" # us-ascii e utf-8 omitidos, pois sempre são tentados\n"
+" charsets = iso-8859-1, iso-8859-15, windows-1252"
+
+msgid ""
+"\n"
+"``extensions``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"\n"
+"``extensions``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+
+msgid ""
+"Mercurial has an extension mechanism for adding new features. To\n"
+"enable an extension, create an entry for it in this section."
+msgstr ""
+"O Mercurial possui um mecanismo de extensão para adicionar novas\n"
+"funcionalidades. Para habilitar uma extensão, crie para ela uma\n"
+"entrada nesta seção."
+
+msgid ""
+"If you know that the extension is already in Python's search path,\n"
+"you can give the name of the module, followed by ``=``, with nothing\n"
+"after the ``=``."
+msgstr ""
+"Se você souber que a extensão já está no caminho de busca do Python\n"
+"(como tipicamente é o caso para extensões distribuídas com o Mercurial),\n"
+"você pode passar o nome do módulo, seguido por ``=``, sem nada após o\n"
+"``=``."
+
+msgid ""
+"Otherwise, give a name that you choose, followed by ``=``, followed by\n"
+"the path to the ``.py`` file (including the file name extension) that\n"
+"defines the extension."
+msgstr ""
+"Caso contrário, forneça um nome à sua escolha, seguido por ``=``,\n"
+"seguido pelo caminho para o arquivo ``.py`` (incluindo a extensão do\n"
+"arquivo) que define a extensão."
+
+msgid ""
+"To explicitly disable an extension that is enabled in an hgrc of\n"
+"broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``\n"
+"or ``foo = !`` when path is not supplied."
+msgstr ""
+"Para desabilitar explicitamente uma extensão habilitada em um\n"
+"arquivo de configuração de escopo mais amplo, prefixe seu caminho com !,\n"
+"como em ``foo = !/ext/path``, ou ``foo = !`` se um caminho não for\n"
+"fornecido."
+
+msgid "Example for ``~/.hgrc``::"
+msgstr "Exemplo para ``~/.hgrc``::"
+
+msgid ""
+" [extensions]\n"
+" # (the mq extension will get loaded from Mercurial's path)\n"
+" mq =\n"
+" # (this extension will get loaded from the file specified)\n"
+" myfeature = ~/.hgext/myfeature.py"
+msgstr ""
+" [extensions]\n"
+" # (a extensão mq será carregada a partir do caminho do Mercurial)\n"
+" mq =\n"
+" # (esta extensão será carregada do arquivo especificado)\n"
+" myfeature = ~/.hgext/myfeature.py"
+
+msgid ""
+"\n"
+"``hostfingerprints``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"\n"
+"``hostfingerprints``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+
+msgid ""
+"Fingerprints of the certificates of known HTTPS servers.\n"
+"A HTTPS connection to a server with a fingerprint configured here will\n"
+"only succeed if the servers certificate matches the fingerprint.\n"
+"This is very similar to how ssh known hosts works.\n"
+"The fingerprint is the SHA-1 hash value of the DER encoded certificate.\n"
+"The CA chain and web.cacerts is not used for servers with a fingerprint."
+msgstr ""
+"Impressões digitais (\"fingerprints\") dos certificados de servidores\n"
+"HTTPS conhecidos.\n"
+"Uma conexão HTTPS com um servidor com uma impressão digital configurada\n"
+"aqui só terá sucesso se o certificado do servidor bater com a impressão.\n"
+"Isto é bastante similar ao mecanismo \"known hosts\" do ssh.\n"
+"A impressão digital é o valor do hash SHA-1 do certificado codificado\n"
+"em formato DER.\n"
+"A cadeia CA e a opção web.cacerts não são usadas para servidores com\n"
+"impressões digitais configuradas."
+
+msgid "For example::"
+msgstr "Por exemplo::"
+
+msgid ""
+" [hostfingerprints]\n"
+" hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:d6:4b:ee:cc"
+msgstr ""
+" [hostfingerprints]\n"
+" hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:d6:4b:ee:cc"
+
+msgid "This feature is only supported when using Python 2.6 or later."
+msgstr "Esta funcionalidade só é suportada nas versões do Python 2.6 ou posteriores."
+
+msgid ""
+"\n"
+"``format``\n"
+"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"\n"
+"``format``\n"
+"\"\"\"\"\"\"\"\"\"\""
+
+msgid ""
+"``usestore``\n"
+" Enable or disable the \"store\" repository format which improves\n"
+" compatibility with systems that fold case or otherwise mangle\n"
+" filenames. Enabled by default. Disabling this option will allow\n"
+" you to store longer filenames in some situations at the expense of\n"
+" compatibility and ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 0.9.4."
+msgstr ""
+"``usestore``\n"
+" Habilita ou desabilita o formato de repositório \"store\", que melhora\n"
+" compatibilidade com sistemas de arquivo que interferem em nomes de\n"
+" arquivo, por exemplo alterando maiúsculas e minúsculas.\n"
+" Habilitado por padrão. Desabilitar esta opção permite o armazenamento\n"
+" de nomes de arquivo mais longos em algumas situações, em prejuízo\n"
+" da compatibilidade, e garante que o formato em disco de repositórios\n"
+" criados recentemente seja compatível com versões do Mercurial\n"
+" anteriores à 0.9.4."
+
+msgid ""
+"``usefncache``\n"
+" Enable or disable the \"fncache\" repository format which enhances\n"
+" the \"store\" repository format (which has to be enabled to use\n"
+" fncache) to allow longer filenames and avoids using Windows\n"
+" reserved names, e.g. \"nul\". Enabled by default. Disabling this\n"
+" option ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 1.1."
+msgstr ""
+"``usefncache``\n"
+" Habilita ou desabilita o formato de repositório \"fncache\", que\n"
+" aprimora o formato \"store\" (que deve ser habilitado para o uso de\n"
+" fncache) para permitir nomes de arquivo mais longos e evitar o uso\n"
+" de nomes de arquivo reservados, como \"nul\". Habilitado por padrão.\n"
+" Desabilitar esta opção garante que o formato em disco de repositórios\n"
+" criados recentemente seja compatível com versões do Mercurial\n"
+" anteriores à 1.1."
+
+msgid ""
+"``dotencode``\n"
+" Enable or disable the \"dotencode\" repository format which enhances\n"
+" the \"fncache\" repository format (which has to be enabled to use\n"
+" dotencode) to avoid issues with filenames starting with ._ on\n"
+" Mac OS X and spaces on Windows. Enabled by default. Disabling this\n"
+" option ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 1.7."
+msgstr ""
+"``usefncache``\n"
+" Habilita ou desabilita o formato de repositório \"fncache\", que\n"
+" aprimora o formato \"fncache\" (que deve ser habilitado para o uso de\n"
+" dotencode) para evitar problemas com nomes de arquivo iniciados por\n"
+" ._ no Mac OS X e espaços no Windows. Habilitado por padrão.\n"
+" Desabilitar esta opção garante que o formato em disco de repositórios\n"
+" criados recentemente seja compatível com versões do Mercurial\n"
+" anteriores à 1.7."
+
+msgid ""
+"``merge-patterns``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"``merge-patterns``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+
+msgid ""
+"This section specifies merge tools to associate with particular file\n"
+"patterns. Tools matched here will take precedence over the default\n"
+"merge tool. Patterns are globs by default, rooted at the repository\n"
+"root."
+msgstr ""
+"Esta seção especifica ferramentas de mesclagem a serem associados a\n"
+"determinados padrões de arquivo. As ferramentas correspondentes têm\n"
+"prioridade sobre o utilitário padrão de mesclagem. Por padrão, os\n"
+"padrões de arquivo são globs a partir do raiz do repositório."
+
+msgid ""
+" [merge-patterns]\n"
+" **.c = kdiff3\n"
+" **.jpg = myimgmerge"
+msgstr ""
+" [merge-patterns]\n"
+" **.c = kdiff3\n"
+" **.jpg = myimgmerge"
+
+msgid ""
+"``merge-tools``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"``merge-tools``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+
+msgid ""
+"This section configures external merge tools to use for file-level\n"
+"merges."
+msgstr ""
+"Esta seção configura ferramentas de mesclagem externas a serem\n"
+"usadas em mesclagens de arquivo."
+
+msgid "Example ``~/.hgrc``::"
+msgstr "Um exemplo de ``~/.hgrc``::"
+
+msgid ""
+" [merge-tools]\n"
+" # Override stock tool location\n"
+" kdiff3.executable = ~/bin/kdiff3\n"
+" # Specify command line\n"
+" kdiff3.args = $base $local $other -o $output\n"
+" # Give higher priority\n"
+" kdiff3.priority = 1"
+msgstr ""
+" [merge-tools]\n"
+" # sobrepõe a localização padrão da ferramenta\n"
+" kdiff3.executable = ~/bin/kdiff3\n"
+" # Especifica a linha de comando\n"
+" kdiff3.args = $base $local $other -o $output\n"
+" # Usa uma prioridade mais alta\n"
+" kdiff3.priority = 1"
+
+msgid ""
+" # Define new tool\n"
+" myHtmlTool.args = -m $local $other $base $output\n"
+" myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n"
+" myHtmlTool.priority = 1"
+msgstr ""
+" # Define uma nova ferramenta\n"
+" myHtmlTool.args = -m $local $other $base $output\n"
+" myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n"
+" myHtmlTool.priority = 1"
+
+msgid ""
+"``priority``\n"
+" The priority in which to evaluate this tool.\n"
+" Default: 0."
+msgstr ""
+"``priority``\n"
+" A prioridade com a qual avaliar esta ferramenta.\n"
+" Padrão: 0."
+
+msgid ""
+"``executable``\n"
+" Either just the name of the executable or its pathname. On Windows,\n"
+" the path can use environment variables with ${ProgramFiles} syntax.\n"
+" Default: the tool name."
+msgstr ""
+"``executable``\n"
+" Pode ser apenas o nome do executável ou seu caminho completo. No\n"
+" Windows, o caminho pode usar variáveis de ambiente com a sintaxe\n"
+" ${ProgramFiles}.\n"
+" Padrão: o próprio nome da ferramenta."
+
+msgid ""
+"``args``\n"
+" The arguments to pass to the tool executable. You can refer to the\n"
+" files being merged as well as the output file through these\n"
+" variables: ``$base``, ``$local``, ``$other``, ``$output``.\n"
+" Default: ``$local $base $other``"
+msgstr ""
+"``args``\n"
+" Os parâmetros passados para o executável da ferramenta. Você pode se\n"
+" referir aos arquivos a serem mesclados bem como ao arquivo de saída\n"
+" usando as seguintes variáveis: ``$base`` (versão base), ``$local``\n"
+" (versão local), ``$other`` (a outra versão), ``$output`` (o arquivo\n"
+" de saída).\n"
+" Padrão: ``$local $base $other``"
+
+msgid ""
+"``premerge``\n"
+" Attempt to run internal non-interactive 3-way merge tool before\n"
+" launching external tool. Options are ``true``, ``false``, or ``keep``\n"
+" to leave markers in the file if the premerge fails.\n"
+" Default: True"
+msgstr ""
+"``premerge``\n"
+" Tenta executar a ferramenta interna não-interativa de mesclagem de\n"
+" 3 vias antes de executar a ferramenta externa. As opções são\n"
+" ``true``, ``false``, ou ``keep`` para deixar marcações no conteúdo\n"
+" do arquivo se o premerge falhar.\n"
+" Padrão: True"
+
+msgid ""
+"``binary``\n"
+" This tool can merge binary files. Defaults to False, unless tool\n"
+" was selected by file pattern match."
+msgstr ""
+"``binary``\n"
+" Esta ferramenta é capaz de mesclar arquivos binários. O padrão é\n"
+" False, a não ser que a ferramenta tenha sido selecionada por\n"
+" correspondência de padrão de arquivo (seção ``[merge-patterns]``)."
+
+msgid ""
+"``symlink``\n"
+" This tool can merge symlinks. Defaults to False, even if tool was\n"
+" selected by file pattern match."
+msgstr ""
+"``symlink``\n"
+" Esta ferramenta pode mesclar links simbólicos. O padrão é False,\n"
+" mesmo que a ferramenta tenha sido selecionada por\n"
+" correspondência de padrão de arquivo."
+
+msgid ""
+"``check``\n"
+" A list of merge success-checking options:"
+msgstr ""
+"``check``\n"
+" Uma lista de opções de verificação de sucesso da mesclagem:"
+
+msgid ""
+" ``changed``\n"
+" Ask whether merge was successful when the merged file shows no changes.\n"
+" ``conflicts``\n"
+" Check whether there are conflicts even though the tool reported success.\n"
+" ``prompt``\n"
+" Always prompt for merge success, regardless of success reported by tool."
+msgstr ""
+" ``changed``\n"
+" Perguntar se a mesclagem teve sucesso, caso o arquivo mesclado não mostre mudanças.\n"
+" ``conflicts``\n"
+" Verificar a existência de conflitos mesmo que a ferramenta indique sucesso.\n"
+" ``prompt``\n"
+" Sempre perguntar se a mesclagem teve sucesso, sem levar em conta o informado pela ferramenta."
+
+msgid ""
+"``checkchanged``\n"
+" True is equivalent to ``check = changed``.\n"
+" Default: False"
+msgstr ""
+"``checkchanged``\n"
+" True equivale a ``check = changed``.\n"
+" Padrão: False"
+
+msgid ""
+"``checkconflicts``\n"
+" True is equivalent to ``check = conflicts``.\n"
+" Default: False"
+msgstr ""
+"``checkconflicts``\n"
+" True equivale a ``check = conflicts``.\n"
+" Padrão: False"
+
+msgid ""
+"``fixeol``\n"
+" Attempt to fix up EOL changes caused by the merge tool.\n"
+" Default: False"
+msgstr ""
+"``fixeol``\n"
+" Tenta corrigir mudanças de quebras de linha causadas pela ferramenta de mesclagem.\n"
+" Padrão: False"
+
+msgid ""
+"``gui``\n"
+" This tool requires a graphical interface to run. Default: False"
+msgstr ""
+"``gui``\n"
+" Esta ferramenta exige uma interface gráfica para ser executada. Padrão: False"
+
+msgid ""
+"``regkey``\n"
+" Windows registry key which describes install location of this\n"
+" tool. Mercurial will search for this key first under\n"
+" ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n"
+" Default: None"
+msgstr ""
+"``regkey``\n"
+" Chave do registro do Windows que descreve a localização de instalação\n"
+" desta ferramenta. O Mercurial procurará por esta chave primeiro sob\n"
+" ``HKEY_CURRENT_USER`` e em seguida sob ``HKEY_LOCAL_MACHINE``.\n"
+" Padrão: Nenhum"
+
+msgid ""
+"``regkeyalt``\n"
+" An alternate Windows registry key to try if the first key is not\n"
+" found. The alternate key uses the same ``regname`` and ``regappend``\n"
+" semantics of the primary key. The most common use for this key\n"
+" is to search for 32bit applications on 64bit operating systems.\n"
+" Default: None"
+msgstr ""
+"``regkeyalt``\n"
+" Uma chave alternativa de registro do Windows a ser tentada caso a primeira\n"
+" chave não seja encontrada. A chave alternativa usa as mesmas semânticas\n"
+" ``regname`` e ``regappend`` da chave primária.\n"
+" O uso mais comum desta chave é a procura de aplicações 32 bits em\n"
+" sistemas operacionais 64 bits.\n"
+" Padrão: None"
+
+msgid ""
+"``regname``\n"
+" Name of value to read from specified registry key. Defaults to the\n"
+" unnamed (default) value."
+msgstr ""
+"``regname``\n"
+" Nome do valor a ser lido da chave de registro especificada. O padrão é\n"
+" o valor sem nome (padrão)."
+
+msgid ""
+"``regappend``\n"
+" String to append to the value read from the registry, typically\n"
+" the executable name of the tool.\n"
+" Default: None"
+msgstr ""
+"``regappend``\n"
+" String a ser anexada ao valor lido do registro, tipicamente o nome\n"
+" do executável da ferramenta.\n"
+" Padrão: None"
+
+msgid ""
+"\n"
+"``hooks``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"\n"
+"``hooks``\n"
+"\"\"\"\"\"\"\"\"\""
+
+msgid ""
+"Commands or Python functions that get automatically executed by\n"
+"various actions such as starting or finishing a commit. Multiple\n"
+"hooks can be run for the same action by appending a suffix to the\n"
+"action. Overriding a site-wide hook can be done by changing its\n"
+"value or setting it to an empty string."
+msgstr ""
+"Hooks, ou ganchos, são comandos ou funções Python automaticamente\n"
+"executados por várias ações, como iniciar ou finalizar um commit.\n"
+"Múltiplos ganchos podem ser executados para a mesma ação através\n"
+"da adição de um sufixo à ação.\n"
+"Um gancho definido para o sistema todo pode ser sobreposto alterando\n"
+"seu valor ou definindo-o para uma string vazia."
+
+msgid "Example ``.hg/hgrc``::"
+msgstr "Um exemplo de ``.hg/.hgrc``::"
+
+msgid ""
+" [hooks]\n"
+" # update working directory after adding changesets\n"
+" changegroup.update = hg update\n"
+" # do not use the site-wide hook\n"
+" incoming =\n"
+" incoming.email = /my/email/hook\n"
+" incoming.autobuild = /my/build/hook"
+msgstr ""
+" [hooks]\n"
+" # atualiza o diretório de trabalho após a adição de revisões\n"
+" changegroup.update = hg update\n"
+" # não usa o gancho de sistema\n"
+" incoming =\n"
+" incoming.email = /my/email/hook\n"
+" incoming.autobuild = /my/build/hook"
+
+msgid ""
+"Most hooks are run with environment variables set that give useful\n"
+"additional information. For each hook below, the environment\n"
+"variables it is passed are listed with names of the form ``$HG_foo``."
+msgstr ""
+"Vários ganchos são executados com variáveis de ambiente que fornecem\n"
+"informações adicionais. Para cada gancho abaixo, as variáveis de\n"
+"ambiente recebidas são listadas com nomes com a forma ``$HG_foo``."
+
+msgid ""
+"``changegroup``\n"
+" Run after a changegroup has been added via push, pull or unbundle.\n"
+" ID of the first new changeset is in ``$HG_NODE``. URL from which\n"
+" changes came is in ``$HG_URL``."
+msgstr ""
+"``changegroup``\n"
+" Executado após um changegroup ser adicionado em operações push, pull\n"
+" ou unbundle.\n"
+" O ID da primeira revisão nova é passado em ``$HG_NODE``.\n"
+" A URL de origem das mudanças é passada em ``$HG_URL``."
+
+msgid ""
+"``commit``\n"
+" Run after a changeset has been created in the local repository. ID\n"
+" of the newly created changeset is in ``$HG_NODE``. Parent changeset\n"
+" IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+"``commit``\n"
+" Executado após uma revisão ser criada no repositório local.\n"
+" O ID da nova revisão é passado em ``$HG_NODE``.\n"
+" Os IDs das revisões pais são passados em ``$HG_PARENT1`` e ``$HG_PARENT2``."
+
+msgid ""
+"``incoming``\n"
+" Run after a changeset has been pulled, pushed, or unbundled into\n"
+" the local repository. The ID of the newly arrived changeset is in\n"
+" ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``."
+msgstr ""
+"``incoming``\n"
+" Executado após uma revisão ser trazida para o repositório local em\n"
+" uma operação pull, push ou unbundle.\n"
+" O ID da nova revisão é passado em ``$HG_NODE``.\n"
+" A URL de origem da revisão é passada em ``$HG_URL``."
+
+msgid ""
+"``outgoing``\n"
+" Run after sending changes from local repository to another. ID of\n"
+" first changeset sent is in ``$HG_NODE``. Source of operation is in\n"
+" ``$HG_SOURCE``; see \"preoutgoing\" hook for description."
+msgstr ""
+"``outgoing``\n"
+" Executado após o envio de mudanças do repositório local para algum outro.\n"
+" O ID da primeira revisão enviada é passado em ``$HG_NODE``.\n"
+" A origem da operação é passada em ``$HG_SOURCE``; veja o gancho\n"
+" \"preoutgoing\" para uma descrição desse valor."
+
+msgid ""
+"``post-<command>``\n"
+" Run after successful invocations of the associated command. The\n"
+" contents of the command line are passed as ``$HG_ARGS`` and the result\n"
+" code in ``$HG_RESULT``. Parsed command line arguments are passed as \n"
+" ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of\n"
+" the python data internally passed to <command>. ``$HG_OPTS`` is a \n"
+" dictionary of options (with unspecified options set to their defaults).\n"
+" ``$HG_PATS`` is a list of arguments. Hook failure is ignored."
+msgstr ""
+"``post-<comando>``\n"
+" Executado após invocações do comando associado realizadas com sucesso.\n"
+" O conteúdo da linha de comando é passado em ``$HG_ARGS``, e o código de\n"
+" resultado em ``$HG_RESULT``. Argumentos de linha de comando decodificados\n"
+" são passados em ``$HG_PATS`` e ``$HG_OPTS``; estas contém representações\n"
+" em string dos dados python passados internamente para o <comando>.\n"
+" Em ``$HG_OPTS`` é passado um dicionário de opções (com opções não\n"
+" especificadas definidas para seus valores padrão). ``$HG_PATS`` é uma\n"
+" lista de argumentos. A falha destes ganchos é ignorada."
+
+msgid ""
+"``pre-<command>``\n"
+" Run before executing the associated command. The contents of the\n"
+" command line are passed as ``$HG_ARGS``. Parsed command line arguments\n"
+" are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string\n"
+" representations of the data internally passed to <command>. ``$HG_OPTS``\n"
+" is a dictionary of options (with unspecified options set to their\n"
+" defaults). ``$HG_PATS`` is a list of arguments. If the hook returns \n"
+" failure, the command doesn't execute and Mercurial returns the failure\n"
+" code."
+msgstr ""
+"``pre-<comando>``\n"
+" Executado antes de invocações do comando associado.\n"
+" O conteúdo da linha de comando é passado em ``$HG_ARGS``.\n"
+" Argumentos de linha de comando decodificados\n"
+" são passados em ``$HG_PATS`` e ``$HG_OPTS``; estas contém representações\n"
+" em string dos dados python passados internamente para o <comando>.\n"
+" Em ``$HG_OPTS`` é passado um dicionário de opções (com opções não\n"
+" especificadas definidas para seus valores padrão). ``$HG_PATS`` é uma\n"
+" lista de argumentos.\n"
+" Se o gancho devolver uma falha, o comando correspondente não será\n"
+" executado, e o Mercurial devolverá o código da falha."
+
+msgid ""
+"``prechangegroup``\n"
+" Run before a changegroup is added via push, pull or unbundle. Exit\n"
+" status 0 allows the changegroup to proceed. Non-zero status will\n"
+" cause the push, pull or unbundle to fail. URL from which changes\n"
+" will come is in ``$HG_URL``."
+msgstr ""
+"``prechangegroup``\n"
+" Executado antes de um changegroup ser adicionado em operações\n"
+" push, pull ou unbundle. O status de saída 0 permite que o\n"
+" changegroup seja processado. Status diferentes de zero farão com\n"
+" que a operação push, pull ou unbundle falhe.\n"
+" A URL de origem das mudanças é passada em ``$HG_URL``."
+
+msgid ""
+"``precommit``\n"
+" Run before starting a local commit. Exit status 0 allows the\n"
+" commit to proceed. Non-zero status will cause the commit to fail.\n"
+" Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+"``precommit``\n"
+" Executado antes de iniciar um commit local. O status de saída 0\n"
+" permite que o commit seja realizado. Status diferentes de zero\n"
+" fazem com que o commit falhe.\n"
+" Os IDs das revisões pais são passados em ``$HG_PARENT1`` e ``$HG_PARENT2``."
+
+msgid ""
+"``prelistkeys``\n"
+" Run before listing pushkeys (like bookmarks) in the\n"
+" repository. Non-zero status will cause failure. The key namespace is\n"
+" in ``$HG_NAMESPACE``."
+msgstr ""
+"``prelistkeys``\n"
+" Executado antes de listar pushkeys (como marcadores) do repositório.\n"
+" Status de saída diferente de zero causará uma falha.\n"
+" O espaço de nomes de chave é passado em ``$HG_NAMESPACE``."
+
+msgid ""
+"``preoutgoing``\n"
+" Run before collecting changes to send from the local repository to\n"
+" another. Non-zero status will cause failure. This lets you prevent\n"
+" pull over HTTP or SSH. Also prevents against local pull, push\n"
+" (outbound) or bundle commands, but not effective, since you can\n"
+" just copy files instead then. Source of operation is in\n"
+" ``$HG_SOURCE``. If \"serve\", operation is happening on behalf of remote\n"
+" SSH or HTTP repository. If \"push\", \"pull\" or \"bundle\", operation\n"
+" is happening on behalf of repository on same system."
+msgstr ""
+"``preoutgoing``\n"
+" Executado antes da coleta de mudanças a serem enviadas do\n"
+" repositório local para algum outro. Status de saída diferentes\n"
+" de zero causarão uma falha. Desta forma, você pode impedir\n"
+" operações pull por HTTP ou SSH. Também previne comandos pull, push\n"
+" (de saída) ou bundle locais, embora esta prevenção não seja\n"
+" efetiva, já que os arquivos locais ainda poderão ser copiados.\n"
+" A operação de origem é passada em ``$HG_SOURCE``. Se esta tiver\n"
+" o valor \"serve\", a operação ocorre através de SSH ou HTTP\n"
+" envolvendo um repositório remoto. Se tiver os valores \"push\",\n"
+" \"pull\" ou \"bundle\", a operação lida com um outro repositório\n"
+" no mesmo sistema."
+
+msgid ""
+"``prepushkey``\n"
+" Run before a pushkey (like a bookmark) is added to the\n"
+" repository. Non-zero status will cause the key to be rejected. The\n"
+" key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,\n"
+" the old value (if any) is in ``$HG_OLD``, and the new value is in\n"
+" ``$HG_NEW``."
+msgstr ""
+"``prepushkey``\n"
+" Executado antes de uma pushkey (como um marcador) ser adicionada ao\n"
+" repositório. Status de saída diferentes de zero farão com que a\n"
+" chave seja rejeitada. O espaço de nomes de chave é passado em\n"
+" ``$HG_NAMESPACE``, a chave é passada em ``$HG_KEY``, o valor antigo\n"
+" (se houver) é passado em ``$HG_OLD``, e o novo valor é passado em\n"
+" ``$HG_NEW``."
+
+msgid ""
+"``pretag``\n"
+" Run before creating a tag. Exit status 0 allows the tag to be\n"
+" created. Non-zero status will cause the tag to fail. ID of\n"
+" changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is\n"
+" local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``."
+msgstr ""
+"``pretag``\n"
+" Executado antes da criação de uma etiqueta. O status de saída 0\n"
+" permite que a etiqueta seja criada. Status de saída diferentes de 0\n"
+" causarão uma falha do comando. O ID da revisão a ser etiquetada é\n"
+" passado em ``$HG_NODE``. O nome da etiqueta é passado em ``$HG_TAG``.\n"
+" Uma etiqueta local é indicada por ``$HG_LOCAL=1``; uma global, por\n"
+" ``$HG_LOCAL=0``."
+
+msgid ""
+"``pretxnchangegroup``\n"
+" Run after a changegroup has been added via push, pull or unbundle,\n"
+" but before the transaction has been committed. Changegroup is\n"
+" visible to hook program. This lets you validate incoming changes\n"
+" before accepting them. Passed the ID of the first new changeset in\n"
+" ``$HG_NODE``. Exit status 0 allows the transaction to commit. Non-zero\n"
+" status will cause the transaction to be rolled back and the push,\n"
+" pull or unbundle will fail. URL that was source of changes is in\n"
+" ``$HG_URL``."
+msgstr ""
+"``pretxnchangegroup``\n"
+" Executado após um changegroup ser adicionado em uma operação\n"
+" push, pull ou unbundle, mas antes da transação ser completada.\n"
+" O changegroup é visível para o programa do gancho.\n"
+" Isto permite que as novas mudanças sejam validadas antes de serem\n"
+" aceitas. O ID da primeira nova revisão é passado em ``$HG_NODE``.\n"
+" O status de saída 0 permite que a transação seja completada. Status\n"
+" de saída diferentes de 0 farão com que a transação seja desfeita,\n"
+" e a operação push, pull ou unbundle falhará.\n"
+" A URL de origem das revisões é passada em ``$HG_URL``."
+
+msgid ""
+"``pretxncommit``\n"
+" Run after a changeset has been created but the transaction not yet\n"
+" committed. Changeset is visible to hook program. This lets you\n"
+" validate commit message and changes. Exit status 0 allows the\n"
+" commit to proceed. Non-zero status will cause the transaction to\n"
+" be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset\n"
+" IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+"``pretxncommit``\n"
+" Executado após uma revisão ser criada mas antes da transação ser\n"
+" completada. A revisão é visível para o programa do gancho.\n"
+" Isto permite que as novas mudanças e a mensagem de consolidação\n"
+" sejam validadas.\n"
+" O status de saída 0 permite que a transação seja completada. Status\n"
+" de saída diferentes de 0 farão com que a transação seja desfeita.\n"
+" O ID da revisão é passado em ``$HG_NODE``.\n"
+" Os IDs das revisões pais são passados em ``$HG_PARENT1`` e ``$HG_PARENT2``."
+
+msgid ""
+"``preupdate``\n"
+" Run before updating the working directory. Exit status 0 allows\n"
+" the update to proceed. Non-zero status will prevent the update.\n"
+" Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID\n"
+" of second new parent is in ``$HG_PARENT2``."
+msgstr ""
+"``preupdate``\n"
+" Executado antes de uma atualização do diretório de trabalho.\n"
+" O status de saída 0 permitirá a atualização. Status de saída\n"
+" diferentes de 0 impedirão a atualização.\n"
+" O ID de revisão do novo primeiro pai é passado em ``$HG_PARENT1``.\n"
+" No caso de uma mesclagem, o ID do novo segundo pai será passado\n"
+" em ``$HG_PARENT2``."
+
+msgid ""
+"``listkeys``\n"
+" Run after listing pushkeys (like bookmarks) in the repository. The\n"
+" key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a\n"
+" dictionary containing the keys and values."
+msgstr ""
+"``listkeys``\n"
+" Executado após listar pushkeys (como marcadores) no repositório.\n"
+" O espaço de nomes de chave é passado em ``$HG_NAMESPACE``.\n"
+" ``$HG_VALUES`` é um dicionário contendo as chaves e valores."
+
+msgid ""
+"``pushkey``\n"
+" Run after a pushkey (like a bookmark) is added to the\n"
+" repository. The key namespace is in ``$HG_NAMESPACE``, the key is in\n"
+" ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new\n"
+" value is in ``$HG_NEW``."
+msgstr ""
+"``pushkey``\n"
+" Executado após uma pushkey (como um marcador) ser adicionado ao\n"
+" repositório. O espaço de nomes de chave é passado em ``$HG_NAMESPACE``,\n"
+" a chave é passada em ``$HG_KEY``, o valor antigo (se houver) é passado\n"
+" em ``$HG_OLD``, e o novo valor é passado em ``$HG_NEW``."
+
+msgid ""
+"``tag``\n"
+" Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.\n"
+" Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in\n"
+" repository if ``$HG_LOCAL=0``."
+msgstr ""
+"``tag``\n"
+" Executado após a criação de uma etiqueta. O ID da revisão etiquetada é\n"
+" passado em ``$HG_NODE``. O nome da etiqueta é passado em ``$HG_TAG``.\n"
+" Uma etiqueta local é indicada por ``$HG_LOCAL=1``; uma global, por\n"
+" ``$HG_LOCAL=0``."
+
+msgid ""
+"``update``\n"
+" Run after updating the working directory. Changeset ID of first\n"
+" new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is\n"
+" in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the\n"
+" update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``."
+msgstr ""
+"``update``\n"
+" Executado após uma atualização do diretório de trabalho.\n"
+" O ID de revisão do novo primeiro pai é passado em ``$HG_PARENT1``.\n"
+" No caso de uma mesclagem, o ID do novo segundo pai será passado\n"
+" em ``$HG_PARENT2``. Se a atualização tiver sucesso, ``$HG_ERROR=0``.\n"
+" Se a atualização falhar (por exemplo, por apresentar conflitos não\n"
+" resolvidos), ``$HG_ERROR=1``."
+
+msgid ""
+".. note:: It is generally better to use standard hooks rather than the\n"
+" generic pre- and post- command hooks as they are guaranteed to be\n"
+" called in the appropriate contexts for influencing transactions.\n"
+" Also, hooks like \"commit\" will be called in all contexts that\n"
+" generate a commit (e.g. tag) and not just the commit command."
+msgstr ""
+".. note:: Em geral é melhor usar ganchos padronizados ao invés dos\n"
+" ganchos genéricos pre- e post- comando, pois é garantido que\n"
+" sejam chamados nos contextos apropriados para influenciar\n"
+" transações.\n"
+" Além disso, ganchos como \"commit\" serão chamados em todos os\n"
+" contextos que gerem uma revisão (a criação de uma etiqueta\n"
+" global, por exemplo), e não apenas no comando commit."
+
+msgid ""
+".. note:: Environment variables with empty values may not be passed to\n"
+" hooks on platforms such as Windows. As an example, ``$HG_PARENT2``\n"
+" will have an empty value under Unix-like platforms for non-merge\n"
+" changesets, while it will not be available at all under Windows."
+msgstr ""
+".. note:: Variáveis de ambiente com valor vazio podem não ser passadas\n"
+" para os ganchos em certas plataformas, como no Windows. Por exemplo,\n"
+" ``$HG_PARENT2`` terá um valor vazio sob plataformas semelhantes ao\n"
+" Unix para revisões que não sejam mesclagens, mas não estará definida\n"
+" sob Windows."
+
+msgid "The syntax for Python hooks is as follows::"
+msgstr "A sintaxe de ganchos Python é como segue::"
+
+msgid ""
+" hookname = python:modulename.submodule.callable\n"
+" hookname = python:/path/to/python/module.py:callable"
+msgstr ""
+" hookname = python:modulename.submodule.callable\n"
+" hookname = python:/path/to/python/module.py:callable"
+
+msgid ""
+"Python hooks are run within the Mercurial process. Each hook is\n"
+"called with at least three keyword arguments: a ui object (keyword\n"
+"``ui``), a repository object (keyword ``repo``), and a ``hooktype``\n"
+"keyword that tells what kind of hook is used. Arguments listed as\n"
+"environment variables above are passed as keyword arguments, with no\n"
+"``HG_`` prefix, and names in lower case."
+msgstr ""
+"Ganchos Python são executados dentro do processo do Mercurial. Cada\n"
+"gancho é chamado com ao menos três argumentos keyword: um objeto ui\n"
+"(keyword ``ui``), um objeto repositório (keyword ``repo``) e um\n"
+"keyword ``hooktype`` que diz o tipo de gancho usado.\n"
+"Argumentos listados acima como variáveis de ambiente são passados\n"
+"como argumentos keyword, sem o prefixo ``HG_``, e nomes em minúsculas."
+
+msgid ""
+"If a Python hook returns a \"true\" value or raises an exception, this\n"
+"is treated as a failure."
+msgstr ""
+"Se um gancho Python devolver um valor \"true\" ou lançar uma exceção,\n"
+"isto será tratado como uma falha."
+
+msgid ""
+"\n"
+"``http_proxy``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"\n"
+"``http_proxy``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+
+msgid ""
+"Used to access web-based Mercurial repositories through a HTTP\n"
+"proxy."
+msgstr ""
+"Usado para acessar repositórios do Mercurial disponibilizados\n"
+"via web através de um proxy HTTP."
+
+msgid ""
+"``host``\n"
+" Host name and (optional) port of the proxy server, for example\n"
+" \"myproxy:8000\"."
+msgstr ""
+"``host``\n"
+" Nome e porta (opcional) do servidor proxy, por exemplo\n"
+" \"myproxy:8000\"."
+
+msgid ""
+"``no``\n"
+" Optional. Comma-separated list of host names that should bypass\n"
+" the proxy."
+msgstr ""
+"``no``\n"
+" Opcional. Lista separada por vírgulas de nomes de servidores para\n"
+" os quais o proxy não deva ser usado."
+
+msgid ""
+"``passwd``\n"
+" Optional. Password to authenticate with at the proxy server."
+msgstr ""
+"``passwd``\n"
+" Opcional. Senha usada para autenticação no servidor proxy."
+
+msgid ""
+"``user``\n"
+" Optional. User name to authenticate with at the proxy server."
+msgstr ""
+"``user``\n"
+" Opcional. Nome de usuário usado para autenticação no servidor proxy."
+
+msgid ""
+"``always``\n"
+" Optional. Always use the proxy, even for localhost and any entries\n"
+" in ``http_proxy.no``. True or False. Default: False."
+msgstr ""
+"``always``\n"
+" Opcional. Sempre usar o proxy, mesmo para localhost e quaisquer\n"
+" entradas em ``http_proxy.no``. Booleana; o padrão é False."
+
+msgid ""
+"``smtp``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+"``smtp``\n"
+"\"\"\"\"\"\"\"\""
+
+msgid "Configuration for extensions that need to send email messages."
+msgstr "Configurações para extensões que enviam mensagens de email."
+
+msgid ""
+"``host``\n"
+" Host name of mail server, e.g. \"mail.example.com\"."
+msgstr ""
+"``host``\n"
+" Nome do servidor de emails, como em \"mail.example.com\"."
+
+msgid ""
+"``port``\n"
+" Optional. Port to connect to on mail server. Default: 25."
+msgstr ""
+"``port``\n"
+" Opcional. Porta usada pelo servidor de emails. Padrão: 25."
+
+msgid ""
+"``tls``\n"
+" Optional. Method to enable TLS when connecting to mail server: starttls,\n"
+" smtps or none. Default: none."
+msgstr ""
+"``tls``\n"
+" Opcional. Método para habilitar TLS ao conectar com o servidor de\n"
+" emails: starttls, smtps ou none. Padrão: none."
+
+msgid ""
+"``username``\n"
+" Optional. User name for authenticating with the SMTP server.\n"
+" Default: none."
+msgstr ""
+"``username``\n"
+" Opcional. Nome de usuário usado para autenticação no servidor\n"
+" de emails. Padrão: none."
+
+msgid ""
+"``password``\n"
+" Optional. Password for authenticating with the SMTP server. If not\n"
+" specified, interactive sessions will prompt the user for a\n"
+" password; non-interactive sessions will fail. Default: none."
+msgstr ""
+"``password``\n"
+" Opcional. Senha usada para autenticação no servidor de emails.\n"
+" Se não for especificada, sessões interativas consultarão o\n"
+" usuário para que ele forneça a senha; sessões não interativas\n"
+" falharão. Padrão: none."
+
+msgid ""
+"``local_hostname``\n"
+" Optional. It's the hostname that the sender can use to identify\n"
+" itself to the MTA."
+msgstr ""
+"``local_hostname``\n"
+" Opcional. É o nome de servidor que o remetente pode usar para se\n"
+" identificar para o MTA."
+
+msgid ""
+"\n"
+"``patch``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"\n"
+"``patch``\n"
+"\"\"\"\"\"\"\"\"\""
+
+msgid ""
+"Settings used when applying patches, for instance through the 'import'\n"
+"command or with Mercurial Queues extension."
+msgstr ""
+"Configurações usadas ao aplicar patches, por exemplo através do\n"
+"comando 'import' ou da extensão Mercurial Queues."
+
+msgid ""
+"``eol``\n"
+" When set to 'strict' patch content and patched files end of lines\n"
+" are preserved. When set to ``lf`` or ``crlf``, both files end of\n"
+" lines are ignored when patching and the result line endings are\n"
+" normalized to either LF (Unix) or CRLF (Windows). When set to\n"
+" ``auto``, end of lines are again ignored while patching but line\n"
+" endings in patched files are normalized to their original setting\n"
+" on a per-file basis. If target file does not exist or has no end\n"
+" of line, patch line endings are preserved.\n"
+" Default: strict."
+msgstr ""
+"``eol``\n"
+" Se definida como 'strict', quebras de linha do conteúdo do patch\n"
+" e dos arquivos alterados são preservadas. Se definida como ``lf``\n"
+" ou ``crlf``, as quebras de linha de ambos são ignoradas na\n"
+" aplicação do patch, e o resultado é normalizado para LF (Unix) ou\n"
+" CRLF (Windows). Se definida como ``auto``, quebras de linha são\n"
+" novamente ignoradas na aplicação do patch, mas as quebras de\n"
+" linha em arquivos modificados são normalizadas para suas\n"
+" configurações originais, arquivo por arquivo. Se o arquivo de\n"
+" destino não existir ou não tiver quebras de linha, as quebras de\n"
+" linha do patch serão preservadas.\n"
+" Padrão: strict."
+
+msgid ""
+"\n"
+"``paths``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"\n"
+"``paths``\n"
+"\"\"\"\"\"\"\"\"\""
+
+msgid ""
+"Assigns symbolic names to repositories. The left side is the\n"
+"symbolic name, and the right gives the directory or URL that is the\n"
+"location of the repository. Default paths can be declared by setting\n"
+"the following entries."
+msgstr ""
+"Atribui nomes simbólicos para repositórios. O lado esquerdo é o\n"
+"nome simbólico, e o direito o diretório ou URL onde se localiza o\n"
+"repositório. Caminhos padrão podem ser declarados definindo as\n"
+"seguintes entradas."
+
+msgid ""
+"``default``\n"
+" Directory or URL to use when pulling if no source is specified.\n"
+" Default is set to repository from which the current repository was\n"
+" cloned."
+msgstr ""
+"``default``\n"
+" Diretório ou URL a ser usado para um pull se a origem não\n"
+" for especificada. Por padrão, é definido como o repositório\n"
+" do qual o repositório local foi clonado."
+
+msgid ""
+"``default-push``\n"
+" Optional. Directory or URL to use when pushing if no destination\n"
+" is specified."
+msgstr ""
+"``default-push``\n"
+" Opcional. Diretório ou URL a ser usado para um push se o destino\n"
+" não for especificado."
+
+msgid ""
+"\n"
+"``profiling``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"\n"
+"``profiling``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\""
+
+msgid ""
+"Specifies profiling format and file output. In this section\n"
+"description, 'profiling data' stands for the raw data collected\n"
+"during profiling, while 'profiling report' stands for a statistical\n"
+"text report generated from the profiling data. The profiling is done\n"
+"using lsprof."
+msgstr ""
+"Especifica formatos de profiling e saída de arquivos. Na descrição desta\n"
+"seção, 'dados de profiling' são os dados crus coletados durante o\n"
+"profiling, enquanto 'relatório de profiling' é um relatório estatístico\n"
+"em formato texto gerado a partir dos dados de profiling.\n"
+"O profiling é feito usando lsprof."
+
+msgid ""
+"``format``\n"
+" Profiling format.\n"
+" Default: text."
+msgstr ""
+"``format``\n"
+" Formato de profiling.\n"
+" Padrão: text."
+
+msgid ""
+" ``text``\n"
+" Generate a profiling report. When saving to a file, it should be\n"
+" noted that only the report is saved, and the profiling data is\n"
+" not kept.\n"
+" ``kcachegrind``\n"
+" Format profiling data for kcachegrind use: when saving to a\n"
+" file, the generated file can directly be loaded into\n"
+" kcachegrind."
+msgstr ""
+" ``text``\n"
+" Gera um relatório de profiling. Nota-se que, ao gravar em um\n"
+" arquivo, apenas o relatório é gravado; os dados de profiling\n"
+" não são mantidos.\n"
+" ``kcachegrind``\n"
+" Formata dados de profiling para uso do kcachegrind: ao salvar\n"
+" para um arquivo, o arquivo gerado pode ser carregado diretamente\n"
+" no kcachegrind."
+
+msgid ""
+"``output``\n"
+" File path where profiling data or report should be saved. If the\n"
+" file exists, it is replaced. Default: None, data is printed on\n"
+" stderr"
+msgstr ""
+"``output``\n"
+" Caminho do arquivo onde dados de profiling devem ser gravados.\n"
+" Se o arquivo existir, será sobrescrito. Padrão: nenhum; os dados\n"
+" são impressos na saída de erros."
+
+msgid ""
+"``revsetalias``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"``revsetalias``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+
+msgid "Alias definitions for revsets. See :hg:`help revsets` for details."
+msgstr ""
+"Definições de apelidos para revsets. Veja :hg:`help revsets` para\n"
+"mais detalhes."
+
+msgid ""
+"``server``\n"
+"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"``server``\n"
+"\"\"\"\"\"\"\"\"\"\""
+
+msgid "Controls generic server settings."
+msgstr "Controla configurações genéricas de servidores."
+
+msgid ""
+"``uncompressed``\n"
+" Whether to allow clients to clone a repository using the\n"
+" uncompressed streaming protocol. This transfers about 40% more\n"
+" data than a regular clone, but uses less memory and CPU on both\n"
+" server and client. Over a LAN (100 Mbps or better) or a very fast\n"
+" WAN, an uncompressed streaming clone is a lot faster (~10x) than a\n"
+" regular clone. Over most WAN connections (anything slower than\n"
+" about 6 Mbps), uncompressed streaming is slower, because of the\n"
+" extra data transfer overhead. This mode will also temporarily hold\n"
+" the write lock while determining what data to transfer.\n"
+" Default is True."
+msgstr ""
+"``uncompressed``\n"
+" Permite que clientes clonem um repositório usando o protocolo\n"
+" de streaming não comprimido. Isto transfere cerca de 40% mais\n"
+" dados que um clone comum, mas usa menos memória e CPU tanto no\n"
+" cliente como no servidor. Em uma LAN (100 Mbps ou melhor) ou uma\n"
+" WAN bem rápida, um clone por streaming não comprimido é bem mais\n"
+" rápido (~10x) que um clone comum. Na maior parte de conexões WAN\n"
+" (ou qualquer conexão mais lenta que cerca de 6 Mbps), streaming\n"
+" não comprimido é mais lento, por causa dos dados extras\n"
+" transferidos. Este modo também temporariamente usará\n"
+" temporariamente o bloqueio de escrita no repositório enquanto\n"
+" forem determinados os dados a serem transmitidos.\n"
+" O padrão é True."
+
+msgid ""
+"``validate``\n"
+" Whether to validate the completeness of pushed changesets by\n"
+" checking that all new file revisions specified in manifests are\n"
+" present. Default is False."
+msgstr ""
+"``validate``\n"
+" Verifica se revisões recebidas em um push estão completas, checando\n"
+" se todas as novas revisões de arquivo especificadas em manifestos\n"
+" estão presentes. O padrão é False."
+
+msgid ""
+"``subpaths``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"``subpaths``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
+
+msgid "Defines subrepositories source locations rewriting rules of the form::"
+msgstr "Define regras de reescrita de localização de subrepositórios da forma::"
+
+msgid " <pattern> = <replacement>"
+msgstr " <padrao> = <substituicao>"
+
+msgid ""
+"Where ``pattern`` is a regular expression matching the source and\n"
+"``replacement`` is the replacement string used to rewrite it. Groups\n"
+"can be matched in ``pattern`` and referenced in ``replacements``. For\n"
+"instance::"
+msgstr ""
+"Onde ``padrao`` é uma expressão regular comparada com a origem e\n"
+"``substituicao`` é o texto a ser usado para reescrevê-la. Grupos\n"
+"podem ser usados em ``padrao`` e referenciados em ``substituicao``.\n"
+"Por exemplo::"
+
+msgid " http://server/(.*)-hg/ = http://hg.server/\\1/"
+msgstr " http://server/(.*)-hg/ = http://hg.server/\\1/"
+
+msgid "rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``."
+msgstr "reescreve ``http://server/foo-hg/`` como ``http://hg.server/foo/``."
+
+msgid "All patterns are applied in definition order."
+msgstr "Todos os padrões são aplicados na ordem de definição."
+
+msgid ""
+"``trusted``\n"
+"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"``trusted``\n"
+"\"\"\"\"\"\"\"\"\"\"\""
+
+msgid ""
+"Mercurial will not use the settings in the\n"
+"``.hg/hgrc`` file from a repository if it doesn't belong to a trusted\n"
+"user or to a trusted group, as various hgrc features allow arbitrary\n"
+"commands to be run. This issue is often encountered when configuring\n"
+"hooks or extensions for shared repositories or servers. However,\n"
+"the web interface will use some safe settings from the ``[web]``\n"
+"section."
+msgstr ""
+"O Mercurial não usará as configurações no arquivo ``.hg/hgrc`` de um\n"
+"repositório se ele não pertencer a um usuário ou a um grupo confiável,\n"
+"pois diversas funcionalidades do arquivo de configuração possibilitam\n"
+"a execução de comandos arbitrários.\n"
+"Esta questão é por vezes encontrada ao configurar ganchos ou extensões\n"
+"em repositórios compartilhados ou servidores. Entretanto,\n"
+"a interface web usará algumas definições seguras da seção ``[web]``."
+
+msgid ""
+"This section specifies what users and groups are trusted. The\n"
+"current user is always trusted. To trust everybody, list a user or a\n"
+"group with name ``*``. These settings must be placed in an\n"
+"*already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the\n"
+"user or service running Mercurial."
+msgstr ""
+"Esta seção especifica quais usuários e grupos são confiáveis. O\n"
+"usuário atual é sempre confiável. Para confiar em todos os usuários,\n"
+"liste um usuário ou grupo de nome ``*``. Para terem efeito, estas\n"
+"configurações devem ser colocadas em um arquivo\n"
+"*que já seja confiável*, como ``$HOME/.hgrc`` do usuário ou serviço\n"
+"que executa o Mercurial."
+
+msgid ""
+"``users``\n"
+" Comma-separated list of trusted users."
+msgstr ""
+"``users``\n"
+" Lista separada por vírgulas de usuários confiáveis."
+
+msgid ""
+"``groups``\n"
+" Comma-separated list of trusted groups."
+msgstr ""
+"``groups``\n"
+" Lista separada por vírgulas de grupos confiáveis."
+
+msgid ""
+"\n"
+"``ui``\n"
+"\"\"\"\"\"\""
+msgstr ""
+"\n"
+"``ui``\n"
+"\"\"\"\"\"\""
+
+msgid "User interface controls."
+msgstr "Controles de interface com o usuário."
+
+msgid ""
+"``archivemeta``\n"
+" Whether to include the .hg_archival.txt file containing meta data\n"
+" (hashes for the repository base and for tip) in archives created\n"
+" by the :hg:`archive` command or downloaded via hgweb.\n"
+" Default is True."
+msgstr ""
+"``archivemeta``\n"
+" Determina se o arquivo .hg_archival.txt contendo metadados (hashes\n"
+" do repositório base e da tip) em pacotes criados pelo comando\n"
+" :hg:`archive` ou baixados via hgweb.\n"
+" O padrão é True."
+
+msgid ""
+"``askusername``\n"
+" Whether to prompt for a username when committing. If True, and\n"
+" neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will\n"
+" be prompted to enter a username. If no username is entered, the\n"
+" default ``USER@HOST`` is used instead.\n"
+" Default is False."
+msgstr ""
+"``askusername``\n"
+" Determina se o usuário deve ser consultado interativamente para\n"
+" fornecer um nome de usuário ao consolidar uma revisão. Se for True,\n"
+" e nem ``$HGUSER`` nem ``$EMAIL`` estiverem definidas, o usuário\n"
+" será consultado para fornecer um nome. Se nenhum nome for passado,\n"
+" o padrão ``USER@HOST`` será usado.\n"
+" O padrão é False."
+
+msgid ""
+"``commitsubrepos``\n"
+" Whether to commit modified subrepositories when committing the\n"
+" parent repository. If False and one subrepository has uncommitted\n"
+" changes, abort the commit.\n"
+" Default is True."
+msgstr ""
+"``commitsubrepos``\n"
+" Determina se sub-repositórios modificados serão automaticamente\n"
+" consolidados ao consolidar o repositório pai. Se for False e\n"
+" algum sub-repositório tiver mudanças não consolidadas, aborta a\n"
+" consolidação do repositório pai.\n"
+" O padrão é True."
+
+msgid ""
+"``debug``\n"
+" Print debugging information. True or False. Default is False."
+msgstr ""
+"``debug``\n"
+" Imprime informações de depuração. Booleana; o padrão é False."
+
+msgid ""
+"``editor``\n"
+" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
+msgstr ""
+"``editor``\n"
+" O editor usado durante um commit. O padrão é ``$EDITOR`` ou ``vi``."
+
+msgid ""
+"``fallbackencoding``\n"
+" Encoding to try if it's not possible to decode the changelog using\n"
+" UTF-8. Default is ISO-8859-1."
+msgstr ""
+"``fallbackencoding``\n"
+" Codificação a ser tentada se não for possível decodificar o\n"
+" changelog usando UTF-8. O padrão é ISO-8859-1."
+
+msgid ""
+"``ignore``\n"
+" A file to read per-user ignore patterns from. This file should be\n"
+" in the same format as a repository-wide .hgignore file. This\n"
+" option supports hook syntax, so if you want to specify multiple\n"
+" ignore files, you can do so by setting something like\n"
+" ``ignore.other = ~/.hgignore2``. For details of the ignore file\n"
+" format, see the ``hgignore(5)`` man page."
+msgstr ""
+"``ignore``\n"
+" Um arquivo contendo listas de padrões de arquivos a serem ignorados\n"
+" para o usuário. Este arquivo deve estar no mesmo formato de um\n"
+" arquivo .hgignore de um repositório. Esta opção suporta sintaxe\n"
+" semelhante a ganchos, de modo que múltiplos arquivos hgignore podem\n"
+" ser especificados de modo semelhante a\n"
+" ``ignore.other = ~/.hgignore2``. Para detalhes do formato de arquivo\n"
+" hgignore, veja a página de manual ``hgignore(5)``."
+
+msgid ""
+"``interactive``\n"
+" Allow to prompt the user. True or False. Default is True."
+msgstr ""
+"``interactive``\n"
+" Permite que o usuário seja consultado interativamente.\n"
+" Booleana; o padrão é True."
+
+msgid ""
+"``logtemplate``\n"
+" Template string for commands that print changesets."
+msgstr ""
+"``logtemplate``\n"
+" String de modelo para comandos que imprimem revisões."
+
+msgid ""
+"``merge``\n"
+" The conflict resolution program to use during a manual merge.\n"
+" For more information on merge tools see :hg:`help merge-tools`.\n"
+" For configuring merge tools see the ``[merge-tools]`` section."
+msgstr ""
+"``merge``\n"
+" O programa de resolução de conflitos a ser usado durante uma\n"
+" mesclagem manual. Para mais informações sobre ferramentas de\n"
+" mesclagem, veja :hg:`help merge-tools`.\n"
+" Para configurar ferramentas de mesclagem, veja a seção\n"
+" ``[merge-tools]``."
+
+msgid ""
+"``portablefilenames``\n"
+" Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n"
+" Default is ``warn``.\n"
+" If set to ``warn`` (or ``true``), a warning message is printed on POSIX\n"
+" platforms, if a file with a non-portable filename is added (e.g. a file\n"
+" with a name that can't be created on Windows because it contains reserved\n"
+" parts like ``AUX``, reserved characters like ``:``, or would cause a case\n"
+" collision with an existing file).\n"
+" If set to ``ignore`` (or ``false``), no warning is printed.\n"
+" If set to ``abort``, the command is aborted.\n"
+" On Windows, this configuration option is ignored and the command aborted."
+msgstr ""
+"``portablefilenames``\n"
+" Verifica a portabilidade de nomes de arquivos. Pode ser ``warn``\n"
+" (avisar), ``ignore`` (ignorar) ou ``abort`` (abortar).\n"
+" O padrão é ``warn``.\n"
+" Com o valor ``warn`` (ou ``true``), uma mensagem de aviso será\n"
+" impressa em plataformas POSIX se um arquivo com um nome não\n"
+" portável for adicionado (por exemplo, um arquivo com um nome que\n"
+" não pode ser criado em Windows por conter partes reservadas (como\n"
+" ``AUX``), caracteres reservados (como ``:``) ou que causaria uma\n"
+" colisão de maiúsculas e minúsculas com um arquivo existente).\n"
+" Com o valor ``ignore`` (ou ``false``), nenhum aviso é emitido.\n"
+" Com o valor ``abort``, o comando é abortado.\n"
+" No Windows, esta configuração é ignorada, e o comando é sempre\n"
+" abortado."
+
+msgid ""
+"``quiet``\n"
+" Reduce the amount of output printed. True or False. Default is False."
+msgstr ""
+"``quiet``\n"
+" Reduz a quantidade de saída impressa. Booleana; o padrão é False."
+
+msgid ""
+"``remotecmd``\n"
+" remote command to use for clone/push/pull operations. Default is ``hg``."
+msgstr ""
+"``remotecmd``\n"
+" Comando remoto a ser usado para operações clone/push/pull.\n"
+" O padrão é ``hg``."
+
+msgid ""
+"``report_untrusted``\n"
+" Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n"
+" trusted user or group. True or False. Default is True."
+msgstr ""
+"``report_untrusted``\n"
+" Avisa se um arquivo ``.hg/hgrc`` for ignorado por não pertencer a um\n"
+" usuário ou grupo confiável (veja a seção ``[trusted]``).\n"
+" Booleana; o padrão é True."
+
+msgid ""
+"``slash``\n"
+" Display paths using a slash (``/``) as the path separator. This\n"
+" only makes a difference on systems where the default path\n"
+" separator is not the slash character (e.g. Windows uses the\n"
+" backslash character (``\\``)).\n"
+" Default is False."
+msgstr ""
+"``slash``\n"
+" Exibe caminhos usando uma barra ``/`` como separador de caminhos.\n"
+" Isto faz diferença apenas em sistemas nos quais o separador de\n"
+" caminhos padrão não for esse caractere (por exemplo, o Windows\n"
+" usa a barra invertida (``\\``)).\n"
+" O padrão é False."
+
+msgid ""
+"``ssh``\n"
+" command to use for SSH connections. Default is ``ssh``."
+msgstr ""
+"``ssh``\n"
+" comando a ser usado para conexões SSH. O padrão é ``ssh``."
+
+msgid ""
+"``strict``\n"
+" Require exact command names, instead of allowing unambiguous\n"
+" abbreviations. True or False. Default is False."
+msgstr ""
+"``strict``\n"
+" Exige nomes de comando exatos, ao invés de permitir abreviações\n"
+" não ambíguas. Booleana; o padrão é False."
+
+msgid ""
+"``style``\n"
+" Name of style to use for command output."
+msgstr ""
+"``style``\n"
+" Nome do estilo usado para saída de comandos."
+
+msgid ""
+"``timeout``\n"
+" The timeout used when a lock is held (in seconds), a negative value\n"
+" means no timeout. Default is 600."
+msgstr ""
+"``timeout``\n"
+" O tempo limite de espera (em segundos) para a obtenção de locks;\n"
+" um valor negativo desabilita o limite. O padrão é 600."
+
+msgid ""
+"``traceback``\n"
+" Mercurial always prints a traceback when an unknown exception\n"
+" occurs. Setting this to True will make Mercurial print a traceback\n"
+" on all exceptions, even those recognized by Mercurial (such as\n"
+" IOError or MemoryError). Default is False."
+msgstr ""
+"``traceback``\n"
+" O Mercurial sempre imprime um traceback quando ocorre uma exceção\n"
+" desconhecida. Definir isto para o valor True fará com que um\n"
+" traceback seja impresso em todas as exceções, mesmo que sejam\n"
+" reconhecidas pelo Mercurial (como IOError ou MemoryError).\n"
+" O padrão é False."
+
+msgid ""
+"``username``\n"
+" The committer of a changeset created when running \"commit\".\n"
+" Typically a person's name and email address, e.g. ``Fred Widget\n"
+" <fred@example.com>``. Default is ``$EMAIL`` or ``username@hostname``. If\n"
+" the username in hgrc is empty, it has to be specified manually or\n"
+" in a different hgrc file (e.g. ``$HOME/.hgrc``, if the admin set\n"
+" ``username =`` in the system hgrc). Environment variables in the\n"
+" username are expanded."
+msgstr ""
+"``username``\n"
+" O autor de uma revisão criada ao executar \"commit\".\n"
+" Tipicamente, é o nome de uma pessoa seguido de seu endereço de\n"
+" email, como em ``Fred Widget <fred@example.com>``.\n"
+" O padrão é ``$EMAIL`` ou ``username@hostname``.\n"
+" Se o nome de usuário em um arquivo de configuração estiver vazio, ele\n"
+" deve ser especificado manualmente ou em um arquivo de configuração\n"
+" diferente (por exemplo, ``$HOME/.hgrc``, se o administrador definir\n"
+" ``username =`` no arquivo de configuração de sistema).\n"
+" Variáveis de ambiente são expandidas no nome de usuário."
+
+msgid ""
+"``verbose``\n"
+" Increase the amount of output printed. True or False. Default is False."
+msgstr ""
+"``verbose``\n"
+" Aumenta a quantidade de saída impressa. Booleana; o padrão é False."
+
+msgid ""
+"\n"
+"``web``\n"
+"\"\"\"\"\"\"\""
+msgstr ""
+"\n"
+"``web``\n"
+"\"\"\"\"\"\"\""
+
+msgid ""
+"Web interface configuration. The settings in this section apply to\n"
+"both the builtin webserver (started by :hg:`serve`) and the script you\n"
+"run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI\n"
+"and WSGI)."
+msgstr ""
+"Configurações para a interface web. As opções desta seção se aplicam\n"
+"tanto ao servidor web interno (iniciado por :hg:`serve`) como ao\n"
+"script executado através de um servidor web separado (``hgweb.cgi``\n"
+"e derivados para FastCGI e WSGI)."
+
+msgid ""
+"The Mercurial webserver does no authentication (it does not prompt for\n"
+"usernames and passwords to validate *who* users are), but it does do\n"
+"authorization (it grants or denies access for *authenticated users*\n"
+"based on settings in this section). You must either configure your\n"
+"webserver to do authentication for you, or disable the authorization\n"
+"checks."
+msgstr ""
+"O servidor web interno do Mercurial não faz autenticação (ele não\n"
+"consulta por nomes de usuários e senhas para validar *quem* são\n"
+"os usuários), mas faz autorização (aceita ou nega o acesso de\n"
+"*usuários autenticados* baseado em definições desta seção).\n"
+"Você deve ou configurar seu servidor web para fazer autenticação,\n"
+"ou desabilitar as verificações de autorização."
+
+msgid ""
+"For a quick setup in a trusted environment, e.g., a private LAN, where\n"
+"you want it to accept pushes from anybody, you can use the following\n"
+"command line::"
+msgstr ""
+"Para uma configuração rápida em um ambiente completamente confiável,\n"
+"por exemplo uma LAN privada, na qual você deseja aceitar operações\n"
+"push de qualquer um, você pode usar a seguinte linha de comando::"
+
+msgid " $ hg --config web.allow_push=* --config web.push_ssl=False serve"
+msgstr " $ hg --config web.allow_push=* --config web.push_ssl=False serve"
+
+msgid ""
+"Note that this will allow anybody to push anything to the server and\n"
+"that this should not be used for public servers."
+msgstr ""
+"Note que isto permitirá que qualquer um envie qualquer coisa para o\n"
+"servidor, e que isto não deve ser usado em servidores públicos."
+
+msgid "The full set of options is:"
+msgstr "As opções são:"
+
+msgid ""
+"``accesslog``\n"
+" Where to output the access log. Default is stdout."
+msgstr ""
+"``accesslog``\n"
+" Onde escrever o log de acesso. O padrão é a saída padrão (stdout)."
+
+msgid ""
+"``address``\n"
+" Interface address to bind to. Default is all."
+msgstr ""
+"``address``\n"
+" Endereço de interface para fazer o bind. Por padrão, usa todos\n"
+" os endereços."
+
+msgid ""
+"``allow_archive``\n"
+" List of archive format (bz2, gz, zip) allowed for downloading.\n"
+" Default is empty."
+msgstr ""
+"``allow_archive``\n"
+" Lista de formatos de pacote (bz2, gz, zip) permitidos para download.\n"
+" O padrão é nenhum (lista vazia)."
+
+msgid ""
+"``allowbz2``\n"
+" (DEPRECATED) Whether to allow .tar.bz2 downloading of repository\n"
+" revisions.\n"
+" Default is False."
+msgstr ""
+"``allowbz2``\n"
+" (OBSOLETA) Determina se revisões estarão disponíveis para download\n"
+" em formato .tar.bz2.\n"
+" O padrao é False."
+
+msgid ""
+"``allowgz``\n"
+" (DEPRECATED) Whether to allow .tar.gz downloading of repository\n"
+" revisions.\n"
+" Default is False."
+msgstr ""
+"``allowgz``\n"
+" (OBSOLETA) Determina se revisões estarão disponíveis para download\n"
+" em formato .tar.gz.\n"
+" O padrao é False."
+
+msgid ""
+"``allowpull``\n"
+" Whether to allow pulling from the repository. Default is True."
+msgstr ""
+"``allowpull``\n"
+" Se este repositório pode fornecer revisões em uma operação pull.\n"
+" O padrão é True."
+
+msgid ""
+"``allow_push``\n"
+" Whether to allow pushing to the repository. If empty or not set,\n"
+" push is not allowed. If the special value ``*``, any remote user can\n"
+" push, including unauthenticated users. Otherwise, the remote user\n"
+" must have been authenticated, and the authenticated user name must\n"
+" be present in this list. The contents of the allow_push list are\n"
+" examined after the deny_push list."
+msgstr ""
+"``allow_push``\n"
+" Se este repositório pode receber revisões em uma operação push.\n"
+" Se vazio ou não definido, o push não é permitido. Com o valor\n"
+" especial ``*``, qualquer usuário remoto poderá fazer push,\n"
+" incluindo usuários não autenticados. Caso contrário, o\n"
+" conteúdo desta opção será uma lista de usuários. Se o usuário\n"
+" remoto estiver autenticado, e se o nome do usuário remoto estiver\n"
+" presente nesta lista, o push será autorizado. O conteúdo da lista\n"
+" allow_push é examinado após a lista deny_push."
+
+msgid ""
+"``allow_read``\n"
+" If the user has not already been denied repository access due to\n"
+" the contents of deny_read, this list determines whether to grant\n"
+" repository access to the user. If this list is not empty, and the\n"
+" user is unauthenticated or not present in the list, then access is\n"
+" denied for the user. If the list is empty or not set, then access\n"
+" is permitted to all users by default. Setting allow_read to the\n"
+" special value ``*`` is equivalent to it not being set (i.e. access\n"
+" is permitted to all users). The contents of the allow_read list are\n"
+" examined after the deny_read list."
+msgstr ""
+"``allow_read``\n"
+" Se o usuário já não tiver seu acesso ao repositório negado pelo\n"
+" conteúdo de deny_read, esta lista determinará se o usuário poderá\n"
+" acessar o repositório. Se esta lista não estiver vazia, e se o\n"
+" usuário não estiver autenticado ou não estiver presente nesta lista,\n"
+" o acesso será negado. Se esta lista estiver vazia ou não definida,\n"
+" o acesso por padrão é permitido para todos os usuários. Definir\n"
+" allow_read com o valor especial ``*`` é equivalente a deixá-la\n"
+" sem definição (ou seja, o acesso é permitido para todos os\n"
+" usuários). O conteúdo da lista allow_read é examinado após a lista\n"
+" deny_read."
+
+msgid ""
+"``allowzip``\n"
+" (DEPRECATED) Whether to allow .zip downloading of repository\n"
+" revisions. Default is False. This feature creates temporary files."
+msgstr ""
+"``allowzip``\n"
+" (OBSOLETA) Determina se revisões estarão disponíveis para download\n"
+" em formato .zip.\n"
+" O padrao é False."
+
+msgid ""
+"``baseurl``\n"
+" Base URL to use when publishing URLs in other locations, so\n"
+" third-party tools like email notification hooks can construct\n"
+" URLs. Example: ``http://hgserver/repos/``."
+msgstr ""
+"``baseurl``\n"
+" URL base usada ao publicar URLs em outros locais, para que\n"
+" ferramentas de terceiros (notificações por email, por exemplo)\n"
+" possam construir URLs. Exemplo: ``http://hgserver/repos/``."
+
+msgid ""
+"``cacerts``\n"
+" Path to file containing a list of PEM encoded certificate\n"
+" authority certificates. Environment variables and ``~user``\n"
+" constructs are expanded in the filename. If specified on the\n"
+" client, then it will verify the identity of remote HTTPS servers\n"
+" with these certificates. The form must be as follows::"
+msgstr ""
+"``cacerts``\n"
+" Caminho para um arquivo contendo uma lista de certificados de\n"
+" autoridades certificadoras em formato PEM. Variáveis de ambiente\n"
+" e construções ``~user`` são expandidas no nome de arquivo. Se\n"
+" especificada no cliente, o Mercurial irá verificar a identidade\n"
+" de servidores HTTPS remotos usando estes certificados. A forma\n"
+" deve ser a seguinte::"
+
+msgid ""
+" -----BEGIN CERTIFICATE-----\n"
+" ... (certificate in base64 PEM encoding) ...\n"
+" -----END CERTIFICATE-----\n"
+" -----BEGIN CERTIFICATE-----\n"
+" ... (certificate in base64 PEM encoding) ...\n"
+" -----END CERTIFICATE-----"
+msgstr ""
+" -----BEGIN CERTIFICATE-----\n"
+" ... (certificado em codificação PEM base64) ...\n"
+" -----END CERTIFICATE-----\n"
+" -----BEGIN CERTIFICATE-----\n"
+" ... (certificado em codificação PEM base64) ...\n"
+" -----END CERTIFICATE-----"
+
+msgid ""
+" This feature is only supported when using Python 2.6 or later. If you wish\n"
+" to use it with earlier versions of Python, install the backported\n"
+" version of the ssl library that is available from\n"
+" ``http://pypi.python.org``."
+msgstr ""
+" Esta funcionalidade só é suportada em versões do Python 2.6 ou\n"
+" posteriores. Se você quiser usá-la em versões anteriores do Python,\n"
+" a versão da biblioteca ssl readaptada para versões antigas do Python\n"
+" disponível em ``http://pypi.python.org``."
+
+msgid ""
+" You can use OpenSSL's CA certificate file if your platform has one.\n"
+" On most Linux systems this will be ``/etc/ssl/certs/ca-certificates.crt``.\n"
+" Otherwise you will have to generate this file manually."
+msgstr ""
+" Você pode usar o arquivo de certificado CA do OpenSSL se sua\n"
+" plataforma tiver um. Em muitos sistemas Linux, será o arquivo\n"
+" ``/etc/ssl/certs/ca-certificates.crt``.\n"
+" De outro modo, você terá que gerar esse arquivo manualmente."
+
+msgid ""
+" To disable SSL verification temporarily, specify ``--insecure`` from\n"
+" command line."
+msgstr ""
+" Para temporariamente desabilitar a verificação SSL, especifique\n"
+" ``--insecure`` (inseguro) na linha de comando."
+
+msgid ""
+"``cache``\n"
+" Whether to support caching in hgweb. Defaults to True."
+msgstr ""
+"``cache``\n"
+" Habilita suporte a cache na interface hgweb. O padrão é True."
+
+msgid ""
+"``contact``\n"
+" Name or email address of the person in charge of the repository.\n"
+" Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty."
+msgstr ""
+"``contact``\n"
+" Nome ou endereço de email da pessoa responsável pelo repositório.\n"
+" O padrão é ui.username ou ``$EMAIL``, ou \"unknown\" se vazia ou\n"
+" não definida."
+
+msgid ""
+"``deny_push``\n"
+" Whether to deny pushing to the repository. If empty or not set,\n"
+" push is not denied. If the special value ``*``, all remote users are\n"
+" denied push. Otherwise, unauthenticated users are all denied, and\n"
+" any authenticated user name present in this list is also denied. The\n"
+" contents of the deny_push list are examined before the allow_push list."
+msgstr ""
+"``deny_push``\n"
+" Determina se operações push que têm como destino este repositório\n"
+" devem ser recusadas. Se vazio ou não definido, o push não é\n"
+" recusado. Com o valor especial ``*``, nenhum usuário remoto\n"
+" poderá fazer push. Caso contrário, o conteúdo desta opção será\n"
+" uma lista de usuários, e todos os usuários autenticados presentes\n"
+" nesta lista, bem como todos os usuários não autenticados, serão\n"
+" recusados. O conteúdo da lista deny_push é examinado antes da\n"
+" lista allow_push."
+
+msgid ""
+"``deny_read``\n"
+" Whether to deny reading/viewing of the repository. If this list is\n"
+" not empty, unauthenticated users are all denied, and any\n"
+" authenticated user name present in this list is also denied access to\n"
+" the repository. If set to the special value ``*``, all remote users\n"
+" are denied access (rarely needed ;). If deny_read is empty or not set,\n"
+" the determination of repository access depends on the presence and\n"
+" content of the allow_read list (see description). If both\n"
+" deny_read and allow_read are empty or not set, then access is\n"
+" permitted to all users by default. If the repository is being\n"
+" served via hgwebdir, denied users will not be able to see it in\n"
+" the list of repositories. The contents of the deny_read list have\n"
+" priority over (are examined before) the contents of the allow_read\n"
+" list."
+msgstr ""
+"``deny_read``\n"
+" Determina se o acesso de leitura e visualização deve ser recusado.\n"
+" Se esta lista não estiver vazia, todos os usuário não autenticados\n"
+" serão recusados, bem como os usuários autenticados presentes nesta\n"
+" lista. Se estiver definida com o valor especial ``*``, todos os\n"
+" usuários remotos são recusados (raramente necessária ;). Se\n"
+" deny_read estiver vazia ou não definida, a determinação do acesso\n"
+" remoto depende da presença e conteúdo da lista allow_read (veja\n"
+" sua descrição). Se tanto deny_read como allow_read estiverem\n"
+" vazias ou não definidas, o acesso é por padrão permitido para\n"
+" todos os usuários.\n"
+" Se o repositório estiver sendo servido via hgwebdir, usuários\n"
+" recusados não verão este repositório na lista de repositórios.\n"
+" O conteúdo da lista deny_read é examinado antes (ou seja, tem\n"
+" prioridade sobre) o conteúdo da lista allow_read."
+
+msgid ""
+"``descend``\n"
+" hgwebdir indexes will not descend into subdirectories. Only repositories\n"
+" directly in the current path will be shown (other repositories are still\n"
+" available from the index corresponding to their containing path)."
+msgstr ""
+"``descend``\n"
+" Booleana. Com o valor False, índices do hgwebdir não irão entrar em\n"
+" subdiretórios recursivamente. Apenas repositórios diretamente no\n"
+" caminho atual serão mostrados (outros repositórios ainda ficam\n"
+" disponíveis a partir do índice correspondente ao caminho que os\n"
+" contém). O padrão é True."
+
+msgid ""
+"``description``\n"
+" Textual description of the repository's purpose or contents.\n"
+" Default is \"unknown\"."
+msgstr ""
+"``description``\n"
+" Descrição textual do propósito ou conteúdo do repositório. O\n"
+" padrão é \"unknown\" (desconhecido)."
+
+msgid ""
+"``encoding``\n"
+" Character encoding name. Default is the current locale charset.\n"
+" Example: \"UTF-8\""
+msgstr ""
+"``encoding``\n"
+" Nome da codificação de caracteres. O padrão é o conjunto de\n"
+" caracteres atual de acordo com o locale. Exemplo: \"UTF-8\""
+
+msgid ""
+"``errorlog``\n"
+" Where to output the error log. Default is stderr."
+msgstr ""
+"``errorlog``\n"
+" Onde escrever o log de erros. O padrão é a saída de erros (stderr)."
+
+msgid ""
+"``hidden``\n"
+" Whether to hide the repository in the hgwebdir index.\n"
+" Default is False."
+msgstr ""
+"``hidden``\n"
+" Determina se o repositório não deve aparecer na índice do hgwebdir.\n"
+" O padrão é False (ou seja, mostrar o repositório)."
+
+msgid ""
+"``ipv6``\n"
+" Whether to use IPv6. Default is False."
+msgstr ""
+"``ipv6``\n"
+" Determina se IPv6 deve ser usado. O padrão é False."
+
+msgid ""
+"``logourl``\n"
+" Base URL to use for logos. If unset, ``http://mercurial.selenic.com/``\n"
+" will be used."
+msgstr ""
+"``logourl``\n"
+" URL base para usar em logos. Se não estiver definida,\n"
+" ``http://mercurial.selenic.com/`` será usada."
+
+msgid ""
+"``name``\n"
+" Repository name to use in the web interface. Default is current\n"
+" working directory."
+msgstr ""
+"``name``\n"
+" Nome do repositório a ser usado na interface web. Por padrão é\n"
+" o nome do diretório de trabalho."
+
+msgid ""
+"``maxchanges``\n"
+" Maximum number of changes to list on the changelog. Default is 10."
+msgstr ""
+"``maxchanges``\n"
+" Número máximo de mudanças listadas no changelog. O padrão é 10."
+
+msgid ""
+"``maxfiles``\n"
+" Maximum number of files to list per changeset. Default is 10."
+msgstr ""
+"``maxfiles``\n"
+" Numero máximo de arquivos listados por revisão. O padrão é 10."
+
+msgid ""
+"``port``\n"
+" Port to listen on. Default is 8000."
+msgstr ""
+"``port``\n"
+" Porta na qual escutar. O padrão é 8000."
+
+msgid ""
+"``prefix``\n"
+" Prefix path to serve from. Default is '' (server root)."
+msgstr ""
+"``prefix``\n"
+" Prefixo dos caminhos a serem servidos. O padrão é '' (que\n"
+" corresponde à raiz do servidor)."
+
+msgid ""
+"``push_ssl``\n"
+" Whether to require that inbound pushes be transported over SSL to\n"
+" prevent password sniffing. Default is True."
+msgstr ""
+"``push_ssl``\n"
+" Determina se SSL será exigido para o recebimento de revisões em\n"
+" um push, para prevenir o vazamento de senhas. O padrão é True."
+
+msgid ""
+"``staticurl``\n"
+" Base URL to use for static files. If unset, static files (e.g. the\n"
+" hgicon.png favicon) will be served by the CGI script itself. Use\n"
+" this setting to serve them directly with the HTTP server.\n"
+" Example: ``http://hgserver/static/``."
+msgstr ""
+"``staticurl``\n"
+" URL base para servir arquivos estáticos. Se não estiver definida,\n"
+" arquivos estáticos (por exemplo, o favicon hgicon.png) serão\n"
+" servidos pelo próprio script CGI. Use esta configuração para\n"
+" servi-los diretamente pelo servidor HTTP externo.\n"
+" Exemplo: ``http://hgserver/static/``."
+
+msgid ""
+"``stripes``\n"
+" How many lines a \"zebra stripe\" should span in multiline output.\n"
+" Default is 1; set to 0 to disable."
+msgstr ""
+"``stripes``\n"
+" Quantas linhas uma \"listra de zebra\" deve ocupar em saídas com\n"
+" múltiplas linhas. O padrão é 1; use 0 para desabilitar."
+
+msgid ""
+"``style``\n"
+" Which template map style to use."
+msgstr ""
+"``style``\n"
+" Estilo a ser usado para exibição."
+
+msgid ""
+"``templates``\n"
+" Where to find the HTML templates. Default is install path.\n"
+msgstr ""
+"``templates``\n"
+" Onde modelos HTML são encontrados. O padrão é o caminho de instalação.\n"
msgid "Some commands allow the user to specify a date, e.g.:"
msgstr "Alguns comandos permitem ao usuário especificar uma data, como:"
@@ -11916,15 +15459,15 @@
msgstr "O comando log também aceita intervalos de data:"
msgid ""
-"- ``<{datetime}`` - at or before a given date/time\n"
-"- ``>{datetime}`` - on or after a given date/time\n"
-"- ``{datetime} to {datetime}`` - a date range, inclusive\n"
-"- ``-{days}`` - within a given number of days of today\n"
-msgstr ""
-"- ``<{date}`` - na data fornecida, ou anterior\n"
-"- ``>{date}`` - na data fornecida, ou posterior\n"
-"- ``{date} to {date}`` - um intervalo de data, incluindo os extremos\n"
-"- ``-{days}`` - dentro de um certo número de dias contados de hoje\n"
+"- ``<DATE`` - at or before a given date/time\n"
+"- ``>DATE`` - on or after a given date/time\n"
+"- ``DATE to DATE`` - a date range, inclusive\n"
+"- ``-DAYS`` - within a given number of days of today\n"
+msgstr ""
+"- ``<DATA`` - na data fornecida, ou anterior\n"
+"- ``>DATA`` - na data fornecida, ou posterior\n"
+"- ``DATA to DATA`` - um intervalo de data, incluindo os extremos\n"
+"- ``-DIAS`` - dentro de um certo número de dias contados de hoje\n"
msgid ""
"Mercurial's default format for showing changes between two versions of\n"
@@ -12126,6 +15669,25 @@
" ambiente não serão sobrepostas."
msgid ""
+"HGPLAINEXCEPT\n"
+" This is a comma-separated list of features to preserve when\n"
+" HGPLAIN is enabled. Currently the only value supported is \"i18n\",\n"
+" which preserves internationalization in plain mode."
+msgstr ""
+"HGPLAINEXCEPT\n"
+" Esta é uma lista separada por vírgulas de funcionalidades a serem\n"
+" preservadas quando HGPLAIN estiver habilitada. No momento, o único\n"
+" valor suportado é \"i18n\", que preserva internacionalização em\n"
+" modo plain."
+
+msgid ""
+" Setting HGPLAINEXCEPT to anything (even an empty string) will\n"
+" enable plain mode."
+msgstr ""
+" Definir HGPLAINEXCEPT para qualquer valor (mesmo uma string vazia)\n"
+" habilitará o modo plain."
+
+msgid ""
"HGUSER\n"
" This is the string used as the author of a commit. If not set,\n"
" available values will be considered in this order:"
@@ -12276,6 +15838,134 @@
" baz = !\n"
msgid ""
+"Mercurial supports a functional language for selecting a set of\n"
+"files. "
+msgstr ""
+"O Mercurial suporta uma linguagem funcional para selecionar um conjunto\n"
+"de arquivoss."
+
+msgid ""
+"Like other file patterns, this pattern type is indicated by a prefix,\n"
+"'set:'. The language supports a number of predicates which are joined\n"
+"by infix operators. Parenthesis can be used for grouping."
+msgstr ""
+"Como outros padrões de arquivo, este tipo de padrão é indicado\n"
+"por um prefixo, 'set:'. A linguagem suporta vários predicados\n"
+"associados por operadores infixos. Parênteses podem ser usados\n"
+"para agrupamento."
+
+msgid ""
+"Identifiers such as filenames or patterns must be quoted with single\n"
+"or double quotes if they contain characters outside of\n"
+"``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]`` or if they match one of the\n"
+"predefined predicates. This generally applies to file patterns other\n"
+"than globs and arguments for predicates."
+msgstr ""
+"Identificadores, tais como nomes de arquivo ou padrões, devem ser\n"
+"passados entre aspas simples ou duplas se contiverem caracteres\n"
+"fora do conjunto ``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]`` ou se forem\n"
+"iguais a um dos predicados pré-definidos. Isto geralmente se\n"
+"aplica a padrões de arquivo diferentes de glob e argumentos para\n"
+"predicados."
+
+msgid ""
+"Special characters can be used in quoted identifiers by escaping them,\n"
+"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
+"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
+msgstr ""
+"Dentro de identificadores protegidos por aspas, caracteres\n"
+"especiais podem ser especificados usando escapes; por exemplo,\n"
+"``\\n`` é interpretado como uma quebra de linha. Para evitar\n"
+"que eles sejam interpretados dessa maneira, strings podem ser\n"
+"prefixadas por ``r``, como em ``r'...'``."
+
+msgid "There is a single prefix operator:"
+msgstr "Há um único operador prefixo:"
+
+msgid ""
+"``not x``\n"
+" Files not in x. Short form is ``! x``."
+msgstr ""
+"``not x``\n"
+" Arquivos que não estejam em x. A forma curta é ``! x``."
+
+msgid "These are the supported infix operators:"
+msgstr "Estes são os operadores infixos suportados:"
+
+msgid ""
+"``x and y``\n"
+" The intersection of files in x and y. Short form is ``x & y``."
+msgstr ""
+"``x and y``\n"
+" A intersecção dos arquivos em x e y. A forma curta é ``x & y``."
+
+msgid ""
+"``x or y``\n"
+" The union of files in x and y. There are two alternative short\n"
+" forms: ``x | y`` and ``x + y``."
+msgstr ""
+"``x or y``\n"
+" A união dos arquivos em x e y. Há duas formas curtas alternativas:\n"
+" ``x | y`` e ``x + y``."
+
+msgid ""
+"``x - y``\n"
+" Files in x but not in y."
+msgstr ""
+"``x - y``\n"
+" Arquivos em x mas não em y."
+
+msgid "The following predicates are supported:"
+msgstr "Os seguintes predicados são suportados:"
+
+msgid ".. predicatesmarker"
+msgstr ".. predicatesmarker"
+
+msgid "Some sample queries:"
+msgstr "Alguns exemplos de consultas:"
+
+msgid "- Show status of files that appear to be binary in the working directory::"
+msgstr ""
+"- Exibe o status de arquivos que parecem ser binários no diretório\n"
+"de trabalho::"
+
+msgid " hg status -A \"set:binary()\""
+msgstr " hg status -A \"set:binary()\""
+
+msgid "- Forget files that are in .hgignore but are already tracked::"
+msgstr "- Esquece arquivos especificados por .hgignore mas já rastreados::"
+
+msgid " hg forget \"set:hgignore() and not ignored()\""
+msgstr " hg forget \"set:hgignore() and not ignored()\""
+
+msgid "- Find text files that contain a string::"
+msgstr "- Encontra arquivos texto que contém uma string::"
+
+msgid " hg locate \"set:grep(magic) and not binary()\""
+msgstr " hg locate \"set:grep(magic) and not binary()\""
+
+msgid "- Find C files in a non-standard encoding::"
+msgstr "- Encontra arquivos C em uma codificação não padrão::"
+
+msgid " hg locate \"set:**.c and not encoding(ascii)\""
+msgstr " hg locate \"set:**.c and not encoding(ascii)\""
+
+msgid "- Revert copies of large binary files::"
+msgstr "- Reverte cópias de arquivos binários grandes::"
+
+msgid " hg revert \"set:copied() and binary() and size('>1M')\""
+msgstr " hg revert \"set:copied() and binary() and size('>1M')\""
+
+msgid "- Remove files listed in files.lst that contain the letter a or b::"
+msgstr "- Remove arquivos listados em files.lst que contêm as letras a ou b::"
+
+msgid " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""
+msgstr " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""
+
+msgid "See also :hg:`help patterns`.\n"
+msgstr "Veja também :hg:`help patterns`.\n"
+
+msgid ""
"Ancestor\n"
" Any changeset that can be reached by an unbroken chain of parent\n"
" changesets from a given changeset. More precisely, the ancestors\n"
@@ -12291,6 +15981,35 @@
" de um ancestral é um ancestral. Veja também: 'Descendant'."
msgid ""
+"Bookmark\n"
+" Bookmarks are pointers to certain commits that move when\n"
+" committing. They are similar to tags in that it is possible to use\n"
+" bookmark names in all places where Mercurial expects a changeset\n"
+" ID, e.g., with :hg:`update`. Unlike tags, bookmarks move along\n"
+" when you make a commit."
+msgstr ""
+"Bookmark\n"
+" Marcador. Marcadores são ponteiros para certas consolidações que\n"
+" se movem quando novas consolidações forem feitas. Assim como\n"
+" etiquetas, nomes de marcadores podem ser usados em todos os lugares\n"
+" onde o Mercurial espera um ID de revisão, por exemplo em\n"
+" :hg:`update`. Ao contrário de etiquetas, marcadores se movem\n"
+" automaticamente quando é feita uma consolidação."
+
+msgid ""
+" Bookmarks can be renamed, copied and deleted. Bookmarks are local,\n"
+" unless they are explicitly pushed or pulled between repositories.\n"
+" Pushing and pulling bookmarks allow you to collaborate with others\n"
+" on a branch without creating a named branch."
+msgstr ""
+" Marcadores podem ser renomeados, copiados e apagados. Marcadores\n"
+" são locais, a não ser que sejam explicitamente enviados para ou\n"
+" trazidos de um repositório remoto. O envio (usando :hg:`push`) e\n"
+" o recebimento (usando :hg:`pull`) de marcadores permite a\n"
+" colaboração com outros usuários em um ramo sem a criação de\n"
+" um ramo nomeado."
+
+msgid ""
"Branch\n"
" (Noun) A child changeset that has been created from a parent that\n"
" is not a head. These are known as topological branches, see\n"
@@ -13063,6 +16782,20 @@
" A maior parte dos repositórios possui apenas uma revisão raiz."
msgid ""
+"Tag\n"
+" An alternative name given to a changeset. Tags can be used in all\n"
+" places where Mercurial expects a changeset ID, e.g., with\n"
+" :hg:`update`. The creation of a tag is stored in the history and\n"
+" will thus automatically be shared with other using push and pull."
+msgstr ""
+"Tag\n"
+" Etiqueta. Um nome alternativo dado a uma revisão. Etiquetas podem\n"
+" ser usadas em todos os lugares nos quais o Mercurial espera um\n"
+" ID de revisão, por exemplo em :hg:`update`. A criação de uma\n"
+" etiqueta é armazenada no histórico e será portanto\n"
+" automaticamente compartilhada com outros, usando push e pull."
+
+msgid ""
"Tip\n"
" The changeset with the highest revision number. It is the changeset\n"
" most recently added in a repository."
@@ -13124,6 +16857,178 @@
" Veja 'Parent, working directory'.\n"
msgid ""
+"Synopsis\n"
+"--------"
+msgstr ""
+"Sinopse\n"
+"-------"
+
+msgid ""
+"The Mercurial system uses a file called ``.hgignore`` in the root\n"
+"directory of a repository to control its behavior when it searches\n"
+"for files that it is not currently tracking."
+msgstr ""
+"O Mercurial usa um arquivo chamado ``.hgignore`` no diretório\n"
+"raiz de um repositório para controlar seu comportamento em relação\n"
+"a arquivos que não estejam sendo rastreados no momento."
+
+msgid ""
+"Description\n"
+"-----------"
+msgstr ""
+"Descrição\n"
+"---------"
+
+msgid ""
+"The working directory of a Mercurial repository will often contain\n"
+"files that should not be tracked by Mercurial. These include backup\n"
+"files created by editors and build products created by compilers.\n"
+"These files can be ignored by listing them in a ``.hgignore`` file in\n"
+"the root of the working directory. The ``.hgignore`` file must be\n"
+"created manually. It is typically put under version control, so that\n"
+"the settings will propagate to other repositories with push and pull."
+msgstr ""
+"O diretório de trabalho de um repositório do Mercurial frequentemente\n"
+"irá conter arquivos que não devem ser rastreados. Isso inclui cópias\n"
+"de segurança criadas por editores e produtos de compilação de fontes.\n"
+"Estes arquivos podem ser ignorados listando-os em um arquivo\n"
+"``.hgignore`` localizado no raiz do diretório de trabalho. O arquivo\n"
+"``.hgignore`` deve ser criado manualmente. Ele é tipicamente colocado\n"
+"sob controle de versão, para que suas definições sejam propagadas\n"
+"para outros repositórios juntamente com as revisões do projeto."
+
+msgid ""
+"An untracked file is ignored if its path relative to the repository\n"
+"root directory, or any prefix path of that path, is matched against\n"
+"any pattern in ``.hgignore``."
+msgstr ""
+"Um arquivo não rastreado será ignorado se seu caminho relativo ao\n"
+"diretório raiz do projeto, ou qualquer caminho que seja um prefixo\n"
+"desse caminho, combinar com qualquer padrão definido no ``.hgignore``."
+
+msgid ""
+"For example, say we have an untracked file, ``file.c``, at\n"
+"``a/b/file.c`` inside our repository. Mercurial will ignore ``file.c``\n"
+"if any pattern in ``.hgignore`` matches ``a/b/file.c``, ``a/b`` or ``a``."
+msgstr ""
+"Por exemplo, suponha que temos um arquivo não rastreado chamado\n"
+"``file.c``, em ``a/b/file.c`` dentro do seu repositório. O Mercurial\n"
+"irá ignorar ``file.c`` se qualquer padrão no ``.hgignore`` combinar\n"
+"``a/b/file.c``, ``a/b`` ou ``a``."
+
+msgid ""
+"In addition, a Mercurial configuration file can reference a set of\n"
+"per-user or global ignore files. See the ``ignore`` configuration\n"
+"key on the ``[ui]`` section of :hg:`help config` for details of how to\n"
+"configure these files."
+msgstr ""
+"Adicionalmente, um arquivo de configuração do Mercurial pode fazer\n"
+"referência a um conjunto de arquivos hgignore globais ou por usuário.\n"
+"Veja a chave de configuração ``ignore`` na seção ``[ui]`` de\n"
+":hg:`help config` para detalhes sobre como configurar esses arquivos."
+
+msgid ""
+"To control Mercurial's handling of files that it manages, many\n"
+"commands support the ``-I`` and ``-X`` options; see\n"
+":hg:`help <command>` and :hg:`help patterns` for details."
+msgstr ""
+"Para controlar o gerenciamento do Mercurial de arquivos versionados,\n"
+"muitos comandos suportam as opções ``-I`` e ``-X``; veja\n"
+":hg:`help <comando>` e :hg:`help patterns` para mais detalhes."
+
+msgid ""
+"An ignore file is a plain text file consisting of a list of patterns,\n"
+"with one pattern per line. Empty lines are skipped. The ``#``\n"
+"character is treated as a comment character, and the ``\\`` character\n"
+"is treated as an escape character."
+msgstr ""
+"Um arquivo hgignore é um arquivo texto que consiste de uma lista de\n"
+"padrões, com um padrão por linha. Linhas em branco são ignoradas.\n"
+"O caractere ``#`` é tratado como caractere de comentários, e o\n"
+"caractere ``\\`` como caractere de escape."
+
+msgid ""
+"Mercurial supports several pattern syntaxes. The default syntax used\n"
+"is Python/Perl-style regular expressions."
+msgstr ""
+"O Mercurial suporta diversas sintaxes de padrões. A sintaxe padrão usa\n"
+"expressões regulares ao estilo Python/Perl."
+
+msgid "To change the syntax used, use a line of the following form::"
+msgstr "Para mudar a sintaxe utilizada, use uma linha com a forma::"
+
+msgid " syntax: NAME"
+msgstr " syntax: NOME"
+
+msgid "where ``NAME`` is one of the following:"
+msgstr "onde ``NoME`` pode ser:"
+
+msgid ""
+"``regexp``\n"
+" Regular expression, Python/Perl syntax.\n"
+"``glob``\n"
+" Shell-style glob."
+msgstr ""
+"``regexp``\n"
+" Expressão regular, com sintaxe ao estilo Python/Perl.\n"
+"``glob``\n"
+" Caracteres de glob (curingas) ao estilo shell."
+
+msgid ""
+"The chosen syntax stays in effect when parsing all patterns that\n"
+"follow, until another syntax is selected."
+msgstr ""
+"A sintaxe escolhida permanece em efeito para todos os padrões\n"
+"subsequentes, até que outra sintaxe seja selecionada."
+
+msgid ""
+"Neither glob nor regexp patterns are rooted. A glob-syntax pattern of\n"
+"the form ``*.c`` will match a file ending in ``.c`` in any directory,\n"
+"and a regexp pattern of the form ``\\.c$`` will do the same. To root a\n"
+"regexp pattern, start it with ``^``."
+msgstr ""
+"Padrões glob e regexp não são restritos à raiz do repositório. Um padrão\n"
+"glob com a forma ``*.c`` casará com um arquivo terminado por ``.c`` em\n"
+"qualquer diretório, e um padrão regexp com a forma ``\\.c$`` fará o\n"
+"mesmo. Para fazer com que um padrão regexp seja considerado somente a\n"
+"partir da raiz, comece-o por ``^``."
+
+msgid ""
+"Example\n"
+"-------"
+msgstr ""
+"Exemplo\n"
+"-------"
+
+msgid "Here is an example ignore file. ::"
+msgstr "Este é um exemplo de arquivo hgignore. ::"
+
+msgid ""
+" # use glob syntax.\n"
+" syntax: glob"
+msgstr ""
+" # use sintaxe glob.\n"
+" syntax: glob"
+
+msgid ""
+" *.elc\n"
+" *.pyc\n"
+" *~"
+msgstr ""
+" *.elc\n"
+" *.pyc\n"
+" *~"
+
+msgid ""
+" # switch to regexp syntax.\n"
+" syntax: regexp\n"
+" ^\\.pc/\n"
+msgstr ""
+" # troque para sintaxe regexp.\n"
+" syntax: regexp\n"
+" ^\\.pc/\n"
+
+msgid ""
"Mercurial's internal web server, hgweb, can serve either a single\n"
"repository, or a collection of them. In the latter case, a special\n"
"configuration file can be used to specify the repository paths to use\n"
@@ -13639,10 +17544,13 @@
msgid ""
" listfile:list.txt read list from list.txt with one file pattern per line\n"
-" listfile0:list.txt read list from list.txt with null byte delimiters\n"
+" listfile0:list.txt read list from list.txt with null byte delimiters"
msgstr ""
" listfile:list.txt lê a lista de list.txt com um padrão por linha\n"
-" listfile0:list.txt lê a lista de list.txt delimitados por bytes null\n"
+" listfile0:list.txt lê a lista de list.txt delimitados por bytes null"
+
+msgid "See also :hg:`help filesets`.\n"
+msgstr "Veja também :hg:`help filesets`.\n"
msgid "Mercurial supports several ways to specify individual revisions."
msgstr ""
@@ -13739,29 +17647,12 @@
"entre aspas simples ou duplas."
msgid ""
-"Special characters can be used in quoted identifiers by escaping them,\n"
-"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
-"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
-msgstr ""
-"Dentro de identificadores protegidos por aspas, caracteres\n"
-"especiais podem ser especificados usando escapes; por exemplo,\n"
-"``\\n`` é interpretado como uma quebra de linha. Para evitar\n"
-"que eles sejam interpretados dessa maneira, strings podem ser\n"
-"prefixadas por ``r``, como em ``r'...'``."
-
-msgid "There is a single prefix operator:"
-msgstr "Há um único operador prefixo:"
-
-msgid ""
"``not x``\n"
" Changesets not in x. Short form is ``! x``."
msgstr ""
"``not x``\n"
" Revisões que não estejam em x. A forma curta é ``! x``."
-msgid "These are the supported infix operators:"
-msgstr "Estes são os operadores infixos suportados:"
-
msgid ""
"``x::y``\n"
" A DAG range, meaning all changesets that are descendants of x and\n"
@@ -13811,11 +17702,81 @@
"``x - y``\n"
" Revisões em x mas não em y."
-msgid "The following predicates are supported:"
-msgstr "Os seguintes predicados são suportados:"
-
-msgid ".. predicatesmarker"
-msgstr ".. predicatesmarker"
+msgid ""
+"``x^n``\n"
+" The nth parent of x, n == 0, 1, or 2.\n"
+" For n == 0, x; for n == 1, the first parent of each changeset in x;\n"
+" for n == 2, the second parent of changeset in x."
+msgstr ""
+"``x^n``\n"
+" O n-ésimo pai de x, onde n == 0, 1, ou 2.\n"
+" Para n == 0, x; para n == 1, o primeiro pai de cada revisão em x;\n"
+" para n == 2, o segundo pai de cada revisão em x."
+
+msgid ""
+"``x~n``\n"
+" The nth first ancestor of x; ``x~0`` is x; ``x~3`` is ``x^^^``."
+msgstr ""
+"``x~n``\n"
+" O n-ésimo primeiro ancestral de x; ``x~0`` é x; ``x~3`` é ``x^^^``."
+
+msgid "There is a single postfix operator:"
+msgstr "Há um único operador posfixo:"
+
+msgid ""
+"``x^``\n"
+" Equivalent to ``x^1``, the first parent of each changeset in x."
+msgstr ""
+"``x^``\n"
+" Equivalente a ``x^1``, o primeiro pai de cada revisão em x."
+
+msgid ""
+"\n"
+"The following predicates are supported:"
+msgstr ""
+"\n"
+"Os seguintes predicados são suportados:"
+
+msgid ""
+"New predicates (known as \"aliases\") can be defined, using any combination of\n"
+"existing predicates or other aliases. An alias definition looks like::"
+msgstr ""
+"Novos predicados (conhecidos como \"aliases\", ou apelidos) podem ser\n"
+"definidos usando qualquer combinação de predicados existentes ou\n"
+"outros apelidos. Uma definição de apelido segue a seguinte forma::"
+
+msgid " <alias> = <definition>"
+msgstr " <apelido> = <definicao>"
+
+msgid ""
+"in the ``revsetalias`` section of a Mercurial configuration file. Arguments\n"
+"of the form `$1`, `$2`, etc. are substituted from the alias into the\n"
+"definition."
+msgstr ""
+"na seção ``revsetalias`` de um arquivo de configuração do Mercurial.\n"
+"Argumentos da forma `$1`, `$2`, etc. são substituídos pelos argumentos\n"
+"passados na chamada do apelido."
+
+msgid "For example,"
+msgstr "Por exemplo,"
+
+msgid ""
+" [revsetalias]\n"
+" h = heads()\n"
+" d($1) = sort($1, date)\n"
+" rs($1, $2) = reverse(sort($1, $2))"
+msgstr ""
+" [revsetalias]\n"
+" h = heads()\n"
+" d($1) = sort($1, date)\n"
+" rs($1, $2) = reverse(sort($1, $2))"
+
+msgid ""
+"defines three aliases, ``h``, ``d``, and ``rs``. ``rs(0:tip, author)`` is\n"
+"exactly equivalent to ``reverse(sort(0:tip, author))``."
+msgstr ""
+"defines três apelidos, ``h``, ``d`` e ``rs``. ``rs(0:tip, author)`` é\n"
+"exatamente equivalente a ``reverse(sort(0:tip, author))``."
msgid "Command line equivalents for :hg:`log`::"
msgstr "Opções de linha de comando equivalentes para :hg:`log`::"
@@ -13839,9 +17800,6 @@
" -P x -> !::x\n"
" -l x -> limit(expr, x)"
-msgid "Some sample queries:"
-msgstr "Alguns exemplos de consultas:"
-
msgid "- Changesets on the default branch::"
msgstr "- Revisões no ramo default::"
@@ -14250,93 +18208,8 @@
"modelador. Estas palavras chave estão comumente disponíveis para\n"
"modelar comandos semelhantes ao log:"
-msgid ":author: String. The unmodified author of the changeset."
-msgstr ":author: String. O autor da revisão, sem modificações."
-
-msgid ""
-":branch: String. The name of the branch on which the changeset was\n"
-" committed."
-msgstr ":branch: String. O nome do ramo no qual a revisão foi consolidada."
-
-msgid ""
-":branches: List of strings. The name of the branch on which the\n"
-" changeset was committed. Will be empty if the branch name was\n"
-" default."
-msgstr ""
-":branches: Lista de strings. O nome do ramo no qual a revisão foi\n"
-" consolidada. Será vazio se o nome do ramo for default."
-
-msgid ":children: List of strings. The children of the changeset."
-msgstr ":children: Lista de strings. As revisões filhas da revisão."
-
-msgid ":date: Date information. The date when the changeset was committed."
-msgstr ":date: Informação de data. A data de consolidação da revisão."
-
-msgid ":desc: String. The text of the changeset description."
-msgstr ":desc: String. O texto da descrição da revisão."
-
-msgid ""
-":diffstat: String. Statistics of changes with the following format:\n"
-" \"modified files: +added/-removed lines\""
-msgstr ""
-":diffstat: String. Estatísticas de mudanças no seguinte\n"
-" formato: \"modified files: +added/-removed lines\""
-
-msgid ""
-":files: List of strings. All files modified, added, or removed by this\n"
-" changeset."
-msgstr ""
-":files: Lista de strings. Todos os arquivos modificados,\n"
-" adicionados ou removidos por esta revisão."
-
-msgid ":file_adds: List of strings. Files added by this changeset."
-msgstr ":file_adds: Lista de strings. Arquivos adicionados por esta revisão."
-
-msgid ""
-":file_copies: List of strings. Files copied in this changeset with\n"
-" their sources."
-msgstr ""
-":file_copies: Lista de strings. Arquivos copiados nesta revisão\n"
-" com suas respectivas origens."
-
-msgid ""
-":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
-" only if the --copied switch is set."
-msgstr ""
-":file_copies_switch: Lista de strings. Como \"file_copies\", mas\n"
-" é exibida apenas se a opção --copied estiver definida."
-
-msgid ":file_mods: List of strings. Files modified by this changeset."
-msgstr ":file_mods: Lista de strings. Arquivos modificados por esta revisão"
-
-msgid ":file_dels: List of strings. Files removed by this changeset."
-msgstr ":file_dels: Lista de strings. Arquivos removidos por esta revisão."
-
-msgid ""
-":node: String. The changeset identification hash, as a 40 hexadecimal\n"
-" digit string."
-msgstr ""
-":node: String. O hash de identificação da revisão, como uma string\n"
-" hexadecimal de 40 dígitos."
-
-msgid ":parents: List of strings. The parents of the changeset."
-msgstr ":parents: Lista de strings. Os pais da revisão."
-
-msgid ":rev: Integer. The repository-local changeset revision number."
-msgstr ":rev: Inteiro. O número de ordem da revisão no repositório local."
-
-msgid ":tags: List of strings. Any tags associated with the changeset."
-msgstr ":tags: Lista de strings. Quaisquer etiquetas associadas à revisão."
-
-msgid ""
-":latesttag: String. Most recent global tag in the ancestors of this\n"
-" changeset."
-msgstr ""
-":latesttag: String. A etiqueta global mais recente nos ancestrais desta\n"
-" revisão."
-
-msgid ":latesttagdistance: Integer. Longest path to the latest tag."
-msgstr ":latesttagdistance: Inteiro. O caminho mais longo para a latesttag."
+msgid ".. keywordsmarker"
+msgstr ".. keywordsmarker"
msgid ""
"The \"date\" keyword does not produce human-readable output. If you\n"
@@ -14365,193 +18238,8 @@
msgid "List of filters:"
msgstr "Lista de filtros:"
-msgid ""
-":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
-" every line except the last."
-msgstr ""
-":addbreaks: Qualquer texto. Adiciona uma tag XHTML \"<br />\"\n"
-" antes do fim de cada linha, exceto a última."
-
-msgid ""
-":age: Date. Returns a human-readable date/time difference between the\n"
-" given date/time and the current date/time."
-msgstr ""
-":age: Data. Devolve uma diferença de data/tempo legível entre\n"
-" a data/hora dada e a data/hora atual."
-
-msgid ""
-":basename: Any text. Treats the text as a path, and returns the last\n"
-" component of the path after splitting by the path separator\n"
-" (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n"
-" \"baz\" and \"foo/bar//\" becomes \"bar\"."
-msgstr ""
-":basename: Qualquer texto. Trata o texto como um caminho, e\n"
-" devolve o último componente do caminho após quebrá-lo\n"
-" usando o separador de caminhos (ignorando separadores à\n"
-" direita). Por exemple, \"foo/bar/baz\" se torna \"baz\"\n"
-" e \"foo/bar//\" se torna \"bar\"."
-
-msgid ""
-":stripdir: Treat the text as path and strip a directory level, if\n"
-" possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"."
-msgstr ""
-":stripdir: Trata o texto como um caminho e remove um nível\n"
-" de diretório, se possível. Por exemplo, \"foo\" e\n"
-" \"foo/bar\" se tornam \"foo\"."
-
-msgid ""
-":date: Date. Returns a date in a Unix date format, including the\n"
-" timezone: \"Mon Sep 04 15:13:13 2006 0700\"."
-msgstr ""
-":date: Data. Devolve uma data em um formato de data Unix,\n"
-" incluindo a diferença de fuso horário:\n"
-" \"Mon Sep 04 15:13:13 2006 0700\"."
-
-msgid ""
-":domain: Any text. Finds the first string that looks like an email\n"
-" address, and extracts just the domain component. Example: ``User\n"
-" <user@example.com>`` becomes ``example.com``."
-msgstr ""
-":domain: Qualquer texto. Encontra a primeira string que se\n"
-" pareça com um endereço de e-mail, e extrai apenas a parte\n"
-" do domínio. Por exemplo:\n"
-" ``User <user@example.com>`` se torna ``example.com``."
-
-msgid ""
-":email: Any text. Extracts the first string that looks like an email\n"
-" address. Example: ``User <user@example.com>`` becomes\n"
-" ``user@example.com``."
-msgstr ""
-":email: Qualquer texto. Extrai a primeira string que se pareça\n"
-" com um endereço de e-mail. Por exemplo:\n"
-" ``User <user@example.com>`` se torna ``user@example.com``."
-
-msgid ""
-":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
-" and \">\" with XML entities."
-msgstr ""
-":escape: Qualquer texto. Substitui os caracteres especiais\n"
-" XML/XHTML \"&\", \"<\" e \">\" por entidades XML."
-
-msgid ""
-":hex: Any text. Convert a binary Mercurial node identifier into\n"
-" its long hexadecimal representation."
-msgstr ""
-":hex: Qualquer texto. Converte um identificador de nó binário do\n"
-" Mercurial em sua representação longa hexadecimal."
-
-msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
-msgstr ""
-":fill68: Qualquer texto. Quebra o texto para caber em 68\n"
-" colunas."
-
-msgid ":fill76: Any text. Wraps the text to fit in 76 columns."
-msgstr ""
-":fill76: Qualquer texto. Quebra o texto para caber em 76\n"
-" colunas."
-
-msgid ":firstline: Any text. Returns the first line of text."
-msgstr ":firstline: Qualquer texto. Devolve a primeira linha do texto."
-
-msgid ":nonempty: Any text. Returns '(none)' if the string is empty."
-msgstr ":nonempty: Qualquer texto. Devolve (none) se o texto for vazio."
-
-msgid ""
-":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n"
-" 25200\" (Unix timestamp, timezone offset)."
-msgstr ""
-":hgdate: Data. Devolve a data como um par de números:\n"
-" \"1157407993 25200\" (timestamp Unix, defasagem de fuso)"
-
-msgid ""
-":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n"
-" +0200\"."
-msgstr ""
-":isodate: Data. Devolve a data em formato ISO 8601:\n"
-" \"2009-08-18 13:00 +0200\"."
-
-msgid ""
-":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
-" seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n"
-" filter."
-msgstr ""
-":isodatesec: Data. Devolve a data em formato ISO 8601, incluindo os\n"
-" segundos: \"2009-08-18 13:00:13 +0200\". Veja também o filtro\n"
-" rfc3339date."
-
-msgid ":localdate: Date. Converts a date to local date."
-msgstr ":localdate: Data. Converte para data local."
-
-msgid ""
-":obfuscate: Any text. Returns the input text rendered as a sequence of\n"
-" XML entities."
-msgstr ""
-":obfuscate: Qualquer texto. Devolve o texto de entrada\n"
-" renderizado como uma sequência de entidades XML."
-
-msgid ":person: Any text. Returns the text before an email address."
-msgstr ""
-":person: Qualquer texto. Devolve o texto antes de um endereço\n"
-" de e-mail."
-
-msgid ""
-":rfc822date: Date. Returns a date using the same format used in email\n"
-" headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"."
-msgstr ""
-":rfc822date: Data. Devolve uma data usando o mesmo formato utilizado\n"
-" em cabeçalhos de e-mail:\n"
-" \"Tue, 18 Aug 2009 13:00:13 +0200\"."
-
-msgid ""
-":rfc3339date: Date. Returns a date using the Internet date format\n"
-" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"."
-msgstr ""
-":rfc3339date: Data. Devolve uma data usando o formato de data da\n"
-" Internet especificado na RFC 3339:\n"
-" \"2009-08-18T13:00:13+02:00\"."
-
-msgid ""
-":short: Changeset hash. Returns the short form of a changeset hash,\n"
-" i.e. a 12 hexadecimal digit string."
-msgstr ""
-":short: Hash da revisão. Devolve a forma curta do hash de\n"
-" uma revisão, ou seja, uma string hexadecimal de 12 dígitos."
-
-msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
-msgstr ":shortdate: Data. Devolve uma data como \"2006-09-18\"."
-
-msgid ""
-":stringify: Any type. Turns the value into text by converting values into\n"
-" text and concatenating them."
-msgstr ""
-":stringify: Qualquer tipo. Transforma o valor em texto convertendo cada\n"
-" parte em texto e concatenando os resultados."
-
-msgid ":strip: Any text. Strips all leading and trailing whitespace."
-msgstr ""
-":strip: Qualquer texto. Remove todos os espaços em branco no\n"
-" início e no final do texto."
-
-msgid ""
-":tabindent: Any text. Returns the text, with every line except the\n"
-" first starting with a tab character."
-msgstr ""
-":tabindent: Qualquer texto. Devolve o texto todo, com a adição\n"
-" de um caractere de tabulação ao início de cada linha,\n"
-" exceto da primeira."
-
-msgid ""
-":urlescape: Any text. Escapes all \"special\" characters. For example,\n"
-" \"foo bar\" becomes \"foo%20bar\"."
-msgstr ""
-":urlescape: Qualquer texto. Codifica todos os caracteres\n"
-" \"especiais\". Por exemplo, \"foo bar\" se torna\n"
-" \"foo%20bar\"."
-
-msgid ":user: Any text. Returns the user portion of an email address.\n"
-msgstr ""
-":user: Qualquer texto. Devolve a parte do usuário de um\n"
-" endereço de e-mail.\n"
+msgid ".. filtersmarker\n"
+msgstr ".. filtersmarker\n"
msgid "Valid URLs are of the form::"
msgstr "URLs válidas são da forma::"
@@ -14780,6 +18468,10 @@
msgstr "não é possível iniciar o servidor em '%s:%d': %s"
#, python-format
+msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
+msgstr "%d arquivos modificados, %d inserções(+), %d remoções(-)\n"
+
+#, python-format
msgid "calling hook %s: %s\n"
msgstr "invocando gancho %s: %s\n"
@@ -14833,6 +18525,13 @@
msgid "warning: %s hook %s\n"
msgstr "aviso: gancho %s %s\n"
+msgid "kb"
+msgstr "kb"
+
+#, python-format
+msgid "ignoring invalid [auth] key '%s'\n"
+msgstr "ignorando chave inválida em [auth] '%s'\n"
+
msgid "connection ended unexpectedly"
msgstr "conexão terminou inesperadamente"
@@ -14873,6 +18572,9 @@
msgid "'%s' uses newer protocol %s"
msgstr "'%s' usa protocolo mais novo %s"
+msgid "unexpected response:"
+msgstr "resposta inesperada:"
+
#, python-format
msgid "push failed: %s"
msgstr "o push falhou: %s"
@@ -14900,10 +18602,6 @@
msgstr "repositório %s já existe"
#, python-format
-msgid "requirement '%s' not supported"
-msgstr "requisito '%s' não suportado"
-
-#, python-format
msgid ".hg/sharedpath points to nonexistent directory %s"
msgstr ".hg/sharedpath aponta para diretório %s inexistente"
@@ -15022,14 +18720,6 @@
msgstr "pull parcial não pode ser feito porque o outro repositório não suporta 'changegroupsubset'."
#, python-format
-msgid "updating bookmark %s\n"
-msgstr "atualizando marcador %s\n"
-
-#, python-format
-msgid "not updating divergent bookmark %s\n"
-msgstr "marcador divergente %s não atualizado\n"
-
-#, python-format
msgid "%d changesets found\n"
msgstr "%d revisões encontradas\n"
@@ -15140,6 +18830,10 @@
msgstr "endereço local inválido: %s"
#, python-format
+msgid "'\\n' and '\\r' disallowed in filenames: %r"
+msgstr "'\\n' e '\\r' proibidos em nomes de arquivos: %r"
+
+#, python-format
msgid "failed to remove %s from manifest"
msgstr "falha ao remover %s do manifesto"
@@ -15230,10 +18924,6 @@
msgid "note: possible conflict - %s was renamed multiple times to:\n"
msgstr "nota: possível conflito - %s foi renomeado múltiplas vezes para:\n"
-#, python-format
-msgid "branch %s not found"
-msgstr "ramo %s não encontrado"
-
msgid "merging with a working directory ancestor has no effect"
msgstr "mesclar com um ancestral do diretório de trabalho não tem nenhum efeito"
@@ -15250,8 +18940,8 @@
msgid "crosses branches (merge branches or use --clean to discard changes)"
msgstr "atravessa ramos (mescle os ramos ou use --clean para descartar mudanças)"
-msgid "crosses branches (merge branches or use --check to force update)"
-msgstr "atravessa ramos (mescle os ramos ou use --check para forçar a atualização)"
+msgid "crosses branches (merge branches or update --check to force update)"
+msgstr "atravessa ramos (mescle os ramos ou use update --check para forçar a atualização)"
msgid "Attention:"
msgstr "Atenção:"
@@ -15281,12 +18971,24 @@
msgstr "Aviso!"
#, python-format
-msgid "cannot create %s: destination already exists"
-msgstr "impossível criar %s: destino já existe"
-
-#, python-format
-msgid "cannot create %s: unable to create destination directory"
-msgstr "impossível criar %s: impossível criar diretório de destino"
+msgid "unexpected token: %s"
+msgstr "token inesperado: %s"
+
+#, python-format
+msgid "not a prefix: %s"
+msgstr "não é um prefixo: %s"
+
+#, python-format
+msgid "not an infix: %s"
+msgstr "não é um infixo: %s"
+
+#, python-format
+msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
+msgstr "%d de %d trechos FALHARAM -- gravando rejeitados no arquivo %s\n"
+
+#, python-format
+msgid "cannot patch %s: file is not tracked"
+msgstr "não é possível aplicar o patch em %s: arquivo não rastreado"
#, python-format
msgid "unable to find '%s' for patching\n"
@@ -15297,14 +18999,14 @@
msgstr "modificando arquivo %s\n"
#, python-format
-msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
-msgstr "%d de %d trechos FALHARAM -- gravando rejeitados no arquivo %s\n"
-
-#, python-format
msgid "bad hunk #%d %s (%d %d %d %d)"
msgstr "trecho ruim #%d %s (%d %d %d %d)"
#, python-format
+msgid "cannot create %s: destination already exists\n"
+msgstr "impossível criar %s: o destino já existe\n"
+
+#, python-format
msgid "file %s already exists\n"
msgstr "arquivo %s já existe\n"
@@ -15343,8 +19045,8 @@
msgstr "arquivos de origem e destino não definidos"
#, python-format
-msgid "malformed patch %s %s"
-msgstr "patch malformado %s %s"
+msgid "cannot create %s: destination already exists"
+msgstr "impossível criar %s: destino já existe"
#, python-format
msgid "unsupported parser state: %s"
@@ -15362,10 +19064,6 @@
msgstr "aplicação do patch falhou"
#, python-format
-msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
-msgstr "%d arquivos modificados, %d inserções(+), %d remoções(-)\n"
-
-#, python-format
msgid "exited with status %d"
msgstr "terminou com o código %d"
@@ -15435,132 +19133,23 @@
msgid "consistency error in delta"
msgstr "erro de consistência no delta"
-msgid "unknown base"
-msgstr "base desconhecida"
-
-msgid "unterminated string"
-msgstr "string não terminada"
-
-msgid "syntax error"
-msgstr "erro de sintaxe"
-
-msgid "missing argument"
-msgstr "argumento faltando"
+msgid "unknown delta base"
+msgstr "base de delta desconhecida"
#, python-format
msgid "can't use %s here"
msgstr "não se pode usar %s aqui"
-msgid "can't use a list in this context"
-msgstr "não se pode usar uma lista nesse contexto"
-
-#, python-format
-msgid "not a function: %s"
-msgstr "não é uma função: %s"
-
-msgid ""
-"``id(string)``\n"
-" Revision non-ambiguously specified by the given hex string prefix."
-msgstr ""
-"``id(string)``\n"
-" Revisão especificada de modo não ambíguo pelo\n"
-" prefixo hexadecimal fornecido em string."
-
-#. i18n: "id" is a keyword
-msgid "id requires one argument"
-msgstr "id requer um argumento"
-
-#. i18n: "id" is a keyword
-msgid "id requires a string"
-msgstr "id requer uma string"
-
-msgid ""
-"``rev(number)``\n"
-" Revision with the given numeric identifier."
-msgstr ""
-"``rev(number)``\n"
-" Revisão com o identificador numérico dado."
-
-#. i18n: "rev" is a keyword
-msgid "rev requires one argument"
-msgstr "rev requer um argumento"
-
-#. i18n: "rev" is a keyword
-msgid "rev requires a number"
-msgstr "rev requer um número"
-
-#. i18n: "rev" is a keyword
-msgid "rev expects a number"
-msgstr "rev espera um número"
-
-msgid ""
-"``p1([set])``\n"
-" First parent of changesets in set, or the working directory."
-msgstr ""
-"``p1([conjunto])``\n"
-" O primeiro pai das revisões no conjunto, ou do diretório de trabalho."
-
-msgid ""
-"``p2([set])``\n"
-" Second parent of changesets in set, or the working directory."
-msgstr ""
-"``p2([conjunto])``\n"
-" O segundo pai das revisões no conjunto, ou do diretório de trabalho."
-
-msgid ""
-"``parents([set])``\n"
-" The set of all parents for all changesets in set, or the working directory."
-msgstr ""
-"``parents([conjunto])``\n"
-" O conjunto de todos os pais de todas as revisões no conjunto pedido,\n"
-" ou os pais do diretório de trabalho."
-
-msgid ""
-"``max(set)``\n"
-" Changeset with highest revision number in set."
-msgstr ""
-"``max(conjunto)``\n"
-" Revisão com maior número de revisão no conjunto."
-
-msgid ""
-"``min(set)``\n"
-" Changeset with lowest revision number in set."
-msgstr ""
-"``min(conjunto)``\n"
-" Revisão com menor número de revisão no conjunto."
-
-msgid ""
-"``limit(set, n)``\n"
-" First n members of set."
-msgstr ""
-"``limit(conjunto, n)``\n"
-" Os primeiros n membros do conjunto."
-
-#. i18n: "limit" is a keyword
-msgid "limit requires two arguments"
-msgstr "limit requer dois argumentos"
-
-#. i18n: "limit" is a keyword
-msgid "limit requires a number"
-msgstr "limit requer um número"
-
-#. i18n: "limit" is a keyword
-msgid "limit expects a number"
-msgstr "limit espera um número"
-
-msgid ""
-"``children(set)``\n"
-" Child changesets of changesets in set."
-msgstr ""
-"``children(conjunto)``\n"
-" Revisões filhas das revisões no conjunto."
-
-msgid ""
-"``branch(set)``\n"
-" All changesets belonging to the branches of changesets in set."
-msgstr ""
-"``branch(conjunto)``\n"
-" Todas as revisões pertencentes aos ramos de revisões no conjunto."
+msgid ""
+"``adds(pattern)``\n"
+" Changesets that add a file matching pattern."
+msgstr ""
+"``adds(padrão)``\n"
+" Revisões que adicionam arquivos correspondentes ao padrão."
+
+#. i18n: "adds" is a keyword
+msgid "adds requires a pattern"
+msgstr "adds requer um padrão"
msgid ""
"``ancestor(single, single)``\n"
@@ -15584,23 +19173,87 @@
"``ancestors(conjunto)``\n"
" Revisões ancestrais de revisões no conjunto."
-msgid ""
-"``descendants(set)``\n"
-" Changesets which are descendants of changesets in set."
-msgstr ""
-"``descendants(conjunto)``\n"
-" Todas as revisões descendentes de revisões do conjunto."
-
-msgid ""
-"``follow()``\n"
-" An alias for ``::.`` (ancestors of the working copy's first parent)."
-msgstr ""
-"``follow()``\n"
-" Um apelido para ``::.`` (ancestrais do primeiro pai da cópia de trabalho)."
-
-#. i18n: "follow" is a keyword
-msgid "follow takes no arguments"
-msgstr "follow não tem argumentos"
+msgid "~ expects a number"
+msgstr "~ espera um número"
+
+msgid ""
+"``author(string)``\n"
+" Alias for ``user(string)``."
+msgstr ""
+"``author(string)``\n"
+" Apelido para ``user(string)``."
+
+#. i18n: "author" is a keyword
+msgid "author requires a string"
+msgstr "author requer uma string"
+
+msgid ""
+"``bisected(string)``\n"
+" Changesets marked in the specified bisect state (good, bad, skip)."
+msgstr ""
+"``bisected(string)``\n"
+" Revisões marcadas com o estado de bissecção especificado (good, bad, skip)."
+
+msgid "bisect requires a string"
+msgstr "bisect requer uma string"
+
+msgid "invalid bisect state"
+msgstr "estado de bisecção inválido"
+
+msgid ""
+"``bookmark([name])``\n"
+" The named bookmark or all bookmarks."
+msgstr ""
+"``bookmark([nome])``\n"
+" O marcador chamado nome, ou todos os marcadores."
+
+#. i18n: "bookmark" is a keyword
+msgid "bookmark takes one or no arguments"
+msgstr "bookmark requer um ou nenhum argumento"
+
+#. i18n: "bookmark" is a keyword
+msgid "the argument to bookmark must be a string"
+msgstr "o argumento para o comando bookmark deve ser uma string"
+
+msgid ""
+"``branch(string or set)``\n"
+" All changesets belonging to the given branch or the branches of the given\n"
+" changesets."
+msgstr ""
+"``branch(string ou conjunto)``\n"
+" Todas as revisões pertencentes ao ramo pedido ou aos ramos\n"
+" das revisões no conjunto."
+
+msgid ""
+"``children(set)``\n"
+" Child changesets of changesets in set."
+msgstr ""
+"``children(conjunto)``\n"
+" Revisões filhas das revisões no conjunto."
+
+msgid ""
+"``closed()``\n"
+" Changeset is closed."
+msgstr ""
+"``closed()``\n"
+" Revisões fechadas."
+
+#. i18n: "closed" is a keyword
+msgid "closed takes no arguments"
+msgstr "closed não tem argumentos"
+
+msgid ""
+"``contains(pattern)``\n"
+" Revision contains a file matching pattern. See :hg:`help patterns`\n"
+" for information about file patterns."
+msgstr ""
+"``contains(padrão)``\n"
+" Revisões que contenham um arquivo que combine com o padrão. Veja\n"
+" :hg:`help patterns` para informações sobre padrões de arquivo."
+
+#. i18n: "contains" is a keyword
+msgid "contains requires a pattern"
+msgstr "contains requer um padrão"
msgid ""
"``date(interval)``\n"
@@ -15614,18 +19267,66 @@
msgstr "date requer uma string"
msgid ""
-"``keyword(string)``\n"
-" Search commit message, user name, and names of changed files for\n"
-" string. The match is case-insensitive."
-msgstr ""
-"``keyword(string)``\n"
-" Revisões que contenham string na mensagem de consolidação, nome de\n"
-" usuário ou nomes de arquivos modificados. A comparação não diferencia\n"
-" maiúsculas e minúsculas."
-
-#. i18n: "keyword" is a keyword
-msgid "keyword requires a string"
-msgstr "keyword requer uma string"
+"``desc(string)``\n"
+" Search commit message for string. The match is case-insensitive."
+msgstr ""
+"``desc(string)``\n"
+" Procura por string na mensagem de consolidação. Essa procura não\n"
+" distingue maiúsculas e minúsculas."
+
+#. i18n: "desc" is a keyword
+msgid "desc requires a string"
+msgstr "desc requer uma string"
+
+msgid ""
+"``descendants(set)``\n"
+" Changesets which are descendants of changesets in set."
+msgstr ""
+"``descendants(conjunto)``\n"
+" Todas as revisões descendentes de revisões do conjunto."
+
+msgid ""
+"``filelog(pattern)``\n"
+" Changesets connected to the specified filelog."
+msgstr ""
+"``filelog(padrão)``\n"
+" Revisões conectadas ao filelog especificado."
+
+msgid "filelog requires a pattern"
+msgstr "filelog requer um padrão"
+
+msgid ""
+"``follow([file])``\n"
+" An alias for ``::.`` (ancestors of the working copy's first parent).\n"
+" If a filename is specified, the history of the given file is followed,\n"
+" including copies."
+msgstr ""
+"``follow([arquivo])``\n"
+" Um apelido para ``::.`` (ancestrais do primeiro pai da cópia de trabalho).\n"
+" Se um nome de arquivo for especificado, o histórico do arquivo pedido será\n"
+" seguido, incluindo cópias."
+
+#. i18n: "follow" is a keyword
+msgid "follow takes no arguments or a filename"
+msgstr "follow requer um nome de arquivo ou nenhum argumento"
+
+msgid "follow expected a filename"
+msgstr "follow espera um nome de arquivo"
+
+#. i18n: "follow" is a keyword
+msgid "follow takes no arguments"
+msgstr "follow não tem argumentos"
+
+msgid ""
+"``all()``\n"
+" All changesets, the same as ``0:tip``."
+msgstr ""
+"``all()``\n"
+" Todas as revisões, o mesmo que ``0:tip``."
+
+#. i18n: "all" is a keyword
+msgid "all takes no arguments"
+msgstr "all não tem argumentos"
msgid ""
"``grep(regex)``\n"
@@ -15648,25 +19349,6 @@
msgstr "padrão de busca inválido: %s"
msgid ""
-"``author(string)``\n"
-" Alias for ``user(string)``."
-msgstr ""
-"``author(string)``\n"
-" Apelido para ``user(string)``."
-
-#. i18n: "author" is a keyword
-msgid "author requires a string"
-msgstr "author requer uma string"
-
-msgid ""
-"``user(string)``\n"
-" User name contains string. The match is case-insensitive."
-msgstr ""
-"``user(texto)``\n"
-" O nome do usuário contém texto. A comparação não diferencia\n"
-" maiúsculas e minúsculas."
-
-msgid ""
"``file(pattern)``\n"
" Changesets affecting files matched by pattern."
msgstr ""
@@ -15678,17 +19360,99 @@
msgstr "file requer um padrão"
msgid ""
-"``contains(pattern)``\n"
-" Revision contains a file matching pattern. See :hg:`help patterns`\n"
-" for information about file patterns."
-msgstr ""
-"``contains(padrão)``\n"
-" Revisões que contenham um arquivo que combine com o padrão. Veja\n"
-" :hg:`help patterns` para informações sobre padrões de arquivo."
-
-#. i18n: "contains" is a keyword
-msgid "contains requires a pattern"
-msgstr "contains requer um padrão"
+"``head()``\n"
+" Changeset is a named branch head."
+msgstr ""
+"``head()``\n"
+" Revisões que forem cabeças de ramos nomeados."
+
+#. i18n: "head" is a keyword
+msgid "head takes no arguments"
+msgstr "head não tem argumentos"
+
+msgid ""
+"``heads(set)``\n"
+" Members of set with no children in set."
+msgstr ""
+"``heads(conjunto)``\n"
+" Membros do conjunto que não tenham filhos no conjunto."
+
+msgid ""
+"``keyword(string)``\n"
+" Search commit message, user name, and names of changed files for\n"
+" string. The match is case-insensitive."
+msgstr ""
+"``keyword(string)``\n"
+" Revisões que contenham string na mensagem de consolidação, nome de\n"
+" usuário ou nomes de arquivos modificados. A comparação não diferencia\n"
+" maiúsculas e minúsculas."
+
+#. i18n: "keyword" is a keyword
+msgid "keyword requires a string"
+msgstr "keyword requer uma string"
+
+msgid ""
+"``limit(set, n)``\n"
+" First n members of set."
+msgstr ""
+"``limit(conjunto, n)``\n"
+" Os primeiros n membros do conjunto."
+
+#. i18n: "limit" is a keyword
+msgid "limit requires two arguments"
+msgstr "limit requer dois argumentos"
+
+#. i18n: "limit" is a keyword
+msgid "limit requires a number"
+msgstr "limit requer um número"
+
+#. i18n: "limit" is a keyword
+msgid "limit expects a number"
+msgstr "limit espera um número"
+
+msgid ""
+"``last(set, n)``\n"
+" Last n members of set."
+msgstr ""
+"``last(conjunto, n)``\n"
+" Os últimos n membros do conjunto."
+
+#. i18n: "last" is a keyword
+msgid "last requires two arguments"
+msgstr "last requer dois argumentos"
+
+#. i18n: "last" is a keyword
+msgid "last requires a number"
+msgstr "last requer um número"
+
+#. i18n: "last" is a keyword
+msgid "last expects a number"
+msgstr "last espera um número"
+
+msgid ""
+"``max(set)``\n"
+" Changeset with highest revision number in set."
+msgstr ""
+"``max(conjunto)``\n"
+" Revisão com maior número de revisão no conjunto."
+
+msgid ""
+"``merge()``\n"
+" Changeset is a merge changeset."
+msgstr ""
+"``merge()``\n"
+" Revisões de mesclagem."
+
+#. i18n: "merge" is a keyword
+msgid "merge takes no arguments"
+msgstr "merge não tem argumentos"
+
+msgid ""
+"``min(set)``\n"
+" Changeset with lowest revision number in set."
+msgstr ""
+"``min(conjunto)``\n"
+" Revisão com menor número de revisão no conjunto."
msgid ""
"``modifies(pattern)``\n"
@@ -15702,15 +19466,71 @@
msgstr "modifies requer um padrão"
msgid ""
-"``adds(pattern)``\n"
-" Changesets that add a file matching pattern."
-msgstr ""
-"``adds(padrão)``\n"
-" Revisões que adicionam arquivos correspondentes ao padrão."
-
-#. i18n: "adds" is a keyword
-msgid "adds requires a pattern"
-msgstr "adds requer um padrão"
+"``id(string)``\n"
+" Revision non-ambiguously specified by the given hex string prefix."
+msgstr ""
+"``id(string)``\n"
+" Revisão especificada de modo não ambíguo pelo\n"
+" prefixo hexadecimal fornecido em string."
+
+#. i18n: "id" is a keyword
+msgid "id requires one argument"
+msgstr "id requer um argumento"
+
+#. i18n: "id" is a keyword
+msgid "id requires a string"
+msgstr "id requer uma string"
+
+msgid ""
+"``outgoing([path])``\n"
+" Changesets not found in the specified destination repository, or the\n"
+" default push location."
+msgstr ""
+"``outgoing([caminho])``\n"
+" Revisões não encontradas no repositório de destino\n"
+" especificado pelo caminho ou na localização padrão de push."
+
+#. i18n: "outgoing" is a keyword
+msgid "outgoing takes one or no arguments"
+msgstr "outgoing recebe um ou nenhum argumento"
+
+#. i18n: "outgoing" is a keyword
+msgid "outgoing requires a repository path"
+msgstr "outgoing exige um caminho para um repositório"
+
+msgid ""
+"``p1([set])``\n"
+" First parent of changesets in set, or the working directory."
+msgstr ""
+"``p1([conjunto])``\n"
+" O primeiro pai das revisões no conjunto, ou do diretório de trabalho."
+
+msgid ""
+"``p2([set])``\n"
+" Second parent of changesets in set, or the working directory."
+msgstr ""
+"``p2([conjunto])``\n"
+" O segundo pai das revisões no conjunto, ou do diretório de trabalho."
+
+msgid ""
+"``parents([set])``\n"
+" The set of all parents for all changesets in set, or the working directory."
+msgstr ""
+"``parents([conjunto])``\n"
+" O conjunto de todos os pais de todas as revisões no conjunto pedido,\n"
+" ou os pais do diretório de trabalho."
+
+msgid "^ expects a number 0, 1, or 2"
+msgstr "^ espera o número 0, 1 ou 2"
+
+msgid ""
+"``present(set)``\n"
+" An empty set, if any revision in set isn't found; otherwise,\n"
+" all revisions in set."
+msgstr ""
+"``present(set)``\n"
+" Um conjunto vazio, se qualquer revisão no conjunto pedido não for\n"
+" encontrada; caso contrário, todas as revisões no conjunto pedido."
msgid ""
"``removes(pattern)``\n"
@@ -15724,37 +19544,23 @@
msgstr "removes requer um padrão"
msgid ""
-"``merge()``\n"
-" Changeset is a merge changeset."
-msgstr ""
-"``merge()``\n"
-" Revisões de mesclagem."
-
-#. i18n: "merge" is a keyword
-msgid "merge takes no arguments"
-msgstr "merge não tem argumentos"
-
-msgid ""
-"``closed()``\n"
-" Changeset is closed."
-msgstr ""
-"``closed()``\n"
-" Revisões fechadas."
-
-#. i18n: "closed" is a keyword
-msgid "closed takes no arguments"
-msgstr "closed não tem argumentos"
-
-msgid ""
-"``head()``\n"
-" Changeset is a named branch head."
-msgstr ""
-"``head()``\n"
-" Revisões que forem cabeças de ramos nomeados."
-
-#. i18n: "head" is a keyword
-msgid "head takes no arguments"
-msgstr "head não tem argumentos"
+"``rev(number)``\n"
+" Revision with the given numeric identifier."
+msgstr ""
+"``rev(number)``\n"
+" Revisão com o identificador numérico dado."
+
+#. i18n: "rev" is a keyword
+msgid "rev requires one argument"
+msgstr "rev requer um argumento"
+
+#. i18n: "rev" is a keyword
+msgid "rev requires a number"
+msgstr "rev requer um número"
+
+#. i18n: "rev" is a keyword
+msgid "rev expects a number"
+msgstr "rev espera um número"
msgid ""
"``reverse(set)``\n"
@@ -15764,13 +19570,11 @@
" Ordem reversa do conjunto."
msgid ""
-"``present(set)``\n"
-" An empty set, if any revision in set isn't found; otherwise,\n"
-" all revisions in set."
-msgstr ""
-"``present(set)``\n"
-" Um conjunto vazio, se qualquer revisão no conjunto pedido não for\n"
-" encontrada; caso contrário, todas as revisões no conjunto pedido."
+"``roots(set)``\n"
+" Changesets with no parent changeset in set."
+msgstr ""
+"``roots(conjunto)``\n"
+" Revisões sem revisões pais no conjunto."
msgid ""
"``sort(set[, [-]key...])``\n"
@@ -15809,44 +19613,6 @@
msgstr "especificação de ordenação desconhecida: %r"
msgid ""
-"``all()``\n"
-" All changesets, the same as ``0:tip``."
-msgstr ""
-"``all()``\n"
-" Todas as revisões, o mesmo que ``0:tip``."
-
-#. i18n: "all" is a keyword
-msgid "all takes no arguments"
-msgstr "all não tem argumentos"
-
-msgid ""
-"``heads(set)``\n"
-" Members of set with no children in set."
-msgstr ""
-"``heads(conjunto)``\n"
-" Membros do conjunto que não tenham filhos no conjunto."
-
-msgid ""
-"``roots(set)``\n"
-" Changesets with no parent changeset in set."
-msgstr ""
-"``roots(conjunto)``\n"
-" Revisões sem revisões pais no conjunto."
-
-msgid ""
-"``outgoing([path])``\n"
-" Changesets not found in the specified destination repository, or the\n"
-" default push location."
-msgstr ""
-"``outgoing([caminho])``\n"
-" Revisões não encontradas no repositório de destino\n"
-" especificado pelo caminho ou na localização padrão de push."
-
-#. i18n: "outgoing" is a keyword
-msgid "outgoing requires a repository path"
-msgstr "outgoing exige um caminho para um repositório"
-
-msgid ""
"``tag([name])``\n"
" The specified tag by name, or all tagged revisions if no name is given."
msgstr ""
@@ -15864,19 +19630,12 @@
msgstr "o argumento de tag deve ser uma string"
msgid ""
-"``bookmark([name])``\n"
-" The named bookmark or all bookmarks."
-msgstr ""
-"``bookmark([nome])``\n"
-" O marcador chamado nome, ou todos os marcadores."
-
-#. i18n: "bookmark" is a keyword
-msgid "bookmark takes one or no arguments"
-msgstr "bookmark requer um ou nenhum argumento"
-
-#. i18n: "bookmark" is a keyword
-msgid "the argument to bookmark must be a string"
-msgstr "o argumento para o comando bookmark deve ser uma string"
+"``user(string)``\n"
+" User name contains string. The match is case-insensitive."
+msgstr ""
+"``user(texto)``\n"
+" O nome do usuário contém texto. A comparação não diferencia\n"
+" maiúsculas e minúsculas."
msgid "can't negate that"
msgstr "não é possível negar essa expressão"
@@ -15884,9 +19643,71 @@
msgid "not a symbol"
msgstr "não é um símbolo"
+#, python-format
+msgid "invalid number of arguments: %s"
+msgstr "número de argumentos inválido: %s"
+
msgid "empty query"
msgstr "consulta vazia"
+#, python-format
+msgid "ui.portablefilenames value is invalid ('%s')"
+msgstr "o valor de ui.portablefilenames é inválido ('%s')"
+
+#, python-format
+msgid "possible case-folding collision for %s"
+msgstr "possível colisão de maiúsculas e minúsculas para %s"
+
+#, python-format
+msgid "path ends in directory separator: %s"
+msgstr "o caminho termina em um separador de diretório: %s"
+
+#, python-format
+msgid "path contains illegal component: %s"
+msgstr "o caminho contém um componente ilegal: %s"
+
+#, python-format
+msgid "path %r is inside nested repo %r"
+msgstr "o caminho %r está dentro do repositório aninhado %r"
+
+#, python-format
+msgid "path %r traverses symbolic link %r"
+msgstr "o caminho %r percorre o link simbólico %r"
+
+#, python-format
+msgid "could not symlink to %r: %s"
+msgstr "impossível criar link simbólico para %r: %s"
+
+#, python-format
+msgid "recording removal of %s as rename to %s (%d%% similar)\n"
+msgstr "gravando remoção de %s como renomeação para %s (%d%% de similaridade)\n"
+
+#, python-format
+msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
+msgstr "%s ainda não foi consolidado, então dados de cópia não serão guardados para %s.\n"
+
+msgid ".hg/requires file is corrupt"
+msgstr "arquivo .hg/requires corrompido"
+
+#, python-format
+msgid "unknown repository format: requires features '%s' (upgrade Mercurial)"
+msgstr "formato de repositório desconhecido: requer as funcionalidades '%s' (atualize o Mercurial)"
+
+msgid "searching for changes\n"
+msgstr "procurando por mudanças\n"
+
+msgid "queries"
+msgstr "consultas"
+
+msgid "searching"
+msgstr "procurando"
+
+msgid "repository is unrelated"
+msgstr "repositório não é relacionado"
+
+msgid "warning: repository is unrelated\n"
+msgstr "aviso: repositório não é relacionado\n"
+
msgid "searching for exact renames"
msgstr "procurando por renomeações exatas"
@@ -15919,13 +19740,50 @@
msgid "remote: "
msgstr "remoto: "
-msgid "unexpected response:"
-msgstr "resposta inesperada:"
-
#, python-format
msgid "push refused: %s"
msgstr "envio recusado: %s"
+msgid "certificate checking requires Python 2.6"
+msgstr "verificação de certificado exige Python 2.6"
+
+msgid "no certificate received"
+msgstr "nenhum certificado recebido"
+
+#, python-format
+msgid "certificate is for %s"
+msgstr "o certificado é para %s"
+
+msgid "IDN in certificate not supported"
+msgstr "IDN no certificado não é suportado"
+
+msgid "no commonName or subjectAltName found in certificate"
+msgstr "nenhum commonName ou subjectAltName encontrado no certificado"
+
+#, python-format
+msgid "could not find web.cacerts: %s"
+msgstr "não foi possível encontrar web.cacerts: %s"
+
+#, python-format
+msgid "%s certificate error: %s (use --insecure to connect insecurely)"
+msgstr "erro no certificado de %s: %s (use --insecure para conectar de modo inseguro)"
+
+#, python-format
+msgid "invalid certificate for %s with fingerprint %s"
+msgstr "certificado inválido para %s com impressão digital %s"
+
+#, python-format
+msgid "warning: %s certificate with fingerprint %s not verified (check hostfingerprints or web.cacerts config setting)\n"
+msgstr "aviso: o certificado %s com impressão digital %s não foi verificado (verifique as opções de configuração hostfingerprints e web.cacerts)\n"
+
+#, python-format
+msgid "host fingerprint for %s can't be verified (Python too old)"
+msgstr "a impressão digital do host para %s não pode ser verificada (versão do Python muito antiga)"
+
+#, python-format
+msgid "warning: certificate for %s can't be verified (Python too old)\n"
+msgstr "aviso: certificado %s não pode ser verificado (versão do Python muito antiga)\n"
+
#, python-format
msgid "'%s' does not appear to be an hg repository"
msgstr "'%s' não parece ser um repositório hg"
@@ -16019,6 +19877,10 @@
msgstr "removendo sub-repositório %s\n"
#, python-format
+msgid "cloning subrepo %s from %s\n"
+msgstr "clonando sub-repositório %s de %s\n"
+
+#, python-format
msgid "pulling subrepo %s from %s\n"
msgstr "trazendo sub-repositório %s de %s\n"
@@ -16037,14 +19899,6 @@
msgstr "repositório %s não removido por possuir mudanças.\n"
#, python-format
-msgid "cloning subrepo %s\n"
-msgstr "clonando sub-repositório %s\n"
-
-#, python-format
-msgid "pulling subrepo %s\n"
-msgstr "trazendo sub-repositório %s\n"
-
-#, python-format
msgid "revision %s does not exist in subrepo %s\n"
msgstr "a revisão %s não existe no sub-repositório %s\n"
@@ -16138,6 +19992,9 @@
msgid "rollback failed - please run hg recover\n"
msgstr "rollback falhou - por favor execute hg recover\n"
+msgid "already have changeset "
+msgstr "já possui a revisão "
+
#, python-format
msgid "Not trusting file %s from untrusted user %s, group %s\n"
msgstr "Não confiando em arquivo %s de usuário não confiável %s, grupo %s\n"
@@ -16151,13 +20008,13 @@
msgstr "('%%' obsoleto em caminho %s=%s de %s)\n"
#, python-format
-msgid "ignoring untrusted configuration option %s.%s = %s\n"
-msgstr "ignorando opção de configuração não confiável %s.%s = %s\n"
-
-#, python-format
-msgid "%s.%s not a boolean ('%s')"
+msgid "%s.%s is not a boolean ('%s')"
msgstr "%s.%s não é uma booleana ('%s')"
+#, python-format
+msgid "%s.%s is not an integer ('%s')"
+msgstr "%s.%s não é um inteiro ('%s')"
+
msgid "enter a commit username:"
msgstr "entre o nome do usuário para consolidação:"
@@ -16184,10 +20041,6 @@
msgid "edit failed"
msgstr "falha ao editar"
-#, python-format
-msgid "ignoring invalid [auth] key '%s'\n"
-msgstr "ignorando chave inválida em [auth] '%s'\n"
-
msgid "http authorization required"
msgstr "autorização http requerida"
@@ -16209,72 +20062,21 @@
msgid "http auth: user %s, password %s\n"
msgstr "autenticação http: usuário %s, senha %s\n"
-msgid "kb"
-msgstr "kb"
-
-msgid "certificate checking requires Python 2.6"
-msgstr "verificação de certificado exige Python 2.6"
-
-msgid "no certificate received"
-msgstr "nenhum certificado recebido"
-
-#, python-format
-msgid "certificate is for %s"
-msgstr "o certificado é para %s"
-
-msgid "IDN in certificate not supported"
-msgstr "IDN no certificado não é suportado"
-
-msgid "no commonName or subjectAltName found in certificate"
-msgstr "nenhum commonName ou subjectAltName encontrado no certificado"
-
-#, python-format
-msgid "could not find web.cacerts: %s"
-msgstr "não foi possível encontrar web.cacerts: %s"
-
-#, python-format
-msgid "%s certificate error: %s (use --insecure to connect insecurely)"
-msgstr "erro no certificado de %s: %s (use --insecure para conectar de modo inseguro)"
-
-#, python-format
-msgid "invalid certificate for %s with fingerprint %s"
-msgstr "certificado inválido para %s com impressão digital %s"
-
-#, python-format
-msgid "warning: %s certificate with fingerprint %s not verified (check hostfingerprints or web.cacerts config setting)\n"
-msgstr "aviso: o certificado %s com impressão digital %s não foi verificado (verifique as opções de configuração hostfingerprints e web.cacerts)\n"
-
-#, python-format
-msgid "no certificate for %s with configured hostfingerprint"
-msgstr "nenhum certificado para %s com a impressão digital configurada"
-
-#, python-format
-msgid "warning: %s certificate not verified (check web.cacerts config setting)\n"
-msgstr "aviso: certificado %s não verificado (confira a opção de configuração web.cacerts)\n"
-
#, python-format
msgid "command '%s' failed: %s"
msgstr "falha ao executar o comando '%s' : %s"
#, python-format
-msgid "path ends in directory separator: %s"
-msgstr "o caminho termina em um separador de diretório: %s"
-
-#, python-format
-msgid "path contains illegal component: %s"
-msgstr "o caminho contém um componente ilegal: %s"
-
-#, python-format
-msgid "path %r is inside repo %r"
-msgstr "o caminho %r está dentro do repositório %r"
-
-#, python-format
-msgid "path %r traverses symbolic link %r"
-msgstr "o caminho %r percorre o link simbólico %r"
-
-#, python-format
-msgid "could not symlink to %r: %s"
-msgstr "impossível criar link simbólico para %r: %s"
+msgid "filename contains '%s', which is reserved on Windows"
+msgstr "o nome de arquivo contém '%s', que é um nome reservado em Windows"
+
+#, python-format
+msgid "filename contains %r, which is invalid on Windows"
+msgstr "o nome de arquivo contém '%s', que é inválido em Windows"
+
+#, python-format
+msgid "filename ends with '%s', which is not allowed on Windows"
+msgstr "o nome de arquivo termina em '%s', o que não é permitido em Windows"
msgid "check your clock"
msgstr "verifique seu relógio"
@@ -16299,11 +20101,24 @@
msgid "impossible time zone offset: %d"
msgstr "fuso horário impossível: %d"
+msgid "dates cannot consist entirely of whitespace"
+msgstr "datas não podem conter apenas espaços em branco"
+
+msgid "invalid day spec, use '<DATE'"
+msgstr "especificação de dia inválida, use '<DATA'"
+
+msgid "invalid day spec, use '>DATE'"
+msgstr "especificação de dia inválida, use '>DATA'"
+
#, python-format
msgid "invalid day spec: %s"
msgstr "especificação de dia inválida: %s"
#, python-format
+msgid "%s must be nonnegative (see 'hg help dates')"
+msgstr "%s não pode ser negativo (veja 'hg help dates')"
+
+#, python-format
msgid "%.0f GB"
msgstr "%.0f GB"
@@ -16347,6 +20162,9 @@
msgid "no port number associated with service '%s'"
msgstr "nenhum número de porta associado ao serviço '%s'"
+msgid "file:// URLs can only refer to localhost"
+msgstr "URLs file:// só podem se referir a localhost"
+
msgid "cannot verify bundle or remote repos"
msgstr "impossível verificar bundle ou repositório remoto"
@@ -16525,10 +20343,3 @@
msgid "push failed:"
msgstr "o push falhou:"
-
-msgid ""
-"``contains(pattern)``\n"
-" Revision contains pattern."
-msgstr ""
-"``contains(padrão)``\n"
-" Revisões contendo o padrão."
--- a/i18n/ru.po Wed Jun 29 12:54:34 2011 +0200
+++ b/i18n/ru.po Wed Jun 29 16:05:41 2011 -0500
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2011-06-09 20:39+0400\n"
+"POT-Creation-Date: 2011-06-29 18:27+0400\n"
"PO-Revision-Date: 2011-05-12 23:48+0400\n"
"Last-Translator: Alexander Sauta <demosito@gmail.com>\n"
"Language-Team: Russian\n"
@@ -556,7 +556,7 @@
msgid ""
"XMLRPC+email example configuration. This uses the Bugzilla at\n"
"``http://my-project.org/bugzilla``, logging in as user\n"
-"``bugmail@my-project.org`` wityh password ``plugh``. It is used with a\n"
+"``bugmail@my-project.org`` with password ``plugh``. It is used with a\n"
"collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
"with a web interface at ``http://my-project.org/hg``. Bug comments\n"
"are sent to the Bugzilla email address\n"
@@ -943,13 +943,13 @@
msgstr ""
#, python-format
+msgid "warning: failed to set color mode to %s\n"
+msgstr ""
+
+#, python-format
msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
msgstr ""
-#, python-format
-msgid "warning: failed to set color mode to %s\n"
-msgstr ""
-
#. i18n: 'always', 'auto', and 'never' are keywords and should
#. not be translated
msgid "when to colorize (boolean, always, auto, or never)"
@@ -966,7 +966,7 @@
msgstr "Преобразовать репозиторий другой SCM в репозиторий Mercurial"
msgid " Accepted source formats [identifiers]:"
-msgstr " Возможные входные форматы [идентификаторы]:"
+msgstr " Возможные входные форматы [обозначения]:"
msgid ""
" - Mercurial [hg]\n"
@@ -981,7 +981,7 @@
msgstr ""
msgid " Accepted destination formats [identifiers]:"
-msgstr " Возможные выходные форматы [идентификаторы]:"
+msgstr " Возможные выходные форматы [обозначения]:"
msgid ""
" - Mercurial [hg]\n"
@@ -1048,7 +1048,6 @@
" --sourcesort пытается сохранить исходный порядок ревизий.\n"
" Только для исходных репозиториев Mercurial"
-#, fuzzy
msgid ""
" If ``REVMAP`` isn't given, it will be put in a default location\n"
" (``<dest>/.hg/shamap`` by default). The ``REVMAP`` is a simple\n"
@@ -1088,9 +1087,8 @@
msgid " source author = destination author"
msgstr " автор в источнике = автор на выходе"
-#, fuzzy
msgid " Empty lines and lines starting with a ``#`` are ignored."
-msgstr " Пустые строки и строки, начинающиеся с ``#`` игнорируются\n"
+msgstr " Пустые строки и строки, начинающиеся с ``#`` игнорируются"
msgid ""
" The filemap is a file that allows filtering and remapping of files\n"
@@ -1345,7 +1343,6 @@
" CVS. Функции передается список с элементами набора изменений,\n"
" она может изменять их, удалять или добавлять новые."
-#, fuzzy
msgid ""
" An additional \"debugcvsps\" Mercurial command allows the builtin\n"
" changeset merging code to be run without doing a conversion. Its\n"
@@ -1475,7 +1472,6 @@
msgid " The following options are supported:"
msgstr " Поддерживаются следующие параметры:"
-#, fuzzy
msgid ""
" :convert.hg.clonebranches: dispatch source branches in separate\n"
" clones. The default is False."
@@ -1594,13 +1590,16 @@
msgstr "hg debugcvsps [ПАРАМЕТР]... [ПУТЬ]..."
msgid ":svnrev: String. Converted subversion revision number."
-msgstr ""
+msgstr ":svnrev: Строка. Номер сконвертированной ревизии subversion."
msgid ":svnpath: String. Converted subversion revision project path."
msgstr ""
+":svnpath: Строка. Путь к проекту сконвертированной из subversion ревизии."
msgid ":svnuuid: String. Converted subversion revision repository identifier."
msgstr ""
+":svnuuid: Строка. Идентификатор репозитория сконвертированной из\n"
+" subversion ревизии."
#, python-format
msgid "%s does not look like a Bazaar repository"
@@ -3363,11 +3362,11 @@
msgstr ""
#, python-format
-msgid "allowing %s - guarded by %r\n"
-msgstr ""
-
-#, python-format
-msgid "skipping %s - guarded by %r\n"
+msgid "allowing %s - guarded by %s\n"
+msgstr ""
+
+#, python-format
+msgid "skipping %s - guarded by %s\n"
msgstr ""
#, python-format
@@ -3530,7 +3529,7 @@
msgstr ""
#, python-format
-msgid "guarded by %r"
+msgid "guarded by %s"
msgstr ""
msgid "no matching guards"
@@ -4254,14 +4253,6 @@
" With two arguments, renames PATCH1 to PATCH2."
msgstr ""
-#, fuzzy, python-format
-msgid "%s already exists"
-msgstr "файл %s уже существует\n"
-
-#, python-format
-msgid "A patch named %s already exists in the series file"
-msgstr ""
-
msgid "delete save entry"
msgstr ""
@@ -4602,9 +4593,8 @@
" Changesets managed by MQ."
msgstr ""
-#, fuzzy
msgid "mq takes no arguments"
-msgstr "несовместимые аргументы"
+msgstr "mq не требует аргументов"
msgid "operate on patch repository"
msgstr "работать с репозиторием патчей mq"
@@ -4632,7 +4622,9 @@
" # one email for each incoming changeset\n"
" incoming.notify = python:hgext.notify.hook\n"
" # batch emails when many changesets incoming at one time\n"
-" changegroup.notify = python:hgext.notify.hook"
+" changegroup.notify = python:hgext.notify.hook\n"
+" # batch emails when many changesets outgoing at one time (client side)\n"
+" outgoing.notify = python:hgext.notify.hook"
msgstr ""
msgid ""
@@ -4656,7 +4648,8 @@
" style = ... # style file to use when formatting email\n"
" template = ... # template to use when formatting email\n"
" incoming = ... # template to use when run as incoming hook\n"
-" changegroup = ... # template when run as changegroup hook\n"
+" outgoing = ... # template to use when run as outgoing hook\n"
+" changegroup = ... # template to use when run as changegroup hook\n"
" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
" maxsubject = 67 # truncate subject line longer than this\n"
" diffstat = True # add a diffstat before the diff content\n"
@@ -5439,12 +5432,27 @@
msgid "source is descendant of destination"
msgstr ""
+msgid "--tool can only be used with --rebase"
+msgstr ""
+
msgid "rebase working directory to branch head"
msgstr "перебазировать рабочий каталог поверх головы ветви"
+msgid "specify merge tool for rebase"
+msgstr "задать программу для слияния при перебазировании"
+
msgid "commands to interactively select changes for commit/qrefresh"
msgstr ""
+msgid "ignore white space when comparing lines"
+msgstr "игнорировать пробельные символы при сравнении строк"
+
+msgid "ignore changes in the amount of white space"
+msgstr "игнорировать изменения в количестве пробельных символов"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "игнорировать пустые строки"
+
msgid "this modifies a binary file (all or nothing)\n"
msgstr "это изменяет двоичный файл (всё или ничего)\n"
@@ -5500,6 +5508,9 @@
msgid "record change %d/%d to %r?"
msgstr ""
+msgid "hg record [OPTION]... [FILE]..."
+msgstr ""
+
msgid "interactively select changes to commit"
msgstr ""
@@ -5549,7 +5560,8 @@
msgid "'mq' extension not loaded"
msgstr ""
-msgid "running non-interactively, use commit instead"
+#, python-format
+msgid "running non-interactively, use %s instead"
msgstr ""
msgid "cannot partially commit a merge (use \"hg commit\" instead)"
@@ -5558,12 +5570,12 @@
msgid "no changes to record\n"
msgstr ""
-msgid "hg record [OPTION]... [FILE]..."
-msgstr ""
-
msgid "hg qrecord [OPTION]... PATCH [FILE]..."
msgstr ""
+msgid "interactively select changes to refresh"
+msgstr ""
+
msgid "recreates hardlinks between repository clones"
msgstr ""
@@ -5635,10 +5647,6 @@
msgid "source and destination are on different devices"
msgstr ""
-#, python-format
-msgid "not linkable: %s\n"
-msgstr ""
-
msgid "pruning"
msgstr ""
@@ -6232,9 +6240,9 @@
msgid "invalid arguments"
msgstr "неверные параметры"
-#, fuzzy, python-format
+#, python-format
msgid "revlog '%s' not found"
-msgstr "репозиторий %s не найден"
+msgstr "revlog '%s' не найден"
#, python-format
msgid "%s: not copying - file is not managed\n"
@@ -6472,9 +6480,8 @@
msgid "time how long the command takes"
msgstr "время выполнения команды"
-#, fuzzy
msgid "print command execution profile"
-msgstr "профилировка выполнения команды"
+msgstr "профилирование выполнения команды"
msgid "output version information and exit"
msgstr "напечатать информацию о версии и выйти"
@@ -6542,15 +6549,6 @@
msgid "produce a diff that undoes the changes"
msgstr "сгенерировать патч, который отменяет изменения"
-msgid "ignore white space when comparing lines"
-msgstr "игнорировать пробельные символы при сравнении строк"
-
-msgid "ignore changes in the amount of white space"
-msgstr "игнорировать изменения в количестве пробельных символов"
-
-msgid "ignore changes whose lines are all blank"
-msgstr "игнорировать пустые строки"
-
msgid "number of lines of context to show"
msgstr "показываемое количество строк контекста"
@@ -6751,9 +6749,8 @@
msgid "type of distribution to create"
msgstr "тип создаваемого архива"
-#, fuzzy
msgid "[OPTION]... DEST"
-msgstr "[ПАРАМЕТР]... [-r] РЕВИЗИЯ"
+msgstr "[ПАРАМЕТР]... НАЗНАЧЕНИЕ"
msgid "create an unversioned archive of a repository revision"
msgstr "создать неверсионируемую архивную копию ревизии репозитория"
@@ -6817,9 +6814,8 @@
msgid "cannot archive plain files to stdout"
msgstr "не могу архивировать обычный каталог в stdout"
-#, fuzzy
msgid "merge with old dirstate parent after backout"
-msgstr "слить со старым родителем после отмены"
+msgstr "слить со старым родителем после завершения"
msgid "parent to choose when backing out merge"
msgstr "выбираемая родительская ревизия при отмене слияния"
@@ -7158,6 +7154,15 @@
" ветвь. Используйте :hg:`commit --close-branch` чтобы пометить эту\n"
" ветвь как закрытую."
+msgid " .. note::"
+msgstr ""
+
+msgid ""
+" Branch names are permanent. Use :hg:`bookmark` to create a\n"
+" light-weight bookmark instead. See :hg:`help glossary` for more\n"
+" information about named branches and bookmarks."
+msgstr ""
+
#, python-format
msgid "reset working directory to branch %s\n"
msgstr "рабочий каталог сброшен на ветвь %s\n"
@@ -7758,9 +7763,8 @@
msgid "need repo for changelog dag"
msgstr ""
-#, fuzzy
msgid "open changelog"
-msgstr "открыть журнал изменений"
+msgstr "открыть журнал изменений (changelog)"
msgid "open manifest"
msgstr ""
@@ -7796,6 +7800,9 @@
msgid "runs the changeset discovery protocol in isolation"
msgstr ""
+msgid "parse and apply a fileset specification"
+msgstr ""
+
msgid "[PATH]"
msgstr ""
@@ -8536,8 +8543,8 @@
msgid "PATH"
msgstr "ПУТЬ"
-msgid "base path"
-msgstr "базовый путь"
+msgid "base path (DEPRECATED)"
+msgstr "базовый путь (УСТАРЕЛО)"
msgid "skip check for outstanding uncommitted changes"
msgstr "не проверять "
@@ -8545,15 +8552,17 @@
msgid "don't commit, just update the working directory"
msgstr "не коммитить, просто обновить рабочий каталог"
+msgid "apply patch without touching the working directory"
+msgstr "применить файл, не трогая рабочий каталог"
+
msgid "apply patch to the nodes from which it was generated"
msgstr "применить патч к узлам, для которых он был сгенерирован"
msgid "use any branch information in patch (implied by --exact)"
msgstr "использовать любую информацию о ветвях из патча (включается --exact)"
-#, fuzzy
msgid "[OPTION]... PATCH..."
-msgstr "[ПАРАМЕТР]... ФАЙЛ..."
+msgstr "[ПАРАМЕТР]... ПАТЧ..."
msgid "import an ordered set of patches"
msgstr "импортировать упорядоченный набор патчей"
@@ -8613,6 +8622,13 @@
" или других дефектах в формате патча."
msgid ""
+" Use --bypass to apply and commit patches directly to the\n"
+" repository, not touching the working directory. Without --exact,\n"
+" patches will be applied on top of the working directory parent\n"
+" revision."
+msgstr ""
+
+msgid ""
" With -s/--similarity, hg will attempt to discover renames and\n"
" copies in the patch in the same way as 'addremove'."
msgstr ""
@@ -8628,15 +8644,21 @@
" стандартного ввода. Если указан URL, патч будет загружен оттуда.\n"
" См. :hg:`help dates` о допустимых форматах дат для -d/--date."
+msgid "cannot use --no-commit with --bypass"
+msgstr ""
+
+msgid "cannot use --similarity with --bypass"
+msgstr ""
+
+msgid "patch is damaged or loses information"
+msgstr "патч поврежден или в нем недостает данных"
+
msgid "to working directory"
msgstr "в рабочий каталог"
msgid "not a Mercurial patch"
msgstr "не патч Mercurial"
-msgid "patch is damaged or loses information"
-msgstr "патч поврежден или в нем недостает данных"
-
msgid "applying patch from stdin\n"
msgstr "применяю патч со стандартного вводар\n"
@@ -8777,9 +8799,8 @@
" проблем, когда \"xargs\" считает отдельные имена с пробелами\n"
" несколькими файлами."
-#, fuzzy
msgid "only follow the first parent of merge changesets"
-msgstr "история только для первого родителя ревизий слияния"
+msgstr "следовать только за первым родителем ревизий слияния"
msgid "show revisions matching date spec"
msgstr "показывать ревизии с датой, соответсвующие данной"
@@ -8808,6 +8829,9 @@
msgid "do not display revision or any of its ancestors"
msgstr "не показывать ревизию и всех ее предшественников"
+msgid "show hidden changesets"
+msgstr "показывать скрытые наборы изменений"
+
msgid "[OPTION]... [FILE]"
msgstr "[ПАРАМЕТР]... [ФАЙЛ]"
@@ -8872,6 +8896,9 @@
msgid "revision to display"
msgstr "показать ревизию"
+msgid "list files from all revisions"
+msgstr "показать файлы из всех ревизий"
+
msgid "[-r REV]"
msgstr "[-r РЕВИЗИЯ]"
@@ -8895,6 +8922,14 @@
" С -v печатает права доступа файлов и признаки символической ссылки\n"
" и исполняемого файла. С --debug печатает хэши ревизий."
+msgid ""
+" If option --all is specified, the list of all files from all revisions\n"
+" is printed. This includes deleted and renamed files."
+msgstr ""
+
+msgid "can't specify a revision with --all"
+msgstr "нельзя одновременно указывать ревизию и --all"
+
msgid "force a merge with outstanding changes"
msgstr "слить принудительно, даже если есть незакоммиченные изменения"
@@ -8953,7 +8988,6 @@
" Используйте :hg:`resolve`, чтобы пометить файлы с устраненными "
"конфликтами"
-#, fuzzy
msgid ""
" To undo an uncommitted merge, use :hg:`update --clean .` which\n"
" will check out a clean copy of the original merge parent, losing\n"
@@ -8961,7 +8995,7 @@
msgstr ""
" Используйте :hg:`update -clean .`, чтобы отменить незакоммиченное\n"
" слияние. Это извлечет чистую копию родителя, изначально выбранного\n"
-" для слияния, с потерей всех изменений."
+" для слияния, с потерей всех изменений."
msgid ""
" Returns 0 on success, 1 if there are unresolved files.\n"
@@ -9117,8 +9151,9 @@
msgid "not found!\n"
msgstr "не найден!\n"
-msgid "not updating, since new heads added\n"
-msgstr "не обновляюсь т.к. добавлены новые головы\n"
+#, python-format
+msgid "not updating: %s\n"
+msgstr "не обновлено: %s\n"
msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
msgstr ""
@@ -9384,6 +9419,11 @@
" -Af R R R R"
msgid ""
+" Note that remove never deletes files in Added [A] state from the\n"
+" working directory, not even if option --force is specified."
+msgstr ""
+
+msgid ""
" This command schedules the files to be removed at the next commit.\n"
" To undo a remove before that, see :hg:`revert`."
msgstr ""
@@ -9541,8 +9581,8 @@
msgid "no files or directories specified; use --all to remerge all files"
msgstr "не заданы файлы или каталоги; --all повторит слияние для всех файлов"
-msgid "revert all changes when no arguments given \n"
-msgstr "без параметров вернуть файлы к прежнему состоянию \n"
+msgid "revert all changes when no arguments given"
+msgstr "без аргументов - вернуть файлы к прежнему состоянию"
msgid "tipmost revision matching date"
msgstr "максимальная ревизия не позднее ДАТЫ"
@@ -9556,81 +9596,40 @@
msgid "[OPTION]... [-r REV] [NAME]..."
msgstr "[ПАРАМЕТР]... [-r РЕВИЗИЯ] [ИМЯ]..."
-msgid "restore individual files or directories to an earlier state"
-msgstr "вернуть файлы или каталоги к более раннему состоянию"
+msgid "restore files to their checkout state"
+msgstr ""
msgid ""
" .. note::\n"
-" This command is most likely not what you are looking for.\n"
-" Revert will partially overwrite content in the working\n"
-" directory without changing the working directory parents. Use\n"
-" :hg:`update -r rev` to check out earlier revisions, or\n"
-" :hg:`update --clean .` to undo a merge which has added another\n"
-" parent."
-msgstr ""
-" .. note::\n"
-" Эта команда почти наверняка не то, что вы ищете. Revert\n"
-" частично переписывает файлы в рабочем каталоге, не изменяя его\n"
-" родительскую ревизию в репозитории. Используйте \n"
-" :hg:`update -r рев` чтобы извлечь предыдущие ревизии, или\n"
-" :hg update --clean .` чтобы отменить слияние, которе добавило\n"
-" второго родителя."
-
-msgid ""
-" With no revision specified, revert the named files or directories\n"
-" to the contents they had in the parent of the working directory.\n"
-" This restores the contents of the affected files to an unmodified\n"
-" state and unschedules adds, removes, copies, and renames. If the\n"
-" working directory has two parents, you must explicitly specify a\n"
-" revision."
+" To check out earlier revisions, you should use :hg:`update REV`.\n"
+" To cancel a merge (and lose your changes), use :hg:`update --clean .`."
+msgstr ""
+
+msgid ""
+" With no revision specified, revert the specified files or directories\n"
+" to the state they had in the first parent of the working directory.\n"
+" This restores the contents of files to an unmodified\n"
+" state and unschedules adds, removes, copies, and renames."
msgstr ""
" Если ревизия не задана, вернуть указанные файлы и каталоги к\n"
" состоянию, в котором они сохранены в родительской ревизии\n"
" рабочего каталога. Это восстанавливает содержимое указанных\n"
" файлов до неизмененного состояния и отменяет запланированные\n"
-" добавления, удаления, копирования и переименования файлов.\n"
-" Если у рабочего каталога два родителя, ревизия нужно указать\n"
-" явно."
-
-msgid ""
-" Using the -r/--rev option, revert the given files or directories\n"
-" to their contents as of a specific revision. This can be helpful\n"
-" to \"roll back\" some or all of an earlier change. See :hg:`help\n"
-" dates` for a list of formats valid for -d/--date."
-msgstr ""
-" С параметром -r/--rev восстанавливает содержимое заданных файлов\n"
-" и каталогов до указанной ревизии. Это может быть полезным чтобы\n"
-" \"откатить\" все или некоторые предшествующие изменения.\n"
-" О форматах датах для -d/--date см. :hg:`help dates`."
-
-msgid ""
-" Revert modifies the working directory. It does not commit any\n"
-" changes, or change the parent of the working directory. If you\n"
-" revert to a revision other than the parent of the working\n"
-" directory, the reverted files will thus appear modified\n"
-" afterwards."
-msgstr ""
-" Revert изменяет рабочий каталог. Она не комитит никаких\n"
-" изменений и не меняет родителя рабочего каталога. Если вы\n"
-" выполните revert на ревизию, отличную от текущей родительской,\n"
-" восстановленные файлы будут иметь статус измененных."
-
-msgid ""
-" If a file has been deleted, it is restored. Files scheduled for\n"
-" addition are just unscheduled and left as they are. If the\n"
-" executable mode of a file was changed, it is reset."
-msgstr ""
-" Если файл был удален, он восстанавливается. У файлов, помеченных\n"
-" для добавления, пометка снимается, сами файлы при этом не\n"
-" изменяются. Если изменился признак исполнимости файла, он\n"
-" сбраывается."
-
-msgid ""
-" If names are given, all files matching the names are reverted.\n"
-" If no arguments are given, no files are reverted."
-msgstr ""
-" Если заданы имена, восстанавливаются все файлы с подходящими\n"
-" именами. Без аргумнтов никакие файлы не будут восстановлены."
+" добавления, удаления, копирования и переименования файлов."
+
+msgid ""
+" Using the -r/--rev or -d/--date options, revert the given files or\n"
+" directories to their states as of a specific revision. Because\n"
+" revert does not change the working directory parents, this will\n"
+" cause these files to appear modified. This can be helpful to \"back\n"
+" out\" some or all of an earlier change. See :hg:`backout` for a\n"
+" related method."
+msgstr ""
+" С параметром -r/--rev или -d/--date восстанавливает содержимое \n"
+" заданных файлов и каталогов до указанной ревизии. Т.к. revert \n"
+" изменяет родителей рабочего каталога, эти файлы будут показыаться\n"
+" как измененные. Это может быть полезным чтобы \"откатить\" все или\n"
+" некоторые предшествующие изменения. См. также backout."
msgid ""
" Modified files are saved with a .orig suffix before reverting.\n"
@@ -9643,12 +9642,33 @@
msgid "you can't specify a revision and a date"
msgstr "нельзя указывать одновременно дату и ревизию"
-msgid "uncommitted merge - use \"hg update\", see \"hg help revert\""
-msgstr ""
-"незакомиченное слияние - используйте \"hg update\", см. \"hg help revert\""
-
-msgid "no files or directories specified; use --all to revert the whole repo"
-msgstr "не заданы файлы или каталоги; --all откатит весь репозиторий"
+msgid "no files or directories specified"
+msgstr "не указаны файлы или каталоги"
+
+msgid ""
+"uncommitted merge, use --all to discard all changes, or 'hg update -C .' to "
+"abort the merge"
+msgstr ""
+
+#, python-format
+msgid ""
+"uncommitted changes, use --all to discard all changes, or 'hg update %s' to "
+"update"
+msgstr ""
+
+#, python-format
+msgid "use --all to revert all files, or 'hg update %s' to update"
+msgstr ""
+"используйте --all чтобы восстановить все файлы, или 'hg update %s'\n"
+"чтобы обновиться"
+
+#, fuzzy
+msgid "uncommitted changes, use --all to discard all changes"
+msgstr "используйте --all чтобы сбросить все изменения"
+
+#, fuzzy
+msgid "use --all to revert all files"
+msgstr "используйте --all чтобы сбросить все изменения"
#, python-format
msgid "forgetting %s\n"
@@ -9760,9 +9780,8 @@
msgid "ADDR"
msgstr "АДРЕС"
-#, fuzzy
msgid "prefix path to serve from (default: server root)"
-msgstr "корневая директория сервера (по умолчанию: корень сервера)"
+msgstr "корневая директория веб-сервера (по умолчанию: корень сервера)"
msgid "name to show in web pages (default: working directory)"
msgstr ""
@@ -9836,10 +9855,13 @@
" указать 0 в качестве номера входящего порта; в этом случае он\n"
" напечатает выбранный порт."
+msgid "cannot use --stdio with --cmdserver"
+msgstr ""
+
msgid "There is no Mercurial repository here (.hg not found)"
msgstr "Здесь нет репозитория Mercurial (.hg не обнаружен)"
-#, fuzzy, python-format
+#, python-format
msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
msgstr "слушаю по адресу http://%s%s/%s (привязан к %s:%d)\n"
@@ -9876,10 +9898,6 @@
" Если указан --debug, для каждого параметра печатается имя файла\n"
" и номер строки, откуда он был прочитан."
-#, python-format
-msgid "read config from: %s\n"
-msgstr "читаю конфиг из: %s\n"
-
msgid "only one config item permitted"
msgstr "можно указать только один парметр конфига"
@@ -10031,7 +10049,7 @@
msgid "%d added"
msgstr "%d добавлено"
-#, fuzzy, python-format
+#, python-format
msgid "%d removed"
msgstr "%d удалено"
@@ -10043,7 +10061,7 @@
msgid "%d copied"
msgstr "%d скопировано"
-#, fuzzy, python-format
+#, python-format
msgid "%d deleted"
msgstr "%d удалено"
@@ -10059,7 +10077,7 @@
msgid "%d unresolved"
msgstr "%d с неразрешенными конфликтами"
-#, fuzzy, python-format
+#, python-format
msgid "%d subrepos"
msgstr "%d субрепозиториев"
@@ -10082,15 +10100,14 @@
msgid "commit: %s\n"
msgstr " коммит: %s\n"
-#, fuzzy
msgid "update: (current)\n"
msgstr "обновление: (текущее)\n"
-#, fuzzy, python-format
+#, python-format
msgid "update: %d new changesets (update)\n"
msgstr "обновление: %d новых наборов изменений (обновление)\n"
-#, fuzzy, python-format
+#, python-format
msgid "update: %d new changesets, %d branch heads (merge)\n"
msgstr "обновление: %d новых наборов изменений, %d голов (слияние)\n"
@@ -10320,6 +10337,13 @@
" нет, раочий каталог обновляется до указанной ревизии."
msgid ""
+" Update sets the working directory's parent revison to the specified\n"
+" changeset (see :hg:`help parents`)."
+msgstr ""
+" Update устанавливает ревизию родителя рабочего каталога в заданный\n"
+" набор изменений (см. :hg:`help update`)."
+
+msgid ""
" The following rules apply when the working directory contains\n"
" uncommitted changes:"
msgstr ""
@@ -10366,11 +10390,11 @@
" (как :hg:`clone -U`)."
msgid ""
-" If you want to update just one file to an older changeset, use\n"
-" :hg:`revert`."
-msgstr ""
-" Если вы хотите просто обновить один файл до состяния в более\n"
-" ревизии, используйте :hg:`revert`."
+" If you want to revert just one file to an older revision, use\n"
+" :hg:`revert [-r REV] NAME`."
+msgstr ""
+" Если вы хотите просто вернуть один файл до более старой\n"
+" ревизии, используйте :hg:`revert [-r РЕВИЗИЯ] ИМЯ`."
msgid "cannot specify both -c/--check and -C/--clean"
msgstr "нельзя одновременно указывать -c/--check и -C/-clean"
@@ -10417,6 +10441,14 @@
"КАКОЙ-ЛИБО ДРУГОЙ ЦЕЛИ."
#, python-format
+msgid "unknown mode %s"
+msgstr "неизвесный режим %s"
+
+#, python-format
+msgid "unknown command %s"
+msgstr ""
+
+#, python-format
msgid "cannot include %s (%s)"
msgstr ""
@@ -10449,14 +10481,6 @@
msgstr ""
#, python-format
-msgid "%s not added!\n"
-msgstr ""
-
-#, fuzzy, python-format
-msgid "%s still exists!\n"
-msgstr "файл %s уже существует\n"
-
-#, python-format
msgid "%s not tracked!\n"
msgstr ""
@@ -10502,10 +10526,6 @@
msgid "setting %r to other parent only allowed in merges"
msgstr ""
-#, fuzzy, python-format
-msgid "not in dirstate: %s\n"
-msgstr "не обновлено: %s\n"
-
msgid "unknown"
msgstr "неизвесно"
@@ -10536,11 +10556,12 @@
msgstr ""
#, python-format
-msgid "push creates new remote heads on branch '%s'!"
-msgstr ""
-
-msgid "push creates new remote heads!"
-msgstr ""
+msgid "push creates new remote head %s on branch '%s'!"
+msgstr ""
+
+#, python-format
+msgid "push creates new remote head %s!"
+msgstr "push создаст новую голову %s в удаленном репозитории!"
msgid "you should pull and merge or use push -f to force"
msgstr ""
@@ -10666,11 +10687,6 @@
#, python-format
msgid ""
-"No argument found for substitution of %i variable in alias '%s' definition."
-msgstr ""
-
-#, python-format
-msgid ""
"error in definition for alias '%s': %s may only be given on the command "
"line\n"
msgstr ""
@@ -10798,6 +10814,236 @@
msgid "merging %s failed!\n"
msgstr ""
+msgid "unterminated string"
+msgstr "незавершенная строка"
+
+msgid "syntax error"
+msgstr "синтаксическая ошибка"
+
+msgid "missing argument"
+msgstr "не хватает аргументов"
+
+msgid "can't use a list in this context"
+msgstr "не могу использовать список в этом контексте"
+
+msgid ""
+"``modified()``\n"
+" File that is modified according to status."
+msgstr ""
+"``modified()``\n"
+" Файл, измененный согласно статусу."
+
+#. i18n: "modified" is a keyword
+msgid "modified takes no arguments"
+msgstr "modified не требует аргументов"
+
+msgid ""
+"``added()``\n"
+" File that is added according to status."
+msgstr ""
+"``added()``\n"
+" Файл, добавленный согласно статусу."
+
+#. i18n: "added" is a keyword
+msgid "added takes no arguments"
+msgstr "added не требует аргументов"
+
+msgid ""
+"``removed()``\n"
+" File that is removed according to status."
+msgstr ""
+"``removed()``\n"
+" Файл, удаленный согласно статусу."
+
+#. i18n: "removed" is a keyword
+msgid "removed takes no arguments"
+msgstr "removed не требует аргументов"
+
+msgid ""
+"``deleted()``\n"
+" File that is deleted according to status."
+msgstr ""
+"``deleted()``\n"
+" Файл, удаленный из рабочего каталога согласно статусу."
+
+#. i18n: "deleted" is a keyword
+msgid "deleted takes no arguments"
+msgstr "deleted не требует аргументов"
+
+msgid ""
+"``unknown()``\n"
+" File that is unknown according to status. These files will only be\n"
+" considered if this predicate is used."
+msgstr ""
+"``unknown()``\n"
+" Файл, неизвестный согласно статусу. Эти файлы рассматриваются\n"
+" только если исли используется этот предикат."
+
+#. i18n: "unknown" is a keyword
+msgid "unknown takes no arguments"
+msgstr "unknown не требует аргументов"
+
+msgid ""
+"``ignored()``\n"
+" File that is ignored according to status. These files will only be\n"
+" considered if this predicate is used."
+msgstr ""
+"``ignored()``\n"
+" Файл, игнорируемый согласно статусу. Эти файлы рассматриваются\n"
+" только если исли используется этот предикат."
+
+#. i18n: "ignored" is a keyword
+msgid "ignored takes no arguments"
+msgstr "ignored не требует аргументов"
+
+msgid ""
+"``clean()``\n"
+" File that is clean according to status."
+msgstr ""
+"``clean()``\n"
+" Файлы, не содержащие изменений согласно статусу."
+
+#. i18n: "clean" is a keyword
+msgid "clean takes no arguments"
+msgstr "clean не требует аргументов"
+
+#, python-format
+msgid "not a function: %s"
+msgstr ""
+
+msgid ""
+"``binary()``\n"
+" File that appears to be binary (contails NUL bytes)."
+msgstr ""
+"``binary()``\n"
+" Файл, который рассматривается как бинарный (содержит символы NUL)."
+
+#. i18n: "binary" is a keyword
+msgid "binary takes no arguments"
+msgstr "binary не требует аргументов"
+
+msgid ""
+"``exec()``\n"
+" File that is marked as executable."
+msgstr ""
+"``exec()``\n"
+" Файл, который помечен как исполняемый."
+
+#. i18n: "exec" is a keyword
+msgid "exec takes no arguments"
+msgstr "exec не требует аргументов"
+
+msgid ""
+"``symlink()``\n"
+" File that is marked as a symlink."
+msgstr ""
+"``symlink()``\n"
+" Файл, помеченный как символическая ссылка."
+
+#. i18n: "symlink" is a keyword
+msgid "symlink takes no arguments"
+msgstr "symlink не требует аргументов"
+
+msgid ""
+"``resolved()``\n"
+" File that is marked resolved according to the resolve state."
+msgstr ""
+"``resolved()``\n"
+" Файл, конфликты в котором считаются разрешенными."
+
+#. i18n: "resolved" is a keyword
+msgid "resolved takes no arguments"
+msgstr "resolved не требует аргументов"
+
+msgid ""
+"``unresolved()``\n"
+" File that is marked unresolved according to the resolve state."
+msgstr ""
+"``unresolved()``\n"
+" Файл, конфликты в котором считаются неразрешенными."
+
+#. i18n: "unresolved" is a keyword
+msgid "unresolved takes no arguments"
+msgstr "unresolved не требует аргументов"
+
+msgid ""
+"``hgignore()``\n"
+" File that matches the active .hgignore pattern."
+msgstr ""
+"``hgignore()``\n"
+" Файл, подходящие под активный шаблон из .hgignore."
+
+msgid "hgignore takes no arguments"
+msgstr "hgignore не требует аргументов"
+
+msgid ""
+"``grep(regex)``\n"
+" File contains the given regular expression."
+msgstr ""
+"``grep(regex)``\n"
+" Файл, содержащий заданное регулярное выражение."
+
+msgid "grep requires a pattern"
+msgstr "grep требует шаблон"
+
+#, python-format
+msgid "couldn't parse size: %s"
+msgstr "неверно задан размер: %s"
+
+msgid ""
+"``size(expression)``\n"
+" File size matches the given expression. Examples:"
+msgstr ""
+"``size(expression)``\n"
+" Размер файла совпадает с данным шаблоном. Например:"
+
+msgid ""
+" - 1k (files from 1024 to 2047 bytes)\n"
+" - < 20k (files less than 20480 bytes)\n"
+" - >= .5MB (files at least 524288 bytes)\n"
+" - 4k - 1MB (files from 4096 bytes to 1048576 bytes)"
+msgstr ""
+" - 1k (файлы от 1024 до 2047 байт)\n"
+" - < 20k (файлы меньше 20480 байт)\n"
+" - >= .5MB (файлы не меньше 524288 байт)\n"
+" - 4k - 1MB (файлы от 4096 байт до 1048576 байт)"
+
+#. i18n: "size" is a keyword
+msgid "size requires an expression"
+msgstr "size требует выражения"
+
+msgid ""
+"``encoding(name)``\n"
+" File can be successfully decoded with the given character\n"
+" encoding. May not be useful for encodings other than ASCII and\n"
+" UTF-8."
+msgstr ""
+"``encoding(name)``\n"
+" Файл, который может быть корректно представлен в данной кодировке.\n"
+" Может быть бесполезным для кодировок, отличных от ASCII и UTF-8."
+
+#. i18n: "encoding" is a keyword
+msgid "encoding requires an encoding name"
+msgstr "не указана кодировка в encoding"
+
+#, python-format
+msgid "unknown encoding '%s'"
+msgstr "неизвестная кодировка '%s'"
+
+msgid ""
+"``copied()``\n"
+" File that is recorded as being copied."
+msgstr ""
+"``copied()``\n"
+" Файл, записанный как копируемый."
+
+#. i18n: "copied" is a keyword
+msgid "copied takes no arguments"
+msgstr "copied не требует аргументов"
+
+msgid "invalid token"
+msgstr "неизвестный символ"
+
msgid "starting revisions are not directly related"
msgstr ""
@@ -10833,6 +11079,9 @@
msgid "Specifying Revision Sets"
msgstr "Задание набора ревизий"
+msgid "Specifying File Sets"
+msgstr "Задание набора файлов"
+
msgid "Diff Formats"
msgstr "Форматы diff'ов"
@@ -10843,10 +11092,10 @@
msgstr "Использование шаблонов"
msgid "URL Paths"
-msgstr "URL путей"
+msgstr "Пути URL"
msgid "Using additional features"
-msgstr "Использвание дополнительных возможностей"
+msgstr "Использование дополнительных возможностей"
msgid "Subrepositories"
msgstr "Субрепозитории"
@@ -10861,105 +11110,20 @@
msgstr "синтаксис файлов игнорирования Mercurial"
msgid ""
-"Mercurial reads configuration data from several files, if they exist.\n"
-"Below we list the most specific file first."
-msgstr ""
-"Mercurial читает настройки из нескольких файлов, если они существуют.\n"
-"Ниже приведен их список, начиная с наиболее характерных."
-
-msgid "On Windows, these configuration files are read:"
-msgstr "В Windows используются эти файлы:"
-
-msgid ""
-"- ``<repo>\\.hg\\hgrc``\n"
-"- ``%USERPROFILE%\\.hgrc``\n"
-"- ``%USERPROFILE%\\mercurial.ini``\n"
-"- ``%HOME%\\.hgrc``\n"
-"- ``%HOME%\\mercurial.ini``\n"
-"- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial."
-"ini found)\n"
-"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial."
-"ini found)\n"
-"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n"
-"- ``<hg.exe-dir>\\mercurial.ini``"
-msgstr ""
-"- ``<репозиторий>\\.hg\\hgrc``\n"
-"- ``%USERPROFILE%\\.hgrc``\n"
-"- ``%USERPROFILE%\\mercurial.ini``\n"
-"- ``%HOME%\\.hgrc``\n"
-"- ``%HOME%\\mercurial.ini``\n"
-"- ``C:\\mercurial\\mercurial.ini`` (если не найден ключ в реестре илиhgrc.d"
-"\\)\n"
-"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (если не найден hgrc.d\\или "
-"mercurial.ini)\n"
-"- ``<каталог-с-hg.exe>\\hgrc.d\\*.rc`` (если не найден mercurial.ini)\n"
-"- ``<каталог-с-hg.exe>\\mercurial.ini``"
-
-msgid "On Unix, these files are read:"
-msgstr "В Unix используются эти файлы:"
-
-msgid ""
-"- ``<репозиторий>/.hg/hgrc``\n"
-"- ``$HOME/.hgrc``\n"
-"- ``/etc/mercurial/hgrc``\n"
-"- ``/etc/mercurial/hgrc.d/*.rc``\n"
-"- ``<корень-установки>/etc/mercurial/hgrc``\n"
-"- ``<корень-установки>/etc/mercurial/hgrc.d/*.rc``"
-msgstr ""
-
-msgid ""
-"These files do not exist by default and you will have to create the\n"
-"appropriate configuration files yourself: global configuration like\n"
-"the username setting is typically put into\n"
-"``%USERPROFILE%\\mercurial.ini`` or ``$HOME/.hgrc`` and local\n"
-"configuration is put into the per-repository ``<repo>/.hg/hgrc`` file."
-msgstr ""
-"По умолчанию эти файлы не существуют, и вам надо создать нужные файлы\n"
-"самостоятельно: глобальные настройки, вроде имени пользователя, обычно\n"
-"помещают в ``%USERPROFILE%\\mercurial.ini`` или ``$HOME/.hgrc``, а\n"
-"локальные настройки хранятся для каждого репозитория в файле\n"
-"``<репозиторий>/.hg/hgrc``\n"
-"."
-
-msgid ""
-"If there is a per-repository configuration file which is not owned by\n"
-"the active user, Mercurial will warn you that the file is skipped::"
-msgstr ""
-"Если владелец файла настроек в репозитории - не текущий пользователь,\n"
-"Mercurial предупреждает о том, что этот файл не будет использован::"
-
-msgid ""
-" not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP"
-msgstr ""
-" не доверяю файлу <репозиторий>/.hg/hgrc от недоверенного пользователя\n"
-" ПОЛЬЗОВАТЕЛЬ в группе ГРУППА"
-
-msgid ""
-"If this bothers you, the warning can be silenced (the file would still\n"
-"be ignored) or trust can be established. Use one of the following\n"
-"settings, the syntax is explained below:"
-msgstr ""
-"Если это вас раздражает, можно отключить предупреждение (файл все равно\n"
-"игнорируется), или начать доверять пользователю. Для этого используйте\n"
-"следующие настройки, синтаксис которых описан далее:"
-
-msgid ""
-"- ``ui.report_untrusted = False``\n"
-"- ``trusted.users = USER``\n"
-"- ``trusted.groups = GROUP``"
-msgstr ""
-"- ``ui.report_untrusted = False``\n"
-"- ``trusted.users = ПОЛЬЗОВАТЕЛЬ``\n"
-"- ``trusted.groups = ГРУППА``"
-
-msgid ""
-"The configuration files for Mercurial use a simple ini-file format. A\n"
-"configuration file consists of sections, led by a ``[section]`` header\n"
-"and followed by ``name = value`` entries::"
-msgstr ""
-"Конфиги Mercurial это простые ini-файлы. Файл конфига состоит из разделов\n"
-"(секций), начинающихся с заголовка ``[секция]`` с последующими настройками\n"
-"вида ``имя = значение``::"
+"The Mercurial system uses a set of configuration files to control\n"
+"aspects of its behavior."
+msgstr ""
+"Mercurial использует набор файлов конфигурации (сокращенно конфиги),\n"
+"управляющих различными аспектами его поведения."
+
+msgid ""
+"The configuration files use a simple ini-file format. A configuration\n"
+"file consists of sections, led by a ``[section]`` header and followed\n"
+"by ``name = value`` entries::"
+msgstr ""
+"Конфиги Mercurial - это простые ini-файлы. Файл конфига состоит из\n"
+"разделов (секций), начинающихся с заголовка ``[секция]`` с последующими\n"
+"настройками вида ``имя = значение``::"
msgid ""
" [ui]\n"
@@ -10972,19 +11136,2712 @@
msgid ""
"The above entries will be referred to as ``ui.username`` and\n"
-"``ui.verbose``, respectively. Please see the hgrc man page for a full\n"
-"description of the possible configuration values:"
+"``ui.verbose``, respectively. See the Syntax section below."
msgstr ""
"Эти праметры далее будут упоминаться как ``ui.username`` и\n"
-"``ui.verbose`` соответсвенно. Полное описание возможных параметров\n"
-"конфигурации см. man hgrc:"
-
-msgid ""
-"- on Unix-like systems: ``man hgrc``\n"
-"- online: http://www.selenic.com/mercurial/hgrc.5.html\n"
-msgstr ""
-"- в Unix-подобных ОС: ``man hgrc``\n"
-"- онлайн: http://www.selenic.com/mercurial/hgrc.5.html\n"
+"``ui.verbose`` соответсвенно. См. раздел Синтаксис ниже."
+
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+"Файлы\n"
+"-----"
+
+msgid ""
+"Mercurial reads configuration data from several files, if they exist.\n"
+"These files do not exist by default and you will have to create the\n"
+"appropriate configuration files yourself: global configuration like\n"
+"the username setting is typically put into\n"
+"``%USERPROFILE%\\mercurial.ini`` or ``$HOME/.hgrc`` and local\n"
+"configuration is put into the per-repository ``<repo>/.hg/hgrc`` file."
+msgstr ""
+"Mercurial читает параметры из нескольких файлов, если они существуют.\n"
+"Эти файлы не существуют по умолчанию, и вам нужно создать нужные\n"
+"файлы самостоятельно: глобальные настройки, вроде имени пользователя, "
+"обычно\n"
+"помещают в ``%USERPROFILE%\\mercurial.ini`` или ``$HOME/.hgrc``, а\n"
+"локальные настройки хранятся для каждого репозитория в файле\n"
+"``<репозиторий>/.hg/hgrc``."
+
+msgid ""
+"The names of these files depend on the system on which Mercurial is\n"
+"installed. ``*.rc`` files from a single directory are read in\n"
+"alphabetical order, later ones overriding earlier ones. Where multiple\n"
+"paths are given below, settings from earlier paths override later\n"
+"ones."
+msgstr ""
+"Имена этих файлов зависят от операционной системы. Файлы ``*.rc``,\n"
+"находящиеся в одном каталоге, читаются в алфавитном порядке, при этом\n"
+"последующие переопределяют предыдущие. Если далее указано несколько\n"
+"путей, первые имеют приоритет над последующими."
+
+msgid "| (Unix, Windows) ``<repo>/.hg/hgrc``"
+msgstr "| (Unix, Windows) ``<репозиторий>/.hg/hgrc``"
+
+msgid ""
+" Per-repository configuration options that only apply in a\n"
+" particular repository. This file is not version-controlled, and\n"
+" will not get transferred during a \"clone\" operation. Options in\n"
+" this file override options in all other configuration files. On\n"
+" Unix, most of this file will be ignored if it doesn't belong to a\n"
+" trusted user or to a trusted group. See the documentation for the\n"
+" ``[trusted]`` section below for more details."
+msgstr ""
+" Индивидуальные настройки репозитория - это те, которые действуют\n"
+" только для текущему репозиторию. Этот файл не участвует в контроле\n"
+" версий и не скачивается при клонировании. Настройки в этом файле\n"
+" переопределяют настройки других файлов. В Unix большая часть этого\n"
+" файла игнорируется, если он не принадлежат доверенному пользователю\n"
+" или группе. См. документацию по секции ``[trusted]``."
+
+msgid ""
+"| (Unix) ``$HOME/.hgrc``\n"
+"| (Windows) ``%USERPROFILE%\\.hgrc``\n"
+"| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n"
+"| (Windows) ``%HOME%\\.hgrc``\n"
+"| (Windows) ``%HOME%\\Mercurial.ini``"
+msgstr ""
+
+msgid ""
+" Per-user configuration file(s), for the user running Mercurial. On\n"
+" Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these\n"
+" files apply to all Mercurial commands executed by this user in any\n"
+" directory. Options in these files override per-system and per-"
+"installation\n"
+" options."
+msgstr ""
+" Файлы конфигурации текущего пользователя, от имени которого.\n"
+" запущен Mercurial. Под Windows 9x ``%HOME%`` заменяется на\n"
+" %APPDATA%. Настройки из этих файлов применяются ко всем командам,\n"
+" выполняемым этим пользователем в любом каталоге. Настройки из\n"
+" из этих файлов переопределяют общесистемные настройки инастройки\n"
+"данной инсталляции."
+
+msgid ""
+"| (Unix) ``/etc/mercurial/hgrc``\n"
+"| (Unix) ``/etc/mercurial/hgrc.d/*.rc``"
+msgstr ""
+
+msgid ""
+" Per-system configuration files, for the system on which Mercurial\n"
+" is running. Options in these files apply to all Mercurial commands\n"
+" executed by any user in any directory. Options in these files\n"
+" override per-installation options."
+msgstr ""
+" Общесистемные файлы конфигурации действуют для всей системы,\n"
+" в которой установлен Mercurial. Настройки из этих файлов действуют\n"
+" для всех команд, выполняемых всеми пользователями в любом каталоге.\n"
+" Настройки из этих файлов переопределяют настройки инсталляции."
+
+msgid ""
+"| (Unix) ``<install-root>/etc/mercurial/hgrc``\n"
+"| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
+msgstr ""
+"| (Unix) ``<корень-установки>/etc/mercurial/hgrc``\n"
+"| (Unix) ``<корень-установки>/etc/mercurial/hgrc.d/*.rc``"
+
+msgid ""
+" Per-installation configuration files, searched for in the\n"
+" directory where Mercurial is installed. ``<install-root>`` is the\n"
+" parent directory of the **hg** executable (or symlink) being run. For\n"
+" example, if installed in ``/shared/tools/bin/hg``, Mercurial will look\n"
+" in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply\n"
+" to all Mercurial commands executed by any user in any directory."
+msgstr ""
+" Файлы конфигурации инсталляции - это файлы, которые находятся в\n"
+" каталоге, в который установлен Mercurial. ``<корень-установки>`` -\n"
+" это каталог, в котором находится запущенного исполняемого файла\n"
+" **hg** (или символическая ссылка на него). Например, если Mercurial\n"
+" установлен в ``/shared/tools/bin/hg``, он будет пытаться прочитать\n"
+" файл ``/shared/tools/etc/mercurial/hgrc``. Настройки из этих файлов\n"
+" действуют для всех команд, исполняемыми любым пользователем в любом\n"
+" каталоге."
+
+msgid ""
+"| (Windows) ``<install-dir>\\Mercurial.ini`` **or**\n"
+"| (Windows) ``<install-dir>\\hgrc.d\\*.rc`` **or**\n"
+"| (Windows) ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``"
+msgstr ""
+"| (Windows) ``<каталог-установки>\\Mercurial.ini`` **or**\n"
+"| (Windows) ``<каталог-установки>\\hgrc.d\\*.rc`` **or**\n"
+"| (Windows) ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``"
+
+msgid ""
+" Per-installation/system configuration files, for the system on\n"
+" which Mercurial is running. Options in these files apply to all\n"
+" Mercurial commands executed by any user in any directory. Registry\n"
+" keys contain PATH-like strings, every part of which must reference\n"
+" a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will\n"
+" be read. Mercurial checks each of these locations in the specified\n"
+" order until one or more configuration files are detected. If the\n"
+" pywin32 extensions are not installed, Mercurial will only look for\n"
+" site-wide configuration in ``C:\\Mercurial\\Mercurial.ini``."
+msgstr ""
+" Настройки из файлов конфигурации инсталляции/общесистемных файлов\n"
+" влияют на все команды, запускаемые всеми пользователемя в любых\n"
+" директориях. Ключи реестра содержат строки, каждая часть которых\n"
+" должна быть путем к файлу ``Mercurial.ini`` или каталогу с файлами\n"
+" ``*.rc``. Mercurial просматривает все эти пути в указанном порядке\n"
+" пока не найдет один или более файл конфигурации. Если не установлены\n"
+" расширения pywin32, Mercurial будет искать только системный конфиг\n"
+" в ``C:\\Mercurial\\Mercurial.ini``."
+
+msgid ""
+"Syntax\n"
+"------"
+msgstr ""
+"Синтаксис\n"
+"------"
+
+msgid ""
+"A configuration file consists of sections, led by a ``[section]`` header\n"
+"and followed by ``name = value`` entries (sometimes called\n"
+"``configuration keys``)::"
+msgstr ""
+"Файлы конфигурации состоят из разделов (секций), начинающихся с\n"
+"заголовка ``[секция]`` с последующими настройками вида ``имя = значение``\n"
+"(иногда называемыми ``ключами конфигурации``)::"
+
+msgid ""
+" [spam]\n"
+" eggs=ham\n"
+" green=\n"
+" eggs"
+msgstr ""
+
+msgid ""
+"Each line contains one entry. If the lines that follow are indented,\n"
+"they are treated as continuations of that entry. Leading whitespace is\n"
+"removed from values. Empty lines are skipped. Lines beginning with\n"
+"``#`` or ``;`` are ignored and may be used to provide comments."
+msgstr ""
+"Каждая строка содержит одну настройку. Если последующие строки\n"
+"выделены отступами, они считаются продолжением этой настройки.\n"
+"Ведущие пробелы удаляются из значений. Пустые строки пропускаются.\n"
+"Строки, начинающиеся с ``#`` или ``;`` игнорируются и могут\n"
+"использоваться в качестве коментариев."
+
+msgid ""
+"Configuration keys can be set multiple times, in which case Mercurial\n"
+"will use the value that was configured last. As an example::"
+msgstr ""
+"Ключи конфигурации могут задаваться несколько раз, при этом будет\n"
+"использоваться последний. Например::"
+
+msgid ""
+" [spam]\n"
+" eggs=large\n"
+" ham=serrano\n"
+" eggs=small"
+msgstr ""
+
+msgid "This would set the configuration key named ``eggs`` to ``small``."
+msgstr "Это установит ключ с именем ``eggs`` в значение ``small``."
+
+msgid ""
+"It is also possible to define a section multiple times. A section can\n"
+"be redefined on the same and/or on different configuration files. For\n"
+"example::"
+msgstr ""
+"Секцию также можно определять несколько раз. Секция может быть\n"
+"переопределена в том же и/или другом файле. Например::"
+
+msgid ""
+" [foo]\n"
+" eggs=large\n"
+" ham=serrano\n"
+" eggs=small"
+msgstr ""
+
+msgid ""
+" [bar]\n"
+" eggs=ham\n"
+" green=\n"
+" eggs"
+msgstr ""
+
+msgid ""
+" [foo]\n"
+" ham=prosciutto\n"
+" eggs=medium\n"
+" bread=toasted"
+msgstr ""
+
+msgid ""
+"This would set the ``eggs``, ``ham``, and ``bread`` configuration keys\n"
+"of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``,\n"
+"respectively. As you can see there only thing that matters is the last\n"
+"value that was set for each of the configuration keys."
+msgstr ""
+"Ключи ``eggs``, ``ham`` и ``bread`` секции ``foo`` будут установлены\n"
+"в значения ``medium``, ``proscuitto`` и ``toasted`` соответственно.\n"
+"Как видно, имеет значение только последяя установка параметра."
+
+msgid ""
+"If a configuration key is set multiple times in different\n"
+"configuration files the final value will depend on the order in which\n"
+"the different configuration files are read, with settings from earlier\n"
+"paths overriding later ones as described on the ``Files`` section\n"
+"above."
+msgstr ""
+"Если ключ установлен несколько раз в разных файлах, окончательное\n"
+"значение зависит от порядка, в котором читаются файлы, причем чем\n"
+"раньше он читается, тем выше его приоритет, как описано выше в\n"
+"разделе ``Файлы``."
+
+msgid ""
+"A line of the form ``%include file`` will include ``file`` into the\n"
+"current configuration file. The inclusion is recursive, which means\n"
+"that included files can include other files. Filenames are relative to\n"
+"the configuration file in which the ``%include`` directive is found.\n"
+"Environment variables and ``~user`` constructs are expanded in\n"
+"``file``. This lets you do something like::"
+msgstr ""
+"Строка вида ``%include файл`` включает файл ``файл`` в текущий\n"
+"файл конфигурации. Включение рекурсивно, т.е. включенные файлы\n"
+"также могут включать другие файлы. Пути файлов задаются относительно\n"
+"файла конфигурации, в котором находится директива ``%include``. В\n"
+"имени файла выполняется подстановка переменных окружения и конструкций\n"
+"вида ``~user``. Это позволяет написать::"
+
+msgid " %include ~/.hgrc.d/$HOST.rc"
+msgstr ""
+
+msgid "to include a different configuration file on each computer you use."
+msgstr "чтобы включать различные файлы на разных компьютерах."
+
+msgid ""
+"A line with ``%unset name`` will remove ``name`` from the current\n"
+"section, if it has been set previously."
+msgstr ""
+"Строка ``%unset имя`` удалит ``имя`` из текущей секции, если оно\n"
+"было определено ранее."
+
+msgid ""
+"The values are either free-form text strings, lists of text strings,\n"
+"or Boolean values. Boolean values can be set to true using any of \"1\",\n"
+"\"yes\", \"true\", or \"on\" and to false using \"0\", \"no\", \"false\", or "
+"\"off\"\n"
+"(all case insensitive)."
+msgstr ""
+"Значения являются либо текстовыми строками произвольной формы, либо\n"
+"списками текстовых строк, либо логическими значениями. Логические\n"
+"значения устанавливаются в истину с помощью \"1\", \"yes\", \"true\",\n"
+"или \"on\", а в ложь с помощью \"0\", \"no\", \"false\", или \"off\"\n"
+"(все нечувствительны к регистру букв)."
+
+msgid ""
+"List values are separated by whitespace or comma, except when values are\n"
+"placed in double quotation marks::"
+msgstr ""
+"Элементы списков отделяются пробельными символами или запятыми, за\n"
+"исключением случаев, когда значения заключаются в двойные кавычки::"
+
+msgid " allow_read = \"John Doe, PhD\", brian, betty"
+msgstr ""
+
+msgid ""
+"Quotation marks can be escaped by prefixing them with a backslash. Only\n"
+"quotation marks at the beginning of a word is counted as a quotation\n"
+"(e.g., ``foo\"bar baz`` is the list of ``foo\"bar`` and ``baz``)."
+msgstr ""
+"Кавычки могут быть экранированы предшествующим обратным слэшем.\n"
+"Только кавычки в начале слова являются разделителем (т.е.\n"
+"``foo\"bar baz`` - это список из ``foo\"bar`` и ``baz``)."
+
+msgid ""
+"Sections\n"
+"--------"
+msgstr ""
+"Секции\n"
+"--------"
+
+msgid ""
+"This section describes the different sections that may appear in a\n"
+"Mercurial configuration file, the purpose of each section, its possible\n"
+"keys, and their possible values."
+msgstr ""
+"Этот раздел описывает секции, которые могут использоваться в файле\n"
+"конфигурации Mercurial, назначение каждой секции, их возможные ключи\n"
+"и их значения."
+
+msgid ""
+"``alias``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Defines command aliases.\n"
+"Aliases allow you to define your own commands in terms of other\n"
+"commands (or aliases), optionally including arguments. Positional\n"
+"arguments in the form of ``$1``, ``$2``, etc in the alias definition\n"
+"are expanded by Mercurial before execution. Positional arguments not\n"
+"already used by ``$N`` in the definition are put at the end of the\n"
+"command to be executed."
+msgstr ""
+"Определяет псевдонимы (алиасы) команд\n"
+"Псевдонимы позволяют определить собственную команду с использованием\n"
+"других команд (или псевдонимов), возможно принимающую аргументы.\n"
+"Позиционные аргументы в виде ``$1``, ``$2`` ... в определении\n"
+"псевдонима раскрываются перед выполнением. Позиционные аргументы,\n"
+"еще не использванные до ``$N`` в определении, добавляются в конец\n"
+"выполняемой команды."
+
+msgid "Alias definitions consist of lines of the form::"
+msgstr "Определения псевдонимов состоят из строк вида::"
+
+msgid " <alias> = <command> [<argument>]..."
+msgstr " <псевдоним> = <команда> [<аргумент>]..."
+
+msgid "For example, this definition::"
+msgstr "Например, это определение::"
+
+msgid " latest = log --limit 5"
+msgstr ""
+
+msgid ""
+"creates a new command ``latest`` that shows only the five most recent\n"
+"changesets. You can define subsequent aliases using earlier ones::"
+msgstr ""
+"создает новую команду ``latest``, которая показывает пять последних\n"
+"ревизий. Можно создавать псевдонимы с использованием уже определенных::"
+
+msgid " stable5 = latest -b stable"
+msgstr ""
+
+msgid ""
+".. note:: It is possible to create aliases with the same names as\n"
+" existing commands, which will then override the original\n"
+" definitions. This is almost always a bad idea!"
+msgstr ""
+".. note:: Можно создать псевдоним с именем, совпадающим с именем\n"
+" существующих команд, который переопределит первоначальные\n"
+" команды. Это почти всегда неудачная идея!"
+
+msgid ""
+"An alias can start with an exclamation point (``!``) to make it a\n"
+"shell alias. A shell alias is executed with the shell and will let you\n"
+"run arbitrary commands. As an example, ::"
+msgstr ""
+"Псевдоним может начинаться с ``!``, тогда он становится псевдонимом\n"
+"командной оболочки (шела). Псевдоним шела исполняется шелом и позволяет\n"
+"запускать произвольные команды. Например, ::"
+
+msgid " echo = !echo"
+msgstr ""
+
+msgid ""
+"will let you do ``hg echo foo`` to have ``foo`` printed in your\n"
+"terminal. A better example might be::"
+msgstr ""
+"позволит вам выполнить ``hg echo foo``, чтобы напечатать ``foo``\n"
+"в терминале. Пример получше::"
+
+msgid " purge = !$HG status --no-status --unknown -0 | xargs -0 rm"
+msgstr ""
+
+msgid ""
+"which will make ``hg purge`` delete all unknown files in the\n"
+"repository in the same manner as the purge extension."
+msgstr ""
+"Это позволит удалить все неизвестные файлы в рабочем каталоге,\n"
+"как это делает расширение purge."
+
+msgid ""
+"Shell aliases are executed in an environment where ``$HG`` expand to\n"
+"the path of the Mercurial that was used to execute the alias. This is\n"
+"useful when you want to call further Mercurial commands in a shell\n"
+"alias, as was done above for the purge alias. In addition,\n"
+"``$HG_ARGS`` expand to the arguments given to Mercurial. In the ``hg\n"
+"echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``."
+msgstr ""
+"Псевдонимы оболочки выполняются в среде, в которой ``$HG`` раскрывается\n"
+"в путь к исполняемому в данный момент файлу Mercurial. Это полезно,\n"
+"если вы хотите запустить еще одну команду Mercurial из псевдонима,\n"
+"как это сделано в предыдущем примере. Кроме того, ``$HG_ARGS``\n"
+"раскрывается в аргументы, переданные Mercurial. В примере с\n"
+"``hg echo foo``, ``$HG_ARGS`` раскроется в ``echo foo``."
+
+msgid ""
+"``auth``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Authentication credentials for HTTP authentication. This section\n"
+"allows you to store usernames and passwords for use when logging\n"
+"*into* HTTP servers. See the ``[web]`` configuration section if\n"
+"you want to configure *who* can login to your HTTP server."
+msgstr ""
+"Данные для аутентификации по HTTP. Эта секция позволяет хранить\n"
+"имена пользователей и пароли при доступе *к* HTTP-серверам. См.\n"
+"секции ``[web]``, если вы хотите настроить *кто* может логиниться\n"
+"на ваш HTTP-сервер."
+
+msgid "Each line has the following format::"
+msgstr "Каждая строка имеет следующий формат::"
+
+msgid " <name>.<argument> = <value>"
+msgstr " <имя>.<аргумент> = <значение>"
+
+msgid ""
+"where ``<name>`` is used to group arguments into authentication\n"
+"entries. Example::"
+msgstr ""
+"где ``<имя>`` используется чтобы сгруппировать аргументы в записи\n"
+"аутентификации::"
+
+msgid ""
+" foo.prefix = hg.intevation.org/mercurial\n"
+" foo.username = foo\n"
+" foo.password = bar\n"
+" foo.schemes = http https"
+msgstr ""
+
+msgid ""
+" bar.prefix = secure.example.org\n"
+" bar.key = path/to/file.key\n"
+" bar.cert = path/to/file.cert\n"
+" bar.schemes = https"
+msgstr ""
+
+msgid "Supported arguments:"
+msgstr "Поддерживаемые аргументы:"
+
+msgid ""
+"``prefix``\n"
+" Either ``*`` or a URI prefix with or without the scheme part.\n"
+" The authentication entry with the longest matching prefix is used\n"
+" (where ``*`` matches everything and counts as a match of length\n"
+" 1). If the prefix doesn't include a scheme, the match is performed\n"
+" against the URI with its scheme stripped as well, and the schemes\n"
+" argument, q.v., is then subsequently consulted."
+msgstr ""
+"``prefix``\n"
+" ``*`` или префикс URI с указанием схемы или без него. Используется\n"
+" запись аутентификации с самым длинным подходящим префиксом (при этом\n"
+" ``*`` совпадает со всем и считается совпадением с длиной 1). Если\n"
+" префикс не включает схему, при проверке совпадения из URI также.\n"
+" удаляется схема и далее прверяется аргумент schemes."
+
+msgid ""
+"``username``\n"
+" Optional. Username to authenticate with. If not given, and the\n"
+" remote site requires basic or digest authentication, the user will\n"
+" be prompted for it. Environment variables are expanded in the\n"
+" username letting you do ``foo.username = $USER``."
+msgstr ""
+"``username``\n"
+" Не обязательный. Имя, используемое при аутентификации. Если не\n"
+" задан, а удаленный сайт требует базовую или digest-аутентификацию,\n"
+" пользователь должен будет ввести имя. Переменные окружения\n"
+" раскрываются, позволяя написать ``foo.username = $USER``."
+
+msgid ""
+"``password``\n"
+" Optional. Password to authenticate with. If not given, and the\n"
+" remote site requires basic or digest authentication, the user\n"
+" will be prompted for it."
+msgstr ""
+"``password``\n"
+" Не обязательный. Пароль для аутентификации. Если не задан, а\n"
+" удаленный сайт требует базовую или digest-аутентификацию,\n"
+" пользователь должен будет ввести пароль."
+
+msgid ""
+"``key``\n"
+" Optional. PEM encoded client certificate key file. Environment\n"
+" variables are expanded in the filename."
+msgstr ""
+"``key``\n"
+"\n"
+" Не обязательный. Защифрованный PEM ключ сертификата клиента.\n"
+" Переменные окружения раскрываются в имя файла."
+
+msgid ""
+"``cert``\n"
+" Optional. PEM encoded client certificate chain file. Environment\n"
+" variables are expanded in the filename."
+msgstr ""
+"``cert``\n"
+" Не обязательный. Защифрованный PEM файл цепочки сертификата клиента.\n"
+" Переменные окружения раскрываются в имя файла."
+
+msgid ""
+"``schemes``\n"
+" Optional. Space separated list of URI schemes to use this\n"
+" authentication entry with. Only used if the prefix doesn't include\n"
+" a scheme. Supported schemes are http and https. They will match\n"
+" static-http and static-https respectively, as well.\n"
+" Default: https."
+msgstr ""
+"``schemes``\n"
+" Не обязательный. Разделенный пробелами списко схем URI для\n"
+" этой записи. Используются только если prefix не включает имени\n"
+" схемы. Поддерживаются http и https. Также совпадут для статических\n"
+" http и https соответственно.\n"
+" По умолчанию: https."
+
+msgid ""
+"If no suitable authentication entry is found, the user is prompted\n"
+"for credentials as usual if required by the remote."
+msgstr ""
+"Если не найдено подходящей записи аутентификации, параметры\n"
+"аутентификации будут запрошены как обычно, если требуются."
+
+msgid ""
+"\n"
+"``decode/encode``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Filters for transforming files on checkout/checkin. This would\n"
+"typically be used for newline processing or other\n"
+"localization/canonicalization of files."
+msgstr ""
+"Фильтры для преобразования файлов при извлечении/фиксации. Обычно\n"
+"используется для обработки переводов строки, локализации или\n"
+"приведении файлов к единому виду."
+
+msgid ""
+"Filters consist of a filter pattern followed by a filter command.\n"
+"Filter patterns are globs by default, rooted at the repository root.\n"
+"For example, to match any file ending in ``.txt`` in the root\n"
+"directory only, use the pattern ``*.txt``. To match any file ending\n"
+"in ``.c`` anywhere in the repository, use the pattern ``**.c``.\n"
+"For each file only the first matching filter applies."
+msgstr ""
+"Фильтр состоит из шаблона с последующей командой. По умолчанию,\n"
+"шаблоны задаются в виде glob'ов, пути относительно корня репозитория.\n"
+"Например, чтобы выбрать все файлы, оканчивающиеся на ``.txt``, только\n"
+"из корневого каталога репозитория, используйте шаблон ``.txt``. Чтобы\n"
+"выбрать файлы, оканчивающиеся на ``.c``, во всем репозитории,\n"
+"используйте шаблон ``**.c``. Для каждого файла применяется только\n"
+"первый совпавший фильтр."
+
+msgid ""
+"The filter command can start with a specifier, either ``pipe:`` or\n"
+"``tempfile:``. If no specifier is given, ``pipe:`` is used by default."
+msgstr ""
+"Команда фильтра может начинаться со спецификатора - ``pipe:`` или\n"
+"``tempfile:``. Если не указан, по умолчанию используется ``pipe:``."
+
+msgid ""
+"A ``pipe:`` command must accept data on stdin and return the transformed\n"
+"data on stdout."
+msgstr ""
+"Команда с ``pipe:`` должна читать данные со стандартного ввода и\n"
+"печатать преобразованные данные на стандартный вывод."
+
+msgid "Pipe example::"
+msgstr "Пример с pipe::"
+
+msgid ""
+" [encode]\n"
+" # uncompress gzip files on checkin to improve delta compression\n"
+" # note: not necessarily a good idea, just an example\n"
+" *.gz = pipe: gunzip"
+msgstr ""
+" [encode]\n"
+" # распаковать архивированные gzip'ом файлы при фиксации для улучшения\n"
+" # сжатия различий (дельт).\n"
+" # примечание: Не обязательно хорошая идея, просто пример.\n"
+" *.gz = pipe: gunzip"
+
+msgid ""
+" [decode]\n"
+" # recompress gzip files when writing them to the working dir (we\n"
+" # can safely omit \"pipe:\", because it's the default)\n"
+" *.gz = gzip"
+msgstr ""
+" [decode]\n"
+" # пережимать файлы gzip'ом при из записи в рабочий каталог (можно\n"
+" # безопасно опустить \"pipe\", т.к. оно используется по умолчанию)\n"
+" *.gz = gzip"
+
+msgid ""
+"A ``tempfile:`` command is a template. The string ``INFILE`` is replaced\n"
+"with the name of a temporary file that contains the data to be\n"
+"filtered by the command. The string ``OUTFILE`` is replaced with the name\n"
+"of an empty temporary file, where the filtered data must be written by\n"
+"the command."
+msgstr ""
+" Команда ``tempfile:`` является шаблоном. Строка ``INFILE`` заменяется\n"
+"именем временного файла, содержащим данные для фильтрации. Строка\n"
+"``OUTFILE`` заменяется именем пустого временного файла, куда должен\n"
+"быть записан вывод команды."
+
+msgid ""
+".. note:: The tempfile mechanism is recommended for Windows systems,\n"
+" where the standard shell I/O redirection operators often have\n"
+" strange effects and may corrupt the contents of your files."
+msgstr ""
+".. note:: Временные файлы рекомендуются для систем Windows, где\n"
+" стандартные перенаправления ввода/вывода могут иметь странные\n"
+" эффекты и могут повредить содержимое файлов."
+
+msgid ""
+"This filter mechanism is used internally by the ``eol`` extension to\n"
+"translate line ending characters between Windows (CRLF) and Unix (LF)\n"
+"format. We suggest you use the ``eol`` extension for convenience."
+msgstr ""
+"Этот механизм используется внутри расширения ``eol`` чтобы менять\n"
+"символы перевода строки из формата Windows (CRLF) в Unix (LF) и\n"
+"обратно. Рекомендуется использовать это расширения для этой цели."
+
+msgid ""
+"\n"
+"``defaults``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "(defaults are deprecated. Don't use them. Use aliases instead)"
+msgstr "(устарело. Не использйте эту секцию. Используйте псевдонимы.)"
+
+msgid ""
+"Use the ``[defaults]`` section to define command defaults, i.e. the\n"
+"default options/arguments to pass to the specified commands."
+msgstr ""
+"Используйте секцию ``[defaults]`` чтобы определить параметры по\n"
+"умолчанию для команды, т.е. параметры/аргументы, которые будут\n"
+"автоматически передаваться команде при вызове."
+
+msgid ""
+"The following example makes :hg:`log` run in verbose mode, and\n"
+":hg:`status` show only the modified files, by default::"
+msgstr ""
+"Этот пример по умолчанию запускает команду :hg:`log` с подробным\n"
+"выводом, а :hg:`status` заставляет показывать только измененные файлы::"
+
+msgid ""
+" [defaults]\n"
+" log = -v\n"
+" status = -m"
+msgstr ""
+
+msgid ""
+"The actual commands, instead of their aliases, must be used when\n"
+"defining command defaults. The command defaults will also be applied\n"
+"to the aliases of the commands defined."
+msgstr ""
+"При опрпедлении умолчаний для команд, дожны использоваться сами команды,\n"
+"а не из псевдонимы. Умолчания для команд применяются также к определенным\n"
+"псевдонимам."
+
+msgid ""
+"\n"
+"``diff``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Settings used when displaying diffs. Everything except for ``unified`` is a\n"
+"Boolean and defaults to False."
+msgstr ""
+"Настройки отображения различий. Все параметры, кроме ``unified``, являются\n"
+"логическими и по умолчанию имеют значение Ложь (False)."
+
+msgid ""
+"``git``\n"
+" Use git extended diff format."
+msgstr ""
+"``git``\n"
+"использовать расширенный формат git для diff'ов"
+
+msgid ""
+"``nodates``\n"
+" Don't include dates in diff headers."
+msgstr ""
+"``nodates``\n"
+" Не добавлять даты в заголовки diff'ов."
+
+msgid ""
+"``showfunc``\n"
+" Show which function each change is in."
+msgstr ""
+"``showfunc``\n"
+" Для каждого изменения показать, в какой оно сделано функции"
+
+msgid ""
+"``ignorews``\n"
+" Ignore white space when comparing lines."
+msgstr ""
+"``ignorews``\n"
+" Игнорировать пробельные символы при сравнении строк"
+
+msgid ""
+"``ignorewsamount``\n"
+" Ignore changes in the amount of white space."
+msgstr ""
+"``ignorewsamount``\n"
+" Игнорировать изменения в количестве пробельных символов"
+
+msgid ""
+"``ignoreblanklines``\n"
+" Ignore changes whose lines are all blank."
+msgstr ""
+"``ignoreblanklines``\n"
+" Игнорировать изменения, состоящие только из пустых строк"
+
+msgid ""
+"``unified``\n"
+" Number of lines of context to show."
+msgstr ""
+"``unified``\n"
+" Показываемое количество строк контекста."
+
+msgid ""
+"``email``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Settings for extensions that send email messages."
+msgstr "Настройки для расширений, использующих email для отправки сообщений"
+
+msgid ""
+"``from``\n"
+" Optional. Email address to use in \"From\" header and SMTP envelope\n"
+" of outgoing messages."
+msgstr ""
+"``from``\n"
+" Не обязательный. Электронный адрес для заголовка \"From\" (\"от\") и\n"
+" конверта SMTP для исходящих сообщений."
+
+msgid ""
+"``to``\n"
+" Optional. Comma-separated list of recipients' email addresses."
+msgstr ""
+"``to``\n"
+" Не обязательный. Разделенный запятыми список адресатов."
+
+msgid ""
+"``cc``\n"
+" Optional. Comma-separated list of carbon copy recipients'\n"
+" email addresses."
+msgstr ""
+"``cc``\n"
+" Не обязательный. Разделенный запятыми список получателей копий писем."
+
+msgid ""
+"``bcc``\n"
+" Optional. Comma-separated list of blind carbon copy recipients'\n"
+" email addresses."
+msgstr ""
+"``bcc``\n"
+" Не обязательный. Разделенный запятыми список получателей скрытых.\n"
+" копий писем."
+
+msgid ""
+"``method``\n"
+" Optional. Method to use to send email messages. If value is ``smtp``\n"
+" (default), use SMTP (see the ``[smtp]`` section for configuration).\n"
+" Otherwise, use as name of program to run that acts like sendmail\n"
+" (takes ``-f`` option for sender, list of recipients on command line,\n"
+" message on stdin). Normally, setting this to ``sendmail`` or\n"
+" ``/usr/sbin/sendmail`` is enough to use sendmail to send messages."
+msgstr ""
+"``method``\n"
+" Не обязательный. Метод для отправки писем. Если значение ``smtp``\n"
+" (по умолчанию), используется SMTP (настройки см. в секции ``[smtp]``).\n"
+" В противном случае, используется как имя программы, которая ведет\n"
+" себя как sendmail (принимает для адрес отправителя через параметр -f,\n"
+" список получателей в командной строке, текст письма через стандартный\n"
+" ввод). Обычно значения ``sendmail`` или ``/usr/sbin/sendmail``\n"
+" достаточно, чтобы отправлять письма через sendmail."
+
+msgid ""
+"``charsets``\n"
+" Optional. Comma-separated list of character sets considered\n"
+" convenient for recipients. Addresses, headers, and parts not\n"
+" containing patches of outgoing messages will be encoded in the\n"
+" first character set to which conversion from local encoding\n"
+" (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct\n"
+" conversion fails, the text in question is sent as is. Defaults to\n"
+" empty (explicit) list."
+msgstr ""
+"``charsets``\n"
+" Не обязательный. Разделенный запятыми список кодировок, которые\n"
+" считаются удобными для получателей. Адреса, заголовки и части,\n"
+" не содержащие патчи, будут закодированы первой кодировкой, для\n"
+" в которую корректно переводится исходная (``$HGENCODING``,\n"
+" ``ui.fallbackencoding``). Если корректно преобразовать не удетается,\n"
+" текст посылается как есть. По умолчанию - пустой (буквально) список."
+
+msgid " Order of outgoing email character sets:"
+msgstr " Порядок кодировок исходящих сообщений::"
+
+msgid ""
+" 1. ``us-ascii``: always first, regardless of settings\n"
+" 2. ``email.charsets``: in order given by user\n"
+" 3. ``ui.fallbackencoding``: if not in email.charsets\n"
+" 4. ``$HGENCODING``: if not in email.charsets\n"
+" 5. ``utf-8``: always last, regardless of settings"
+msgstr ""
+" 1. ``us-ascii``: всегда первая, независимо от установок.\n"
+" 2. ``email.charsets``: в порядке, определенном пользователем\n"
+" 3. ``ui.fallbackencoding``: если не содержится в email.charsets\n"
+" 4. ``$HGENCODING``: если не содержится в email.charsets\n"
+" 5. ``utf-8``: всегда последняя, независимо от установок"
+
+msgid "Email example::"
+msgstr "Пример::"
+
+msgid ""
+" [email]\n"
+" from = Joseph User <joe.user@example.com>\n"
+" method = /usr/sbin/sendmail\n"
+" # charsets for western Europeans\n"
+" # us-ascii, utf-8 omitted, as they are tried first and last\n"
+" charsets = iso-8859-1, iso-8859-15, windows-1252"
+msgstr ""
+" [email]\n"
+" from = Joseph User <joe.user@example.com>\n"
+" method = /usr/sbin/sendmail\n"
+" # кодировки для западной Европы\n"
+" # us-ascii, utf-8 omitted, as they are tried first and last\n"
+" charsets = iso-8859-1, iso-8859-15, windows-1252"
+
+msgid ""
+"\n"
+"``extensions``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Mercurial has an extension mechanism for adding new features. To\n"
+"enable an extension, create an entry for it in this section."
+msgstr ""
+"Mercurial поддерживает механизм расширений для добавления новых\n"
+"функций. Чтобы включить расширение, создайте для него запись в этой\n"
+"секции."
+
+msgid ""
+"If you know that the extension is already in Python's search path,\n"
+"you can give the name of the module, followed by ``=``, with nothing\n"
+"after the ``=``."
+msgstr ""
+"Если вы знаете, что расширение уже доступно по путям, известным\n"
+"Python'у, можно указать имя модуля с последующим знаком ``=``,\n"
+"после которого ничего нет."
+
+msgid ""
+"Otherwise, give a name that you choose, followed by ``=``, followed by\n"
+"the path to the ``.py`` file (including the file name extension) that\n"
+"defines the extension."
+msgstr ""
+"В противном случае, укажите любое имя с последующим знаком ``=``,\n"
+"после которого идет путь к файлу ``.py`` (включая расширение файла)\n"
+"с реализацей расширения."
+
+msgid ""
+"To explicitly disable an extension that is enabled in an hgrc of\n"
+"broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``\n"
+"or ``foo = !`` when path is not supplied."
+msgstr ""
+"Чтобы явно отключить расширение, включенное в конфиге более широкой\n"
+"области действия, добавьте ``!`` перед путем - ``foo = !/расш/путь``,\n"
+"или ``foo = !``, если путь не указан."
+
+msgid "Example for ``~/.hgrc``::"
+msgstr "Пример для ``~/.hgrc`` ::"
+
+msgid ""
+" [extensions]\n"
+" # (the mq extension will get loaded from Mercurial's path)\n"
+" mq =\n"
+" # (this extension will get loaded from the file specified)\n"
+" myfeature = ~/.hgext/myfeature.py"
+msgstr ""
+" [extensions]\n"
+" # (расширение mq будет загружено из каталога Mercurial)\n"
+" mq =\n"
+" # (это расширение будет загружено из указанного файла)\n"
+" myfeature = ~/.hgext/myfeature.py"
+
+msgid ""
+"\n"
+"``hostfingerprints``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Fingerprints of the certificates of known HTTPS servers.\n"
+"A HTTPS connection to a server with a fingerprint configured here will\n"
+"only succeed if the servers certificate matches the fingerprint.\n"
+"This is very similar to how ssh known hosts works.\n"
+"The fingerprint is the SHA-1 hash value of the DER encoded certificate.\n"
+"The CA chain and web.cacerts is not used for servers with a fingerprint."
+msgstr ""
+"Слепки сертификатов известных HTTPS-серверов. При заданном слепке,\n"
+"HTTPS-соединение успешно установится только если слепок сертификата\n"
+"сервера совпадает с заданным. Это похоже на работу с известными хостами\n"
+"по ssh. Слепок - это хэш SHA-1 от сертификата, зашифрованного DER.\n"
+"Цепочка CA и web.cacerts не используются для серверов с заданными\n"
+"слепками."
+
+msgid "For example::"
+msgstr "Приме::"
+
+msgid ""
+" [hostfingerprints]\n"
+" hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:"
+"d6:4b:ee:cc"
+msgstr ""
+
+msgid "This feature is only supported when using Python 2.6 or later."
+msgstr "Поддерживается только если используется Python 2.6 или выше."
+
+msgid ""
+"\n"
+"``format``\n"
+"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"``usestore``\n"
+" Enable or disable the \"store\" repository format which improves\n"
+" compatibility with systems that fold case or otherwise mangle\n"
+" filenames. Enabled by default. Disabling this option will allow\n"
+" you to store longer filenames in some situations at the expense of\n"
+" compatibility and ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 0.9.4."
+msgstr ""
+"``usestore``\n"
+" Использовать формат репозитория \"store\", который улучшает\n"
+" совместимость с системами, которые путают регистр букв или еще\n"
+" как-нибудь искажают имена файлов. Включен по умолчанию. Отключение\n"
+" этого параметра позволит хранить более длинные имена файлов во\n"
+" многих ситуациях ценой совместимости и позволяет удостовериться,\n"
+" что созданные репозитории будут совместимы с Mercurial до\n"
+" версии 0.9.4."
+
+msgid ""
+"``usefncache``\n"
+" Enable or disable the \"fncache\" repository format which enhances\n"
+" the \"store\" repository format (which has to be enabled to use\n"
+" fncache) to allow longer filenames and avoids using Windows\n"
+" reserved names, e.g. \"nul\". Enabled by default. Disabling this\n"
+" option ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 1.1."
+msgstr ""
+"``usefncache``\n"
+" Включить или выключить формат репозитория \"fncache\", который\n"
+" является улучшением формата \"store\" (который должен быть включен,\n"
+" чтобы использовать fncache) и позволяет использовать длинные имена\n"
+" файлов и избежать использования зарезервированных в Windows имен\n"
+" (например, \"nul\"). По умолчанию включен. Отключение этого параметра\n"
+" позволяет быть уверенным, что созданные репозитории будут\n"
+" совместимы с Mercurial до версии 1.1."
+
+msgid ""
+"``dotencode``\n"
+" Enable or disable the \"dotencode\" repository format which enhances\n"
+" the \"fncache\" repository format (which has to be enabled to use\n"
+" dotencode) to avoid issues with filenames starting with ._ on\n"
+" Mac OS X and spaces on Windows. Enabled by default. Disabling this\n"
+" option ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 1.7."
+msgstr ""
+"``dotencode``\n"
+" Включить или выключить формат репозитория \"dotencode\", который\n"
+" является улучшением формата \"fncache\" (который должен быть\n"
+" включен, чтобы использовать dotencode), чтобы решить проблемы\n"
+" с именами файлов, начинающихся с ._ в Mac OS X и пробелов в\n"
+" Windows. По умолчанию включен. Отключение этого параметра позволяет\n"
+" быть уверенным, что формат хранения создаваемого репозитория\n"
+" будет совместим с Mercurial до версии 1.7."
+
+msgid ""
+"``merge-patterns``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"This section specifies merge tools to associate with particular file\n"
+"patterns. Tools matched here will take precedence over the default\n"
+"merge tool. Patterns are globs by default, rooted at the repository\n"
+"root."
+msgstr ""
+"Эта секция задает инструменты для слияния файлов, подходящих под\n"
+"определенный шаблон. Подходящие сюда программы имеют приоритет перед\n"
+"инструментами по умолчанию. Шаблоны по умолчанию имеют формат glob,\n"
+"пути задаются относительно корня репозитория."
+
+msgid ""
+" [merge-patterns]\n"
+" **.c = kdiff3\n"
+" **.jpg = myimgmerge"
+msgstr ""
+
+msgid ""
+"``merge-tools``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"This section configures external merge tools to use for file-level\n"
+"merges."
+msgstr "Эта секция задает внешние инструменты для слияния отдельных файлов."
+
+msgid "Example ``~/.hgrc``::"
+msgstr "Пример ``~/.hgrc``::"
+
+msgid ""
+" [merge-tools]\n"
+" # Override stock tool location\n"
+" kdiff3.executable = ~/bin/kdiff3\n"
+" # Specify command line\n"
+" kdiff3.args = $base $local $other -o $output\n"
+" # Give higher priority\n"
+" kdiff3.priority = 1"
+msgstr ""
+" [merge-tools]\n"
+" # Переопределить изначальное расположение программы\n"
+" kdiff3.executable = ~/bin/kdiff3\n"
+" # Задать параметры командной строки\n"
+" kdiff3.args = $base $local $other -o $output\n"
+" # Задать повышенный приоритет\n"
+" kdiff3.priority = 1"
+
+msgid ""
+" # Define new tool\n"
+" myHtmlTool.args = -m $local $other $base $output\n"
+" myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n"
+" myHtmlTool.priority = 1"
+msgstr ""
+" # Определить новый инструмент\n"
+" myHtmlTool.args = -m $local $other $base $output\n"
+" myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n"
+" myHtmlTool.priority = 1"
+
+msgid ""
+"``priority``\n"
+" The priority in which to evaluate this tool.\n"
+" Default: 0."
+msgstr ""
+"``priority``\n"
+" Приоритет, с которым выбирается этот инструмент.\n"
+" По умолчанию 0."
+
+msgid ""
+"``executable``\n"
+" Either just the name of the executable or its pathname. On Windows,\n"
+" the path can use environment variables with ${ProgramFiles} syntax.\n"
+" Default: the tool name."
+msgstr ""
+"``executable``\n"
+" Имя или полный путь к исполняемого файлу. В Windows в пути можно\n"
+" использовать переменные окружения с синтаксисом ${ProgramFiles}.\n"
+" По умолчанию: имя программы."
+
+msgid ""
+"``args``\n"
+" The arguments to pass to the tool executable. You can refer to the\n"
+" files being merged as well as the output file through these\n"
+" variables: ``$base``, ``$local``, ``$other``, ``$output``.\n"
+" Default: ``$local $base $other``"
+msgstr ""
+"``args``\n"
+" Аргументы, передаваемые иструменту слияния. Можно обращаться к\n"
+" сливаемым файлам и результату слияния через эти переменные:\n"
+" ``$base``, ``$local``, ``$other``, ``$output``.\n"
+" По умолчанию: ``$local $base $other``"
+
+msgid ""
+"``premerge``\n"
+" Attempt to run internal non-interactive 3-way merge tool before\n"
+" launching external tool. Options are ``true``, ``false``, or ``keep``\n"
+" to leave markers in the file if the premerge fails.\n"
+" Default: True"
+msgstr ""
+"``premerge``\n"
+" Пытаться запускать внутренний неинтерактивный инструмент слияния\n"
+" для трех файлов перед запуском внешней программы. Возможны значения\n"
+" ``true``(включено), ``false``(выключено) или ``keep``, чтобы оставить\n"
+" маркеры конфликтов в файлах при неудавшемся предварительном слиянии.\n"
+" По умолчанию: True"
+
+msgid ""
+"``binary``\n"
+" This tool can merge binary files. Defaults to False, unless tool\n"
+" was selected by file pattern match."
+msgstr ""
+"``binary``\n"
+" Этот инструмент может использоваться для слияния бинарных файлов.\n"
+" По умолчанию False, если этот инструмент не был выбран при\n"
+" совпадении шаблона имени файла."
+
+msgid ""
+"``symlink``\n"
+" This tool can merge symlinks. Defaults to False, even if tool was\n"
+" selected by file pattern match."
+msgstr ""
+"``symlink``\n"
+" Этот инструмент может использоваться для слияния символических ссылок\n"
+" По умолчанию False, даже если инструмент был выбран при совпадении\n"
+" шаблона имени файла."
+
+msgid ""
+"``check``\n"
+" A list of merge success-checking options:"
+msgstr ""
+"``check``\n"
+" Список параметров, свидетельствующих об успехе слияния::"
+
+msgid ""
+" ``changed``\n"
+" Ask whether merge was successful when the merged file shows no changes.\n"
+" ``conflicts``\n"
+" Check whether there are conflicts even though the tool reported "
+"success.\n"
+" ``prompt``\n"
+" Always prompt for merge success, regardless of success reported by tool."
+msgstr ""
+" ``changed``\n"
+" Спросить, было ли слияние успешным, если в слитом файле нет изменений.\n"
+" ``conflicts``\n"
+" Проверить наличие конфликтов, даже если программа слияния сигнализирует "
+"об успехе\n"
+" ``prompt``\n"
+" Всегда спрашивать об успехе слияния, вне зависимости от возвращенного "
+"инструментом слияния статуса."
+
+msgid ""
+"``checkchanged``\n"
+" True is equivalent to ``check = changed``.\n"
+" Default: False"
+msgstr ""
+"``checkchanged``\n"
+" Эквивалентно ``check = changed``.\n"
+" По умолчанию: False"
+
+msgid ""
+"``checkconflicts``\n"
+" True is equivalent to ``check = conflicts``.\n"
+" Default: False"
+msgstr ""
+"``checkconflicts``\n"
+" Эквивалентно ``check = conflicts``.\n"
+" По умолчанию: False"
+
+msgid ""
+"``fixeol``\n"
+" Attempt to fix up EOL changes caused by the merge tool.\n"
+" Default: False"
+msgstr ""
+"``fixeol``\n"
+" Пытаться исправить изменения формата новой строки из-за работы программы "
+"слияния.\n"
+" По умолчанию: False"
+
+msgid ""
+"``gui``\n"
+" This tool requires a graphical interface to run. Default: False"
+msgstr ""
+"``gui``\n"
+" Эта программа требует графический интерфейс. По умолчанию: False"
+
+msgid ""
+"``regkey``\n"
+" Windows registry key which describes install location of this\n"
+" tool. Mercurial will search for this key first under\n"
+" ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n"
+" Default: None"
+msgstr ""
+"``regkey``\n"
+" Ключ реестра Windows, описывающий установочный каталог этого\n"
+" инструмента. Mercurial ищет этот ключ сначала в ``HKEY_CURRENT_USER``,\n"
+" потом в ``HKEY_LOCAL_MACHINE``.\n"
+" По умолчанию: не задан"
+
+msgid ""
+"``regkeyalt``\n"
+" An alternate Windows registry key to try if the first key is not\n"
+" found. The alternate key uses the same ``regname`` and ``regappend``\n"
+" semantics of the primary key. The most common use for this key\n"
+" is to search for 32bit applications on 64bit operating systems.\n"
+" Default: None"
+msgstr ""
+"``regkeyalt``\n"
+" Альтернативный ключ в реестре Windows, который используется если\n"
+" первый ключ не найдан. Этот ключ использует ту же семантику\n"
+" ``regname`` и ``regappend``, что и первичный ключ. Обычно это\n"
+" используется для поиска 32-битных приложений в 64-битных ОС.\n"
+" По умолчанию: не задан"
+
+msgid ""
+"``regname``\n"
+" Name of value to read from specified registry key. Defaults to the\n"
+" unnamed (default) value."
+msgstr ""
+"``regname``\n"
+" Имя читаемого из реестра параметра. По умолчанию значение не пусто -\n"
+" неименованный параметр."
+
+msgid ""
+"``regappend``\n"
+" String to append to the value read from the registry, typically\n"
+" the executable name of the tool.\n"
+" Default: None"
+msgstr ""
+"``regappend``\n"
+" Строка, добавляемая к прочитанному из реестра значению, как правило\n"
+" это имя исполняемого файла инструмента.\n"
+" По умолчанию: не задан"
+
+msgid ""
+"\n"
+"``hooks``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Commands or Python functions that get automatically executed by\n"
+"various actions such as starting or finishing a commit. Multiple\n"
+"hooks can be run for the same action by appending a suffix to the\n"
+"action. Overriding a site-wide hook can be done by changing its\n"
+"value or setting it to an empty string."
+msgstr ""
+"Команды или функции Python, вызываемые автоматически при различных\n"
+"действиях, таких как начало или конец коммита. Можно задавать несколько\n"
+"хуков для одного и того же действия, добавляя к действию суффикс.\n"
+"Можно переопределить глобальный хук, изменив его значения или задав\n"
+"для него пустую строку."
+
+msgid "Example ``.hg/hgrc``::"
+msgstr "Пример ``.hg/hgrc``::"
+
+msgid ""
+" [hooks]\n"
+" # update working directory after adding changesets\n"
+" changegroup.update = hg update\n"
+" # do not use the site-wide hook\n"
+" incoming =\n"
+" incoming.email = /my/email/hook\n"
+" incoming.autobuild = /my/build/hook"
+msgstr ""
+" [hooks]\n"
+" # Обновить рабочий каталог после добавления наборов изменений\n"
+" changegroup.update = hg update\n"
+" # не использовать глобальный хук\n"
+" incoming =\n"
+" incoming.email = /my/email/hook\n"
+" incoming.autobuild = /my/build/hook"
+
+msgid ""
+"Most hooks are run with environment variables set that give useful\n"
+"additional information. For each hook below, the environment\n"
+"variables it is passed are listed with names of the form ``$HG_foo``."
+msgstr ""
+"Болшьниство хуков выполняются с переменными окружения, содержащими\n"
+"полезную дополнительную информацию. Для каждого хука ниже, передаваемые\n"
+"ему переменные перечисленны с именами вида ``$HG_foo``."
+
+msgid ""
+"``changegroup``\n"
+" Run after a changegroup has been added via push, pull or unbundle.\n"
+" ID of the first new changeset is in ``$HG_NODE``. URL from which\n"
+" changes came is in ``$HG_URL``."
+msgstr ""
+"``changegroup``\n"
+" Выполняется после того, как группа наборов изменений была добавлена\n"
+" с помощью push, pull или unbundle. ID первого набора изменений\n"
+" содержится в ``$HG_NODE``. URL источника измений находится в ``$HG_URL``."
+
+msgid ""
+"``commit``\n"
+" Run after a changeset has been created in the local repository. ID\n"
+" of the newly created changeset is in ``$HG_NODE``. Parent changeset\n"
+" IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+"``commit``\n"
+" Выполняется после создания нового набора изменений в локальном\n"
+" репозитории. ID созданного набора изменений передается в ``$HG_NODE``,\n"
+" ID родителей содержатся в ``$HG_PARENT1`` и ``$HG_PARENT2``."
+
+msgid ""
+"``incoming``\n"
+" Run after a changeset has been pulled, pushed, or unbundled into\n"
+" the local repository. The ID of the newly arrived changeset is in\n"
+" ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``."
+msgstr ""
+"``incoming``\n"
+" Выполняется после того, как набор изменений был добавлен с помощью\n"
+" push, pull или unbundle. ID первого набора изменений содержится\n"
+" в ``$HG_NODE``. URL источника измений находится в ``$HG_URL``."
+
+msgid ""
+"``outgoing``\n"
+" Run after sending changes from local repository to another. ID of\n"
+" first changeset sent is in ``$HG_NODE``. Source of operation is in\n"
+" ``$HG_SOURCE``; see \"preoutgoing\" hook for description."
+msgstr ""
+"``outgoing``\n"
+" Выполняется после отправки изменений из локального репозитория в\n"
+" другой. ID первого набора изменений содержится в ``$HG_NODE``.\n"
+" Источник операции находится в ``$HG_SOURCE``; описание см. в\n"
+" \"preoutgoing\""
+
+msgid ""
+"``post-<command>``\n"
+" Run after successful invocations of the associated command. The\n"
+" contents of the command line are passed as ``$HG_ARGS`` and the result\n"
+" code in ``$HG_RESULT``. Parsed command line arguments are passed as \n"
+" ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of\n"
+" the python data internally passed to <command>. ``$HG_OPTS`` is a \n"
+" dictionary of options (with unspecified options set to their defaults).\n"
+" ``$HG_PATS`` is a list of arguments. Hook failure is ignored."
+msgstr ""
+"``post-<команда>``\n"
+" Выполняется после успешного вызова соответствующей команды.\n"
+" Содержимое командной строки передавется в ``$HG_ARGS``, код\n"
+" завершения - в ``$HG_RESULT``. Разобранные аргументы командной\n"
+" строки передаются как ``$HG_PATS`` и ``$HG_OPTS``. Они содержат\n"
+" строковое представление данных Python, передаваемых <команде>\n"
+" внутренней реализацией. ``$HG_OPTS`` - это словарь опций \n"
+" (опущенные опциии установлены в значения по умолчанию).\n"
+" ``$HG_PATS`` - список аргументов. Неудачное завершение хука\n"
+" игнорируется."
+
+msgid ""
+"``pre-<command>``\n"
+" Run before executing the associated command. The contents of the\n"
+" command line are passed as ``$HG_ARGS``. Parsed command line arguments\n"
+" are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string\n"
+" representations of the data internally passed to <command>. ``$HG_OPTS``\n"
+" is a dictionary of options (with unspecified options set to their\n"
+" defaults). ``$HG_PATS`` is a list of arguments. If the hook returns \n"
+" failure, the command doesn't execute and Mercurial returns the failure\n"
+" code."
+msgstr ""
+"``pre-<команда>``\n"
+" Выполняется перед вызовом соответствующей команды.\n"
+" Содержимое командной строки передавется в ``$HG_ARGS``.\n"
+" Разобранные аргументы командной строки передаются как ``$HG_PATS``\n"
+" и ``$HG_OPTS``. Они содержат строковое представление данных\n"
+" Python, передаваемых <команде> внутренней реализацией. ``$HG_OPTS`` -\n"
+" это словарь опций (опущенные опции установленны в значения по\n"
+" умолчанию).``$HG_PATS`` - список аргументов. Неудачное завершение\n"
+" хука игнорируется."
+
+msgid ""
+"``prechangegroup``\n"
+" Run before a changegroup is added via push, pull or unbundle. Exit\n"
+" status 0 allows the changegroup to proceed. Non-zero status will\n"
+" cause the push, pull or unbundle to fail. URL from which changes\n"
+" will come is in ``$HG_URL``."
+msgstr ""
+"``prechangegroup``\n"
+" Выполняется перед добавлением группы наборов изменений с помощью\n"
+" pull, push или unbundle. Код возврата 0 разрешает продолжение\n"
+" операции, ненулевой код возврата заставляет push, pull или unbundle\n"
+" завершиться с ошибкой. URL источника изменений содержится в ``$HG_URL``."
+
+msgid ""
+"``precommit``\n"
+" Run before starting a local commit. Exit status 0 allows the\n"
+" commit to proceed. Non-zero status will cause the commit to fail.\n"
+" Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+"``precommit``\n"
+" Выполняется перед началом локального коммита. Код возврата 0\n"
+" разрешает продолжение операции, ненулевой код возврата заставляет\n"
+" commit завершиться с ошибкой. ID родителей передаются в ``$HG_PARENT1``\n"
+" и ``$HG_PARENT2``."
+
+msgid ""
+"``prelistkeys``\n"
+" Run before listing pushkeys (like bookmarks) in the\n"
+" repository. Non-zero status will cause failure. The key namespace is\n"
+" in ``$HG_NAMESPACE``."
+msgstr ""
+"``prelistkeys``\n"
+" Выполняется перед выводом ключей наборов изменений (например, закладок)\n"
+" репозитория. Ненулевой код возврата вызовет завершение с ошибкой.\n"
+" Пространство имен ключа передается в ``$HG_NAMESPACE``."
+
+msgid ""
+"``preoutgoing``\n"
+" Run before collecting changes to send from the local repository to\n"
+" another. Non-zero status will cause failure. This lets you prevent\n"
+" pull over HTTP or SSH. Also prevents against local pull, push\n"
+" (outbound) or bundle commands, but not effective, since you can\n"
+" just copy files instead then. Source of operation is in\n"
+" ``$HG_SOURCE``. If \"serve\", operation is happening on behalf of remote\n"
+" SSH or HTTP repository. If \"push\", \"pull\" or \"bundle\", operation\n"
+" is happening on behalf of repository on same system."
+msgstr ""
+"``preoutgoing``\n"
+" Выполняется перед сборкой изменений для отправки из локального\n"
+" репозитория в удаленный. Ненулевой код возврата вызовет аварийное\n"
+" завершение. Это позволяет предотвратить pull по HTTP или SSH. Также\n"
+" можно отменить и локальные pull, push или bundle, но это неэффективно,\n"
+" т.к. в этом случае можно просто скопировать файлы. Источник операции\n"
+" передается в ``$HG_SOURCE``. Для \"serve\" операция вполняется\n"
+" на стороне удаленного SSH или HTTP репозитория. Для \"push\", \"pull\"\n"
+" или \"bundle\", операция выполняется в локальной системе."
+
+msgid ""
+"``prepushkey``\n"
+" Run before a pushkey (like a bookmark) is added to the\n"
+" repository. Non-zero status will cause the key to be rejected. The\n"
+" key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,\n"
+" the old value (if any) is in ``$HG_OLD``, and the new value is in\n"
+" ``$HG_NEW``."
+msgstr ""
+"``prepushkey``\n"
+" Выполняется перед добавлением ключа (напрмер, закладки) в\n"
+" репозиторий. Ненулевой код возврата отменит добавление ключа.\n"
+" Пространство имен ключа передается в ``$HG_NAMESPACE``, ключ в\n"
+" ``$HG_KEY``, предыдущее значение (если есть) в ``$HG_OLD``, новое -\n"
+" в ``$HG_NEW``."
+
+msgid ""
+"``pretag``\n"
+" Run before creating a tag. Exit status 0 allows the tag to be\n"
+" created. Non-zero status will cause the tag to fail. ID of\n"
+" changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag "
+"is\n"
+" local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``."
+msgstr ""
+"``pretag``\n"
+" Выполняется перед созданием метки. Код возврата 0 позволит создать\n"
+" метку, ненулевой вызовет завершение с ошибкой. ID помечаемого набора\n"
+" изменений передается в ``$HG_NODE``, имя метки - в ``$HG_TAG``.\n"
+" Метка является локальной, если ``$HG_LOCAL=1``, записывается в\n"
+" репозиторий, если ``$HG_LOCAL=0``."
+
+msgid ""
+"``pretxnchangegroup``\n"
+" Run after a changegroup has been added via push, pull or unbundle,\n"
+" but before the transaction has been committed. Changegroup is\n"
+" visible to hook program. This lets you validate incoming changes\n"
+" before accepting them. Passed the ID of the first new changeset in\n"
+" ``$HG_NODE``. Exit status 0 allows the transaction to commit. Non-zero\n"
+" status will cause the transaction to be rolled back and the push,\n"
+" pull or unbundle will fail. URL that was source of changes is in\n"
+" ``$HG_URL``."
+msgstr ""
+"``pretxnchangegroup``\n"
+" Выполняется после добавления группы наборов изменений с помощью\n"
+" push, pull или unbundle, до коммита транзакции. Группа изменений\n"
+" доступна в программе хука. Это позволяет проверить входящие\n"
+" изменения, перед тем, как принять их. ID первого добавляемого\n"
+" набора изменений передается в ``$HG_NODE``. Код возврата 0 разрешает\n"
+" закоммитить транзакцию, ненулевой откатывает ее и заставляет\n"
+" pull, push или unbundle завершиться с ошибкой. URL источника\n"
+" изменений передается в ``$HG_URL``."
+
+msgid ""
+"``pretxncommit``\n"
+" Run after a changeset has been created but the transaction not yet\n"
+" committed. Changeset is visible to hook program. This lets you\n"
+" validate commit message and changes. Exit status 0 allows the\n"
+" commit to proceed. Non-zero status will cause the transaction to\n"
+" be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset\n"
+" IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+"``pretxncommit``\n"
+" Выполняется после того, как набор изменений был создан, но еще\n"
+" транзакция еще не закоммичена. Набор изменений доступен в программе\n"
+" хука. Это позволяет проверить текст коммита и изменения. Код\n"
+" возврата 0 разрешает продолжение коммита, ненулевой код возврата\n"
+" откатит транзакцию. ID набора изменений передается в ``$HG_NODE``.\n"
+" ID родителей передаются в ``$HG_PARENT1`` и ``$HG_PARENT2``."
+
+msgid ""
+"``preupdate``\n"
+" Run before updating the working directory. Exit status 0 allows\n"
+" the update to proceed. Non-zero status will prevent the update.\n"
+" Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID\n"
+" of second new parent is in ``$HG_PARENT2``."
+msgstr ""
+"``preupdate``\n"
+" Выполняется перед обновлением рабочего каталога. Код возврата 0\n"
+" позволяет продолжить обновление. Ненулевой код возврата отменит\n"
+" обновление. ID первого нового родителя передается в ``$HG_PARENT1``.\n"
+" Если выполняется слияние, ID второго нового родителя доступно в\n"
+" ``$HG_PARENT2``."
+
+msgid ""
+"``listkeys``\n"
+" Run after listing pushkeys (like bookmarks) in the repository. The\n"
+" key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a\n"
+" dictionary containing the keys and values."
+msgstr ""
+"``listkeys``\n"
+" Выполняется после вывода ключей репозитория (например, закладок).\n"
+" Пространство имен ключа доступно в ``$HG_NAMESPACE``. ``$HG_VALUES`` -\n"
+" словарь, содержащий ключи и значения."
+
+msgid ""
+"``pushkey``\n"
+" Run after a pushkey (like a bookmark) is added to the\n"
+" repository. The key namespace is in ``$HG_NAMESPACE``, the key is in\n"
+" ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new\n"
+" value is in ``$HG_NEW``."
+msgstr ""
+"``pushkey``\n"
+" Выполняется после того, как ключ (например, закладка) добавлен\n"
+" в репозиторий. Пространство имен ключа доступно в ``$HG_NAMESPACE``,\n"
+" ключ в - ``$HG_KEY``, старое значение (если есть) - в ``$HG_OLD``,\n"
+" новое значение - в ``$HG_NEW``."
+
+msgid ""
+"``tag``\n"
+" Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.\n"
+" Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in\n"
+" repository if ``$HG_LOCAL=0``."
+msgstr ""
+"``tag``\n"
+" Выполняется после создания метки. ID помечаемого набора изменений\n"
+" передается в ``$HG_TAG``. Метка является локальной, если\n"
+" ``$HG_LOCAL=1``, создается в репозитории если ``$HG_LOCAL=0``."
+
+msgid ""
+"``update``\n"
+" Run after updating the working directory. Changeset ID of first\n"
+" new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is\n"
+" in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the\n"
+" update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``."
+msgstr ""
+"``update``\n"
+" Выполняется после обновления рабочего каталога. ID первого нового\n"
+" родителя передается в ``$HG_PARENT1``. Если выполняется слияние,\n"
+" ID второго родителя доступен в ``$HG_PARENT2``. Если обновление\n"
+" прошло успешно, ``$HG_ERROR=0``. При неудаче (например, если есть\n"
+" неразрешенные конфликты) ``$HG_ERROR=1``."
+
+msgid ""
+".. note:: It is generally better to use standard hooks rather than the\n"
+" generic pre- and post- command hooks as they are guaranteed to be\n"
+" called in the appropriate contexts for influencing transactions.\n"
+" Also, hooks like \"commit\" will be called in all contexts that\n"
+" generate a commit (e.g. tag) and not just the commit command."
+msgstr ""
+".. note:: Вообще говоря обычно лучше использовать стандартные хуки,\n"
+" а не pre- и post-хуки, потому что они гарантированно вызываются\n"
+" с правильным контекстом для транзакций, на которые они влияют.\n"
+" Также такие хуки как \"commit\" будут вызваны во всех ситуациях,\n"
+" когда создается коммит (например, tag), а не только по команде\n"
+" commit."
+
+msgid ""
+".. note:: Environment variables with empty values may not be passed to\n"
+" hooks on platforms such as Windows. As an example, ``$HG_PARENT2``\n"
+" will have an empty value under Unix-like platforms for non-merge\n"
+" changesets, while it will not be available at all under Windows."
+msgstr ""
+".. note:: Переменные окружения с пустыми значениями могут не\n"
+" передаться в хуки на платформах вроде Windows. Например,\n"
+" ``$HG_PARENT2`` будет иметь пустое значение в Unix-подобных\n"
+" ОС, а под Windows вообще будет недоступна."
+
+msgid "The syntax for Python hooks is as follows::"
+msgstr "Синтаксис хуков для Python::"
+
+msgid ""
+" hookname = python:modulename.submodule.callable\n"
+" hookname = python:/path/to/python/module.py:callable"
+msgstr ""
+" имя_хука = python:modulename.submodule.callable\n"
+" имя_хука = python:/path/to/python/module.py:callable"
+
+msgid ""
+"Python hooks are run within the Mercurial process. Each hook is\n"
+"called with at least three keyword arguments: a ui object (keyword\n"
+"``ui``), a repository object (keyword ``repo``), and a ``hooktype``\n"
+"keyword that tells what kind of hook is used. Arguments listed as\n"
+"environment variables above are passed as keyword arguments, with no\n"
+"``HG_`` prefix, and names in lower case."
+msgstr ""
+"Хуки на Python выполняются в рамках процесса Mercurial. Каждый хук\n"
+"вызывается как минимум с тремя аргументами - ключевыми словами:\n"
+"объект интерфейса (``ui``), объект репозитория (``repo``) и ``hooktype``\n"
+"который определяет, какой вид хука используется. Аргументы, описанные\n"
+"выше как переменные окружения, передаются как ключевые слова без\n"
+"префикса ``HG_`` с именами в нижнем регистре."
+
+msgid ""
+"If a Python hook returns a \"true\" value or raises an exception, this\n"
+"is treated as a failure."
+msgstr ""
+"Если хуки Python возвращают значение \"true\" или возбуждают исключение\n"
+"что расценивается как ошибка."
+
+msgid ""
+"\n"
+"``http_proxy``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Used to access web-based Mercurial repositories through a HTTP\n"
+"proxy."
+msgstr ""
+"Используется для доступа к web-репозиторию Mercurial через\n"
+"HTTP-прокси."
+
+msgid ""
+"``host``\n"
+" Host name and (optional) port of the proxy server, for example\n"
+" \"myproxy:8000\"."
+msgstr ""
+"``host``\n"
+" Имя хостя и (необязательный) порт прокси-сервера, например\n"
+" \"myproxy:8000\"."
+
+msgid ""
+"``no``\n"
+" Optional. Comma-separated list of host names that should bypass\n"
+" the proxy."
+msgstr ""
+"``no``\n"
+" Необязательный. Разделенный запятыми список имен хостов, доступных\n"
+" в обход прокси-сервера."
+
+msgid ""
+"``passwd``\n"
+" Optional. Password to authenticate with at the proxy server."
+msgstr ""
+"``passwd``\n"
+" Необязательный. Пароль для аутетификации на прокси-сервере."
+
+msgid ""
+"``user``\n"
+" Optional. User name to authenticate with at the proxy server."
+msgstr ""
+"``user``\n"
+" Необязательный. Имя пользователя для аутентификации на прокси."
+
+msgid ""
+"``always``\n"
+" Optional. Always use the proxy, even for localhost and any entries\n"
+" in ``http_proxy.no``. True or False. Default: False."
+msgstr ""
+"``always``\n"
+" Необязательный. Всегда использовать прокси, даже для localhost и\n"
+" записей из ``http_proxy.no``. True или False. По умолчанию: False."
+
+msgid ""
+"``smtp``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Configuration for extensions that need to send email messages."
+msgstr "Настройки для расширений, которые рассылают email-сообщения."
+
+msgid ""
+"``host``\n"
+" Host name of mail server, e.g. \"mail.example.com\"."
+msgstr ""
+"``host``\n"
+" Имя хоста почтового сервера, например \"mail.example.com\"."
+
+msgid ""
+"``port``\n"
+" Optional. Port to connect to on mail server. Default: 25."
+msgstr " Необязательный. Входящий порт почтового сервера. По умолчанию: 25."
+
+msgid ""
+"``tls``\n"
+" Optional. Method to enable TLS when connecting to mail server: "
+"starttls,\n"
+" smtps or none. Default: none."
+msgstr ""
+"``tls``\n"
+" Необязательный. Способ включения TLS при подключении к "
+"почтовомусерверу:\n"
+" starttls, smtps или none (откл.). По умолчанию: none."
+
+msgid ""
+"``username``\n"
+" Optional. User name for authenticating with the SMTP server.\n"
+" Default: none."
+msgstr ""
+"``username``\n"
+" Необязательный. Имя пользователя для аутентификации на SMTP-сервере.\n"
+" По умолчанию: не задан."
+
+msgid ""
+"``password``\n"
+" Optional. Password for authenticating with the SMTP server. If not\n"
+" specified, interactive sessions will prompt the user for a\n"
+" password; non-interactive sessions will fail. Default: none."
+msgstr ""
+"``password``\n"
+" Необязательный. Пароль для аутентификации на SMTP-сервере. Если\n"
+" не задан, пользователю будет предложено ввести пароль.\n"
+" Неитерактивный сеанс завершиться неудачей. По умолчанию: не задан."
+
+msgid ""
+"``local_hostname``\n"
+" Optional. It's the hostname that the sender can use to identify\n"
+" itself to the MTA."
+msgstr ""
+"``local_hostname``\n"
+" Необязательный. Имя хоста, используемое отправителем для\n"
+" самоидентификации через MTA."
+
+msgid ""
+"\n"
+"``patch``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Settings used when applying patches, for instance through the 'import'\n"
+"command or with Mercurial Queues extension."
+msgstr ""
+"Настройки, используемые при наложении патчей, например, с помощью\n"
+"команды 'import' или расширения Mercurial Queues."
+
+msgid ""
+"``eol``\n"
+" When set to 'strict' patch content and patched files end of lines\n"
+" are preserved. When set to ``lf`` or ``crlf``, both files end of\n"
+" lines are ignored when patching and the result line endings are\n"
+" normalized to either LF (Unix) or CRLF (Windows). When set to\n"
+" ``auto``, end of lines are again ignored while patching but line\n"
+" endings in patched files are normalized to their original setting\n"
+" on a per-file basis. If target file does not exist or has no end\n"
+" of line, patch line endings are preserved.\n"
+" Default: strict."
+msgstr ""
+"``eol``\n"
+" Если установлен в 'strict', символы перевода строки в патче\n"
+" и файле, к которому он применяется, остаются без изменений. Если\n"
+" установлен в ``lf`` или ``crlf``, формат символа перевода строки\n"
+" игнорируется в обоих файлах при наложении патча и приводятся к\n"
+" LF (Unix) или CRLF (Windows) в результате. Если установлен \n"
+" ``auto``, переводы строки так же игнорируются при наложении патча,\n"
+" но восстанавливаются в исходный формат для каждого файла. Если\n"
+" файл назначения не существует или не имеет символов первода строки,\n"
+" сохраняется формат новой строки патча.\n"
+" По умолчанию: strict."
+
+msgid ""
+"\n"
+"``paths``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Assigns symbolic names to repositories. The left side is the\n"
+"symbolic name, and the right gives the directory or URL that is the\n"
+"location of the repository. Default paths can be declared by setting\n"
+"the following entries."
+msgstr ""
+"Задает читаемые имена для репозиториев. Левая часть - символьное\n"
+"имя, правая - URL, которая задает положение репозитория. Пути по\n"
+"умолчанию могут быть заданы с помощью следующих записей."
+
+msgid ""
+"``default``\n"
+" Directory or URL to use when pulling if no source is specified.\n"
+" Default is set to repository from which the current repository was\n"
+" cloned."
+msgstr ""
+"``default``\n"
+" Каталог или URL, используемый для pull, если источнмк не указан.\n"
+" По умолчанию установлен в репозиторий, из которого текущий был\n"
+" клонирован."
+
+msgid ""
+"``default-push``\n"
+" Optional. Directory or URL to use when pushing if no destination\n"
+" is specified."
+msgstr ""
+"``default-push``\n"
+" Необязательный. Каталог или URL, используемый при операции push,\n"
+" если репозиторий назначения не задан."
+
+msgid ""
+"\n"
+"``profiling``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Specifies profiling format and file output. In this section\n"
+"description, 'profiling data' stands for the raw data collected\n"
+"during profiling, while 'profiling report' stands for a statistical\n"
+"text report generated from the profiling data. The profiling is done\n"
+"using lsprof."
+msgstr ""
+"Задает формат для профолирования и выходного файла. В описании этой\n"
+"секции 'данные профилирования' означают сырые данные, собранные при\n"
+"профилировании, а 'отчет профилирования' означает статистический\n"
+"текстовый отчет, сгенерированный из данных профилирования.\n"
+"Профилирование выполняется с помощью lsprof."
+
+msgid ""
+"``format``\n"
+" Profiling format.\n"
+" Default: text."
+msgstr ""
+"``format``\n"
+" Формат профилирования.\n"
+" По умолчанию: text (текстовый)."
+
+msgid ""
+" ``text``\n"
+" Generate a profiling report. When saving to a file, it should be\n"
+" noted that only the report is saved, and the profiling data is\n"
+" not kept.\n"
+" ``kcachegrind``\n"
+" Format profiling data for kcachegrind use: when saving to a\n"
+" file, the generated file can directly be loaded into\n"
+" kcachegrind."
+msgstr ""
+" ``text``\n"
+" Генерировать отчет профилирования. При сохранении в файл, необходимо\n"
+" помнить, что сохраняется только отчет, данные профилирования\n"
+" удаляются. ``kcachegrind``\n"
+" Данные профилирования для использования в kcachegrind: после\n"
+" сохранения в файл, он может быть загружен прямо в kcachegrind."
+
+msgid ""
+"``output``\n"
+" File path where profiling data or report should be saved. If the\n"
+" file exists, it is replaced. Default: None, data is printed on\n"
+" stderr"
+msgstr ""
+"``output``\n"
+" Путь к выходному файлу, куда будут сохранены данные или отчет\n"
+" профилирования. Если файл существует, от перезаписывается.\n"
+" По умолчанию: не задан, данные печатаются в stderr"
+
+msgid ""
+"``revsetalias``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Alias definitions for revsets. See :hg:`help revsets` for details."
+msgstr ""
+
+msgid ""
+"``server``\n"
+"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Controls generic server settings."
+msgstr "Общие настройки сервера."
+
+msgid ""
+"``uncompressed``\n"
+" Whether to allow clients to clone a repository using the\n"
+" uncompressed streaming protocol. This transfers about 40% more\n"
+" data than a regular clone, but uses less memory and CPU on both\n"
+" server and client. Over a LAN (100 Mbps or better) or a very fast\n"
+" WAN, an uncompressed streaming clone is a lot faster (~10x) than a\n"
+" regular clone. Over most WAN connections (anything slower than\n"
+" about 6 Mbps), uncompressed streaming is slower, because of the\n"
+" extra data transfer overhead. This mode will also temporarily hold\n"
+" the write lock while determining what data to transfer.\n"
+" Default is True."
+msgstr ""
+"``uncompressed``\n"
+" Разрешать или нет клиентам клонировать клонировать репозиторий,\n"
+" использовать несжатый потоковый протокол. При этом передается\n"
+" примерно на 40% больше данных при обычном клонировании, но экономит\n"
+" процессорное время и память на обеих сторонах. По локальной сети\n"
+" (100 Мбит/c и выше) или при очень быстром интернет-соединении,\n"
+" протокол без сжатия намного быстрее (~ в 10 раз) обычного.\n"
+" На большинстве интернет-соединений (медленней 6 Мбит/c), протокол\n"
+" бес сжатия будет медленней из-за большего передаваемого трафика.\n"
+" Этот режим также временно устанавливает блокировку записи на\n"
+" время определения, какие данные передавать.\n"
+" По умолчанию True (включен)."
+
+msgid ""
+"``validate``\n"
+" Whether to validate the completeness of pushed changesets by\n"
+" checking that all new file revisions specified in manifests are\n"
+" present. Default is False."
+msgstr ""
+" Проводить или нет проверку полноты передаваемых с помощью push\n"
+" наборов изменений, проверяя, что все новые ревизии файлов,\n"
+" присутсвующие в манифесте, подготовлены для передачи.\n"
+" По умолчанию False (отключено)."
+
+msgid ""
+"``subpaths``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Defines subrepositories source locations rewriting rules of the form::"
+msgstr "Определяет правила переопределения адресов источников в форме::"
+
+msgid " <pattern> = <replacement>"
+msgstr " <шаблон> = <замена>"
+
+msgid ""
+"Where ``pattern`` is a regular expression matching the source and\n"
+"``replacement`` is the replacement string used to rewrite it. Groups\n"
+"can be matched in ``pattern`` and referenced in ``replacements``. For\n"
+"instance::"
+msgstr ""
+"Где ``шаблон`` - это регулярное выражение, с которым совпадает\n"
+"адрес источника, а ``замена`` - строка, на которую он будет заменен.\n"
+"Группы, совпадающие в ``шаблоне``, могут быть использваны в ``замене``.\n"
+"Например::"
+
+msgid " http://server/(.*)-hg/ = http://hg.server/\\1/"
+msgstr " http://server/(.*)-hg/ = http://hg.server/\\1/"
+
+msgid "rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``."
+msgstr "заменит ``http://server/foo-hg/`` на ``http://hg.server/foo/``."
+
+msgid "All patterns are applied in definition order."
+msgstr "Все шаблоны применяются в порядке определения."
+
+msgid ""
+"``trusted``\n"
+"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Mercurial will not use the settings in the\n"
+"``.hg/hgrc`` file from a repository if it doesn't belong to a trusted\n"
+"user or to a trusted group, as various hgrc features allow arbitrary\n"
+"commands to be run. This issue is often encountered when configuring\n"
+"hooks or extensions for shared repositories or servers. However,\n"
+"the web interface will use some safe settings from the ``[web]``\n"
+"section."
+msgstr ""
+"Mercurial не будет использовать настройки из файла ``.hg/hgrc``\n"
+"репозитория, если он не принадлежит доверенному пользователю или\n"
+"группе, поскольку многие функции из hgrc позволяют выполнять\n"
+"произвольные команды. С этим часто возникают проблемы при настройке\n"
+"хуков или расширений для публичных репозиториев или серверов. Однако,\n"
+"web-интерфейс будет использовать некоторые безопасные настройки из\n"
+"секции ``[web]``."
+
+msgid ""
+"This section specifies what users and groups are trusted. The\n"
+"current user is always trusted. To trust everybody, list a user or a\n"
+"group with name ``*``. These settings must be placed in an\n"
+"*already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the\n"
+"user or service running Mercurial."
+msgstr ""
+"Эта секции определяет, каким пользователям и группам доверять.\n"
+"Текущему пользователю Mercurial доверяет всегда. Чтобы доверять всем,\n"
+"добавьте группу или пользователя с именем ``*``. Эти настройки должны\n"
+"быть в *уже доверенном файле*, например ``$HOME/.hgrc`` пользователя\n"
+"или службы, под которым запущен Mercurial."
+
+msgid ""
+"``users``\n"
+" Comma-separated list of trusted users."
+msgstr ""
+"``users``\n"
+" Разделенный запятыми список доверенных пользователей."
+
+msgid ""
+"``groups``\n"
+" Comma-separated list of trusted groups."
+msgstr ""
+"``groups``\n"
+" Разделенный запятыми список доверенных групп."
+
+msgid ""
+"\n"
+"``ui``\n"
+"\"\"\"\"\"\""
+msgstr ""
+
+msgid "User interface controls."
+msgstr "Настройки пользовательского интерфейса."
+
+msgid ""
+"``archivemeta``\n"
+" Whether to include the .hg_archival.txt file containing meta data\n"
+" (hashes for the repository base and for tip) in archives created\n"
+" by the :hg:`archive` command or downloaded via hgweb.\n"
+" Default is True."
+msgstr ""
+"``archivemeta``\n"
+" Включать или нет содержимое файла .hg_archival.txt, хранящего\n"
+" метаданные (хэши базовой и оконечной (tip) ревизии репозитория)\n"
+" в архивы, создаваемые командой :hg:`archive` или загруженными\n"
+" через hgweb. По умолчанию True (включено)."
+
+msgid ""
+"``askusername``\n"
+" Whether to prompt for a username when committing. If True, and\n"
+" neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user "
+"will\n"
+" be prompted to enter a username. If no username is entered, the\n"
+" default ``USER@HOST`` is used instead.\n"
+" Default is False."
+msgstr ""
+"``askusername``\n"
+" Спришивать или нет имя пользователя при коммите. Если True, и не\n"
+" установлены ни ``$HGUSER``, ни ``$EMAIL``, пользователю будетпредложено\n"
+" ввести имя пользователя. Если ничего не введено, будет использовано\n"
+" ``ПОЛЬЗОВАТЕЛЬ@ХОСТ``. По умолчанию False (отключено)."
+
+msgid ""
+"``commitsubrepos``\n"
+" Whether to commit modified subrepositories when committing the\n"
+" parent repository. If False and one subrepository has uncommitted\n"
+" changes, abort the commit.\n"
+" Default is True."
+msgstr ""
+"``commitsubrepos``\n"
+" Коммитить или нет измененные субрепозитории при коммите\n"
+" родительского репозитория. Если False, и один из субрепозиториев\n"
+" имеет незакоммиченные изменения, отменить коммит.\n"
+" По умолчанию True (включено)."
+
+msgid ""
+"``debug``\n"
+" Print debugging information. True or False. Default is False."
+msgstr ""
+"``debug``\n"
+" Печатать отладочную информацию. True или False. По умолчанию False."
+
+msgid ""
+"``editor``\n"
+" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
+msgstr ""
+"``editor``\n"
+" Редактор, вызываетмый при коммите. По умолчанию ``$EDITOR`` or ``vi``."
+
+msgid ""
+"``fallbackencoding``\n"
+" Encoding to try if it's not possible to decode the changelog using\n"
+" UTF-8. Default is ISO-8859-1."
+msgstr ""
+"``fallbackencoding``\n"
+" Кодировка, используемая если невозможно декодировать лог, используя\n"
+" UTF-8. По умолчанию ISO-8859-1."
+
+msgid ""
+"``ignore``\n"
+" A file to read per-user ignore patterns from. This file should be\n"
+" in the same format as a repository-wide .hgignore file. This\n"
+" option supports hook syntax, so if you want to specify multiple\n"
+" ignore files, you can do so by setting something like\n"
+" ``ignore.other = ~/.hgignore2``. For details of the ignore file\n"
+" format, see the ``hgignore(5)`` man page."
+msgstr ""
+"``ignore``\n"
+" Файл, из которого читаются шаблоны игнорируемых файлов данного\n"
+" пользователя. Имеет тот же формате, что и файл .hgignore репозитория.\n"
+" Эта опция поддерживает синтаксис хуков, так что можно задать несколько\n"
+" таких файлов, написав что-то вроде ``ignore.other = ~/.hgignore2``.\n"
+" Дополнительно см. справку по hgignore."
+
+msgid ""
+"``interactive``\n"
+" Allow to prompt the user. True or False. Default is True."
+msgstr ""
+"``interactive``\n"
+" Разрешить интерактивно спрашивать пльзователя. True или False.\n"
+" По умолчанию True (включено)."
+
+msgid ""
+"``logtemplate``\n"
+" Template string for commands that print changesets."
+msgstr ""
+"``logtemplate``\n"
+" Шаблонная строка для команд, печатающих наборы изменений."
+
+msgid ""
+"``merge``\n"
+" The conflict resolution program to use during a manual merge.\n"
+" For more information on merge tools see :hg:`help merge-tools`.\n"
+" For configuring merge tools see the ``[merge-tools]`` section."
+msgstr ""
+"``merge``\n"
+" Программа для разрешения конфликтов во время ручного слияния.\n"
+" Дополнительно см. :hg:`help merge-tools`. Настройки инструментов\n"
+" для слияния см. в секции ``[merge-tools]``."
+
+msgid ""
+"``portablefilenames``\n"
+" Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n"
+" Default is ``warn``.\n"
+" If set to ``warn`` (or ``true``), a warning message is printed on POSIX\n"
+" platforms, if a file with a non-portable filename is added (e.g. a file\n"
+" with a name that can't be created on Windows because it contains "
+"reserved\n"
+" parts like ``AUX``, reserved characters like ``:``, or would cause a "
+"case\n"
+" collision with an existing file).\n"
+" If set to ``ignore`` (or ``false``), no warning is printed.\n"
+" If set to ``abort``, the command is aborted.\n"
+" On Windows, this configuration option is ignored and the command aborted."
+msgstr ""
+"``portablefilenames``\n"
+" Проверять имена файлов на переносимость. Может быть ``warn``,\n"
+" ``ignore`` или ``abort``. По умолчанию ``warn``.\n"
+" Если установлен в ``warn`` (или ``true``), на POSIX-совместимых "
+"платформах\n"
+" печатается предупреждение, если создается файл с непереносимым\n"
+" именем (т.е. файл, который не может быть создан в Windows, потому\n"
+" что содержит зарезервированные части, вроде ``AUX``, зарезервированные\n"
+" символы вроде ``:``, или отличается от уже существующего файла только\n"
+" регистром букв).\n"
+" Если установлен в ``ignore`` (или ``false``), предупреждение на\n"
+" печатается.\n"
+" Если установлен в ``abort``, команда прерывается.\n"
+" В Windows этот параметр игнорируется, команда завершается с ошибкой."
+
+msgid ""
+"``quiet``\n"
+" Reduce the amount of output printed. True or False. Default is False."
+msgstr ""
+"``quiet``\n"
+" Печатать меньше информации. True или False. По умолчанию False."
+
+msgid ""
+"``remotecmd``\n"
+" remote command to use for clone/push/pull operations. Default is ``hg``."
+msgstr ""
+"``remotecmd``\n"
+" Комадна, используемая на удаленной машине для операций clone/push/pull.\n"
+" По умолчанию ``hg``."
+
+msgid ""
+"``report_untrusted``\n"
+" Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n"
+" trusted user or group. True or False. Default is True."
+msgstr ""
+"``report_untrusted``\n"
+" Предупреждать, если файл ``.hg/hgrc`` игноририуется, потому что\n"
+" его вледалец не доверенный пользователь или группа. True или False.\n"
+" По умолчанию True (включено)."
+
+msgid ""
+"``slash``\n"
+" Display paths using a slash (``/``) as the path separator. This\n"
+" only makes a difference on systems where the default path\n"
+" separator is not the slash character (e.g. Windows uses the\n"
+" backslash character (``\\``)).\n"
+" Default is False."
+msgstr ""
+"``slash``\n"
+" Показывать пути используя слэш (``/``) в качестве разделителя.\n"
+" Имеет смысл только на системах, где в качестве разделителя в\n"
+" путях используется другой символ (например, Windows использует\n"
+" обратный слэш (``\\``)).\n"
+" По умолчанию False (отключено)."
+
+msgid ""
+"``ssh``\n"
+" command to use for SSH connections. Default is ``ssh``."
+msgstr ""
+"``ssh``\n"
+" Команда, используемая для соединений по SSH. По умолчанию ``ssh``."
+
+msgid ""
+"``strict``\n"
+" Require exact command names, instead of allowing unambiguous\n"
+" abbreviations. True or False. Default is False."
+msgstr ""
+"``strict``\n"
+" Требовать точных имен команд, вместо того, чтобы разрешать\n"
+" однозначные сокращения. True или False. По умолчанию False."
+
+msgid ""
+"``style``\n"
+" Name of style to use for command output."
+msgstr ""
+"``style``\n"
+" Имя стиля, используемое при выводе результата команды."
+
+msgid ""
+"``timeout``\n"
+" The timeout used when a lock is held (in seconds), a negative value\n"
+" means no timeout. Default is 600."
+msgstr ""
+"``timeout``\n"
+" Таймаут в секундах, используемый при удержании блокировки,\n"
+" отрицательное число - без таймаута. По умолчанию 600."
+
+msgid ""
+"``traceback``\n"
+" Mercurial always prints a traceback when an unknown exception\n"
+" occurs. Setting this to True will make Mercurial print a traceback\n"
+" on all exceptions, even those recognized by Mercurial (such as\n"
+" IOError or MemoryError). Default is False."
+msgstr ""
+"``traceback``\n"
+" Mercurial всегда печатает трассировку вызовов при неизвестном\n"
+" исключении. Если этот параметр установлен в True, трассировка\n"
+" будет печататься при любых исключениях, даже обрабатываемых\n"
+" Mrecurial (таких, как IOError или MemoryError).\n"
+" По умолчанию False (отключено)."
+
+msgid ""
+"``username``\n"
+" The committer of a changeset created when running \"commit\".\n"
+" Typically a person's name and email address, e.g. ``Fred Widget\n"
+" <fred@example.com>``. Default is ``$EMAIL`` or ``username@hostname``. "
+"If\n"
+" the username in hgrc is empty, it has to be specified manually or\n"
+" in a different hgrc file (e.g. ``$HOME/.hgrc``, if the admin set\n"
+" ``username =`` in the system hgrc). Environment variables in the\n"
+" username are expanded."
+msgstr ""
+"``username``\n"
+" Имя автора создаваемого при коммите набора изменений. Оычно\n"
+" состоит из имени человека и его электронной почты, например\n"
+" ``Василий Пупкин <vasya@example.com>``. По умолчанию ``$EMAIL``\n"
+" или ``пользователь@хост``. Если имя пользователя не задано в hgrc,\n"
+" оно должно быть указано вручную или в другом файле hgrc (например,\n"
+" в ``$HOME/.hgrc``, если администратор задал ``username =`` в\n"
+" общесистемном файле настроек). Переменные окружения раскрываются\n"
+" в этом параметре."
+
+msgid ""
+"``verbose``\n"
+" Increase the amount of output printed. True or False. Default is False."
+msgstr ""
+"``verbose``\n"
+" Увеличивает подробность вывода команд. True or False. По умолчанию False."
+
+msgid ""
+"\n"
+"``web``\n"
+"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Web interface configuration. The settings in this section apply to\n"
+"both the builtin webserver (started by :hg:`serve`) and the script you\n"
+"run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI\n"
+"and WSGI)."
+msgstr ""
+"Настройки web-интерфейса. Настройки из этой секци применяются как\n"
+"для встроенного web-сервера (запускаемого :hg:`serve`), так и для\n"
+"скрипта, запускаемого обычным веб-сервером (``hgweb.cgi`` и\n"
+"вариации для FastCGI и WSGI)."
+
+msgid ""
+"The Mercurial webserver does no authentication (it does not prompt for\n"
+"usernames and passwords to validate *who* users are), but it does do\n"
+"authorization (it grants or denies access for *authenticated users*\n"
+"based on settings in this section). You must either configure your\n"
+"webserver to do authentication for you, or disable the authorization\n"
+"checks."
+msgstr ""
+"Встроенный web-сервер Mercurial не производит аутентификацию (не\n"
+"спрашивает имена пользователей и пароли, чтобы узнать *кто* это)\n"
+"но проводит авторизацию (разрешает или запрещает доступ\n"
+"*аутентифицированным пользователям*, основываясь на настройках\n"
+"из этой секции). Вы должны или настроить веб-сервер, чтобы он\n"
+"выполнял аутентификацию, либо отключить проверки авторизации."
+
+msgid ""
+"For a quick setup in a trusted environment, e.g., a private LAN, where\n"
+"you want it to accept pushes from anybody, you can use the following\n"
+"command line::"
+msgstr ""
+"Для быстрой настройки в доверенной среде, например, частной локальной\n"
+"сети, где можно разрешить push всем, можно использовать такую\n"
+"командную строку::"
+
+msgid " $ hg --config web.allow_push=* --config web.push_ssl=False serve"
+msgstr ""
+
+msgid ""
+"Note that this will allow anybody to push anything to the server and\n"
+"that this should not be used for public servers."
+msgstr ""
+"Обратите внимание, что это позволит кому угодно push'ить что угодно\n"
+"на сервер, поэтому так нельзя делать на публичных серверах."
+
+msgid "The full set of options is:"
+msgstr "Полный набор опций:"
+
+msgid ""
+"``accesslog``\n"
+" Where to output the access log. Default is stdout."
+msgstr ""
+"``accesslog``\n"
+" Где хранить логи доступа. По умолчанию стандартный вывод."
+
+msgid ""
+"``address``\n"
+" Interface address to bind to. Default is all."
+msgstr ""
+"``address``\n"
+" Адрес прослушиваемого интерфейса. По умолчанию все интерфейсы."
+
+msgid ""
+"``allow_archive``\n"
+" List of archive format (bz2, gz, zip) allowed for downloading.\n"
+" Default is empty."
+msgstr ""
+"``allow_archive``\n"
+" Список форматов архивов (bz2, gz, zip), которые можно скачивать.\n"
+" По умолчанию пуст."
+
+msgid ""
+"``allowbz2``\n"
+" (DEPRECATED) Whether to allow .tar.bz2 downloading of repository\n"
+" revisions.\n"
+" Default is False."
+msgstr ""
+"``allowbz2``\n"
+" (УСТАРЕЛО) Разрешать или нет скачивать ревизии репозитория в\n"
+" формате .tar.bz2.\n"
+" По умолчанию False (запрещено)."
+
+msgid ""
+"``allowgz``\n"
+" (DEPRECATED) Whether to allow .tar.gz downloading of repository\n"
+" revisions.\n"
+" Default is False."
+msgstr ""
+"``allowgz``\n"
+" (УСТАРЕЛО) Разрешать или нет скачивать ревизии репозитория в\n"
+" формате .tar.gz.\n"
+" По умолчанию False (запрещено)."
+
+msgid ""
+"``allowpull``\n"
+" Whether to allow pulling from the repository. Default is True."
+msgstr ""
+"``allowpull``\n"
+" Разрешить или нет pull из репозитория. По умолчанию True (разрешать)."
+
+msgid ""
+"``allow_push``\n"
+" Whether to allow pushing to the repository. If empty or not set,\n"
+" push is not allowed. If the special value ``*``, any remote user can\n"
+" push, including unauthenticated users. Otherwise, the remote user\n"
+" must have been authenticated, and the authenticated user name must\n"
+" be present in this list. The contents of the allow_push list are\n"
+" examined after the deny_push list."
+msgstr ""
+"``allow_push``\n"
+" Разрешать или нет push в репозиторий. Если постая строка или не\n"
+" задан, push запрещен. Если установлен в специальное значение ``*``,\n"
+" любой удаленный пользователь может делать push, даже если он не\n"
+" аутентифицирован. В противном случае, пользователь должен быть\n"
+" аутентифицирован, и его имя должно присутствовать в этом списке.\n"
+" Этот список проверяется после списка deny_push."
+
+msgid ""
+"``allow_read``\n"
+" If the user has not already been denied repository access due to\n"
+" the contents of deny_read, this list determines whether to grant\n"
+" repository access to the user. If this list is not empty, and the\n"
+" user is unauthenticated or not present in the list, then access is\n"
+" denied for the user. If the list is empty or not set, then access\n"
+" is permitted to all users by default. Setting allow_read to the\n"
+" special value ``*`` is equivalent to it not being set (i.e. access\n"
+" is permitted to all users). The contents of the allow_read list are\n"
+" examined after the deny_read list."
+msgstr ""
+"``allow_read``\n"
+" Если пользователь еще не получил отказ в доступе к репозиторию\n"
+" из-за списка deny_read, этот список определяет, можно ли дать\n"
+" доступ к репозиторию этому пользователю. Если этот список не\n"
+" пуст, и пользователь не аутентифицирован и не присутствует в списке,\n"
+" ему будет отказано в доступе. Если список пуст или не задан,\n"
+" то доступ предоставляется всем пользователям по умолчанию.\n"
+" Специальное значение ``*`` эквивалентно незаданному значению\n"
+" (т.е. доступ разрешен для всех). Этот список проверяется после\n"
+" deny_read."
+
+msgid ""
+"``allowzip``\n"
+" (DEPRECATED) Whether to allow .zip downloading of repository\n"
+" revisions. Default is False. This feature creates temporary files."
+msgstr ""
+"``allowzip``\n"
+" (УСТАРЕЛО) Разрешать или нет скачивать ревизии репозитория в\n"
+" формате .zip.\n"
+" По умолчанию False (запрещено). Эта функция создает временные файлы."
+
+msgid ""
+"``baseurl``\n"
+" Base URL to use when publishing URLs in other locations, so\n"
+" third-party tools like email notification hooks can construct\n"
+" URLs. Example: ``http://hgserver/repos/``."
+msgstr ""
+"``baseurl``\n"
+" Базовый URL, используемый при публикации ссылок в других местах,\n"
+" чтобы сторонние инструменты, например хуки уведомлений, могли\n"
+" составлять URLы. Например: ``http://hgserver/repos/``."
+
+msgid ""
+"``cacerts``\n"
+" Path to file containing a list of PEM encoded certificate\n"
+" authority certificates. Environment variables and ``~user``\n"
+" constructs are expanded in the filename. If specified on the\n"
+" client, then it will verify the identity of remote HTTPS servers\n"
+" with these certificates. The form must be as follows::"
+msgstr ""
+"``cacerts``\n"
+" Путь к файлу, содержащему список зашифрованных PEM сертификатов.\n"
+" Производится подстановка переменных окружения и строк вида\n"
+" ``~user``. Если указан на стороне клиента, будет импользоваться\n"
+" для идентификации удаленных HTTPS-серверов с этими сертификатами.\n"
+" Формат файла следующий::"
+
+msgid ""
+" -----BEGIN CERTIFICATE-----\n"
+" ... (certificate in base64 PEM encoding) ...\n"
+" -----END CERTIFICATE-----\n"
+" -----BEGIN CERTIFICATE-----\n"
+" ... (certificate in base64 PEM encoding) ...\n"
+" -----END CERTIFICATE-----"
+msgstr ""
+" -----BEGIN CERTIFICATE-----\n"
+" ... (сертификат в base64 зашифрованный PEM) ...\n"
+" -----END CERTIFICATE-----\n"
+" -----BEGIN CERTIFICATE-----\n"
+" ... (сертификат в base64 зашифрованный PEM) ...\n"
+" -----END CERTIFICATE-----"
+
+msgid ""
+" This feature is only supported when using Python 2.6 or later. If you "
+"wish\n"
+" to use it with earlier versions of Python, install the backported\n"
+" version of the ssl library that is available from\n"
+" ``http://pypi.python.org``."
+msgstr ""
+" Эта возможность поддерживается только при использовании Python 2.6\n"
+" или выше. Если вы хотите использовать ее с более ранними версиями\n"
+" Python, установите бэкпортированную версию библиотеки ssl,\n"
+" доступную под адресу ``http://pypi.python.org``."
+
+msgid ""
+" You can use OpenSSL's CA certificate file if your platform has one.\n"
+" On most Linux systems this will be ``/etc/ssl/certs/ca-certificates."
+"crt``.\n"
+" Otherwise you will have to generate this file manually."
+msgstr ""
+" Вы можете использовать файл сертификата CA OpenSSL, если он \n"
+" имеется на вашей платформе. На большинстве Linux-систем это\n"
+" ``/etc/ssl/certs/ca-certificates.crt``. В противном случае вам\n"
+" необходимо вручную сгенерировать этот файл."
+
+msgid ""
+" To disable SSL verification temporarily, specify ``--insecure`` from\n"
+" command line."
+msgstr ""
+" Чтобы временно отключить SSL-верификацию, укажите ``--insecure``\n"
+" из командной строки."
+
+msgid ""
+"``cache``\n"
+" Whether to support caching in hgweb. Defaults to True."
+msgstr ""
+"``cache``\n"
+" Включить или нет кеширование в hgweb. По умолчанию True (включено)."
+
+msgid ""
+"``contact``\n"
+" Name or email address of the person in charge of the repository.\n"
+" Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty."
+msgstr ""
+"``contact``\n"
+" Имя или электронный адрес человека, ответственного за репозиторий.\n"
+" По умолчанию используется ui.username или ``$EMAIL`` или \"unknown\",\n"
+" если не задан или пустой."
+
+msgid ""
+"``deny_push``\n"
+" Whether to deny pushing to the repository. If empty or not set,\n"
+" push is not denied. If the special value ``*``, all remote users are\n"
+" denied push. Otherwise, unauthenticated users are all denied, and\n"
+" any authenticated user name present in this list is also denied. The\n"
+" contents of the deny_push list are examined before the allow_push list."
+msgstr ""
+"``deny_push``\n"
+" Запретить или нет push в репозиторий. Если пустой или не задан,\n"
+" push не запрещается. Если установлен в специальное значение ``*``,\n"
+" push запрещен для всех удаленных пользователей. В противном случае,\n"
+" все неаутентифицированные пользователи не могут делать push, равно\n"
+" как и пользователи, присутствующие в этом списке. Этот список\n"
+" проверяется перед списком allow_push."
+
+msgid ""
+"``deny_read``\n"
+" Whether to deny reading/viewing of the repository. If this list is\n"
+" not empty, unauthenticated users are all denied, and any\n"
+" authenticated user name present in this list is also denied access to\n"
+" the repository. If set to the special value ``*``, all remote users\n"
+" are denied access (rarely needed ;). If deny_read is empty or not set,\n"
+" the determination of repository access depends on the presence and\n"
+" content of the allow_read list (see description). If both\n"
+" deny_read and allow_read are empty or not set, then access is\n"
+" permitted to all users by default. If the repository is being\n"
+" served via hgwebdir, denied users will not be able to see it in\n"
+" the list of repositories. The contents of the deny_read list have\n"
+" priority over (are examined before) the contents of the allow_read\n"
+" list."
+msgstr ""
+"``deny_read``\n"
+" Запрещать или нет чтение/просмотр репозитория. Если этот список не\n"
+" пуст, неаутентифицированным пользователям запрещается чтение\n"
+" репозитория, равно как и пользователям, перечисленным в этом списке.\n"
+" Если установлен в специальное значение ``*``, всем удаленным\n"
+" пользователям запрещается доступ (это требуется редко). Если этот\n"
+" список пуст или не задан, предоставление доступа к репозиторию\n"
+" зависит от списка allow_read (см. описание). Если оба этих списка\n"
+" не заданы или пусты, доступ предоставляется всем пользователям по\n"
+" умолчанию. Если репозиторий расшаривается с помощью hgwebdir,\n"
+" запрещенные пользователи не смогут видеть его в списке репозиториев.\n"
+" Список deny_read имеет приоритет (читается раньше) перед allow_read."
+
+msgid ""
+"``descend``\n"
+" hgwebdir indexes will not descend into subdirectories. Only "
+"repositories\n"
+" directly in the current path will be shown (other repositories are "
+"still\n"
+" available from the index corresponding to their containing path)."
+msgstr ""
+"``descend``\n"
+" hgwebdir не будет индексировать подкаталоги. Только репозитории,\n"
+" расположенные прямо по текущему пути будут видны (остальные\n"
+" репозитории все равно будут доступны по индексу, соответствующему\n"
+" их пути)."
+
+msgid ""
+"``description``\n"
+" Textual description of the repository's purpose or contents.\n"
+" Default is \"unknown\"."
+msgstr ""
+"``description``\n"
+" Текстовое описание назначения и содержимого репозитория.\n"
+" По умолчанию \"unknown\" (неизвестно)."
+
+msgid ""
+"``encoding``\n"
+" Character encoding name. Default is the current locale charset.\n"
+" Example: \"UTF-8\""
+msgstr ""
+"``encoding``\n"
+" Название кодировки. По умолчанию кодировка текущей локали.\n"
+" Например: \"UTF-8\""
+
+msgid ""
+"``errorlog``\n"
+" Where to output the error log. Default is stderr."
+msgstr ""
+"``errorlog``\n"
+" Куда писать журнал ошибок. По умолчанию stderr."
+
+msgid ""
+"``hidden``\n"
+" Whether to hide the repository in the hgwebdir index.\n"
+" Default is False."
+msgstr ""
+"``hidden``\n"
+" Прятать репозиторий из списка hgwebdir.\n"
+" По умолчанию False (не прятать)."
+
+msgid ""
+"``ipv6``\n"
+" Whether to use IPv6. Default is False."
+msgstr ""
+"``ipv6``\n"
+" Использовать IPv6. По умолчанию False (не использовать)."
+
+msgid ""
+"``logourl``\n"
+" Base URL to use for logos. If unset, ``http://mercurial.selenic.com/``\n"
+" will be used."
+msgstr ""
+"``logourl``\n"
+" Базовый URL для логотипов. Если не задан, по умолчанию используется\n"
+" ``http://mercurial.selenic.com/``."
+
+msgid ""
+"``name``\n"
+" Repository name to use in the web interface. Default is current\n"
+" working directory."
+msgstr ""
+"``name``\n"
+" Имя репозитория, используемое в веб-интерфейсе. По умолчанию\n"
+" текущий рабочий каталог."
+
+msgid ""
+"``maxchanges``\n"
+" Maximum number of changes to list on the changelog. Default is 10."
+msgstr ""
+"``maxchanges``\n"
+" Максимальное количество изменений, показываемых в логе. По умолчанию 10."
+
+msgid ""
+"``maxfiles``\n"
+" Maximum number of files to list per changeset. Default is 10."
+msgstr ""
+"``maxfiles``\n"
+" Максимальное количество файлов, показываемых для набора изменений.\n"
+" По умолчанию 10."
+
+msgid ""
+"``port``\n"
+" Port to listen on. Default is 8000."
+msgstr ""
+"``port``\n"
+" Номер порта для входящих соединений. По умолчанию 8000."
+
+msgid ""
+"``prefix``\n"
+" Prefix path to serve from. Default is '' (server root)."
+msgstr ""
+"``prefix``\n"
+" Префикс пути, откуда шарятся репозитории (по умолчанию: корень сервера)"
+
+msgid ""
+"``push_ssl``\n"
+" Whether to require that inbound pushes be transported over SSL to\n"
+" prevent password sniffing. Default is True."
+msgstr ""
+"``push_ssl``\n"
+" Требовать передачи входящих изменений по SSL, чтобы предотвратить\n"
+" кражу паролей. По умолчанию True (требовать)."
+
+msgid ""
+"``staticurl``\n"
+" Base URL to use for static files. If unset, static files (e.g. the\n"
+" hgicon.png favicon) will be served by the CGI script itself. Use\n"
+" this setting to serve them directly with the HTTP server.\n"
+" Example: ``http://hgserver/static/``."
+msgstr ""
+"``staticurl``\n"
+" Базовый URL для статических файлов. Если не задан, статические\n"
+" файлы (например, фавикон hgicon.png) будут отдаваться самим\n"
+" CGI-скриптом. Используйте этот параметр, чтобы отдавать статику\n"
+" напрямую HTTP-сервером. Пример: ``http://hgserver/static/``."
+
+#, fuzzy
+msgid ""
+"``stripes``\n"
+" How many lines a \"zebra stripe\" should span in multiline output.\n"
+" Default is 1; set to 0 to disable."
+msgstr ""
+"``stripes``\n"
+" Количество строк ...\n"
+
+#, fuzzy
+msgid ""
+"``style``\n"
+" Which template map style to use."
+msgstr ""
+"``style``\n"
+" Используемый стиль шаблона"
+
+msgid ""
+"``templates``\n"
+" Where to find the HTML templates. Default is install path.\n"
+msgstr ""
+"``templates``\n"
+" Где искать HTML-шаблоны. По умолчанию установочный каталог.\n"
msgid "Some commands allow the user to specify a date, e.g.:"
msgstr "Некоторые команды позволяют задать дату, например:"
@@ -10997,7 +13854,7 @@
"- log, revert, update: выбрать ревизию(и) по дате."
msgid "Many date formats are valid. Here are some examples:"
-msgstr "Возможны много форматов даты. Например:"
+msgstr "Можно задавать даты во многих форматах. Например:"
msgid ""
"- ``Wed Dec 6 13:18:29 2006`` (local timezone assumed)\n"
@@ -11124,7 +13981,6 @@
"в секции [diff] в вашем конфиге. Эту опцию не обязательно указыать\n"
"при импорте diff'ов в этом формате или использовании расширения mq.\n"
-#, fuzzy
msgid ""
"HG\n"
" Path to the 'hg' executable, automatically passed when running\n"
@@ -11348,6 +14204,9 @@
"existing commands, change the default behavior of commands, or\n"
"implement hooks."
msgstr ""
+"В Mercurial можно добавлять новые функции с помощью расширений.\n"
+"Расширения могут добавлять новые команды, опции к существующим\n"
+"командам, изменять поведение команд, реализовывать хуки."
msgid ""
"Extensions are not loaded by default for a variety of reasons:\n"
@@ -11358,12 +14217,22 @@
"Mercurial. It is thus up to the user to activate extensions as\n"
"needed."
msgstr ""
+"Расширения не загружаются по умолчанию по многим причинам: они могут\n"
+"увеличить время запуска; они могут подразумевать только использование\n"
+"опытными пользователями; они могут предоставлять потенциально опасные\n"
+"возможности (например, позволяя стирать или изменять историю); они\n"
+"могут быть не готовы к мажорному релизу; или они могут менять\n"
+"стандартное поведение Mercurial. Поэтому пользователь должен включать\n"
+"расширения по мере надобности."
msgid ""
"To enable the \"foo\" extension, either shipped with Mercurial or in the\n"
"Python search path, create an entry for it in your configuration file,\n"
"like this::"
msgstr ""
+"Чтобы включить расширение \"foo\", включенное в дистрибутив Mercurial\n"
+"или доступное по известным Python'у путям, создайте запись в вышем\n"
+"файле конфигурации::"
msgid ""
" [extensions]\n"
@@ -11371,7 +14240,7 @@
msgstr ""
msgid "You may also specify the full path to an extension::"
-msgstr ""
+msgstr "Можно также указать полный путь к раширению::"
msgid ""
" [extensions]\n"
@@ -11382,6 +14251,8 @@
"To explicitly disable an extension enabled in a configuration file of\n"
"broader scope, prepend its path with !::"
msgstr ""
+"Чтобы явно отключить расширение, включенное в файле конфигурации\n"
+"охватывающей области действия, добавьте перед ним !::"
msgid ""
" [extensions]\n"
@@ -11390,6 +14261,136 @@
" # ditto, but no path was supplied for extension baz\n"
" baz = !\n"
msgstr ""
+" [extensions]\n"
+" # отключить расширение bar, находящееся в /path/to/extension/bar.py\n"
+" bar = !/path/to/extension/bar.py\n"
+" # то же, но путь для расширения baz не был указан\n"
+" baz = !\n"
+
+msgid ""
+"Mercurial supports a functional language for selecting a set of\n"
+"files. "
+msgstr ""
+"Mercurial поддерживает функциональный язык для выбора набора\n"
+"файлов."
+
+msgid ""
+"Like other file patterns, this pattern type is indicated by a prefix,\n"
+"'set:'. The language supports a number of predicates which are joined\n"
+"by infix operators. Parenthesis can be used for grouping."
+msgstr ""
+"Как и другие шаблоны имен файлов, этот шаблон обозначается префиксом\n"
+"'set:'. Язык поддерживает несколько предикатов, которые объединяются\n"
+"инфиксными операторами. Для группировки можно использовать скобки."
+
+msgid ""
+"Identifiers such as filenames or patterns must be quoted with single\n"
+"or double quotes if they contain characters outside of\n"
+"``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]`` or if they match one of the\n"
+"predefined predicates. This generally applies to file patterns other\n"
+"than globs and arguments for predicates."
+msgstr ""
+"Идентификаторы, такие как имена файлов или шаблоны, должны заключаться\n"
+"в одиночные или двойные кавычки, если они содержат символы не из набора\n"
+"``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]``, или если они совпадают с одним\n"
+"из предопредленных предикатов. Это относится также и к шаблонам имен\n"
+"файлов, не являющихся glob'ами, и к аргументам предикатов."
+
+msgid ""
+"Special characters can be used in quoted identifiers by escaping them,\n"
+"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
+"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
+msgstr ""
+"Спец. символы могут использоваться в идентификаторах, при этом они\n"
+"должны экранироваться, например ``\\n`` интерпретируется как перевод\n"
+"строки. Чтобы отключить интерпретацию спецсимволов, строку можно\n"
+"предварять ``r``, например ``r'...'``."
+
+msgid "There is a single prefix operator:"
+msgstr "Поддерживается один префиксный оператор:"
+
+msgid ""
+"``not x``\n"
+" Files not in x. Short form is ``! x``."
+msgstr ""
+"``not x``\n"
+" Файлы, не входящие в x. Краткая форма: ``! x``."
+
+msgid "These are the supported infix operators:"
+msgstr "Поддерживаемые инфиксные операторы:"
+
+msgid ""
+"``x and y``\n"
+" The intersection of files in x and y. Short form is ``x & y``."
+msgstr ""
+"``x and y``\n"
+" Пересечение файлов из x и y. Краткая форма: ``x & y``."
+
+msgid ""
+"``x or y``\n"
+" The union of files in x and y. There are two alternative short\n"
+" forms: ``x | y`` and ``x + y``."
+msgstr ""
+"``x or y``\n"
+" Объединение файлов из x и y. Существуют две краткие формы:\n"
+" ``x | y`` and ``x + y``."
+
+msgid ""
+"``x - y``\n"
+" Files in x but not in y."
+msgstr ""
+"``x - y``\n"
+" Файлы, входящие в x, но не в y."
+
+msgid "The following predicates are supported:"
+msgstr "Поддерживаются следующие предикаты:"
+
+msgid ".. predicatesmarker"
+msgstr ""
+
+msgid "Some sample queries:"
+msgstr "Примеры запросов:"
+
+msgid ""
+"- Show status of files that appear to be binary in the working directory::"
+msgstr "- Показать статус файлов, считающихся бинарными, в рабочем каталоге::"
+
+msgid " hg status -A \"set:binary()\""
+msgstr ""
+
+msgid "- Forget files that are in .hgignore but are already tracked::"
+msgstr "- Забыть файлы, которые записаны в .hgignore, но уже контролируются::"
+
+msgid " hg forget \"set:hgignore() and not ignored()\""
+msgstr ""
+
+msgid "- Find text files that contain a string::"
+msgstr "- Найти текстовые файлы, содержащие строку::"
+
+msgid " hg locate \"set:grep(magic) and not binary()\""
+msgstr ""
+
+msgid "- Find C files in a non-standard encoding::"
+msgstr "- Найти файлы С с нестандартной кодировкой::"
+
+msgid " hg locate \"set:**.c and not encoding(ascii)\""
+msgstr ""
+
+msgid "- Revert copies of large binary files::"
+msgstr "- Вернуть (revert) копии больших бинарных файлов::"
+
+msgid " hg revert \"set:copied() and binary() and size('>1M')\""
+msgstr ""
+
+msgid "- Remove files listed in files.lst that contain the letter a or b::"
+msgstr ""
+"- Удалить файлы, перечисленные в files.lst и содержащие букву a или b::"
+
+msgid " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""
+msgstr ""
+
+msgid "See also :hg:`help patterns`.\n"
+msgstr "См. также :hg:`help patterns`.\n"
msgid ""
"Ancestor\n"
@@ -11399,6 +14400,38 @@
" changeset is an ancestor, and a parent of an ancestor is an\n"
" ancestor. See also: 'Descendant'."
msgstr ""
+"Предок\n"
+" Любой набор изменений, до которого можно пройти по непрерывной\n"
+" цепочке родительских наборов изменений от данного набора. Более\n"
+" точно, предок набора изменений определяется двумя свойствами:\n"
+" родитель набора изменений является предком, и родитель предка\n"
+" также является предком. См. также: 'Потомок'."
+
+msgid ""
+"Bookmark\n"
+" Bookmarks are pointers to certain commits that move when\n"
+" committing. They are similar to tags in that it is possible to use\n"
+" bookmark names in all places where Mercurial expects a changeset\n"
+" ID, e.g., with :hg:`update`. Unlike tags, bookmarks move along\n"
+" when you make a commit."
+msgstr ""
+"Закладка (Bookmark)\n"
+" Закладки - это указатели на некоторый коммит, которые перемещаются\n"
+" при коммите. Они похожи на метки тем, что их можно использовать\n"
+" вместо ID (хэшей) наборов изменений, например, в :hg:`update`.\n"
+" Но, в отличие от меток, закладки перемещаются вслед за коммитами."
+
+msgid ""
+" Bookmarks can be renamed, copied and deleted. Bookmarks are local,\n"
+" unless they are explicitly pushed or pulled between repositories.\n"
+" Pushing and pulling bookmarks allow you to collaborate with others\n"
+" on a branch without creating a named branch."
+msgstr ""
+" Закладки можно переименовывать, копировать и удалять. Закладки\n"
+" по умолчанию локальны, до тех пор пока они явно не передаются\n"
+" с помощью push или pull между репозиториями. Передача закладок\n"
+" позволяет вам совместно работать над ветвями, не создавая\n"
+" именованную ветку."
msgid ""
"Branch\n"
@@ -11408,6 +14441,13 @@
" a named branch. If a topological branch is not named, it becomes\n"
" an anonymous branch. See 'Branch, anonymous' and 'Branch, named'."
msgstr ""
+"Ветвь (Branch)\n"
+" Дочерний набор изменений, родительский набор которого не является\n"
+" головной ревизией. Иногда называются также топологическими ветками\n"
+" (см. 'Ветвь, топологическая'). Если для топологической ветви \n"
+" задается имя, она становится именованной веткой. Если \n"
+" топологическая ветвь не имеет имени, она становится\n"
+" анонимной веткой. См. 'Ветвь, анонимная' и 'Ветвь, именованная'."
msgid ""
" Branches may be created when changes are pulled from or pushed to\n"
@@ -11418,17 +14458,28 @@
" explicitly with a named branch, but it can also be done locally,\n"
" using bookmarks or clones and anonymous branches."
msgstr ""
+" Ветви могут создаваться при передаче изменений с помощью push или\n"
+" pull, поскольку эти операции могут создавать новые головы. Следует\n"
+" заметить, что термин \"ветвь\" пожет быть использован неформально\n"
+" для описания независимой части процесса разработки. Иногда это\n"
+" формализуется явно с помощью именованных ветвей, но можно сделать\n"
+" это и локально с помощью закладок или клонирования и анонимных\n"
+" ветвей."
msgid " Example: \"The experimental branch\"."
-msgstr ""
+msgstr " Пример: \"Экспериментальная ветка\"."
msgid ""
" (Verb) The action of creating a child changeset which results in\n"
" its parent having more than one child."
msgstr ""
+"Ветвление\n"
+" (создание ветви) Действие по созданию дочернего набора изменений,\n"
+" в результате которого родетльская ревизия имеет более одной\n"
+" дочерней."
msgid " Example: \"I'm going to branch at X\"."
-msgstr ""
+msgstr " Пример: \"Я собираюсь ответвиться в точке Х\"."
msgid ""
"Branch, anonymous\n"
@@ -11436,22 +14487,33 @@
" a head and the name of the branch is not changed, a new anonymous\n"
" branch is created."
msgstr ""
+"Ветвь, анонимная\n"
+" Каждый раз, когда новый набор изменений создается от родителя,\n"
+" не являющегося головной ревизией, и при этом имя ветви не меняется,\n"
+" содается новая анонимная ветвь."
msgid ""
"Branch, closed\n"
" A named branch whose branch heads have all been closed."
msgstr ""
+"Ветвь, закрытая\n"
+" Именованная ветвь, на которой все головные ревизии закрыты."
msgid ""
"Branch, default\n"
" The branch assigned to a changeset when no name has previously been\n"
" assigned."
msgstr ""
+"Ветвь, по умолчанию\n"
+" Ветвь, привязанная к набору изменений, до того, как было явно задано\n"
+" какое-либо имя ветви."
msgid ""
"Branch head\n"
" See 'Head, branch'."
msgstr ""
+"Голова ветви\n"
+" См. 'Голова, ветви'."
msgid ""
"Branch, inactive\n"
@@ -11461,12 +14523,22 @@
" shows inactive branches by default, though they can be hidden with\n"
" :hg:`branches --active`."
msgstr ""
+"Ветвь, неактивная\n"
+" Если именованная ветвь не имеет топологических головных ревизий,\n"
+" она считается неактивной. Например, ветка для новой функциеи станет\n"
+" неактивной, когда она будет слита в ветвь по умолчанию (default).\n"
+" Команда ':hg:`branches` по умолчанию показывает неактивные ветви,\n"
+" их можно скрыть с помощью :hg:`branches --active`."
msgid ""
" NOTE: this concept is deprecated because it is too implicit.\n"
" Branches should now be explicitly closed using :hg:`commit\n"
" --close-branch` when they are no longer needed."
msgstr ""
+" ПРИМЕЧАНИЕ: такое поведение устарело и больше не используется,\n"
+" потому что оно слишком неочивидно и может вызывать путаницу.\n"
+" Теперь не нужные более ветви необходимо явно закрывать с помощью\n"
+" :hg:`commit --close-branch`"
msgid ""
"Branch, named\n"
@@ -11477,6 +14549,13 @@
" :hg:`commit --close-branch` for more information on managing\n"
" branches."
msgstr ""
+"Ветвь, именованная\n"
+" Несколько наборов изменений, имеющих одно и то же имя ветви.\n"
+" По умолчанию дочерние ревизии набора изменений на некоторой\n"
+" именованной ветви принадлежат той же ветви. Дочерний набор\n"
+" изменений может быть явно привязан к другой ветви. Подробнее об\n"
+" управлении ветвями см. :hg:`help branch`, :hg:`help branches` и\n"
+" :hg:`commit --close-branch`"
msgid ""
" Named branches can be thought of as a kind of namespace, dividing\n"
@@ -11487,11 +14566,20 @@
" further changesets are added to that previous branch, then that\n"
" previous branch will be a branch in name only."
msgstr ""
+" Именованные ветви можно трактовать как некое пространство имен,\n"
+" разделяющие наборы изменений, составляющие репозиторий, на\n"
+" несколько отдельных подмножеств. Именованная ветвь не обязательно\n"
+" является топологичесткой веткой. Если именованная ветвь отщепляется\n"
+" от головы другой именованной ветви или ветви по умолчанию (default),\n"
+" но на первоначальную ветвь более не добавляется наборов изменений,\n"
+" то первоначальная ветвь будет существовать только в качестве имени."
msgid ""
"Branch tip\n"
" See 'Tip, branch'."
msgstr ""
+"Оконченая ревизия (tip) ветви\n"
+" См. 'Оконечная ревизия (tip), ветвь'."
msgid ""
"Branch, topological\n"
@@ -11501,6 +14589,13 @@
" branch is not named, it becomes an anonymous branch of the\n"
" current, possibly default, branch."
msgstr ""
+"Ветвь, топологическая\n"
+" Каждый раз, когда дочерняя ревизия отщепляется от родительской,\n"
+" которая не является головной ревизий, создается топологическая\n"
+" ветвь. Если ей присваивается имя, она становится именованной\n"
+" веткой. Если для топологичской ветви не задается имя, она\n"
+" становится анонимной веткой текущей ветви - возможно ветви\n"
+" по умолчанию (default)."
msgid ""
"Changelog\n"
@@ -11508,11 +14603,17 @@
" to the repository. This includes details such as changeset id,\n"
" author, commit message, date, and list of changed files."
msgstr ""
+"Журнал изменений (Changelog)\n"
+" Запись наборов изменений в порядке из добавления в репозиторий.\n"
+" Она включает информацию об ID (хэше) ревизии, авторе, сообщение\n"
+" коммита, дату и список измененных файлов."
msgid ""
"Changeset\n"
" A snapshot of the state of the repository used to record a change."
msgstr ""
+"Набор изменений (changeset)\n"
+" Снимок состояния репозитория, используемый для записи изменения."
msgid ""
"Changeset, child\n"
@@ -11520,6 +14621,11 @@
" a child of P. There is no limit to the number of children that a\n"
" changeset may have."
msgstr ""
+"Набор изменений (ревизия), дочерний\n"
+" Противоположность родительского набора изменений: если Р -\n"
+" родительский набор изменений Д, то Д - дочерний набор\n"
+" изменений Р. Набор изменений может иметь неограниченное количество\n"
+" дочерних наборов изменений."
msgid ""
"Changeset id\n"
@@ -11527,12 +14633,19 @@
" represented as either a \"long\" 40 hexadecimal digit string, or a\n"
" \"short\" 12 hexadecimal digit string."
msgstr ""
+"Идентификатор (ID) набора изменений\n"
+" Хэш SHA-1, однозначно идентифицирующий набор изменений. Может\n"
+" быть представлен как \"длинная\" (40 шестнадцатиричных символов)\n"
+" или \"короткая\" (12 шестнадцатиричных символов) строка."
msgid ""
"Changeset, merge\n"
" A changeset with two parents. This occurs when a merge is\n"
" committed."
msgstr ""
+"Набор изменений слияния\n"
+" Набор изменений с двумя предками. Создается когда коммитится\n"
+" результат слияния."
msgid ""
"Changeset, parent\n"
@@ -11541,6 +14654,11 @@
" immediately precedes C in the DAG. Changesets have at most two\n"
" parents."
msgstr ""
+"Набор изменений, родительский\n"
+" Ревизия, на основе которой создана дочерняя ревизия. Точнее,\n"
+" родительский набор изменений набора Д - это набор изменений,\n"
+" непосредственно предшествующий набору Д на графе. Набор\n"
+" изменений может иметь не более двух родителей."
msgid ""
"Checkout\n"
@@ -11548,60 +14666,82 @@
" revision. This use should probably be avoided where possible, as\n"
" changeset is much more appropriate than checkout in this context."
msgstr ""
+"Чекаут (checkout, извлечение)\n"
+" (Сущ.) Рабочий каталог, обновленный до определенной ревизии.\n"
+" Не стоит использовать это понятие (а по-русски оно вообще\n"
+" бессмысленно), поскольку ревизия является более подходящим\n"
+" термином в таком контексте."
msgid " Example: \"I'm using checkout X.\""
-msgstr ""
+msgstr " Пример: \"Я использую чекаут Х.\" // Бред какой ;)"
msgid ""
" (Verb) Updating the working directory to a specific changeset. See\n"
" :hg:`help update`."
msgstr ""
+" (Гл.) Обновление рабочего каталога до определенной ревизии. См.\n"
+" :hg:`help update`."
msgid " Example: \"I'm going to check out changeset X.\""
-msgstr ""
+msgstr " Пример: \"Я собираюсь чекнуть ревизию Х.\" // еще хуже"
msgid ""
"Child changeset\n"
" See 'Changeset, child'."
msgstr ""
+" Дочерний набор изменений (ревизия)\n"
+" См. 'Набор изменинй, дочерний'."
msgid ""
"Close changeset\n"
" See 'Changeset, close'."
msgstr ""
+"Закрыть набор изменений (ревизию)\n"
+" См. 'Набор изменений, закрыть'."
msgid ""
"Closed branch\n"
" See 'Branch, closed'."
msgstr ""
+"Закрытая ветвь\n"
+" Cм. 'Ветвь, закрытая'."
msgid ""
"Clone\n"
" (Noun) An entire or partial copy of a repository. The partial\n"
" clone must be in the form of a revision and its ancestors."
msgstr ""
+"Клон\n"
+" Полная или частичная копия репозитория. Частичный клон должен\n"
+" быть в форме ревизии с ее предками."
msgid " Example: \"Is your clone up to date?\"."
-msgstr ""
+msgstr " Пример: \"Я всегда беру клон репозитория Linux в отпуск.\""
msgid " (Verb) The process of creating a clone, using :hg:`clone`."
msgstr ""
+"Клонирование\n"
+" Процесс создания клона с использованием :hg:`clone`."
msgid " Example: \"I'm going to clone the repository\"."
-msgstr ""
+msgstr " Пример:\"Я собираюсь клонировать репозиторий\"."
msgid ""
"Closed branch head\n"
" See 'Head, closed branch'."
msgstr ""
+"Закрытая голова ветви\n"
+" См. 'Головная ревизия, закрытая ветвь'."
msgid ""
"Commit\n"
" (Noun) A synonym for changeset."
msgstr ""
+"Коммит\n"
+" (Сущ.) Синоним набора изменений."
msgid " Example: \"Is the bug fixed in your recent commit?\""
-msgstr ""
+msgstr " Пример: \"Исправлен ли этот баг в твоем последнем коммите?\""
msgid ""
" (Verb) The act of recording changes to a repository. When files\n"
@@ -11609,14 +14749,20 @@
" differences between the committed files and their parent\n"
" changeset, creating a new changeset in the repository."
msgstr ""
+" (Гл.) Действие по фиксации изменений в репозитории. Когда файлы\n"
+" коммитятся в рабочем каталоге, Mercurial ищет отличия между ними и\n"
+" и их родительской ревизией, создавая новый набор изменений в\n"
+" репозитории."
msgid " Example: \"You should commit those changes now.\""
-msgstr ""
+msgstr " Пример: \"Тебе стоит закоммитить эти изменения прямо сейчас.\""
msgid ""
"Cset\n"
" A common abbreviation of the term changeset."
msgstr ""
+"Cset\n"
+" Сокр. от changeset (набор изменений)."
msgid ""
"DAG\n"
@@ -11628,11 +14774,21 @@
" (graphlog). In Mercurial, the DAG is limited by the requirement\n"
" for children to have at most two parents."
msgstr ""
+"НАГ (DAG, граф)\n"
+" Репозитоирий с наборами изменений распределенной системы контроля\n"
+" версий (DVCS) может быть представлен как направленный ациклический\n"
+" граф (НАГ, англ. DAG), состоящий из узлов и ребер, где узлы являются\n"
+" наборами изменений, а ребра отражают отражают отношение родительская-\n"
+" дочерняя ревизия. Этот граф можно визуализировать с помощью\n"
+" графических инструментов вроде :hg:`glog` (graphlog). В Mercurial\n"
+" граф ограничен требованием существования не более двух родителей."
msgid ""
"Default branch\n"
" See 'Branch, default'."
msgstr ""
+"Ветвь по умолчанию (default)\n"
+" См. 'Ветвь, по умолчанию'."
msgid ""
"Descendant\n"
@@ -11642,6 +14798,12 @@
" changeset is a descendant, and the child of a descendant is a\n"
" descendant. See also: 'Ancestor'."
msgstr ""
+"Потомок\n"
+" Любая ревизия, до которой можно добраться по цепочке дочерних\n"
+" ревизий от данной ревизии. Точнее, потомки ревизий могут быть\n"
+" описаны двумя свойствами: дочерняя ревизия некой ревизии является\n"
+" ее потомком и дочерняя ревизия потомка некой ревизии также является\n"
+" потомком этой ревизии."
msgid ""
"Diff\n"
@@ -11653,18 +14815,29 @@
" attributes, none of which can be represented/handled by classic\n"
" \"diff\" and \"patch\"."
msgstr ""
+"Дифф (diff)\n"
+" Отличия содержимого и атрибутов файлов между двумя ревизиями\n"
+" или между некой ревизией и текущим рабочим каталогом. Отлчия\n"
+" обычно представлены в стандартной форме, называемой \"диффом\"\n"
+" или \"патчем\". Формат диффов git используется, если изменения\n"
+" должны включать копирования, переименования или изменения\n"
+" атрибутов файлов, которые не могут быть представлены или\n"
+" обработаны классическими инструментами \"diff\" и \"patch\"."
msgid " Example: \"Did you see my correction in the diff?\""
-msgstr ""
+msgstr " Пример: \"Ты видел мои исправления в диффе (патче)?\""
msgid ""
" (Verb) Diffing two changesets is the action of creating a diff or\n"
" patch."
msgstr ""
+" (в англ) Diff (гл.) - процесс создания диффов или патчей. По-русски\n"
+" так не говорят."
msgid ""
" Example: \"If you diff with changeset X, you will see what I mean.\""
msgstr ""
+" Пример: \"If you diff with changeset X, you will see what I mean.\""
msgid ""
"Directory, working\n"
@@ -11676,11 +14849,21 @@
" to the files introduced manually or by a merge. The repository\n"
" metadata exists in the .hg directory inside the working directory."
msgstr ""
+"Каталог, рабочий\n"
+" Рабочий каталог отражает состояние файлов, контролируемых Mercurial,\n"
+" которое будет зафиксировано при следующем коммите. Рабочий каталог\n"
+" изначально соответствует снимку существующей ревизии, называемой\n"
+" родителем рабочего каталога. См. 'Родитель, рабочий каталог'.\n"
+" Состояние может быть изменено за счет ручной правки файлов или\n"
+" слияния. Метаданные репозитория находятся в каталоге .hg в рабочем\n"
+" каталоге."
msgid ""
"Graph\n"
" See DAG and :hg:`help graphlog`."
msgstr ""
+"Граф\n"
+" См. НАГ и :hg:`help graphlog`."
msgid ""
"Head\n"
@@ -11688,16 +14871,24 @@
" repository head, depending on the context. See 'Head, branch' and\n"
" 'Head, repository' for specific definitions."
msgstr ""
+"Голова (головная ревизия)\n"
+" Термин 'голова', может быть использован как для обозначения\n"
+" головной ревизии ветви, так и репозитория, в зависимости от\n"
+" контекста. См. 'Голова, репозиторий' и 'Голова, ветвь'."
msgid ""
" Heads are where development generally takes place and are the\n"
" usual targets for update and merge operations."
msgstr ""
+" В головных ревизия происходит вся разработка и они обычно\n"
+" являются целями слияний и обновлений."
msgid ""
"Head, branch\n"
" A changeset with no descendants on the same named branch."
msgstr ""
+"Голова, ветви\n"
+" Набор изменений, не имеющий потомков на той же именованной ветви"
msgid ""
"Head, closed branch\n"
@@ -11706,16 +14897,25 @@
" closed when all its heads are closed and consequently is not\n"
" listed by :hg:`branches`."
msgstr ""
+"Голова, закрытая ветвь\n"
+" Набор изменений, который помечает голову как более не интересную.\n"
+" Закрытая ветвь не отображается :hg:`heads`. Ветка считается закрытой,\n"
+" если закрыты все ее головы, и соответственно она не отображается\n"
+" в выводе :hg:`branches`."
msgid ""
"Head, repository\n"
" A topological head which has not been closed."
msgstr ""
+"Голова, репозиторий\n"
+" Топологическая не закрытая головная ревизия."
msgid ""
"Head, topological\n"
" A changeset with no children in the repository."
msgstr ""
+"Голова, топологическая\n"
+" Ревизия, не имеющая потомков в репозитории."
msgid ""
"History, immutable\n"
@@ -11725,6 +14925,13 @@
" so in public repositories can result in old changesets being\n"
" reintroduced to the repository."
msgstr ""
+"История, неизменная\n"
+" Закомиченный однажды набор изменений не может быть изменен.\n"
+" Расширения, которые изменяют историю, на самом деле создают\n"
+" новые наборы изменений, которые заменяют уже существующие,\n"
+" после чего удаляют старые наборы изменений. Такие действия в\n"
+" публичном репозитории могут быть причиной ситуации, когда\n"
+" старые наборы изменений будут добавлены вновь."
msgid ""
"History, rewriting\n"
@@ -11732,22 +14939,33 @@
" to Mercurial can be used to alter the repository, usually in such\n"
" a way as to preserve changeset contents."
msgstr ""
+"История, изменение\n"
+" Наборы изменений в репозитории неизменны. Однако, расширения\n"
+" Mercurial могут быть использованы для изменения самого репозитория,\n"
+" как таким образом, чтобы сохранить содержимое наборов изменений."
msgid ""
"Immutable history\n"
" See 'History, immutable'."
msgstr ""
+"Неизменная история\n"
+" См. 'История, неизменная'."
msgid ""
"Merge changeset\n"
" See 'Changeset, merge'."
msgstr ""
+"Ревизия слияния\n"
+" См. Набор изменений слияния"
msgid ""
"Manifest\n"
" Each changeset has a manifest, which is the list of files that are\n"
" tracked by the changeset."
msgstr ""
+"Манифест\n"
+" Каждый набор изменений имеет манифест, который является списком\n"
+" файлов, которые контролируются в этом наборе изменений."
msgid ""
"Merge\n"
@@ -11757,11 +14975,20 @@
" conflicts are resolved (and marked), this merge may be committed\n"
" as a merge changeset, bringing two branches together in the DAG."
msgstr ""
+"Слияние\n"
+" Используется для объединения расходящихся ветвей разработки. Когда\n"
+" вы обновляетесь на некоторую ревизию и потом сливаете ее в другую\n"
+" ревизию, вы добавляете историю последней в ваш рабочий каталог.\n"
+" После разрешения конфликтов (и пометки файлов как разрешенных),\n"
+" это слияние будет закоммичено как ревизия слияния, объединяя две\n"
+" ветви на графе ревизий."
msgid ""
"Named branch\n"
" See 'Branch, named'."
msgstr ""
+"Именованная ветвь\n"
+" См. 'Ветвь, именованная'."
msgid ""
"Null changeset\n"
@@ -11771,16 +14998,27 @@
" merging unrelated changesets. Can be specified by the alias 'null'\n"
" or by the changeset ID '000000000000'."
msgstr ""
+"Пустая (Null) ревизия\n"
+" Пустой набор изменений. Это родительская ревизия только что\n"
+" инициализированного репозитория и репозитория, для которго\n"
+" не извлечен рабочий каталог. Таким образом, она является родителем\n"
+" корневой (root) ревизии и фактическим предком при слиянии\n"
+" несвязанных наборов изменений. Может быть задана псевдонимом\n"
+" 'null' или ревизией с ID '000000000000'."
msgid ""
"Parent\n"
" See 'Changeset, parent'."
msgstr ""
+"Родитель\n"
+" См. 'Набор изменений, родительский'."
msgid ""
"Parent changeset\n"
" See 'Changeset, parent'."
msgstr ""
+"Родительский набор изменений\n"
+" См. 'Набор изменений, родительский'."
msgid ""
"Parent, working directory\n"
@@ -11790,22 +15028,32 @@
" :hg:`update`. Other commands to see the working directory parent\n"
" are :hg:`summary` and :hg:`id`. Can be specified by the alias \".\"."
msgstr ""
+" Родитель, рабочего каталога\n"
+" Родительская ревизия рабочего каталога отражает виртуальную\n"
+" ревизию, являющуся дочерней ревизией показываемых :hg:`parents`\n"
+" наборов изменений. Меняется с помощью :hg:`update`. Также можно\n"
+" узнать родителя рабочего каталога с помощью :hg:`summary` и\n"
+" :hg:`id`. Может задаваться псевдонимом \".\"."
msgid ""
"Patch\n"
" (Noun) The product of a diff operation."
msgstr ""
+"Патч\n"
+" Результат операции diff."
msgid " Example: \"I've sent you my patch.\""
-msgstr ""
+msgstr " Пример: \"Я отправил тебе мой патч.\""
msgid ""
" (Verb) The process of using a patch file to transform one\n"
" changeset into another."
msgstr ""
+" Патчить - применять файл патча чтобы преобразовать один набор\n"
+" изменений в другой."
msgid " Example: \"You will need to patch that revision.\""
-msgstr ""
+msgstr " Пример: \"Тебе придется пропатчить эту ревизию.\""
msgid ""
"Pull\n"
@@ -11815,6 +15063,12 @@
" only updates the repository, it does not update the files in the\n"
" working directory. See :hg:`help pull`."
msgstr ""
+"Подтянуть (Pull)\n"
+" Операция, при которой наборы изменений из удаленного репозитория,\n"
+" отсутсвующие в локальном, передаются в локальный репозиторий.\n"
+" Обратите внимание, что эта операция без дополнительных аргументов\n"
+" обновляет только репозиторий, но не рабочий каталог.\n"
+" См. :hg:`help pull`."
msgid ""
"Push\n"
@@ -11824,6 +15078,12 @@
" locally to the remote repository. Uncommitted changes are not\n"
" sent. See :hg:`help push`."
msgstr ""
+"Протолкнуть (Pull)\n"
+" Операция, при которой наборы изменения из локального репозитория,\n"
+" отсутствующие в удаленном, пересылаются в удаленный репозиторий.\n"
+" Обратите внимание, что это передает только наборы изменений,\n"
+" которые были закоммичены в локальный репозиторий. Незакоммиченные\n"
+" изменения не пересылаются. См. :hg:`help push`."
msgid ""
"Repository\n"
@@ -11834,11 +15094,20 @@
" recreated by \"updating\" a working directory to a specific\n"
" changeset."
msgstr ""
+"Репозиторий\n"
+" Метаданные, описывающие все зафиксированные состояния набора\n"
+" файлов. Каждое зафиксированное состояние представлено набором\n"
+" изменений. Репозиторий как правило (но не всегда) находится\n"
+" в подкаталоге ``.hg`` рабочего каталога. Каждое зафиксированное\n"
+" состояние может быть воссоздано \"обновлением\" рабочего каталога\n"
+" до желаемого набора изменений."
msgid ""
"Repository head\n"
" See 'Head, repository'."
msgstr ""
+"Репозитория, голова\n"
+" См. 'Голова, репозиторий'."
msgid ""
"Revision\n"
@@ -11846,6 +15115,14 @@
" can be updated to by using :hg:`update`. See also 'Revision\n"
" number'; See also 'Changeset'."
msgstr ""
+"Ревизия\n"
+" Состояние репозитория на некоторый момент времени. Более ранние\n"
+" ревизии могут быть получены с помощью :hg:`update`. См. также\n"
+" 'Номер ревизии' и 'Набор изменений'.\n"
+"\n"
+" ПРИМЕЧАНИЕ: в русском переводе термин \"ревизия\" часто используется\n"
+" как синоним набора изменений. Хотя это технически\n"
+" некорректно, но короче и понятнее."
msgid ""
"Revision number\n"
@@ -11856,6 +15133,14 @@
" identify changesets uniquely between different clones, see\n"
" 'Changeset id'."
msgstr ""
+"Номер ревизии\n"
+" Это целое число однозначно определяет набор изменений в отдельно\n"
+" взятом репозитории. Оно отражает порядок, в котором наборы\n"
+" изменений были добавлены в репозиторий, начиная с ревизии с\n"
+" номером 0. Очень важно понимать, что номера ревизий могут\n"
+" различаться в каждом клоне репозитория. Чтобы однозначно задать\n"
+" ревизию среди всех клонов, см. 'Идентификатор (ID) набора\n"
+" изменений'."
msgid ""
"Revlog\n"
@@ -11864,23 +15149,50 @@
" of each successive revision. It includes data and an index\n"
" pointing to the data."
msgstr ""
+"Revlog (ревлог)\n"
+" Механизм хранения истории, используемый Mercurial. Является\n"
+" разновидностью кодирования дельт (отличий), с иногда встречающимися\n"
+" полными ревизиями с дельтами для каждой следующей ревизии. Включает\n"
+" данные и индекс с указателями на данные."
msgid ""
"Rewriting history\n"
" See 'History, rewriting'."
msgstr ""
+"Изменение истории\n"
+" См. 'История, изменение'."
msgid ""
"Root\n"
" A changeset that has only the null changeset as its parent. Most\n"
" repositories have only a single root changeset."
msgstr ""
+"Корень (корневая ревизия)\n"
+" Набор изменений, у которого единственный предок - null. Большинство\n"
+" репозиториев имеют только один корень."
+
+msgid ""
+"Tag\n"
+" An alternative name given to a changeset. Tags can be used in all\n"
+" places where Mercurial expects a changeset ID, e.g., with\n"
+" :hg:`update`. The creation of a tag is stored in the history and\n"
+" will thus automatically be shared with other using push and pull."
+msgstr ""
+"Метка\n"
+" Альтернативное имя, присвоенное набору изменений. Метки могут\n"
+" быть использованы там, где Mercurial ожидает ID наборов изменений,\n"
+" например, в :hg:`update`. Создание метки фиксируется в истории,\n"
+" поэтому метки будет автоматически доступны другим при использовании\n"
+" pull или push."
msgid ""
"Tip\n"
" The changeset with the highest revision number. It is the changeset\n"
" most recently added in a repository."
msgstr ""
+"Оконечная ревизия (tip)\n"
+" Набор изменений с максимальным номером ревизии. Это набор изменений,\n"
+" добавленный в репозиторий последним."
msgid ""
"Tip, branch\n"
@@ -11890,49 +15202,71 @@
" numbers may be different in different repository clones, the\n"
" branch tip may be different in different cloned repositories."
msgstr ""
+"Оконечная ревизия (tip) ветви\n"
+" Голова данной ветви с максимальным номером ревизии. Когда имя\n"
+" ветви используется в качестве идентификатора ревизии, оно ссылается\n"
+" на оконечную ревизию ветви. См. также 'Голова ветви'. Обратите\n"
+" внимание, что поскольку номера ревизий могут различаться в разных\n"
+" клонах репозиториев, tip может быть различным в разных клонах."
msgid ""
"Update\n"
" (Noun) Another synonym of changeset."
msgstr ""
+"Обновление\n"
+" (Сущ.) Синоним набора изменений."
msgid " Example: \"I've pushed an update\"."
-msgstr ""
+msgstr " Пример: \"Я пушнул тебе обновление\"."
msgid ""
" (Verb) This term is usually used to describe updating the state of\n"
" the working directory to that of a specific changeset. See\n"
" :hg:`help update`."
msgstr ""
+" (Гл.) Этот термин обычно используется чтобы описать обновление\n"
+" рабочего каталога до некоторой ревизии. См. :hg:`help update`."
msgid " Example: \"You should update\"."
-msgstr ""
+msgstr " Пример: \"Тебе надо обновиться\"."
msgid ""
"Working directory\n"
" See 'Directory, working'."
msgstr ""
+"Рабочий каталог\n"
+" См. 'Каталог, рабочий'."
msgid ""
"Working directory parent\n"
" See 'Parent, working directory'.\n"
msgstr ""
-
+"Рабочий каталог, родитель\n"
+" См. 'Родитель, рабочего каталога'.\n"
+
+#, fuzzy
msgid ""
"Synopsis\n"
"--------"
msgstr ""
+"Сводка\n"
+"--------"
msgid ""
"The Mercurial system uses a file called ``.hgignore`` in the root\n"
"directory of a repository to control its behavior when it searches\n"
"for files that it is not currently tracking."
msgstr ""
+"Mercurial использует файл с именем ``.hgignore`` из корневого каталога\n"
+"репозитория для управления поведением при обнаружении файлов, которые\n"
+"в настоящий момент не отслеживаются."
msgid ""
"Description\n"
"-----------"
msgstr ""
+"Описание\n"
+"-----------"
msgid ""
"The working directory of a Mercurial repository will often contain\n"
@@ -11943,37 +15277,51 @@
"created manually. It is typically put under version control, so that\n"
"the settings will propagate to other repositories with push and pull."
msgstr ""
+"Рабочий каталог репозитория часто содержит файлы, которые не должны\n"
+"контролироваться Mercurial. Это, например, бэкапы, создаваемые\n"
+"редакторами, или результаты сборки, полученные при компиляции.\n"
+"Эти файлы могут быть игнорированы, если добавить их в файл ``.hgignore``\n"
+"в корне рабочего каталога. Файл ``.hgignore`` должен быть создан\n"
+"вручную. Как правило его помещают под контроль версий, чтобы настройки\n"
+"могли передаваться между репозиториями с помощью push и pull."
msgid ""
"An untracked file is ignored if its path relative to the repository\n"
"root directory, or any prefix path of that path, is matched against\n"
"any pattern in ``.hgignore``."
msgstr ""
+"Неотслеживаемый файл игнорируется, если его путь относительно\n"
+"корневого каталога репозитория или любая часть этого пути совпадает\n"
+"с любым шаблоном из файла ``.hgignore``."
msgid ""
"For example, say we have an untracked file, ``file.c``, at\n"
"``a/b/file.c`` inside our repository. Mercurial will ignore ``file.c``\n"
"if any pattern in ``.hgignore`` matches ``a/b/file.c``, ``a/b`` or ``a``."
msgstr ""
+"Например, допустим, что у нас есть неотслеживаемый файл ``file.c``,\n"
+"имеющий путь ``a/b/file.c`` в нашем репозитории. Mercurial будет\n"
+"игнорировать этот файл, любой шаблон из ``.hgignore`` совпадает с\n"
+"``a/b/file.c``, ``a/b`` или ``a``."
msgid ""
"In addition, a Mercurial configuration file can reference a set of\n"
-"per-user or global ignore files. See the\n"
-"``http://www.selenic.com/mercurial/hgrc.5.html`` man page for details\n"
-"of how to configure these files. Look for the \"ignore\" entry in the\n"
-"\"ui\" section."
-msgstr ""
-
-msgid ""
-"To control Mercurial's handling of files that it manages, see the\n"
-"``http://www.selenic.com/mercurial/hg.1.html`` man page. Look for\n"
-"the ``-I`` and ``-X`` options."
-msgstr ""
-
-msgid ""
-"Syntax\n"
-"------"
-msgstr ""
+"per-user or global ignore files. See the ``ignore`` configuration\n"
+"key on the ``[ui]`` section of :hg:`help config` for details of how to\n"
+"configure these files."
+msgstr ""
+"Также возможно задать несколько таких файлов игнорирования\n"
+"глобально или для каждого пользователя в конфиге. Как это сделать -\n"
+"см. ключ ``ignore`` секции ``[ui]`` из :hg:`help config`."
+
+msgid ""
+"To control Mercurial's handling of files that it manages, many\n"
+"commands support the ``-I`` and ``-X`` options; see\n"
+":hg:`help <command>` and :hg:`help patterns` for details."
+msgstr ""
+"Чтобы управлять обработкой файлов, которые находятся под\n"
+"контролем Mercurial, многие команды поддерживают опции ``-I`` и ``-X``;\n"
+"Подробнее см. :hg:`help <команда>` и :hg:`help patterns`."
msgid ""
"An ignore file is a plain text file consisting of a list of patterns,\n"
@@ -11981,20 +15329,26 @@
"character is treated as a comment character, and the ``\\`` character\n"
"is treated as an escape character."
msgstr ""
+"Файл игнорирования - это простой текстовый файл, содержащий список\n"
+"шаблонов, по одному на строку. Пустые строки пропускаются. Символ ``#``\n"
+"начинает комментарий, а ``\\`` обозначает управляющую последовательность\n"
+"(эскейп-символ, используется для экранирования)."
msgid ""
"Mercurial supports several pattern syntaxes. The default syntax used\n"
"is Python/Perl-style regular expressions."
msgstr ""
+"Mercurial поддерживает несколько синтаксисов шаблонов. По умолчанию\n"
+"используются регулярные выражения в стиле Perl/Python."
msgid "To change the syntax used, use a line of the following form::"
-msgstr ""
+msgstr "Чтобы задать другой синтаксис, используйте строку вида::"
msgid " syntax: NAME"
-msgstr ""
+msgstr " syntax: ИМЯ"
msgid "where ``NAME`` is one of the following:"
-msgstr ""
+msgstr "где ``ИМЯ`` одно из:"
msgid ""
"``regexp``\n"
@@ -12002,11 +15356,17 @@
"``glob``\n"
" Shell-style glob."
msgstr ""
+"``regexp``\n"
+" Регулярное выражение, синтаксис Python/Perl.\n"
+"``glob``\n"
+" Глоб (glob), как в командной оболочке (bash и т.п.)."
msgid ""
"The chosen syntax stays in effect when parsing all patterns that\n"
"follow, until another syntax is selected."
msgstr ""
+"Выбранный синтаксис для всех последующих шаблонов, пока не будет\n"
+"встречена строка, включающая другой синтаксис."
msgid ""
"Neither glob nor regexp patterns are rooted. A glob-syntax pattern of\n"
@@ -12014,19 +15374,28 @@
"and a regexp pattern of the form ``\\.c$`` will do the same. To root a\n"
"regexp pattern, start it with ``^``."
msgstr ""
+"Шаблоны в любом стиле не привязаны к одному корневому каталогу. Шаблон\n"
+"в стиле глоб вида ``*.c`` совпадет с любым файлом, оканчивающимся на\n"
+"``.c`` в любом каталоге, так же как и шаблон в стиле регулярного\n"
+"выражения вида ``\\.c$``. Чтобы задать шаблон в стиле regexp\n"
+"относительно корневого каталога, начните его с ``^``."
msgid ""
"Example\n"
"-------"
msgstr ""
+"Пример\n"
+"-------"
msgid "Here is an example ignore file. ::"
-msgstr ""
+msgstr "Пример файла игнорирования. ::"
msgid ""
" # use glob syntax.\n"
" syntax: glob"
msgstr ""
+" # использовать синтаксис glob.\n"
+" syntax: glob"
msgid ""
" *.elc\n"
@@ -12039,6 +15408,9 @@
" syntax: regexp\n"
" ^\\.pc/\n"
msgstr ""
+" # переключить синтаксис на regexp.\n"
+" syntax: regexp\n"
+" ^\\.pc/\n"
msgid ""
"Mercurial's internal web server, hgweb, can serve either a single\n"
@@ -12046,11 +15418,17 @@
"configuration file can be used to specify the repository paths to use\n"
"and global web configuration options."
msgstr ""
+"Встроенный веб-сервер Mercurial, hgweb, может обслуживать как один\n"
+"репозиторий, так и несколько. В последнем случае может быть использован\n"
+"отдельный файл конфигурации чтобы задать пути к репозиториям вместе\n"
+"с глобальными настройками веб-сервера."
msgid ""
"This file uses the same syntax as other Mercurial configuration files,\n"
"but only the following sections are recognized:"
msgstr ""
+"Этот файл имеет тот же формат, что и другие файлы конфигурации\n"
+"Mercurial, но обрабатываются только следующие секции:"
msgid ""
" - web\n"
@@ -12063,11 +15441,15 @@
"section of the hgrc(5) documentation. See :hg:`help config` for\n"
"information on where to find the manual page."
msgstr ""
+"Секция ``web`` для задания всех параметров, описанных в справке по\n"
+"одноименной секции из :hg:`help config`."
msgid ""
"The ``paths`` section provides mappings of physical repository\n"
"paths to virtual ones. For instance::"
msgstr ""
+"Секция ``paths`` задает соответствие физических путей к репозиториям\n"
+"и виртуальных. Например::"
msgid ""
" [paths]\n"
@@ -12091,12 +15473,28 @@
"- The fifth entry recursively finds all repositories under the real\n"
" root, and maps their relative paths under the virtual root."
msgstr ""
+"- Первые две строки показывают два репозитрия, физически находящихся по\n"
+" разным путям, в одном каталоге в веб-интерфейсе\n"
+"- Третья строка показывает все репозитории Mercurial, находящиеся в\n"
+" '/real/root', в каталоге 'web/root' веб-интерфейса. Такая форма\n"
+" является предпочтительной по сравнению с секцией [collections],\n"
+" т.к. использование абсолютных путей в качестве ключей поддерживается\n"
+" не на всех платформах (в частности, не работает в Windows)\n"
+"- Четвертая строка иллюстрирует особый случай, при котором все\n"
+" репозитории из каталога '/real/root2' отображаются в корневом\n"
+" виртуальном каталоге.\n"
+"- Пятая строка рекурсивно ищет все репозитории в подкаталогах\n"
+" /real/root2 и показывает из относительные пути в виртуальном\n"
+" каталоге."
msgid ""
"The ``collections`` section provides mappings of trees of physical\n"
"repositories paths to virtual ones, though the paths syntax is generally\n"
"preferred. For instance::"
msgstr ""
+"Секция ``collections`` задает соответстие деревьев физических путей\n"
+"репозиториев виртуальным. Однако, предпочтительно использовать секцию\n"
+"paths. Пример::"
msgid ""
" [collections]\n"
@@ -12108,9 +15506,12 @@
"right side. Thus ``/foo/bar`` and ``foo/quux/baz`` will be listed as\n"
"``bar`` and ``quux/baz`` respectively.\n"
msgstr ""
+"Здесь левая часть путей будет удалена из всех путей репозиториев,\n"
+"найденых в каталоге из правой части. Так, ``/foo/bar`` и ``foo/quux/baz``\n"
+"будут отображаться как ``bar`` и ``quux/baz`` соответственно.\n"
msgid "To merge files Mercurial uses merge tools."
-msgstr ""
+msgstr "При слиянии файлов Mercurial использует специальные инструменты."
msgid ""
"A merge tool combines two different versions of a file into a merged\n"
@@ -12118,11 +15519,18 @@
"ancestor of the two file versions, so they can determine the changes\n"
"made on both branches."
msgstr ""
+"Такой иструмент объединяет две различных версии файла в результирующую.\n"
+"Инструментом слияния является программа, которой передаются два файла\n"
+"и последний общий предок обеих версий, так что она может определить,\n"
+"какие изменения были были сделаны на каких ветках."
msgid ""
"Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n"
":hg:`backout` and in several extensions."
msgstr ""
+"Инструменты используются командами :hg:`resolve`, :hg:`merge`, :hg:"
+"`update`,\n"
+":hg:`backout` и несколькими раширениями."
msgid ""
"Usually, the merge tool tries to automatically reconcile the files by\n"
@@ -12134,17 +15542,29 @@
"conflict markers. Mercurial does not include any interactive merge\n"
"programs but relies on external tools for that."
msgstr ""
+"Обычно, программы слияния пытаются автоматически разрешить конфликты,\n"
+"объединяя непересекающиеся изменения, которые были сделаны в двух\n"
+"различных ветвях истории файла. Более того, некоторые интерактивные\n"
+"инструменты слияния облегчают ручное разрешение конфликтов, используя\n"
+"графическое представление или вставляя особые маркеры. Mercurial\n"
+"не поставляется с интерактивными инструментами, полагаясь на внешние\n"
+"программы."
msgid ""
"Available merge tools\n"
"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"Возможные инструменты слияния\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgid ""
"External merge tools and their properties are configured in the\n"
"merge-tools configuration section - see hgrc(5) - but they can often just\n"
"be named by their executable."
msgstr ""
+"Внешние инструменты слияния и их свойства настраиваются в секции\n"
+"merge-tools конфигурационного файла (см :hg:`help config`), но как\n"
+"правило можно просто указать имя их исполнимого файла."
msgid ""
"A merge tool is generally usable if its executable can be found on the\n"
@@ -12155,11 +15575,19 @@
"symlink, if it can handle binary files if the file is binary, and if a\n"
"GUI is available if the tool requires a GUI."
msgstr ""
+"Инстумент слияния может использоваться, если его исполняемый файл\n"
+"может быть найден системой, и если он может провести слияние.\n"
+"Исполняемый файл может быть найден, если он доступен по известным\n"
+"путям. Инструмент может провести слияние, если он корректно\n"
+"обрабатывает символические сслылки, в том случае если файл является\n"
+"символической ссылкой, обрабатывает бинарные файлы, если файл\n"
+"является бинарным, и если доступна графическая среда, в случае,\n"
+"если инструмент требует GUI."
msgid ""
"There are some internal merge tools which can be used. The internal\n"
"merge tools are:"
-msgstr ""
+msgstr "Существуеют также встроенные инструменты слияния:"
msgid ""
"``internal:merge``\n"
@@ -12167,6 +15595,10 @@
" files. It will fail if there are any conflicts and leave markers in\n"
" the partially merged file."
msgstr ""
+"``internal:merge``\n"
+" Использует внутренний неинтерактивный простой алгоритм слияния.\n"
+" Завершиться с ошибкой, если обнаружит конфликт, и оставит специальные\n"
+" маркеры в частично слитом файле."
msgid ""
"``internal:fail``\n"
@@ -12174,22 +15606,33 @@
" branches, it marks them as unresolved. The resolve command must be\n"
" used to resolve these conflicts."
msgstr ""
+"``internal:fail``\n"
+" Вместо того, чтобы попытаться провести слияне файлов, измененных на\n"
+" обеих ветках, он отмечает их как файлы с неразрешенными конфликтами.\n"
+" После разрешения конфликта должна быть использована команда resolve."
msgid ""
"``internal:local``\n"
" Uses the local version of files as the merged version."
msgstr ""
+"``internal:local``\n"
+" Использует локальные версии файлов в качестве слитой версии."
msgid ""
"``internal:other``\n"
" Uses the other version of files as the merged version."
msgstr ""
+"``internal:other``\n"
+" Использует версию файла из репозитория в качестве слитой версии."
msgid ""
"``internal:prompt``\n"
" Asks the user which of the local or the other version to keep as\n"
" the merged version."
msgstr ""
+"``internal:prompt``\n"
+" Спрашивает пользователя, какую версию файла - локальную или \n"
+" из репозитория - использовать в качестве слитой версии."
msgid ""
"``internal:dump``\n"
@@ -12200,20 +15643,31 @@
" ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n"
" same directory as ``a.txt``."
msgstr ""
+"``internal:dump``\n"
+" Создает три версии файла для слияния: локальную, из репозитория и\n"
+" базовую. Эти файлы можно использовать для слияния вручную. Если\n"
+" файл называется `a.txt``, то эти файлы будут называться ``a.txt.local``,\n"
+" ``a.txt.other`` и ``a.txt.base`` соответсвенно и будут находиться\n"
+" в том же каталоге, что и ``a.txt``."
msgid ""
"Internal tools are always available and do not require a GUI but will by "
"default\n"
"not handle symlinks or binary files."
msgstr ""
+"Встроенные инструменты доступны всегда и не требуют графической среды,\n"
+"но они по умолчанию не обрабатывают символьные ссылки и бинарные\n"
+"файлы."
msgid ""
"Choosing a merge tool\n"
"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"Выбор инструмента слияния\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgid "Mercurial uses these rules when deciding which merge tool to use:"
-msgstr ""
+msgstr "Mercurial использует следующие правила при выбора программы слияния:"
msgid ""
"1. If a tool has been specified with the --tool option to merge or resolve, "
@@ -12224,12 +15678,18 @@
"by\n"
" the shell."
msgstr ""
+"1. Если иснтрумент был задан с помощью опции --tool, то используется он.\n"
+" Если это имя инструмента из секции merge-tools, используются\n"
+" настройки оттуда. В противном случае, заданный инструмент должен\n"
+" быть пригодным для запуска командной оболочкой."
msgid ""
"2. If the ``HGMERGE`` environment variable is present, its value is used "
"and\n"
" must be executable by the shell."
msgstr ""
+"2. Если переменная окружения ``HGMERGE`` установлена, используется\n"
+" ее значение, оно должно быть исполняемо оболочкой."
msgid ""
"3. If the filename of the file to be merged matches any of the patterns in "
@@ -12239,6 +15699,10 @@
"the\n"
" merge tool are not considered."
msgstr ""
+"3. Если имя сливаемого файла совпадает с любым шаблоном из секции\n"
+" merge-patterns, используется первый соответствующий шаблону\n"
+" инструмент слияния. При этои не учитываются возможности этого\n"
+" инструмента для слияния двоичных файлов."
msgid ""
"4. If ui.merge is set it will be considered next. If the value is not the "
@@ -12247,25 +15711,39 @@
"by\n"
" the shell. Otherwise the named tool is used if it is usable."
msgstr ""
+"4. Если ui.merge установлен, он рассматривается следующим. Если значение\n"
+" не является именем сконфигурированного инструмента, используется\n"
+" указанное значение, которое должно быть исполнимо командной\n"
+" оболочкой. В противном случае по возможности используется заданный\n"
+" инструмент."
msgid ""
"5. If any usable merge tools are present in the merge-tools configuration\n"
" section, the one with the highest priority is used."
msgstr ""
+"5. Если в секции merge-tools присутствуют любые подходящие инструменты\n"
+" слияния, используется инструмент с максимальным приоритетом."
msgid ""
"6. If a program named ``hgmerge`` can be found on the system, it is used - "
"but\n"
" it will by default not be used for symlinks and binary files."
msgstr ""
+"6. Если программа ``hgmerge`` может быть найдена в системе, она будет\n"
+" использована, но по умолчанию она не будет использоваться для\n"
+" символьных ссылок и бинарных файлов по умолчанию."
msgid ""
"7. If the file to be merged is not binary and is not a symlink, then\n"
" ``internal:merge`` is used."
msgstr ""
+"7. Если сливаемый файл не является символьной ссылкой или бинарным\n"
+" файлом, используется ``internal:merge``."
msgid "8. The merge of the file fails and must be resolved before commit."
msgstr ""
+"8. Слияние завершается неудачей и должно быть завершено с помощью\n"
+" resolve перед коммитом."
msgid ""
".. note::\n"
@@ -12279,17 +15757,30 @@
"by\n"
" default unless the file is binary or a symlink."
msgstr ""
+".. note::\n"
+" После выбора программы слияния, Mercurial по умолчанию пытается\n"
+" слить файлы, используя простой алгоритм. Инструмент слияния будет\n"
+" запущен, только если это не удастся из-за возникших конфликтов.\n"
+" Решение о том, использовать или нет простой алгоритм слияния может\n"
+" быть проконтролировано настройкой premerge инструмента слияния.\n"
+" По умолчанию оно включено и используется, если сливаемый файл\n"
+" не является бинарным или символьной ссылкой."
msgid ""
"See the merge-tools and ui sections of hgrc(5) for details on the\n"
"configuration of merge tools.\n"
msgstr ""
+"Подробнее см. секции merge-tools и ui в :hg:`help config` или\n"
+"man hgrc.\n"
msgid ""
"When Mercurial accepts more than one revision, they may be specified\n"
"individually, or provided as a topologically continuous range,\n"
"separated by the \":\" character."
msgstr ""
+"Если Mercurial принимает где-либо более одной ревизии, их можно\n"
+"задавать по одной, либо в виде топологически непрерывного диапазона, \n"
+"разделенного символом \":\"."
msgid ""
"The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
@@ -12297,49 +15788,74 @@
"specified, it defaults to revision number 0. If END is not specified,\n"
"it defaults to the tip. The range \":\" thus means \"all revisions\"."
msgstr ""
+"Запись диапазона ревизий имеет вид [НАЧАЛО]:[КОНЕЦ], где НАЧАЛО и\n"
+"КОНЕЦ - идентификаторы ревизий. Оба этих идентификатора не обязательны.\n"
+"Если не указан НАЧАЛО, по умолчанию он считается равным 0. Если не\n"
+"указан КОНЕЦ, по умолчанию он считается равным оконечной ревизии (tip).\n"
+"Таким образом, диапазон \":\" означает \"все ревизии\"."
msgid "If BEGIN is greater than END, revisions are treated in reverse order."
msgstr ""
+"Если НАЧАЛО больше, чем КОНЕЦ, ревизии обрабатываются в обратном порядке."
msgid ""
"A range acts as a closed interval. This means that a range of 3:5\n"
"gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
msgstr ""
+"Диапазон интерпретируется как отрезок, т.е. крайние значения являются\n"
+"его частью. Так, диапазон 3:5 соответствует 3, 4 и 5, а диапазон\n"
+"9:6 дает 9, 8, 7 и 6.\n"
msgid ""
"Mercurial accepts several notations for identifying one or more files\n"
"at a time."
msgstr ""
+"Mercurial понимает несколько форм задания одного или более файла\n"
+"единовременно."
msgid ""
"By default, Mercurial treats filenames as shell-style extended glob\n"
"patterns."
msgstr ""
+"По умолчанию Mercurial интерпретирует имена файлов как это делает\n"
+"командная оболочка (bash и др.), выполняя подстановку шаблонов в\n"
+"стиле glob."
msgid "Alternate pattern notations must be specified explicitly."
-msgstr ""
+msgstr "Другая форма шаблонов должна указываться явно."
msgid ""
"To use a plain path name without any pattern matching, start it with\n"
"``path:``. These path names must completely match starting at the\n"
"current repository root."
msgstr ""
+"Чтобы использовать буквальный путь к файлу, в котором не выполняются\n"
+"подстановки, начните его с ``path:``. Такие пути должны полностью\n"
+"совпадать с именем файла относительно корня репозитория."
msgid ""
"To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
"at the current directory; a glob such as ``*.c`` will only match files\n"
"in the current directory ending with ``.c``."
msgstr ""
+"Чтобы использовать расширенный glob, начните его с ``glob:``. Глобы\n"
+"раскрываются относительно текущего каталога; глоб ``*.c`` совпадет\n"
+"только с файлами в текущем каталоге, оканчивающимися на ``.c``."
msgid ""
"The supported glob syntax extensions are ``**`` to match any string\n"
"across path separators and ``{a,b}`` to mean \"a or b\"."
msgstr ""
+"Поддерживается расширение обычных глобов в виде ``**``, которое\n"
+"совпадает с любой строкой в пределах всего пути, включая разделители;\n"
+"также поддерживается форма ``{a,b}``, означающая \"a или b\"."
msgid ""
"To use a Perl/Python regular expression, start a name with ``re:``.\n"
"Regexp pattern matching is anchored at the root of the repository."
msgstr ""
+"Чтобы использовать регулярные выражения Perl/Python, начните имя с\n"
+"``re:``. Такие шаблоны раскрываются относительно корня репозитория."
msgid ""
"To read name patterns from a file, use ``listfile:`` or ``listfile0:``.\n"
@@ -12347,18 +15863,24 @@
"feeds. Each string read from the file is itself treated as a file\n"
"pattern."
msgstr ""
+"Можно прочитать шаблоны имен из файла, используя ``listfile:`` или\n"
+"``listfile0:``. Последний ожидает шаблонов, отделенных друг от друга\n"
+"символом NUL, в то время как первый предполоает перевод строки. Каждая\n"
+"прочитанная из файла строка интерпретируется как шаблон имени файла."
msgid "Plain examples::"
-msgstr ""
+msgstr "Примеры буквальных путей::"
msgid ""
" path:foo/bar a name bar in a directory named foo in the root\n"
" of the repository\n"
" path:path:name a file or directory named \"path:name\""
msgstr ""
+" path:foo/bar файл с именем bar в каталоге foo в корне репозитория\n"
+" path:path:name файл или каталог с именем \"path:name\""
msgid "Glob examples::"
-msgstr ""
+msgstr "Примеры глобов::"
msgid ""
" glob:*.c any name ending in \".c\" in the current directory\n"
@@ -12369,34 +15891,56 @@
" foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
" including itself."
msgstr ""
+" glob:*.c любой файл, оканчивающийся на \".c\", в текущем каталоге\n"
+" *.c любой файл, оканчивающийся на \".c\", в текущем каталоге\n"
+" **.c любой файл, оканчивающийся на \".c\", в любом подкаталоге\n"
+" текущего каталога, включая его самого.\n"
+" foo/*.c любой файл, оканчивающийся на \".c\", в каталоге foo\n"
+" foo/**.c любой файл, оканчивающийся на \".c\", в любом подкаталоге\n"
+" foo, включая его самого."
msgid "Regexp examples::"
-msgstr ""
+msgstr "Примеры regexp::"
msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository"
msgstr ""
+" re:.*\\.c$ любой файл, оканчивающийся на \".c\",\n"
+" находящийся где угодно в репозитории"
msgid "File examples::"
-msgstr ""
+msgstr "Примеры шаблонов из файлов::"
msgid ""
" listfile:list.txt read list from list.txt with one file pattern per line\n"
-" listfile0:list.txt read list from list.txt with null byte delimiters\n"
-msgstr ""
+" listfile0:list.txt read list from list.txt with null byte delimiters"
+msgstr ""
+" listfile:list.txt читать шаблоны из файла list.txt, содержащего\n"
+" под одному шаблону на строку\n"
+" listfile0:list.txt читать шаблоны из файла list.txt, содержащего\n"
+" шаблоны, разделенные символом NULL"
+
+msgid "See also :hg:`help filesets`.\n"
+msgstr "См. также :hg:`help filesetes`.\n"
msgid "Mercurial supports several ways to specify individual revisions."
-msgstr ""
+msgstr "Mercurial поддерживает несколько способов задания отдельных ревизий."
msgid ""
"A plain integer is treated as a revision number. Negative integers are\n"
"treated as sequential offsets from the tip, with -1 denoting the tip,\n"
"-2 denoting the revision prior to the tip, and so forth."
msgstr ""
+"Простое целое число интерпретируется как номер ревизии. Отрицательные\n"
+"целые чила интерпретируются как непрерывное смещение относительно\n"
+"оконечной ревизии (tip). Так, -1 означает tip, -2 означает ревизию,\n"
+"предшествующую tip и т.д."
msgid ""
"A 40-digit hexadecimal string is treated as a unique revision\n"
"identifier."
msgstr ""
+"Шестнадцатиричная строка из 40 символов считается уникальным\n"
+"идентификатором (ID) ревизии."
msgid ""
"A hexadecimal string less than 40 characters long is treated as a\n"
@@ -12404,6 +15948,10 @@
"identifier. A short-form identifier is only valid if it is the prefix\n"
"of exactly one full-length identifier."
msgstr ""
+"Шестнадцатиричная строка короче 40 символов считается сокращенной\n"
+"формой уникального идентификатора ревизии. Такой идентификатор\n"
+"является корректным, только если он является старшей частью\n"
+"ровно одного полного ID ревизии."
msgid ""
"Any other string is treated as a tag or branch name. A tag name is a\n"
@@ -12411,16 +15959,24 @@
"denotes the tipmost revision of that branch. Tag and branch names must\n"
"not contain the \":\" character."
msgstr ""
+"Любая другая строка интерпретируется как имя ветви или метки. Имя\n"
+"метки - это символьное имя, ассоциированное с некоторым ID ревизии.\n"
+"Имя ветви означает последнюю ревизию на этой ветви. Имена ветви и\n"
+"метки не должны содержать символа \":\"."
msgid ""
"The reserved name \"tip\" is a special tag that always identifies the\n"
"most recent revision."
msgstr ""
+"Зарезервированное имя \"tip\" является специальной меткой, которая\n"
+"всегда ссылается на самую последнюю ревизию."
msgid ""
"The reserved name \"null\" indicates the null revision. This is the\n"
"revision of an empty repository, and the parent of revision 0."
msgstr ""
+"Зарезервированное имя \"null\" означает пустую ревизию. Это ревизия\n"
+"пустого репозитория или родитель ревизии 0."
msgid ""
"The reserved name \".\" indicates the working directory parent. If no\n"
@@ -12428,16 +15984,24 @@
"uncommitted merge is in progress, \".\" is the revision of the first\n"
"parent.\n"
msgstr ""
+"Зарезервированное имя \".\" означает родителя рабочего каталога.\n"
+"Если рабочий каталог ен извлечен, оно эквивалентно null. Если в\n"
+"рабочем каталоге находится незакоммиченный результат слияния, \".\"\n"
+"означает первого родителя.\n"
msgid ""
"Mercurial supports a functional language for selecting a set of\n"
"revisions."
msgstr ""
+"Mercurial поддерживает функциональный язык для задания множества\n"
+"ревизий."
msgid ""
"The language supports a number of predicates which are joined by infix\n"
"operators. Parenthesis can be used for grouping."
msgstr ""
+"Язык поддерживает несколько предикатов, которые объединяются с помощью\n"
+"инфиксных операторов. Можно использовать скобки для группировки."
msgid ""
"Identifiers such as branch names must be quoted with single or double\n"
@@ -12445,23 +16009,17 @@
"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n"
"predicates."
msgstr ""
-
-msgid ""
-"Special characters can be used in quoted identifiers by escaping them,\n"
-"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
-"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
-msgstr ""
-
-msgid "There is a single prefix operator:"
-msgstr ""
+"Идентификаторы, такие как имена ветвей, должны заключаться в одинарные\n"
+"или двойные кавычки, если они содержат символы не из множества\n"
+"``[._a-zA-Z0-9\\x80-\\xff]`` или если их имена совпадают с одним\n"
+"из предопределенных предикатов."
msgid ""
"``not x``\n"
" Changesets not in x. Short form is ``! x``."
msgstr ""
-
-msgid "These are the supported infix operators:"
-msgstr ""
+"``not x``\n"
+" Наборы изменений не в х. Краткая форма: ``! x``."
msgid ""
"``x::y``\n"
@@ -12470,9 +16028,14 @@
" is left out, this is equivalent to ``ancestors(y)``, if the second\n"
" is left out it is equivalent to ``descendants(x)``."
msgstr ""
+"``x::y``\n"
+" Диапазон на графе ревизий, означающий все ревизии, являющиеся\n"
+" предками y и потомками x, включая x и y. Если первая ревизия\n"
+" опущена, это эквивалентно ``ancestors(y)``, если вторая ревизия\n"
+" опущена, это эквивалентно ``descendats(x)``."
msgid " An alternative syntax is ``x..y``."
-msgstr ""
+msgstr " Альтернативная форма: ``x..y``."
msgid ""
"``x:y``\n"
@@ -12480,66 +16043,89 @@
" inclusive. Either endpoint can be left out, they default to 0 and\n"
" tip."
msgstr ""
+"``x:y``\n"
+" Все ревизии с номерами от x до y, включительно. Обе могут быть\n"
+" опущены, по умолчанию считаются 0 и tip соответственно."
msgid ""
"``x and y``\n"
" The intersection of changesets in x and y. Short form is ``x & y``."
msgstr ""
+"``x and y``\n"
+" Пересечение множеств ревизий x и y. Краткая форма: ``x & y``."
msgid ""
"``x or y``\n"
" The union of changesets in x and y. There are two alternative short\n"
" forms: ``x | y`` and ``x + y``."
msgstr ""
+"``x or y``\n"
+" Объединение множеств ревизий x и y. Возможны две краткие формы:\n"
+" ``x | y`` и ``x + y``."
msgid ""
"``x - y``\n"
-" Changesets in x but not in y.\n"
-" \n"
+" Changesets in x but not in y."
+msgstr ""
+"``x - y``\n"
+" Ревизии, входящие в x, но не в y."
+
+msgid ""
"``x^n``\n"
" The nth parent of x, n == 0, 1, or 2.\n"
" For n == 0, x; for n == 1, the first parent of each changeset in x;\n"
" for n == 2, the second parent of changeset in x."
msgstr ""
+" n-ый родитель x, n == 0, 1, или 2.\n"
+" Если n == 0, соответствует x; если n == 1, соответствует первому\n"
+" родителю каждой ревизии из x; если n == 2 - второму родителю."
msgid ""
"``x~n``\n"
" The nth first ancestor of x; ``x~0`` is x; ``x~3`` is ``x^^^``."
msgstr ""
+"``x~n``\n"
+" n-ый первый предок x; ``x~0`` соответствует x; ``x~3`` - ``x^^^``."
msgid "There is a single postfix operator:"
-msgstr ""
+msgstr "Существует единственный постфиксный оператор:"
msgid ""
"``x^``\n"
" Equivalent to ``x^1``, the first parent of each changeset in x."
msgstr ""
+"``x^``\n"
+" То же, что ``x^1`` - первый родитель каждой ревизии из x."
msgid ""
"\n"
"The following predicates are supported:"
msgstr ""
-
-msgid ".. predicatesmarker"
-msgstr ""
+"\n"
+"Поддерживаются следующие предикаты:"
msgid ""
"New predicates (known as \"aliases\") can be defined, using any combination "
"of\n"
"existing predicates or other aliases. An alias definition looks like::"
msgstr ""
+"Можно определить новые предикаты (известные как псевдонимы или \"алиасы\"),\n"
+"используя любые комбинации существующих предикатов или псевдонимов.\n"
+"Определение псевдонима имеет вид::"
msgid " <alias> = <definition>"
-msgstr ""
-
-msgid ""
-"in the ``revsetalias`` section of ``.hgrc``. Arguments of the form `$1`, `"
-"$2`,\n"
-"etc. are substituted from the alias into the definition."
-msgstr ""
+msgstr " <псевдоним> = <определение>"
+
+msgid ""
+"in the ``revsetalias`` section of a Mercurial configuration file. Arguments\n"
+"of the form `$1`, `$2`, etc. are substituted from the alias into the\n"
+"definition."
+msgstr ""
+"в секции ``revsetalias`` конфига Mercurial. Аргументы вида `$1`, `$2`\n"
+"и т.д. передаются из псевдонима в его определение."
msgid "For example,"
-msgstr ""
+msgstr "Например,"
msgid ""
" [revsetalias]\n"
@@ -12552,9 +16138,11 @@
"defines three aliases, ``h``, ``d``, and ``rs``. ``rs(0:tip, author)`` is\n"
"exactly equivalent to ``reverse(sort(0:tip, author))``."
msgstr ""
+"определяет три псевдонима, ``h``, ``d`` и ``rs``. ``rs(0:tip, автор)`` -\n"
+"это ровно то же самое, что ``reverse(sort(0:tip, автор))``."
msgid "Command line equivalents for :hg:`log`::"
-msgstr ""
+msgstr "Аналоги командной строки для :hg:`log`::"
msgid ""
" -f -> ::.\n"
@@ -12567,23 +16155,22 @@
" -l x -> limit(expr, x)"
msgstr ""
-msgid "Some sample queries:"
-msgstr ""
-
msgid "- Changesets on the default branch::"
-msgstr ""
+msgstr "- Ревизии на ветви default::"
msgid " hg log -r \"branch(default)\""
msgstr ""
msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::"
msgstr ""
+"- Ревизии на ветви default, начиная с ветки 1.5, не включая ревизии\n"
+" слияния::"
msgid " hg log -r \"branch(default) and 1.5:: and not merge()\""
msgstr ""
msgid "- Open branch heads::"
-msgstr ""
+msgstr "- Головы открытых ветвей"
msgid " hg log -r \"head() and not closed()\""
msgstr ""
@@ -12592,12 +16179,14 @@
"- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n"
" ``hgext/*``::"
msgstr ""
+"- Ревизии между метками 1.3 и 1.5, содержащие в описании слово \"bug\",\n"
+" в которых были изменены файлы ``hgext/*``::"
msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
msgstr ""
msgid "- Changesets committed in May 2008, sorted by user::"
-msgstr ""
+msgstr "- Ревизии, закомиченные в Мае 2008, отсортированные по пользователю::"
msgid " hg log -r \"sort(date('May 2008'), user)\""
msgstr ""
@@ -12605,7 +16194,7 @@
msgid ""
"- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n"
" release::"
-msgstr ""
+msgstr "- Не помеченные ревизии, содержищие слова \"bug\" или \"issue\"::"
msgid ""
" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())"
@@ -12618,21 +16207,31 @@
"group. External Mercurial and Subversion projects are currently\n"
"supported."
msgstr ""
+"Субрепозитории (подрепозитории) позволяют вложить несколько внешних\n"
+"репозиториев или пректов в один репозиторий Mercurial и выполнять\n"
+"над ними команды как над единой группой. В настоящее время поддерживаются\n"
+"внешнии проекты Mercurial и Subversion."
msgid "Subrepositories are made of three components:"
-msgstr ""
+msgstr "Субрепозитории включают три компонента:"
msgid ""
"1. Nested repository checkouts. They can appear anywhere in the\n"
" parent working directory, and are Mercurial clones or Subversion\n"
" checkouts."
msgstr ""
+"1. Извлеченные рабочие копии вложенных репозиториев. Они могут\n"
+" находится где угодно в рабочем каталоге и являются либо клонами\n"
+" Mercurial, либо рабочими копиями Subversion."
msgid ""
"2. Nested repository references. They are defined in ``.hgsub`` and\n"
" tell where the subrepository checkouts come from. Mercurial\n"
" subrepositories are referenced like:"
msgstr ""
+"2. Ссылки на вложенные репозитории. Они определены в ``.hgsub`` и\n"
+" описывают, откуда были извлечены копии субрепозиториев.\n"
+" Субрепозитории имеют такие пути:"
msgid " path/to/nested = https://example.com/nested/repo/path"
msgstr ""
@@ -12643,6 +16242,11 @@
" is the source repository path. The source can also reference a\n"
" filesystem path. Subversion repositories are defined with:"
msgstr ""
+" где ``path/to/nested`` - путь к извлеченной рабочей копии относительно\n"
+" корня родительского репозитория Mercurial, а \n"
+" ``https://example.com/nested/repo/path`` - путь к репозиторию-\n"
+" источнику. Источник может быть также путем в файловой системе.\n"
+" Репозитории Subversion определяются так:"
msgid " path/to/nested = [svn]https://example.com/nested/trunk/path"
msgstr ""
@@ -12652,6 +16256,9 @@
" repositories, you have to create and add it to the parent\n"
" repository before using subrepositories."
msgstr ""
+" Обратите внимание, что ``.hgsub`` по умолчанию не существует\n"
+" в репозиториях Mercurial, вам надо создать его и добавть\n"
+" в родительский репозиторий перед использованием субрепозиториев."
msgid ""
"3. Nested repository states. They are defined in ``.hgsubstate`` and\n"
@@ -12660,17 +16267,27 @@
" repository changeset. Mercurial automatically record the nested\n"
" repositories states when committing in the parent repository."
msgstr ""
+"3. Состояния вложенных репозиториев. Они определены в ``.hgsubstate``\n"
+" и содержат информацию, необходимую для дальнейшего восстановления\n"
+" субрепозиториев до состояния, в котором они были закоммичены в\n"
+" родительский репозиторий. Mercurial записывает состояния вложенных\n"
+" репозиториев автоматичски при коммите в родительский репозиторий."
msgid ""
" .. note::\n"
" The ``.hgsubstate`` file should not be edited manually."
msgstr ""
+" .. note::\n"
+" Файл ``.hgsubstate`` не следует редактировать вручную."
msgid ""
"\n"
"Adding a Subrepository\n"
"----------------------"
msgstr ""
+"\n"
+"Добавление субрепозитория\n"
+"-------------------------"
msgid ""
"If ``.hgsub`` does not exist, create it and add it to the parent\n"
@@ -12680,11 +16297,21 @@
"subrepository is tracked and the next commit will record its state in\n"
"``.hgsubstate`` and bind it to the committed changeset."
msgstr ""
+"Если файл ``.hgsub`` не существует, создайте его и добавьте в\n"
+"родительский репозиторий. Клонируйте или извлеките внешние проекты\n"
+"в каталог, в котором они будут размещаться в родительском репозитории.\n"
+"Отредактируйте файл ``.hgsub``, добавив туда запись для субрепозитория\n"
+"как описано выше. Начиная с этого момента, этот субрепозиторий\n"
+"контролируется Mercurial, и при следующем коммите в файле ``.hgsubstate``\n"
+"будет зафиксировано его состояние и выполнена привязка к нему\n"
+"закомиченного набора изменений."
msgid ""
"Synchronizing a Subrepository\n"
"-----------------------------"
msgstr ""
+"Синхронизация субрепозитория\n"
+"----------------------------"
msgid ""
"Subrepos do not automatically track the latest changeset of their\n"
@@ -12693,38 +16320,57 @@
"developers always get a consistent set of compatible code and\n"
"libraries when they update."
msgstr ""
+"Субрепозитории не отслеживают автоматически изменения в их источниках.\n"
+"Вместо этого они обновляются до ревизии, соответствующей ревизии,\n"
+"извлеченной уровнем выше. Это сделано для того, чтобы разработчики\n"
+"всегда имели целостный набор кода и библиотек, когда они обновляются."
msgid ""
"Thus, updating subrepos is a manual process. Simply check out target\n"
"subrepo at the desired revision, test in the top-level repo, then\n"
"commit in the parent repository to record the new combination."
msgstr ""
+"Таким образом, обновление субрепозитория необходимо выполнять вручную.\n"
+"Просто извлеките желаемую ревизию субрепозитория, протестируйте ее\n"
+"в родительском репозитории и выполните commit в родительском\n"
+"репозитории, чтобы зафиксировать новую комбинацию."
msgid ""
"Deleting a Subrepository\n"
"------------------------"
msgstr ""
+"Удаление субрепозитория\n"
+"-----------------------"
msgid ""
"To remove a subrepository from the parent repository, delete its\n"
"reference from ``.hgsub``, then remove its files."
msgstr ""
+"Чтобы удалить субрепозиторий из родительского репозитория, удалите\n"
+"ссылку на него из файла ``.hgsub``, после чего удалите его файлы."
msgid ""
"Interaction with Mercurial Commands\n"
"-----------------------------------"
msgstr ""
+"Взаимодействие с командами Mercurial\n"
+"------------------------------------"
msgid ""
":add: add does not recurse in subrepos unless -S/--subrepos is\n"
" specified. Subversion subrepositories are currently silently\n"
" ignored."
msgstr ""
+":add: add не обрабатывает субрепозитории рекурсивно, если не указана\n"
+" опция -S/--subrepos. Субрепозитории Subversion в настоящее\n"
+" время молча игнорируются."
msgid ""
":archive: archive does not recurse in subrepositories unless\n"
" -S/--subrepos is specified."
msgstr ""
+":archive: archive не обрабатывает субрепозитории рекурсивно, если\n"
+" не указана опция -S/--subrepos."
msgid ""
":commit: commit creates a consistent snapshot of the state of the\n"
@@ -12735,6 +16381,13 @@
" content is modified by setting \"ui.commitsubrepos=no\" in a\n"
" configuration file (see :hg:`help config`)."
msgstr ""
+":commit: commit создает целостный снисок состояния всего проекта и\n"
+" его субрепозиториев. Она делает это сначала пытаясь закоммитить\n"
+" все измененные субрепозитории, потом записывая из состояние,\n"
+" после чего выполняет коммит в родительский репозиторий. Можно\n"
+" заставить Mercurial отменять коммит, если содержимое хотя бы одного\n"
+" субрепозиторий изменено, с помощью установки \"ui.commitsubrepos=no\"\n"
+" в конфиге (см. :hg:`help config`)."
msgid ""
":diff: diff does not recurse in subrepos unless -S/--subrepos is\n"
@@ -12742,18 +16395,28 @@
" elements. Subversion subrepositories are currently silently\n"
" ignored."
msgstr ""
+":diff: diff не обрабатывает субрепозитории рекурсивно, если не указана\n"
+" опция -S/--subrepos. Различия отображаются как обычно для элементов "
+"субрепозиториев. Репозитории Subversion в настоящее время молча\n"
+" игнорируются."
msgid ""
":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n"
" is specified. Subversion subrepositories are currently silently\n"
" ignored."
msgstr ""
+":incoming: incoming не обрабатывает субрепозитории рекурсивно, если\n"
+" не указана опция -S/--subrepos. Субрепозитории Subversion в\n"
+" настоящее время молча игнорируются."
msgid ""
":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n"
" is specified. Subversion subrepositories are currently silently\n"
" ignored."
msgstr ""
+":outgoing: outgoing не обрабатывает субрепозитории рекурсивно, если\n"
+" не указана опция -S/--subrepos. Субрепозитории Subversion в\n"
+" настоящее время молча игнорируются."
msgid ""
":pull: pull is not recursive since it is not clear what to pull prior\n"
@@ -12762,6 +16425,11 @@
" changesets is expensive at best, impossible in the Subversion\n"
" case."
msgstr ""
+":pull: pull не обрабатывает субрепозитории рекурсивно, т.к. до\n"
+" выполнения :hg:`update` не ясно, что подтягивать. Перечисление и\n"
+" передача изменений во всех субрепозиториях, на которые ссылаются\n"
+" подтянуютые ревизии родительского репозитория в лучшем случае\n"
+" дорого, и вообще не возможно в случае Subversion."
msgid ""
":push: Mercurial will automatically push all subrepositories first\n"
@@ -12769,6 +16437,10 @@
" subrepository changes are available when referenced by top-level\n"
" repositories."
msgstr ""
+":push: Mercurial автоматически выполняет push для всех субрепозиториев\n"
+" при выполнении push для родительского репозитория. Это позволяет\n"
+" быть уверенным, что новые изменения в субрепозиториях будут доступны,\n"
+" когда на них ссылаются репозиторие уровнем выше."
msgid ""
":status: status does not recurse into subrepositories unless\n"
@@ -12777,6 +16449,10 @@
" elements. Subversion subrepositories are currently silently\n"
" ignored."
msgstr ""
+":status: status по умолчанию не обрабатывает субрепозитории рекурсивно,\n"
+" если не указан -S/--subrepos. Изменения в субрепозиториях\n"
+" отображаются как обычные изменения в элементах субрепозитория.\n"
+" Репозитории Subversion в настоящее время молча игнорируются."
msgid ""
":update: update restores the subrepos in the state they were\n"
@@ -12785,11 +16461,18 @@
" will pull it in first before updating. This means that updating\n"
" can require network access when using subrepositories."
msgstr ""
+":update: update восстанавливает субрепозитории до состояния,\n"
+" в котором они были закоммичены в целевой ревизии. Если\n"
+" записанная ревизия недоступна, Mercurial сначала подтянет\n"
+" ее до обновления. Это значит, что обновление может потребовать\n"
+" доступа к сети при использовании субрепозиториев."
msgid ""
"Remapping Subrepositories Sources\n"
"---------------------------------"
msgstr ""
+"Переназначение источников субрепозиториев\n"
+"-----------------------------------------"
msgid ""
"A subrepository source location may change during a project life,\n"
@@ -12798,6 +16481,11 @@
"file or in Mercurial configuration. See the ``[subpaths]`` section in\n"
"hgrc(5) for more details."
msgstr ""
+"Местоположение источников субрепозиториев может меняться в течение\n"
+"жизни проекта, делая ссылки, хранящиеся в истории родительского\n"
+"репозитория, некорректными. Чтобы исправить это, можно определить\n"
+"правила переназначения в файле ``hgrc`` родительского репозитория\n"
+"или в конфиге Mercurial. Подробенее см. секцию ``[subpaths]``."
msgid ""
"Mercurial allows you to customize output of commands through\n"
@@ -12805,11 +16493,16 @@
"line, via the --template option, or select an existing\n"
"template-style (--style)."
msgstr ""
+"Mercurial позволяет вам настраивать вывод команд с помощью шаблонов.\n"
+"Вы можете передать шаблон через командную строку с помощью опции\n"
+"--template, либо выбрать существующий шаблонный стиль (--style)."
msgid ""
"You can customize output for any \"log-like\" command: log,\n"
"outgoing, incoming, tip, parents, heads and glog."
msgstr ""
+"Можно настроить вывод для любой команды, похожей на log: log,\n"
+"outgoing, incoming, tip, parents, heads и glog."
msgid ""
"Four styles are packaged with Mercurial: default (the style used\n"
@@ -12817,6 +16510,9 @@
"and xml.\n"
"Usage::"
msgstr ""
+"С Mercurial поставляются четыре стиля: стиль по умолчанию (используется,\n"
+"когда другой стиль явно указан), compact, changelog и xml.\n"
+"Использование::"
msgid " $ hg log -r1 --style changelog"
msgstr ""
@@ -12825,6 +16521,8 @@
"A template is a piece of text, with markup to invoke variable\n"
"expansion::"
msgstr ""
+"Шаблон - это текст с разметкой, позволяющей выполнять подстановку\n"
+"переменных::"
msgid ""
" $ hg log -r1 --template \"{node}\\n\"\n"
@@ -12836,6 +16534,10 @@
"keywords depends on the exact context of the templater. These\n"
"keywords are usually available for templating a log-like command:"
msgstr ""
+"Строки в фигурных скобках называются ключевыми словами. Ключевые\n"
+"слова доступны в зависимости от контекста, в котором применяется\n"
+"шаблон. Эти ключевые слова как правило доступны в шаблонах для\n"
+"команд, похожих на log:"
msgid ".. keywordsmarker"
msgstr ""
@@ -12848,6 +16550,14 @@
"applying a string-input filter to a list-like input variable.\n"
"You can also use a chain of filters to get the desired output::"
msgstr ""
+"Ключевое слово \"date\" не создает читаемого вывода. Если вы хотите\n"
+"использовать дату в выходном тексте, можно использовать для этого\n"
+"фильтр. Фильтры - это функции, которые возвращают строку, основанную\n"
+"на входной переменной. Убедитесь, что сначала используется фильтр,\n"
+"преобразующий входные значения в строки, если вы хотите применить\n"
+"фильтр, принимающий на вход строку, к входной переменной типа список.\n"
+"Можно также использовать цепочку фильтров для получения желаемого\n"
+"результата::"
msgid ""
" $ hg tip --template \"{date|isodate}\\n\"\n"
@@ -12855,13 +16565,13 @@
msgstr ""
msgid "List of filters:"
-msgstr ""
+msgstr "Список фильтров (вход, описание):"
msgid ".. filtersmarker\n"
msgstr ""
msgid "Valid URLs are of the form::"
-msgstr ""
+msgstr "Возможные следующие формы URL::"
msgid ""
" local/filesystem/path[#revision]\n"
@@ -12876,26 +16586,37 @@
"repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n"
"incoming --bundle`). See also :hg:`help paths`."
msgstr ""
+"Пути в локальной файловой системе могут указывать на репозитории\n"
+"Mercurial или на файлы бандлов (созданных с помощью :hg:`bundle` или\n"
+":hg:`incoming --bundle`). См. также :hg:`help paths`."
msgid ""
"An optional identifier after # indicates a particular branch, tag, or\n"
"changeset to use from the remote repository. See also :hg:`help\n"
"revisions`."
msgstr ""
+"Необязательный идентификатор после # указывает конкретную ветвь, метку\n"
+"или набор изменений, которую следует использовать из удаленного\n"
+"репозитория. См. также :hg:`help revisions`."
msgid ""
"Some features, such as pushing to http:// and https:// URLs are only\n"
"possible if the feature is explicitly enabled on the remote Mercurial\n"
"server."
msgstr ""
+"Некоторые функции, такие как выполнение push по URL вида http://\n"
+"и https://, доступны только если эти функции явно включены на удаленном\n"
+"сервере Mercurial."
msgid ""
"Note that the security of HTTPS URLs depends on proper configuration of\n"
"web.cacerts."
msgstr ""
+"Обратите внимание, что безопасность работы с URL HTTPS зависит от\n"
+"правильноых настроек в web.cacerts."
msgid "Some notes about using SSH with Mercurial:"
-msgstr ""
+msgstr "Замечания относительно использования Mercurial по SSH:"
msgid ""
"- SSH requires an accessible shell account on the destination machine\n"
@@ -12903,6 +16624,12 @@
"- path is relative to the remote user's home directory by default. Use\n"
" an extra slash at the start of a path to specify an absolute path::"
msgstr ""
+"- SSH требует доступного пользовательского аккаунта на удаленной\n"
+" машине и доступного исполняемого файла Mercurial (hg) по известным\n"
+" на удаленной машине путям, либо заданного через remotecmd.\n"
+"- пути по умолчанию задаются относительно домашнего каталога удаленного\n"
+" пользователя. Используйте дополнительный слэш в начале пути, чтобы\n"
+" задать абсолютный путь::"
msgid " ssh://example.com//tmp/repository"
msgstr ""
@@ -12911,6 +16638,8 @@
"- Mercurial doesn't use its own compression via SSH; the right thing\n"
" to do is to configure it in your ~/.ssh/config, e.g.::"
msgstr ""
+"- Mercurial не использует встроенное сжатие при работе по SSH; будет\n"
+" правильным настроить его в вашем ~/.ssh/config, например::"
msgid ""
" Host *.mylocalnetwork.example.com\n"
@@ -12923,11 +16652,16 @@
" Alternatively specify \"ssh -C\" as your ssh command in your\n"
" configuration file or with the --ssh command line option."
msgstr ""
+" В качестве альтернативы можно указать \"ssh -C\" в качестве\n"
+" вашей команды ssh в конфиге или и с помощью опции командной\n"
+" строки --ssh."
msgid ""
"These URLs can all be stored in your configuration file with path\n"
"aliases under the [paths] section like so::"
msgstr ""
+"Все эти URL могут храниться в вашем конфигурационном файле вместе с\n"
+"краткими псевдонимами путей в секции [path]::"
msgid ""
" [paths]\n"
@@ -12935,16 +16669,25 @@
" alias2 = URL2\n"
" ..."
msgstr ""
+" [paths]\n"
+" псевдоним1 = URL1\n"
+" псевдоним2 = URL2\n"
+" ..."
msgid ""
"You can then use the alias for any command that uses a URL (for\n"
"example :hg:`pull alias1` will be treated as :hg:`pull URL1`)."
msgstr ""
+"Эти псевдонимы можно использовать в любой команде, которая ожидает\n"
+"URL (например, :hg:`pull псевдоним1` означает то же, что и\n"
+":hg:`pull URL1`)."
msgid ""
"Two path aliases are special because they are used as defaults when\n"
"you do not provide the URL to a command:"
msgstr ""
+"Два псевдонима путей являются особыми, т.е. они используются по\n"
+"умолчанию, если URL не указан при вызове команды:"
msgid ""
"default:\n"
@@ -12953,12 +16696,20 @@
" 'default' path. This is then used when you omit path from push- and\n"
" pull-like commands (including incoming and outgoing)."
msgstr ""
+"default:\n"
+" Когда вы создаете репозиторий с помощью hg clone, команда clone\n"
+" сохраняет адрес источника в качестве пути 'default' для нового\n"
+" репозитория. Он используется, если вы опускаете путь в командах\n"
+" вроде push и pull (т.ч. incoming и outgoing)."
msgid ""
"default-push:\n"
" The push command will look for a path named 'default-push', and\n"
" prefer it over 'default' if both are defined.\n"
msgstr ""
+"default-push:\n"
+" Команда push сначала ищет путь с именем `default-push` и предпочтет\n"
+" использовать его вместо 'default', если оба определены.\n"
msgid "remote branch lookup not supported"
msgstr ""
@@ -13042,6 +16793,10 @@
msgstr ""
#, python-format
+msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
+msgstr ""
+
+#, python-format
msgid "calling hook %s: %s\n"
msgstr ""
@@ -13138,6 +16893,9 @@
msgid "'%s' uses newer protocol %s"
msgstr ""
+msgid "unexpected response:"
+msgstr ""
+
#, python-format
msgid "push failed: %s"
msgstr ""
@@ -13165,10 +16923,6 @@
msgstr ""
#, python-format
-msgid "requirement '%s' not supported"
-msgstr ""
-
-#, python-format
msgid ".hg/sharedpath points to nonexistent directory %s"
msgstr ""
@@ -13505,7 +17259,7 @@
msgid "crosses branches (merge branches or use --clean to discard changes)"
msgstr ""
-msgid "crosses branches (merge branches or use --check to force update)"
+msgid "crosses branches (merge branches or update --check to force update)"
msgstr ""
msgid "Attention:"
@@ -13536,16 +17290,24 @@
msgstr ""
#, python-format
+msgid "unexpected token: %s"
+msgstr ""
+
+#, python-format
+msgid "not a prefix: %s"
+msgstr "не префиксный оператор: %s"
+
+#, python-format
+msgid "not an infix: %s"
+msgstr "не инфиксный оператор: %s"
+
+#, python-format
msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
msgstr ""
#, python-format
-msgid "cannot create %s: destination already exists"
-msgstr ""
-
-#, fuzzy, python-format
-msgid "cannot create %s: unable to create destination directory"
-msgstr "ветвь с таким именем уже существует"
+msgid "cannot patch %s: file is not tracked"
+msgstr "не могу пропатчить %s: файл не контролируется"
#, python-format
msgid "unable to find '%s' for patching\n"
@@ -13560,6 +17322,10 @@
msgstr "плохая полоса #%d %s (%d %d %d %d)"
#, python-format
+msgid "cannot create %s: destination already exists\n"
+msgstr "не могу создаеть %s: файл уже существует\n"
+
+#, python-format
msgid "file %s already exists\n"
msgstr "файл %s уже существует\n"
@@ -13599,6 +17365,10 @@
msgstr ""
#, python-format
+msgid "cannot create %s: destination already exists"
+msgstr ""
+
+#, python-format
msgid "unsupported parser state: %s"
msgstr ""
@@ -13614,10 +17384,6 @@
msgstr ""
#, python-format
-msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
-msgstr ""
-
-#, python-format
msgid "exited with status %d"
msgstr ""
@@ -13690,26 +17456,10 @@
msgid "unknown delta base"
msgstr ""
-msgid "unterminated string"
-msgstr ""
-
-msgid "syntax error"
-msgstr ""
-
-msgid "missing argument"
-msgstr ""
-
#, python-format
msgid "can't use %s here"
msgstr ""
-msgid "can't use a list in this context"
-msgstr ""
-
-#, python-format
-msgid "not a function: %s"
-msgstr ""
-
msgid ""
"``adds(pattern)``\n"
" Changesets that add a file matching pattern."
@@ -13814,6 +17564,15 @@
msgstr ""
msgid ""
+"``desc(string)``\n"
+" Search commit message for string. The match is case-insensitive."
+msgstr ""
+
+#. i18n: "desc" is a keyword
+msgid "desc requires a string"
+msgstr ""
+
+msgid ""
"``descendants(set)``\n"
" Changesets which are descendants of changesets in set."
msgstr ""
@@ -13835,11 +17594,15 @@
#. i18n: "follow" is a keyword
msgid "follow takes no arguments or a filename"
-msgstr ""
+msgstr "follow не принимает аргументов или имени файла"
+
+#, fuzzy
+msgid "follow expected a filename"
+msgstr "писать имя файла"
#. i18n: "follow" is a keyword
msgid "follow takes no arguments"
-msgstr ""
+msgstr "follow не требует аргументов"
msgid ""
"``all()``\n"
@@ -13848,7 +17611,7 @@
#. i18n: "all" is a keyword
msgid "all takes no arguments"
-msgstr ""
+msgstr "all не требует аргументов"
msgid ""
"``grep(regex)``\n"
@@ -13980,6 +17743,11 @@
msgstr ""
#. i18n: "outgoing" is a keyword
+#, fuzzy
+msgid "outgoing takes one or no arguments"
+msgstr "unknown не требует аргументов"
+
+#. i18n: "outgoing" is a keyword
msgid "outgoing requires a repository path"
msgstr ""
@@ -14096,6 +17864,10 @@
msgid "not a symbol"
msgstr ""
+#, python-format
+msgid "invalid number of arguments: %s"
+msgstr "неверное количество аргументов: %s"
+
msgid "empty query"
msgstr ""
@@ -14135,6 +17907,13 @@
msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
msgstr ""
+msgid ".hg/requires file is corrupt"
+msgstr ""
+
+#, python-format
+msgid "unknown repository format: requires features '%s' (upgrade Mercurial)"
+msgstr ""
+
msgid "searching for changes\n"
msgstr ""
@@ -14182,9 +17961,6 @@
msgid "remote: "
msgstr ""
-msgid "unexpected response:"
-msgstr ""
-
#, python-format
msgid "push refused: %s"
msgstr ""
@@ -14224,12 +18000,11 @@
msgstr ""
#, python-format
-msgid "no certificate for %s with configured hostfingerprint"
-msgstr ""
-
-#, python-format
-msgid ""
-"warning: %s certificate not verified (check web.cacerts config setting)\n"
+msgid "host fingerprint for %s can't be verified (Python too old)"
+msgstr ""
+
+#, python-format
+msgid "warning: certificate for %s can't be verified (Python too old)\n"
msgstr ""
#, python-format
@@ -14379,6 +18154,275 @@
msgid ".hg/cache/tags is corrupt, rebuilding it\n"
msgstr ""
+msgid ""
+":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
+" every line except the last."
+msgstr ""
+":addbreaks: Произвольный текст. Добавляет XHTML-тег \"<br />\" перед\n"
+" окончанием каждой строки кроме последней."
+
+msgid ""
+":age: Date. Returns a human-readable date/time difference between the\n"
+" given date/time and the current date/time."
+msgstr ""
+":age: Дата. Возвращает читаемый интервал дат/времени между данной\n"
+" датой/временем и текущей датой/временем."
+
+msgid ""
+":basename: Any text. Treats the text as a path, and returns the last\n"
+" component of the path after splitting by the path separator\n"
+" (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n"
+" \"baz\" and \"foo/bar//\" becomes \"bar\"."
+msgstr ""
+":basename: Произвольный текст. Интерпретирует текст как путь и\n"
+" возвращает последний его компонент после разбиения по разделителям\n"
+" пути (игнорируя разделители на конце). Например, \"foo/bar/baz\"\n"
+" преобразуется в \"baz\", а \"foo/bar//\" - в \"bar\"."
+
+msgid ""
+":date: Date. Returns a date in a Unix date format, including the\n"
+" timezone: \"Mon Sep 04 15:13:13 2006 0700\"."
+msgstr ""
+":date: Дата. Возвращает дату в формате Unix, включая часовой пояс:\n"
+" \"Mon Sep 04 15:13:13 2006 0700\"."
+
+msgid ""
+":domain: Any text. Finds the first string that looks like an email\n"
+" address, and extracts just the domain component. Example: ``User\n"
+" <user@example.com>`` becomes ``example.com``."
+msgstr ""
+":domain: Произвольный текст. Ищет первую строку, которая выглядит как\n"
+" email-адрес, и вычленяет из нее домен. Пример:\n"
+" ``User <user@example.com>`` преобразуется в ``example.com``."
+
+msgid ""
+":email: Any text. Extracts the first string that looks like an email\n"
+" address. Example: ``User <user@example.com>`` becomes\n"
+" ``user@example.com``."
+msgstr ""
+":email: Произвольный текст. Выделяет первую строку, которая выглядит\n"
+" как email-адрес. Пример: ``User <user@example.com>`` преобразуется\n"
+" в ``user@example.com``."
+
+msgid ""
+":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
+" and \">\" with XML entities."
+msgstr ""
+":escape: Произвольный текст. Заменяет спецсимволы XML/XHTML \"&\", \"<\"\n"
+" и \">\" соответствующими сущностями XML."
+
+msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
+msgstr ":fill68: Произвольный текст. Делает строки не длиннее 68 символов."
+
+msgid ":fill76: Any text. Wraps the text to fit in 76 columns."
+msgstr ":fill76: Произвольный текст. Делает строки не длиннее 76 символов."
+
+msgid ":firstline: Any text. Returns the first line of text."
+msgstr ":firstline: Произвольный текст. Возвращает первую строку текста."
+
+msgid ""
+":hex: Any text. Convert a binary Mercurial node identifier into\n"
+" its long hexadecimal representation."
+msgstr ""
+":hex: Произвольный текст. Преобразует двоичный идентификатор ревизии\n"
+" в длинную шестнадцатиричную форму."
+
+msgid ""
+":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n"
+" 25200\" (Unix timestamp, timezone offset)."
+msgstr ""
+":hgdate: Дата. Возвращает дату в виде пары чисел: \"1157407993\n"
+" 25200\" (метка времени Unix, смещение часового пояса)."
+
+msgid ""
+":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n"
+" +0200\"."
+msgstr ""
+":isodate: Дата. Возвращает дату в формате ISO 8601: \"2009-08-18 13:00\n"
+" +0200\"."
+
+msgid ""
+":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
+" seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n"
+" filter."
+msgstr ""
+":isodatesec: Дата. Возвращает дату в формате ISO 8601 включая\n"
+" секунды: \"2009-08-18 13:00:13 +0200\". См. также фильтр\n"
+" rfc3339date."
+
+msgid ":localdate: Date. Converts a date to local date."
+msgstr ":localdate: Дата. Преобразует дату в локальный формат."
+
+msgid ":nonempty: Any text. Returns '(none)' if the string is empty."
+msgstr ""
+":nonempty: Произвольный текст. Возвращает '(none)' если входная\n"
+" строка пуста."
+
+msgid ""
+":obfuscate: Any text. Returns the input text rendered as a sequence of\n"
+" XML entities."
+msgstr ""
+":obfuscate: Произвольный текст. Возвращает входной текст в виде\n"
+" последовательности XML-сущностей."
+
+msgid ":person: Any text. Returns the text before an email address."
+msgstr ":person: Произвольный текст. Возвращает текст перед email-адресом."
+
+msgid ""
+":rfc3339date: Date. Returns a date using the Internet date format\n"
+" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"."
+msgstr ""
+":rfc3339date: Дата. Возвращает дату в Internet-формате, описанном\n"
+" в RFC 3339: \"2009-08-18T13:00:13+02:00\"."
+
+msgid ""
+":rfc822date: Date. Returns a date using the same format used in email\n"
+" headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"."
+msgstr ""
+":rfc822date: Дата. Возвращает дату, используя формат заголовков\n"
+" email-сообщений: \"Tue, 18 Aug 2009 13:00:13 +0200\"."
+
+msgid ""
+":short: Changeset hash. Returns the short form of a changeset hash,\n"
+" i.e. a 12 hexadecimal digit string."
+msgstr ""
+":short: Хэш набора изменений. Возвращает хэш набора изменений в\n"
+" сокращенной форме, т.е. строку из 12 шестнадцатиричных символов."
+
+msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
+msgstr ":shortdate: Дата. Возвращает дату в виде \"2006-09-18\"."
+
+msgid ""
+":stringify: Any type. Turns the value into text by converting values into\n"
+" text and concatenating them."
+msgstr ""
+":stringify: Любой тип. Превращает значение в текст, путем конвертации\n"
+" значений в текст и их объединения."
+
+msgid ":strip: Any text. Strips all leading and trailing whitespace."
+msgstr ""
+":strip: Произвольный текст. Удаляет ведущие и замыкающие пробельные\n"
+" символы."
+
+msgid ""
+":stripdir: Treat the text as path and strip a directory level, if\n"
+" possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"."
+msgstr ""
+":stripdir: Считает входной текст путем файловой системы и по\n"
+" возможности удаляет последний уровень каталога. Например,\n"
+" \"foo\" и \"foo/bar\" преобразуются в \"foo\"."
+
+msgid ""
+":tabindent: Any text. Returns the text, with every line except the\n"
+" first starting with a tab character."
+msgstr ""
+":tabindent: Произвольный текст. Возвращает текст, каждая строка\n"
+" которго, кроме первой, начинается с символа табуляции."
+
+msgid ""
+":urlescape: Any text. Escapes all \"special\" characters. For example,\n"
+" \"foo bar\" becomes \"foo%20bar\"."
+msgstr ""
+":urlescape: Произвольный текст. Экранирует все \"специальные\" символы.\n"
+" Например, \"foo bar\" превращается в \"foo%20bar\"."
+
+msgid ":user: Any text. Returns the user portion of an email address."
+msgstr ":user: Произвольный текст. Возвращает пользователя из email-адреса."
+
+msgid ":author: String. The unmodified author of the changeset."
+msgstr ":author: Строка. Неизмененный автор набора изменений."
+
+msgid ""
+":branch: String. The name of the branch on which the changeset was\n"
+" committed."
+msgstr ":branch: Строка. Имя ветви, на которую был закоммичен набор изменений."
+
+msgid ""
+":branches: List of strings. The name of the branch on which the\n"
+" changeset was committed. Will be empty if the branch name was\n"
+" default."
+msgstr ""
+":branches: Список строк. Имя ветви, на которую был закоммичен набор\n"
+" изменений. Будет пустым, если имя ветви было default."
+
+msgid ""
+":bookmarks: List of strings. Any bookmarks associated with the\n"
+" changeset."
+msgstr ""
+":bookmarks: Список строк. Все закладки, ассоциированные с набором\n"
+" изменений."
+
+msgid ":children: List of strings. The children of the changeset."
+msgstr ":children: Список строк. Дочерние ревизии набора изменений."
+
+msgid ":date: Date information. The date when the changeset was committed."
+msgstr ":date: Информация о дате. Дата коммита набора изменений."
+
+msgid ":desc: String. The text of the changeset description."
+msgstr ":desc: Строка. Текст описания набора изменений."
+
+msgid ""
+":diffstat: String. Statistics of changes with the following format:\n"
+" \"modified files: +added/-removed lines\""
+msgstr ""
+":diffstat: Строка. Статистика изменений в следующем формате:\n"
+" \"измененные файлы: +добавленных/-удаленных строк\""
+
+msgid ":file_adds: List of strings. Files added by this changeset."
+msgstr ":file_adds: Список строк. Файлы, добавленные этим набором изменений."
+
+msgid ""
+":file_copies: List of strings. Files copied in this changeset with\n"
+" their sources."
+msgstr ""
+":file_copies: Список строк. Файлы, скопированные в этом наборе\n"
+" изменений, вместе с их источниками."
+
+msgid ""
+":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
+" only if the --copied switch is set."
+msgstr ""
+":file_copies_switch: Список строк. То же, что \"file_copies\", но\n"
+" отображается только если была установлена опция --copied."
+
+msgid ":file_dels: List of strings. Files removed by this changeset."
+msgstr ":file_dels: Список строк. Файлы, удаленные этим набором изменений."
+
+msgid ":file_mods: List of strings. Files modified by this changeset."
+msgstr ":file_mods: Список строк. Файлы, измененные этим набором изменений."
+
+msgid ""
+":files: List of strings. All files modified, added, or removed by this\n"
+" changeset."
+msgstr ""
+":files: Список строк. Все файлы, измененные, добавленные или удаленные\n"
+" этим набором изменений."
+
+msgid ""
+":latesttag: String. Most recent global tag in the ancestors of this\n"
+" changeset."
+msgstr ""
+":latesttag: Строка. Последняя глобальная метка среди предков данного\n"
+" набора изменений."
+
+msgid ":latesttagdistance: Integer. Longest path to the latest tag."
+msgstr ""
+":latesttagdistance: Целое чиcло. Самый длинный путь до последней\n"
+" метки."
+
+msgid ""
+":node: String. The changeset identification hash, as a 40 hexadecimal\n"
+" digit string."
+msgstr ""
+":node: Строка. Хэш набора изменений в виде 40-значной шестнадцатиричной\n"
+" строки."
+
+msgid ":rev: Integer. The repository-local changeset revision number."
+msgstr ":rev: Целое число. Локальный номер ревизии в этом репозитории."
+
+msgid ":tags: List of strings. Any tags associated with the changeset."
+msgstr ":tags: Список строк. Все метки, ассоциированные с набором изменений."
+
#, python-format
msgid "unknown method '%s'"
msgstr ""
@@ -14444,10 +18488,6 @@
msgstr ""
#, python-format
-msgid "ignoring untrusted configuration option %s.%s = %s\n"
-msgstr ""
-
-#, python-format
msgid "%s.%s is not a boolean ('%s')"
msgstr ""
@@ -14784,70 +18824,152 @@
msgid "push failed:"
msgstr ""
-#~ msgid "specify merge tool for rebase"
-#~ msgstr "задать программу для слияния при перебазировании"
-
-#, fuzzy
-#~ msgid "can't specify a revision with --all"
-#~ msgstr "пожалуйста, укажите ревизию для отмены"
-
-#, fuzzy
-#~ msgid "Supported arguments:"
-#~ msgstr "несовместимые аргументы"
+#~ msgid "read config from: %s\n"
+#~ msgstr "читаю конфиг из: %s\n"
+
+#~ msgid "restore individual files or directories to an earlier state"
+#~ msgstr "вернуть файлы или каталоги к более раннему состоянию"
+
+#~ msgid ""
+#~ " .. note::\n"
+#~ " This command is most likely not what you are looking for.\n"
+#~ " Revert will partially overwrite content in the working\n"
+#~ " directory without changing the working directory parents. Use\n"
+#~ " :hg:`update -r rev` to check out earlier revisions, or\n"
+#~ " :hg:`update --clean .` to undo a merge which has added another\n"
+#~ " parent."
+#~ msgstr ""
+#~ " .. note::\n"
+#~ " Эта команда почти наверняка не то, что вы ищете. Revert\n"
+#~ " частично переписывает файлы в рабочем каталоге, не изменяя его\n"
+#~ " родительскую ревизию в репозитории. Используйте \n"
+#~ " :hg:`update -r рев` чтобы извлечь предыдущие ревизии, или\n"
+#~ " :hg update --clean .` чтобы отменить слияние, которе добавило\n"
+#~ " второго родителя."
+
+#~ msgid ""
+#~ " Revert modifies the working directory. It does not commit any\n"
+#~ " changes, or change the parent of the working directory. If you\n"
+#~ " revert to a revision other than the parent of the working\n"
+#~ " directory, the reverted files will thus appear modified\n"
+#~ " afterwards."
+#~ msgstr ""
+#~ " Revert изменяет рабочий каталог. Она не комитит никаких\n"
+#~ " изменений и не меняет родителя рабочего каталога. Если вы\n"
+#~ " выполните revert на ревизию, отличную от текущей родительской,\n"
+#~ " восстановленные файлы будут иметь статус измененных."
+
+#~ msgid ""
+#~ " If a file has been deleted, it is restored. Files scheduled for\n"
+#~ " addition are just unscheduled and left as they are. If the\n"
+#~ " executable mode of a file was changed, it is reset."
+#~ msgstr ""
+#~ " Если файл был удален, он восстанавливается. У файлов, помеченных\n"
+#~ " для добавления, пометка снимается, сами файлы при этом не\n"
+#~ " изменяются. Если изменился признак исполнимости файла, он\n"
+#~ " сбраывается."
+
+#~ msgid ""
+#~ " If names are given, all files matching the names are reverted.\n"
+#~ " If no arguments are given, no files are reverted."
+#~ msgstr ""
+#~ " Если заданы имена, восстанавливаются все файлы с подходящими\n"
+#~ " именами. Без аргумнтов никакие файлы не будут восстановлены."
+
+#~ msgid "uncommitted merge - use \"hg update\", see \"hg help revert\""
+#~ msgstr ""
+#~ "незакомиченное слияние - используйте \"hg update\", см. \"hg help revert\""
+
+#~ msgid ""
+#~ "no files or directories specified; use --all to revert the whole repo"
+#~ msgstr "не заданы файлы или каталоги; --all откатит весь репозиторий"
#, fuzzy
-#~ msgid ""
-#~ "``git``\n"
-#~ " Use git extended diff format."
-#~ msgstr "использовать расширенный формат git для diff'ов"
-
-#, fuzzy
-#~ msgid ""
-#~ "``showfunc``\n"
-#~ " Show which function each change is in."
-#~ msgstr "для каждого изменения показать, в какой оно сделано функции"
-
-#, fuzzy
-#~ msgid ""
-#~ "``ignorews``\n"
-#~ " Ignore white space when comparing lines."
-#~ msgstr "игнорировать пробельные символы при сравнении строк"
+#~ msgid "%s already exists"
+#~ msgstr "файл %s уже существует\n"
+
+#~ msgid "base path"
+#~ msgstr "базовый путь"
+
+#~ msgid "not updating, since new heads added\n"
+#~ msgstr "не обновляюсь т.к. добавлены новые головы\n"
#, fuzzy
+#~ msgid "%s still exists!\n"
+#~ msgstr "файл %s уже существует\n"
+
#~ msgid ""
-#~ "``ignorewsamount``\n"
-#~ " Ignore changes in the amount of white space."
-#~ msgstr "игнорировать изменения в количестве пробельных символов"
-
-#, fuzzy
-#~ msgid ""
-#~ "``ignoreblanklines``\n"
-#~ " Ignore changes whose lines are all blank."
-#~ msgstr "игнорировать пустые строки"
-
-#, fuzzy
+#~ "Mercurial reads configuration data from several files, if they exist.\n"
+#~ "Below we list the most specific file first."
+#~ msgstr ""
+#~ "Mercurial читает настройки из нескольких файлов, если они существуют.\n"
+#~ "Ниже приведен их список, начиная с наиболее характерных."
+
+#~ msgid "On Windows, these configuration files are read:"
+#~ msgstr "В Windows используются эти файлы:"
+
#~ msgid ""
-#~ "``unified``\n"
-#~ " Number of lines of context to show."
-#~ msgstr "показываемое количество строк контекста"
-
-#, fuzzy
-#~ msgid "The full set of options is:"
-#~ msgstr "Первая хорошая ревизия:\n"
-
-#, fuzzy
+#~ "- ``<repo>\\.hg\\hgrc``\n"
+#~ "- ``%USERPROFILE%\\.hgrc``\n"
+#~ "- ``%USERPROFILE%\\mercurial.ini``\n"
+#~ "- ``%HOME%\\.hgrc``\n"
+#~ "- ``%HOME%\\mercurial.ini``\n"
+#~ "- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or "
+#~ "mercurial.ini found)\n"
+#~ "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or "
+#~ "mercurial.ini found)\n"
+#~ "- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n"
+#~ "- ``<hg.exe-dir>\\mercurial.ini``"
+#~ msgstr ""
+#~ "- ``<репозиторий>\\.hg\\hgrc``\n"
+#~ "- ``%USERPROFILE%\\.hgrc``\n"
+#~ "- ``%USERPROFILE%\\mercurial.ini``\n"
+#~ "- ``%HOME%\\.hgrc``\n"
+#~ "- ``%HOME%\\mercurial.ini``\n"
+#~ "- ``C:\\mercurial\\mercurial.ini`` (если не найден ключ в реестре илиhgrc."
+#~ "d\\)\n"
+#~ "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (если не найден hgrc.d\\или "
+#~ "mercurial.ini)\n"
+#~ "- ``<каталог-с-hg.exe>\\hgrc.d\\*.rc`` (если не найден mercurial.ini)\n"
+#~ "- ``<каталог-с-hg.exe>\\mercurial.ini``"
+
+#~ msgid "On Unix, these files are read:"
+#~ msgstr "В Unix используются эти файлы:"
+
#~ msgid ""
-#~ "``prefix``\n"
-#~ " Prefix path to serve from. Default is '' (server root)."
+#~ "If there is a per-repository configuration file which is not owned by\n"
+#~ "the active user, Mercurial will warn you that the file is skipped::"
#~ msgstr ""
-#~ "префикс пути для предоставления доступа (по умолчанию: в корне сервера)"
-
-#, fuzzy
+#~ "Если владелец файла настроек в репозитории - не текущий пользователь,\n"
+#~ "Mercurial предупреждает о том, что этот файл не будет использован::"
+
+#~ msgid ""
+#~ " not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP"
+#~ msgstr ""
+#~ " не доверяю файлу <репозиторий>/.hg/hgrc от недоверенного пользователя\n"
+#~ " ПОЛЬЗОВАТЕЛЬ в группе ГРУППА"
+
#~ msgid ""
-#~ "``style``\n"
-#~ " Which template map style to use."
-#~ msgstr "используемый стиль шаблона"
-
-#, fuzzy
-#~ msgid "cannot patch %s: file is not tracked"
-#~ msgstr "%s не удален, он и так не отслеживается\n"
+#~ "If this bothers you, the warning can be silenced (the file would still\n"
+#~ "be ignored) or trust can be established. Use one of the following\n"
+#~ "settings, the syntax is explained below:"
+#~ msgstr ""
+#~ "Если это вас раздражает, можно отключить предупреждение (файл все равно\n"
+#~ "игнорируется), или начать доверять пользователю. Для этого используйте\n"
+#~ "следующие настройки, синтаксис которых описан далее:"
+
+#~ msgid ""
+#~ "- ``ui.report_untrusted = False``\n"
+#~ "- ``trusted.users = USER``\n"
+#~ "- ``trusted.groups = GROUP``"
+#~ msgstr ""
+#~ "- ``ui.report_untrusted = False``\n"
+#~ "- ``trusted.users = ПОЛЬЗОВАТЕЛЬ``\n"
+#~ "- ``trusted.groups = ГРУППА``"
+
+#~ msgid ""
+#~ "- on Unix-like systems: ``man hgrc``\n"
+#~ "- online: http://www.selenic.com/mercurial/hgrc.5.html\n"
+#~ msgstr ""
+#~ "- в Unix-подобных ОС: ``man hgrc``\n"
+#~ "- онлайн: http://www.selenic.com/mercurial/hgrc.5.html\n"
--- a/i18n/sv.po Wed Jun 29 12:54:34 2011 +0200
+++ b/i18n/sv.po Wed Jun 29 16:05:41 2011 -0500
@@ -13,8 +13,8 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2011-02-26 09:27+0100\n"
-"PO-Revision-Date: 2011-02-26 16:39+0100\n"
+"POT-Creation-Date: 2011-06-29 09:21+0200\n"
+"PO-Revision-Date: 2011-06-29 09:24+0200\n"
"Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
"Language-Team: Swedish\n"
"Language: Swedish\n"
@@ -40,7 +40,7 @@
"Mercurial. Help for other extensions is available in the help system."
msgstr ""
"Den här sektioner innehåller hjälp för utökningar som levereras med "
-"Mercurial. Hjälp för andra utälningar är tillgängliga i hjälpsystemet."
+"Mercurial. Hjälp för andra utökningar är tillgängliga i hjälpsystemet."
msgid "Options:"
msgstr "Flaggor:"
@@ -297,140 +297,231 @@
msgid ""
"This hook extension adds comments on bugs in Bugzilla when changesets\n"
-"that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
-"bug status."
-msgstr ""
-
-msgid ""
-"The hook updates the Bugzilla database directly. Only Bugzilla\n"
-"installations using MySQL are supported."
-msgstr ""
-
-msgid ""
-"The hook relies on a Bugzilla script to send bug change notification\n"
-"emails. That script changes between Bugzilla versions; the\n"
-"'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
-"subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
-"be run by Mercurial as the user pushing the change; you will need to\n"
-"ensure the Bugzilla install file permissions are set appropriately."
-msgstr ""
-
-msgid ""
-"The extension is configured through three different configuration\n"
-"sections. These keys are recognized in the [bugzilla] section:"
-msgstr ""
-
-msgid ""
-"host\n"
-" Hostname of the MySQL server holding the Bugzilla database."
-msgstr ""
-
-msgid ""
-"db\n"
-" Name of the Bugzilla database in MySQL. Default 'bugs'."
-msgstr ""
-
-msgid ""
-"user\n"
-" Username to use to access MySQL server. Default 'bugs'."
-msgstr ""
-
-msgid ""
-"password\n"
+"that refer to bugs by Bugzilla ID are seen. The comment is formatted using\n"
+"the Mercurial template mechanism."
+msgstr ""
+
+msgid "The hook does not change bug status."
+msgstr ""
+
+msgid "Three basic modes of access to Bugzilla are provided:"
+msgstr ""
+
+msgid ""
+"1. Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later."
+msgstr ""
+
+msgid ""
+"2. Check data via the Bugzilla XMLRPC interface and submit bug change\n"
+" via email to Bugzilla email interface. Requires Bugzilla 3.4 or later."
+msgstr ""
+
+msgid ""
+"3. Writing directly to the Bugzilla database. Only Bugzilla installations\n"
+" using MySQL are supported. Requires Python MySQLdb."
+msgstr ""
+
+msgid ""
+"Writing directly to the database is susceptible to schema changes, and\n"
+"relies on a Bugzilla contrib script to send out bug change\n"
+"notification emails. This script runs as the user running Mercurial,\n"
+"must be run on the host with the Bugzilla install, and requires\n"
+"permission to read Bugzilla configuration details and the necessary\n"
+"MySQL user and password to have full access rights to the Bugzilla\n"
+"database. For these reasons this access mode is now considered\n"
+"deprecated, and will not be updated for new Bugzilla versions going\n"
+"forward."
+msgstr ""
+
+msgid ""
+"Access via XMLRPC needs a Bugzilla username and password to be specified\n"
+"in the configuration. Comments are added under that username. Since the\n"
+"configuration must be readable by all Mercurial users, it is recommended\n"
+"that the rights of that user are restricted in Bugzilla to the minimum\n"
+"necessary to add comments."
+msgstr ""
+
+msgid ""
+"Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends\n"
+"email to the Bugzilla email interface to submit comments to bugs.\n"
+"The From: address in the email is set to the email address of the Mercurial\n"
+"user, so the comment appears to come from the Mercurial user. In the event\n"
+"that the Mercurial user email is not recognised by Bugzilla as a Bugzilla\n"
+"user, the email associated with the Bugzilla username used to log into\n"
+"Bugzilla is used instead as the source of the comment."
+msgstr ""
+
+msgid "Configuration items common to all access modes:"
+msgstr ""
+
+msgid ""
+"bugzilla.version\n"
+" This access type to use. Values recognised are:"
+msgstr ""
+
+msgid ""
+" :``xmlrpc``: Bugzilla XMLRPC interface.\n"
+" :``xmlrpc+email``: Bugzilla XMLRPC and email interfaces.\n"
+" :``3.0``: MySQL access, Bugzilla 3.0 and later.\n"
+" :``2.18``: MySQL access, Bugzilla 2.18 and up to but not\n"
+" including 3.0.\n"
+" :``2.16``: MySQL access, Bugzilla 2.16 and up to but not\n"
+" including 2.18."
+msgstr ""
+
+msgid ""
+"bugzilla.regexp\n"
+" Regular expression to match bug IDs in changeset commit message.\n"
+" Must contain one \"()\" group. The default expression matches ``Bug\n"
+" 1234``, ``Bug no. 1234``, ``Bug number 1234``, ``Bugs 1234,5678``,\n"
+" ``Bug 1234 and 5678`` and variations thereof. Matching is case\n"
+" insensitive."
+msgstr ""
+
+msgid ""
+"bugzilla.style\n"
+" The style file to use when formatting comments."
+msgstr ""
+
+msgid ""
+"bugzilla.template\n"
+" Template to use when formatting comments. Overrides style if\n"
+" specified. In addition to the usual Mercurial keywords, the\n"
+" extension specifies:"
+msgstr ""
+
+msgid ""
+" :``{bug}``: The Bugzilla bug ID.\n"
+" :``{root}``: The full pathname of the Mercurial repository.\n"
+" :``{webroot}``: Stripped pathname of the Mercurial repository.\n"
+" :``{hgweb}``: Base URL for browsing Mercurial repositories."
+msgstr ""
+
+msgid ""
+" Default ``changeset {node|short} in repo {root} refers to bug\n"
+" {bug}.\\ndetails:\\n\\t{desc|tabindent}``"
+msgstr ""
+
+msgid ""
+"bugzilla.strip\n"
+" The number of path separator characters to strip from the front of\n"
+" the Mercurial repository path (``{root}`` in templates) to produce\n"
+" ``{webroot}``. For example, a repository with ``{root}``\n"
+" ``/var/local/my-project`` with a strip of 2 gives a value for\n"
+" ``{webroot}`` of ``my-project``. Default 0."
+msgstr ""
+
+msgid ""
+"web.baseurl\n"
+" Base URL for browsing Mercurial repositories. Referenced from\n"
+" templates as ``{hgweb}``."
+msgstr ""
+
+msgid "Configuration items common to XMLRPC+email and MySQL access modes:"
+msgstr ""
+
+msgid ""
+"bugzilla.usermap\n"
+" Path of file containing Mercurial committer email to Bugzilla user email\n"
+" mappings. If specified, the file should contain one mapping per\n"
+" line::"
+msgstr ""
+
+msgid " committer = Bugzilla user"
+msgstr ""
+
+msgid " See also the ``[usermap]`` section."
+msgstr ""
+
+msgid ""
+"The ``[usermap]`` section is used to specify mappings of Mercurial\n"
+"committer email to Bugzilla user email. See also ``bugzilla.usermap``.\n"
+"Contains entries of the form ``committer = Bugzilla user``."
+msgstr ""
+
+msgid "XMLRPC access mode configuration:"
+msgstr ""
+
+msgid ""
+"bugzilla.bzurl\n"
+" The base URL for the Bugzilla installation.\n"
+" Default ``http://localhost/bugzilla``."
+msgstr ""
+
+msgid ""
+"bugzilla.user\n"
+" The username to use to log into Bugzilla via XMLRPC. Default\n"
+" ``bugs``."
+msgstr ""
+
+msgid ""
+"bugzilla.password\n"
+" The password for Bugzilla login."
+msgstr ""
+
+msgid ""
+"XMLRPC+email access mode uses the XMLRPC access mode configuration items,\n"
+"and also:"
+msgstr ""
+
+msgid ""
+"bugzilla.bzemail\n"
+" The Bugzilla email address."
+msgstr ""
+
+msgid ""
+"In addition, the Mercurial email settings must be configured. See the\n"
+"documentation in hgrc(5), sections ``[email]`` and ``[smtp]``."
+msgstr ""
+
+msgid "MySQL access mode configuration:"
+msgstr ""
+
+msgid ""
+"bugzilla.host\n"
+" Hostname of the MySQL server holding the Bugzilla database.\n"
+" Default ``localhost``."
+msgstr ""
+
+msgid ""
+"bugzilla.db\n"
+" Name of the Bugzilla database in MySQL. Default ``bugs``."
+msgstr ""
+
+msgid ""
+"bugzilla.user\n"
+" Username to use to access MySQL server. Default ``bugs``."
+msgstr ""
+
+msgid ""
+"bugzilla.password\n"
" Password to use to access MySQL server."
msgstr ""
msgid ""
-"timeout\n"
+"bugzilla.timeout\n"
" Database connection timeout (seconds). Default 5."
msgstr ""
msgid ""
-"version\n"
-" Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
-" '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
-" to 2.18."
-msgstr ""
-
-msgid ""
-"bzuser\n"
+"bugzilla.bzuser\n"
" Fallback Bugzilla user name to record comments with, if changeset\n"
" committer cannot be found as a Bugzilla user."
msgstr ""
msgid ""
-"bzdir\n"
+"bugzilla.bzdir\n"
" Bugzilla install directory. Used by default notify. Default\n"
-" '/var/www/html/bugzilla'."
-msgstr ""
-
-msgid ""
-"notify\n"
+" ``/var/www/html/bugzilla``."
+msgstr ""
+
+msgid ""
+"bugzilla.notify\n"
" The command to run to get Bugzilla to send bug change notification\n"
-" emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
-" and 'user' (committer bugzilla email). Default depends on version;\n"
-" from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
-" %(id)s %(user)s\"."
-msgstr ""
-
-msgid ""
-"regexp\n"
-" Regular expression to match bug IDs in changeset commit message.\n"
-" Must contain one \"()\" group. The default expression matches 'Bug\n"
-" 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
-" 1234 and 5678' and variations thereof. Matching is case insensitive."
-msgstr ""
-
-msgid ""
-"style\n"
-" The style file to use when formatting comments."
-msgstr ""
-
-msgid ""
-"template\n"
-" Template to use when formatting comments. Overrides style if\n"
-" specified. In addition to the usual Mercurial keywords, the\n"
-" extension specifies::"
-msgstr ""
-
-msgid ""
-" {bug} The Bugzilla bug ID.\n"
-" {root} The full pathname of the Mercurial repository.\n"
-" {webroot} Stripped pathname of the Mercurial repository.\n"
-" {hgweb} Base URL for browsing Mercurial repositories."
-msgstr ""
-
-msgid ""
-" Default 'changeset {node|short} in repo {root} refers '\n"
-" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'"
-msgstr ""
-
-msgid ""
-"strip\n"
-" The number of slashes to strip from the front of {root} to produce\n"
-" {webroot}. Default 0."
-msgstr ""
-
-msgid ""
-"usermap\n"
-" Path of file containing Mercurial committer ID to Bugzilla user ID\n"
-" mappings. If specified, the file should contain one mapping per\n"
-" line, \"committer\"=\"Bugzilla user\". See also the [usermap] section."
-msgstr ""
-
-msgid ""
-"The [usermap] section is used to specify mappings of Mercurial\n"
-"committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
-"\"committer\"=\"Bugzilla user\""
-msgstr ""
-
-msgid "Finally, the [web] section supports one entry:"
-msgstr ""
-
-msgid ""
-"baseurl\n"
-" Base URL for browsing Mercurial repositories. Reference from\n"
-" templates as {hgweb}."
+" emails. Substitutes from a map with 3 keys, ``bzdir``, ``id`` (bug\n"
+" id) and ``user`` (committer bugzilla email). Default depends on\n"
+" version; from 2.18 it is \"cd %(bzdir)s && perl -T\n"
+" contrib/sendbugmail.pl %(id)s %(user)s\"."
msgstr ""
msgid "Activating the extension::"
@@ -447,13 +538,69 @@
" incoming.bugzilla = python:hgext.bugzilla.hook"
msgstr ""
-msgid "Example configuration:"
-msgstr ""
-
-msgid ""
-"This example configuration is for a collection of Mercurial\n"
-"repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
-"installation in /opt/bugzilla-3.2. ::"
+msgid "Example configurations:"
+msgstr "Exempelkonfigurationer:"
+
+msgid ""
+"XMLRPC example configuration. This uses the Bugzilla at\n"
+"``http://my-project.org/bugzilla``, logging in as user\n"
+"``bugmail@my-project.org`` with password ``plugh``. It is used with a\n"
+"collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
+"with a web interface at ``http://my-project.org/hg``. ::"
+msgstr ""
+
+msgid ""
+" [bugzilla]\n"
+" bzurl=http://my-project.org/bugzilla\n"
+" user=bugmail@my-project.org\n"
+" password=plugh\n"
+" version=xmlrpc\n"
+" template=Changeset {node|short} in {root|basename}.\n"
+" {hgweb}/{webroot}/rev/{node|short}\\n\n"
+" {desc}\\n\n"
+" strip=5"
+msgstr ""
+
+msgid ""
+" [web]\n"
+" baseurl=http://my-project.org/hg"
+msgstr ""
+
+msgid ""
+"XMLRPC+email example configuration. This uses the Bugzilla at\n"
+"``http://my-project.org/bugzilla``, logging in as user\n"
+"``bugmail@my-project.org`` with password ``plugh``. It is used with a\n"
+"collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
+"with a web interface at ``http://my-project.org/hg``. Bug comments\n"
+"are sent to the Bugzilla email address\n"
+"``bugzilla@my-project.org``. ::"
+msgstr ""
+
+msgid ""
+" [bugzilla]\n"
+" bzurl=http://my-project.org/bugzilla\n"
+" user=bugmail@my-project.org\n"
+" password=plugh\n"
+" version=xmlrpc\n"
+" bzemail=bugzilla@my-project.org\n"
+" template=Changeset {node|short} in {root|basename}.\n"
+" {hgweb}/{webroot}/rev/{node|short}\\n\n"
+" {desc}\\n\n"
+" strip=5"
+msgstr ""
+
+msgid ""
+" [usermap]\n"
+" user@emaildomain.com=user.name@bugzilladomain.com"
+msgstr ""
+
+msgid ""
+"MySQL example configuration. This has a local Bugzilla 3.2 installation\n"
+"in ``/opt/bugzilla-3.2``. The MySQL database is on ``localhost``,\n"
+"the Bugzilla database name is ``bugs`` and MySQL is\n"
+"accessed with MySQL username ``bugs`` password ``XYZZY``. It is used\n"
+"with a collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
+"with a web interface at ``http://my-project.org/hg``. ::"
msgstr ""
msgid ""
@@ -469,28 +616,22 @@
" strip=5"
msgstr ""
-msgid ""
-" [web]\n"
-" baseurl=http://dev.domain.com/hg"
-msgstr ""
-
-msgid ""
-" [usermap]\n"
-" user@emaildomain.com=user.name@bugzilladomain.com"
-msgstr ""
-
-msgid "Commits add a comment to the Bugzilla bug record of the form::"
+msgid "All the above add a comment to the Bugzilla bug record of the form::"
msgstr ""
msgid ""
" Changeset 3b16791d6642 in repository-name.\n"
-" http://dev.domain.com/hg/repository-name/rev/3b16791d6642"
+" http://my-project.org/hg/repository-name/rev/3b16791d6642"
msgstr ""
msgid " Changeset commit comment. Bug 1234.\n"
msgstr ""
#, python-format
+msgid "python mysql support not available: %s"
+msgstr ""
+
+#, python-format
msgid "connecting to %s:%s as %s, password %s\n"
msgstr ""
@@ -539,9 +680,16 @@
msgid "cannot find bugzilla user id for %s or %s"
msgstr ""
+msgid "configuration 'bzemail' missing"
+msgstr "'bzemail' inte konfigurerad"
+
+#, python-format
+msgid "default bugzilla user %s email not found"
+msgstr ""
+
#, python-format
msgid "bugzilla version %s not supported"
-msgstr ""
+msgstr "bugzilla version %s stöds inte"
msgid ""
"changeset {node|short} in repo {root} refers to bug {bug}.\n"
@@ -550,16 +698,12 @@
msgstr ""
#, python-format
-msgid "python mysql support not available: %s"
-msgstr ""
-
-#, python-format
msgid "hook type %s does not pass a changeset id"
msgstr ""
#, python-format
-msgid "database error: %s"
-msgstr ""
+msgid "Bugzilla error: %s"
+msgstr "Bugzilla-fel: %s"
msgid "command to display child changesets"
msgstr ""
@@ -696,12 +840,11 @@
msgstr "färglägg utmatning från vissa kommandon"
msgid ""
-"This extension modifies the status and resolve commands to add color to "
-"their\n"
-"output to reflect file status, the qseries command to add color to reflect\n"
-"patch status (applied, unapplied, missing), and to diff-related\n"
-"commands to highlight additions, removals, diff headers, and trailing\n"
-"whitespace."
+"This extension modifies the status and resolve commands to add color\n"
+"to their output to reflect file status, the qseries command to add\n"
+"color to reflect patch status (applied, unapplied, missing), and to\n"
+"diff-related commands to highlight additions, removals, diff headers,\n"
+"and trailing whitespace."
msgstr ""
"Denna utökning modifierar kommandona status och resolve för att färglägga\n"
"deras utmaning för att spegla filstatus, qseries-kommandon för att\n"
@@ -711,17 +854,19 @@
msgid ""
"Other effects in addition to color, like bold and underlined text, are\n"
-"also available. Effects are rendered with the ECMA-48 SGR control\n"
-"function (aka ANSI escape codes). This module also provides the\n"
-"render_text function, which can be used to add effects to any text."
+"also available. By default, the terminfo database is used to find the\n"
+"terminal codes used to change color and effect. If terminfo is not\n"
+"available, then effects are rendered with the ECMA-48 SGR control\n"
+"function (aka ANSI escape codes)."
msgstr ""
"Andra effekter förutom färg, såsom fet och understryken text, är också\n"
-"tillgänglig. Effekter renderas med kontrollfunktionerna ECMA-48 SGR\n"
-"(aka ANSI escape-koder). Denna modul tillhandahåller också funktionen\n"
-"render_text, som kan användas för att lägga till effekter på valfri text."
+"tillgänglig. Som standard används terminfo-databasen för att hitta\n"
+"terminalkoderna för att ändra färg och effekt. Om terminfo inte är\n"
+"tillgänglig, så renderas effekterna med kontrollfunktionerna ECMA-48 SGR\n"
+"(ANSI-escape-koder)."
msgid "Default effects may be overridden from your configuration file::"
-msgstr "Standardeffekter kan ersättas från din konfiturationsfil::"
+msgstr "Standardeffekter kan modifieras från din konfigurationsfil::"
msgid ""
" [color]\n"
@@ -801,11 +946,58 @@
" branches.inactive = none"
msgid ""
-"The color extension will try to detect whether to use ANSI codes or\n"
-"Win32 console APIs, unless it is made explicit::"
-msgstr ""
-"Utökningen color försöker att upptäcka om ANSI-koder eller APIer för\n"
-"konsolen i Win32 om det inte anges explicit::"
+"The available effects in terminfo mode are 'blink', 'bold', 'dim',\n"
+"'inverse', 'invisible', 'italic', 'standout', and 'underline'; in\n"
+"ECMA-48 mode, the options are 'bold', 'inverse', 'italic', and\n"
+"'underline'. How each is rendered depends on the terminal emulator.\n"
+"Some may not be available for a given terminal type, and will be\n"
+"silently ignored."
+msgstr ""
+"De tillgängliga effekterna i terminfo-läge är 'blink', 'bold', 'dim',\n"
+"'inverse', 'invisible', 'italic', 'standout', och 'underline'; i\n"
+"ECMA-48-läge, så är 'bold', 'inverse', 'italic', och 'underline'\n"
+"tillgängliga. Hur varje effekt renderas beror på terminalemulatorn. Vissa\n"
+"kan vara otillgängliga för en viss terminaltyp, och kommer att ignoreras i\n"
+"det tysta."
+
+msgid ""
+"Because there are only eight standard colors, this module allows you\n"
+"to define color names for other color slots which might be available\n"
+"for your terminal type, assuming terminfo mode. For instance::"
+msgstr ""
+"Eftersom det bara finns åtta standardfärger, tillåter denna modul dig att\n"
+"definiera färgnamn för andra färgnummer som är tillgängliga för din\n"
+"terminaltyp. Exempelvis::"
+
+msgid ""
+" color.brightblue = 12\n"
+" color.pink = 207\n"
+" color.orange = 202"
+msgstr ""
+" color.brightblue = 12\n"
+" color.pink = 207\n"
+" color.orange = 202"
+
+msgid ""
+"to set 'brightblue' to color slot 12 (useful for 16 color terminals\n"
+"that have brighter colors defined in the upper eight) and, 'pink' and\n"
+"'orange' to colors in 256-color xterm's default color cube. These\n"
+"defined colors may then be used as any of the pre-defined eight,\n"
+"including appending '_background' to set the background to that color."
+msgstr ""
+"för att sätta 'brightblue' till färgnummer 12 (användbart för terminaler\n"
+"med 16 färger som har ljusare färger definierade bland de övre åtta), samt\n"
+"'pink' och 'orange' till färger i 256-färgs terminalfärger. Dessa\n"
+"definierade färger kan sedan användas som vilken som helst av de\n"
+"fördefinierade åtta, inklusive att lägga till '_background' för att sätta\n"
+"bakgrunden till den färgen."
+
+msgid ""
+"The color extension will try to detect whether to use terminfo, ANSI\n"
+"codes or Win32 console APIs, unless it is made explicit; e.g.::"
+msgstr ""
+"Utökningen color försöker att upptäcka om terminfo, ANSI-koder eller\n"
+"APIer för konsolen i Win32 om det inte anges explicit::"
msgid ""
" [color]\n"
@@ -814,16 +1006,24 @@
" [color]\n"
" mode = ansi"
-msgid "Any value other than 'ansi', 'win32', or 'auto' will disable color."
-msgstr "Ett värde skilt från 'ansi', 'win32', eller 'auto' stänger av färg."
+msgid ""
+"Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will\n"
+"disable color."
+msgstr ""
+"Ett värde skilt från 'ansi', 'win32', 'terminfo' eller 'auto' stänger av\n"
+"färg."
+
+msgid "no terminfo entry for setab/setaf: reverting to ECMA-48 color\n"
+msgstr "ingen terminfo-post för setab/setaf: återgår till ECMA-48-färger\n"
+
+#, python-format
+msgid "warning: failed to set color mode to %s\n"
+msgstr "varning: kunde inte sätta färgläge till %s\n"
#, python-format
msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
msgstr "ignorerar okänd färg/effekt %r (konfigurerad i color.%s)\n"
-msgid "win32console not found, please install pywin32\n"
-msgstr "win32console hittades inte, installera pywin32\n"
-
#. i18n: 'always', 'auto', and 'never' are keywords and should
#. not be translated
msgid "when to colorize (boolean, always, auto, or never)"
@@ -1131,7 +1331,7 @@
msgid ""
" :convert.svn.branches: specify the directory containing branches.\n"
-" The defaults is ``branches``."
+" The default is ``branches``."
msgstr ""
msgid ""
@@ -1140,8 +1340,8 @@
msgstr ""
msgid ""
-" :convert.svn.trunk: specify the name of the trunk branch The\n"
-" defauls is ``trunk``."
+" :convert.svn.trunk: specify the name of the trunk branch. The\n"
+" default is ``trunk``."
msgstr ""
msgid ""
@@ -1292,6 +1492,15 @@
msgid "hg debugcvsps [OPTION]... [PATH]..."
msgstr ""
+msgid ":svnrev: String. Converted subversion revision number."
+msgstr ""
+
+msgid ":svnpath: String. Converted subversion revision project path."
+msgstr ""
+
+msgid ":svnuuid: String. Converted subversion revision repository identifier."
+msgstr ""
+
#, python-format
msgid "%s does not look like a Bazaar repository"
msgstr "%s verkar inte vara ett Bazaar-arkiv"
@@ -1352,10 +1561,6 @@
msgstr "convert: %s\n"
#, python-format
-msgid "%s\n"
-msgstr "%s\n"
-
-#, python-format
msgid "%s: unknown repository type"
msgstr "%s: okänd arkivtyp"
@@ -1617,13 +1822,16 @@
#, python-format
msgid "pulling from %s into %s\n"
-msgstr ""
+msgstr "drar från %s till %s\n"
msgid "filtering out empty revision\n"
-msgstr ""
+msgstr "filtrerar bort tom revision\n"
msgid "updating tags\n"
-msgstr ""
+msgstr "uppdaterar märken\n"
+
+msgid "updating bookmarks\n"
+msgstr "uppdaterar bokmärken\n"
#, python-format
msgid "%s is not a valid start revision"
@@ -1631,16 +1839,51 @@
#, python-format
msgid "ignoring: %s\n"
-msgstr ""
+msgstr "ignorerar: %s\n"
#, python-format
msgid "%s does not look like a monotone repository"
msgstr "%s verkar inte vara ett monotone-arkiv"
+msgid "bad mtn packet - no end of commandnbr"
+msgstr ""
+
+#, python-format
+msgid "bad mtn packet - bad stream type %s"
+msgstr ""
+
+msgid "bad mtn packet - no divider before size"
+msgstr ""
+
+msgid "bad mtn packet - no end of packet size"
+msgstr ""
+
+#, python-format
+msgid "bad mtn packet - bad packet size %s"
+msgstr ""
+
+#, python-format
+msgid "bad mtn packet - unable to read full packet read %s of %s"
+msgstr ""
+
+#, python-format
+msgid "mtn command '%s' returned %s"
+msgstr "mtn-kommandot '%s' returnerade %s"
+
#, python-format
msgid "copying file in renamed directory from '%s' to '%s'"
msgstr ""
+msgid "unable to determine mtn automate interface version"
+msgstr ""
+
+#, python-format
+msgid "mtn automate stdio header unexpected: %s"
+msgstr ""
+
+msgid "failed to reach end of mtn automate stdio headers"
+msgstr ""
+
#, python-format
msgid "%s does not look like a P4 repository"
msgstr "%s verkar inte vara ett P4-arkiv"
@@ -1846,9 +2089,13 @@
msgid ""
"The ``win32text.forbid*`` hooks provided by the win32text extension\n"
-"have been unified into a single hook named ``eol.hook``. The hook will\n"
-"lookup the expected line endings from the ``.hgeol`` file, which means\n"
-"you must migrate to a ``.hgeol`` file first before using the hook."
+"have been unified into a single hook named ``eol.checkheadshook``. The\n"
+"hook will lookup the expected line endings from the ``.hgeol`` file,\n"
+"which means you must migrate to a ``.hgeol`` file first before using\n"
+"the hook. ``eol.checkheadshook`` only checks heads, intermediate\n"
+"invalid revisions will be pushed. To forbid them completely, use the\n"
+"``eol.checkallhook`` hook. These hooks are best used as\n"
+"``pretxnchangegroup`` hooks."
msgstr ""
msgid ""
@@ -1858,23 +2105,26 @@
"Se :hg:`help patterns` för mer information om de använda glob-mönstren.\n"
#, python-format
-msgid "%s should not have CRLF line endings"
-msgstr ""
-
-#, python-format
-msgid "%s should not have LF line endings"
-msgstr ""
-
-msgid "the eol extension is incompatible with the win32text extension"
-msgstr "eol-utökningen är inkompativel med win32text-utökningen"
-
-#, python-format
msgid "ignoring unknown EOL style '%s' from %s\n"
-msgstr ""
+msgstr "ignorerar okänd EOL-stil '%s' från %s\n"
+
+#, python-format
+msgid "warning: ignoring .hgeol file due to parse error at %s: %s\n"
+msgstr "varning: ignorerar .hgeol-fil, parsningsfel vid %s: %s\n"
+
+#, python-format
+msgid " %s in %s should not have %s line endings"
+msgstr " %s i %s borde inte ha %s-radslut"
+
+msgid "end-of-line check failed:\n"
+msgstr "radslutskontroll misslyckades:\n"
+
+msgid "the eol extension is incompatible with the win32text extension\n"
+msgstr "eol-utökningen är inkompatibel med win32text-utökningen\n"
#, python-format
msgid "inconsistent newline style in %s\n"
-msgstr ""
+msgstr "inkonsekvent radslutsstil i %s\n"
msgid "command to allow external programs to compare revisions"
msgstr ""
@@ -1888,7 +2138,7 @@
msgstr ""
msgid ""
-"The extdiff extension also allows to configure new diff commands, so\n"
+"The extdiff extension also allows you to configure new diff commands, so\n"
"you do not need to type :hg:`extdiff -p kdiff3` always. ::"
msgstr ""
@@ -1926,6 +2176,7 @@
" $parent1, $plabel1 - filename, descriptive label of first parent\n"
" $child, $clabel - filename, descriptive label of child revision\n"
" $parent2, $plabel2 - filename, descriptive label of second parent\n"
+" $root - repository root\n"
" $parent is an alias for $parent1."
msgstr ""
@@ -2148,6 +2399,9 @@
msgid "%s Note: This key has expired (signed by: \"%s\")\n"
msgstr "%s Notera: Den här nyckenl har gått ut (signerad av: \"%s\")\n"
+msgid "hg sigs"
+msgstr "hg sigs"
+
msgid "list signed changesets"
msgstr "visa signerade ändringar"
@@ -2155,6 +2409,9 @@
msgid "%s:%d node does not exist\n"
msgstr "%s:%d noden existerar inte\n"
+msgid "hg sigcheck REVISION"
+msgstr "hg sigcheck REVISION"
+
msgid "verify all the signatures there may be for a particular revision"
msgstr "verifiera alla signaturerna som finns för en viss revision"
@@ -2162,6 +2419,30 @@
msgid "No valid signature for %s\n"
msgstr "Ingen giltig signatur för %s\n"
+msgid "make the signature local"
+msgstr "gör signaturen lokal"
+
+msgid "sign even if the sigfile is modified"
+msgstr "signera även om signaturfilen är modifierad"
+
+msgid "do not commit the sigfile after signing"
+msgstr "arkivera inte signaturfilen efter signering"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "the key id to sign with"
+msgstr "nyckel-ID att signera med"
+
+msgid "TEXT"
+msgstr "TEXT"
+
+msgid "commit message"
+msgstr "arkiveringsmeddelande"
+
+msgid "hg sign [OPTION]... [REVISION]..."
+msgstr "hg sign [FLAGGA]... [REVISION]..."
+
msgid "add a signature for the current or given revision"
msgstr "lägg till en signatur för den aktuella eller angivna revisionen"
@@ -2180,52 +2461,24 @@
" "
msgid "uncommitted merge - please provide a specific revision"
-msgstr ""
+msgstr "oarkiverad sammanfogning - ange en specifik revision"
#, python-format
msgid "Signing %d:%s\n"
msgstr "Signerar %d:%s\n"
msgid "error while signing"
-msgstr ""
+msgstr "fel vid signering"
msgid ""
"working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
"force)"
msgstr ""
+"arbetskopian av .hgsigs är ändrad (arkivera .hgsigs manuellt eller använd\n"
+"--force)"
msgid "unknown signature version"
-msgstr ""
-
-msgid "make the signature local"
-msgstr ""
-
-msgid "sign even if the sigfile is modified"
-msgstr ""
-
-msgid "do not commit the sigfile after signing"
-msgstr ""
-
-msgid "ID"
-msgstr ""
-
-msgid "the key id to sign with"
-msgstr ""
-
-msgid "TEXT"
-msgstr "TEXT"
-
-msgid "commit message"
-msgstr ""
-
-msgid "hg sign [OPTION]... [REVISION]..."
-msgstr ""
-
-msgid "hg sigcheck REVISION"
-msgstr ""
-
-msgid "hg sigs"
-msgstr ""
+msgstr "okänd signaturversion"
msgid "command to view revision graphs from a shell"
msgstr "kommando för att se revisionsgrafer i ett skal"
@@ -2240,8 +2493,26 @@
"revisionsgrafen.\n"
#, python-format
-msgid "--graph option is incompatible with --%s"
-msgstr "flaggan --graph är inkompatibel med --%s"
+msgid "-G/--graph option is incompatible with --%s"
+msgstr "flaggan -G/--graph är inkompatibel med --%s"
+
+msgid "-G/--graph option is incompatible with --follow with file argument"
+msgstr "flaggan -G/--graph är inkompatibel med --follow med filargument"
+
+msgid "NUM"
+msgstr "NUM"
+
+msgid "limit number of changes displayed"
+msgstr "begränsa antalet visade ändringar"
+
+msgid "show patch"
+msgstr "visa patch"
+
+msgid "show the specified revision or range"
+msgstr "visa den specifika revisionen eller serien"
+
+msgid "hg glog [OPTION]... [FILE]"
+msgstr "hg glog [FLAGGA]... [FIL]"
msgid "show revision history alongside an ASCII revision graph"
msgstr "visa revisionshistorik vid sidan av en ASCII-revisionsgraf"
@@ -2264,21 +2535,6 @@
msgid "show the revision DAG"
msgstr "visa revisionsdiagram"
-msgid "NUM"
-msgstr ""
-
-msgid "limit number of changes displayed"
-msgstr "begränsa antalet visade ändringar"
-
-msgid "show patch"
-msgstr "visa patch"
-
-msgid "show the specified revision or range"
-msgstr "visa den specifika revisionen eller serien"
-
-msgid "hg glog [OPTION]... [FILE]"
-msgstr "hg glog [FLAGGA]... [FIL]"
-
msgid "hooks for integrating with the CIA.vc notification service"
msgstr ""
@@ -2298,7 +2554,7 @@
" # Append a diffstat to the log message (optional)\n"
" #diffstat = False\n"
" # Template to use for log messages (optional)\n"
-" #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
+" #template = {desc}\\n{baseurl}{webroot}/rev/{node}-- {diffstat}\n"
" # Style to use (optional)\n"
" #style = foo\n"
" # The URL of the CIA notification service (optional)\n"
@@ -2307,7 +2563,9 @@
" # Make sure to set email.from if you do this.\n"
" #url = http://cia.vc/\n"
" # print message instead of sending it (optional)\n"
-" #test = False"
+" #test = False\n"
+" # number of slashes to strip for url paths\n"
+" #strip = 0"
msgstr ""
msgid ""
@@ -2720,13 +2978,13 @@
"available templates and filters."
msgstr ""
-msgid "Three additional date template filters are provided::"
-msgstr ""
-
-msgid ""
-" utcdate \"2006/09/18 15:13:13\"\n"
-" svnutcdate \"2006-09-18 15:13:13Z\"\n"
-" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
+msgid "Three additional date template filters are provided:"
+msgstr ""
+
+msgid ""
+":``utcdate``: \"2006/09/18 15:13:13\"\n"
+":``svnutcdate``: \"2006-09-18 15:13:13Z\"\n"
+":``svnisodate``: \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
msgstr ""
msgid ""
@@ -2765,6 +3023,15 @@
msgid "no [keyword] patterns configured"
msgstr ""
+msgid "show default keyword template maps"
+msgstr ""
+
+msgid "read maps from rcfile"
+msgstr ""
+
+msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
+msgstr ""
+
msgid "print [keywordmaps] configuration and an expansion example"
msgstr ""
@@ -2838,6 +3105,9 @@
"\tkeywords expanded\n"
msgstr ""
+msgid "hg kwexpand [OPTION]... [FILE]..."
+msgstr ""
+
msgid "expand keywords in the working directory"
msgstr ""
@@ -2849,6 +3119,18 @@
" "
msgstr ""
+msgid "show keyword status flags of all files"
+msgstr ""
+
+msgid "show files excluded from expansion"
+msgstr ""
+
+msgid "only show unknown (not tracked) files"
+msgstr "visa bara okända (ospårade) filer"
+
+msgid "hg kwfiles [OPTION]... [FILE]..."
+msgstr ""
+
msgid "show files configured for keyword expansion"
msgstr ""
@@ -2881,6 +3163,9 @@
" "
msgstr ""
+msgid "hg kwshrink [OPTION]... [FILE]..."
+msgstr ""
+
msgid "revert expanded keywords in the working directory"
msgstr ""
@@ -2892,33 +3177,6 @@
" "
msgstr ""
-msgid "show default keyword template maps"
-msgstr ""
-
-msgid "read maps from rcfile"
-msgstr ""
-
-msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
-msgstr ""
-
-msgid "hg kwexpand [OPTION]... [FILE]..."
-msgstr ""
-
-msgid "show keyword status flags of all files"
-msgstr ""
-
-msgid "show files excluded from expansion"
-msgstr ""
-
-msgid "only show unknown (not tracked) files"
-msgstr "visa bara okända (ospårade) filer"
-
-msgid "hg kwfiles [OPTION]... [FILE]..."
-msgstr ""
-
-msgid "hg kwshrink [OPTION]... [FILE]..."
-msgstr ""
-
msgid "manage a stack of patches"
msgstr "hantera en uppsättning patchar"
@@ -2999,6 +3257,13 @@
"Du kommer som standard att handera en patchkö vid namn \"patches\". Du\n"
"kan skapa en ny, oberoende patchkö med kommandot :hg:`qqueue`.\n"
+msgid "print first line of patch header"
+msgstr "skriv ut första raden i patchheadern"
+
+#, python-format
+msgid "malformated mq status line: %s\n"
+msgstr "defekt mq-statusrad: %s\n"
+
#, python-format
msgid "mq.git option can be auto/keep/yes/no got %s"
msgstr "mq.git kan vara auto/keep/yes/no men läste %s"
@@ -3035,12 +3300,12 @@
msgstr ""
#, python-format
-msgid "allowing %s - guarded by %r\n"
-msgstr ""
-
-#, python-format
-msgid "skipping %s - guarded by %r\n"
-msgstr ""
+msgid "allowing %s - guarded by %s\n"
+msgstr ""
+
+#, python-format
+msgid "skipping %s - guarded by %s\n"
+msgstr "hoppar över %s - skyddad av %s\n"
#, python-format
msgid "skipping %s - no matching guards\n"
@@ -3102,6 +3367,14 @@
msgstr ""
#, python-format
+msgid "revision %s refers to unknown patches: %s\n"
+msgstr "revision %s refererar till okända patchar: %s\n"
+
+#, python-format
+msgid "unknown patches: %s\n"
+msgstr "okända patchar: %s\n"
+
+#, python-format
msgid "revision %d is not managed"
msgstr ""
@@ -3145,6 +3418,14 @@
msgstr ""
#, python-format
+msgid "patch name cannot begin with \"%s\""
+msgstr ""
+
+#, python-format
+msgid "\"%s\" cannot be used in the name of a patch"
+msgstr ""
+
+#, python-format
msgid "\"%s\" already exists as a directory"
msgstr "\"%s\" finns redan som katalog"
@@ -3186,8 +3467,8 @@
msgstr ""
#, python-format
-msgid "guarded by %r"
-msgstr ""
+msgid "guarded by %s"
+msgstr "skyddad av %s"
msgid "no matching guards"
msgstr ""
@@ -3364,6 +3645,15 @@
msgid "adding %s to series file\n"
msgstr "lägger till %s till seriefilen\n"
+msgid "keep patch file"
+msgstr ""
+
+msgid "stop managing a revision (DEPRECATED)"
+msgstr ""
+
+msgid "hg qdelete [-k] [PATCH]..."
+msgstr "hg qdelete [-k] [PATCH]..."
+
msgid "remove patches from queue"
msgstr ""
@@ -3378,6 +3668,12 @@
" use the :hg:`qfinish` command."
msgstr ""
+msgid "show only the last patch"
+msgstr "visa bara den sista patchen"
+
+msgid "hg qapplied [-1] [-s] [PATCH]"
+msgstr "hg qapplied [-1] [-s] [PATCH]"
+
msgid "print the patches already applied"
msgstr "skriv ut redan applicerade patchar"
@@ -3387,12 +3683,42 @@
msgid "only one patch applied\n"
msgstr "bara en patch applicerad\n"
+msgid "show only the first patch"
+msgstr "visa bara den första patchen"
+
+msgid "hg qunapplied [-1] [-s] [PATCH]"
+msgstr "hg qunapplied [-1] [-s] [PATCH]"
+
msgid "print the patches not yet applied"
msgstr "skriv ut oapplicerade patchar"
msgid "all patches applied\n"
msgstr "alla patchar applicerade\n"
+msgid "import file in patch directory"
+msgstr ""
+
+msgid "NAME"
+msgstr "NAMN"
+
+msgid "name of patch file"
+msgstr ""
+
+msgid "overwrite existing files"
+msgstr ""
+
+msgid "place existing revisions under mq control"
+msgstr ""
+
+msgid "use git extended diff format"
+msgstr "använd gits utökade diff-format"
+
+msgid "qpush after importing"
+msgstr ""
+
+msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
+msgstr "hg qimport [-e] [-n NAMN] [-f] [-g] [-P] [-r REV]... FIL..."
+
msgid "import a patch"
msgstr "importera en patch"
@@ -3423,7 +3749,7 @@
" With -g/--git, patches imported with --rev will use the git diff\n"
" format. See the diffs help topic for information on why this is\n"
" important for preserving rename/copy information and permission\n"
-" changes."
+" changes. Use :hg:`qfinish` to remove changesets from mq control."
msgstr ""
msgid ""
@@ -3445,6 +3771,12 @@
" Returnerar 0 om importeringen lyckades.\n"
" "
+msgid "create queue repository"
+msgstr "skapa köarkiv"
+
+msgid "hg qinit [-c]"
+msgstr "hg qinit [-c]"
+
msgid "init a new queue repository (DEPRECATED)"
msgstr ""
@@ -3461,6 +3793,24 @@
" commands. With -c, use :hg:`init --mq` instead."
msgstr ""
+msgid "use pull protocol to copy metadata"
+msgstr "använd pull-protokollet för att kopiera metadata"
+
+msgid "do not update the new working directories"
+msgstr "uppdatera inte de nya arbetskatalogerna"
+
+msgid "use uncompressed transfer (fast over LAN)"
+msgstr "använd okomprimerad överföring (snabbt över LAN)"
+
+msgid "REPO"
+msgstr "ARKIV"
+
+msgid "location of source patch repository"
+msgstr ""
+
+msgid "hg qclone [OPTION]... SOURCE [DEST]"
+msgstr ""
+
msgid "clone main and patch repository at same time"
msgstr ""
@@ -3504,6 +3854,9 @@
msgid "updating destination repository\n"
msgstr ""
+msgid "hg qcommit [OPTION]... [FILE]..."
+msgstr ""
+
msgid "commit changes in the queue repository (DEPRECATED)"
msgstr "arkivera ändringar i köarkivet (FÖRÅLDRAD)"
@@ -3511,18 +3864,54 @@
msgstr ""
" Detta är ett föråldrat kommando; använd :hg:`commit --mq` istället."
+msgid "print patches not in series"
+msgstr ""
+
+msgid "hg qseries [-ms]"
+msgstr ""
+
msgid "print the entire series file"
msgstr ""
+msgid "hg qtop [-s]"
+msgstr "hg qtop [-s]"
+
msgid "print the name of the current patch"
msgstr ""
+msgid "hg qnext [-s]"
+msgstr "hg qnext [-s]"
+
msgid "print the name of the next patch"
msgstr ""
+msgid "hg qprev [-s]"
+msgstr "hg qprev [-s]"
+
msgid "print the name of the previous patch"
msgstr ""
+msgid "import uncommitted changes (DEPRECATED)"
+msgstr "importera icke arkiverade ändringar (FÖRLEGAD)"
+
+msgid "add \"From: <current user>\" to patch"
+msgstr ""
+
+msgid "USER"
+msgstr ""
+
+msgid "add \"From: <USER>\" to patch"
+msgstr ""
+
+msgid "add \"Date: <current date>\" to patch"
+msgstr ""
+
+msgid "add \"Date: <DATE>\" to patch"
+msgstr ""
+
+msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
+msgstr "hg qnew [-e] [-m TEXT] [-l FIL] PATCH [FIL]..."
+
msgid "create a new patch"
msgstr ""
@@ -3561,6 +3950,24 @@
" Returnerar 0 om en patch skapades.\n"
" "
+msgid "refresh only files already in the patch and specified files"
+msgstr ""
+
+msgid "add/update author field in patch with current user"
+msgstr ""
+
+msgid "add/update author field in patch with given user"
+msgstr ""
+
+msgid "add/update date field in patch with current date"
+msgstr ""
+
+msgid "add/update date field in patch with given date"
+msgstr ""
+
+msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
+msgstr ""
+
msgid "update the current patch"
msgstr "uppdatera den nuvarande patchen"
@@ -3593,6 +4000,9 @@
msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
msgstr ""
+msgid "hg qdiff [OPTION]... [FILE]..."
+msgstr ""
+
msgid "diff of the current patch and subsequent modifications"
msgstr ""
@@ -3610,6 +4020,15 @@
" qrefresh."
msgstr ""
+msgid "edit patch header"
+msgstr ""
+
+msgid "keep folded patch files"
+msgstr ""
+
+msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
+msgstr "hg qfold [-e] [-k] [-m TEXT] [-l FIL] PATCH..."
+
msgid "fold the named patches into the current patch"
msgstr ""
@@ -3642,9 +4061,24 @@
msgid "error folding patch %s"
msgstr ""
+msgid "overwrite any local changes"
+msgstr ""
+
+msgid "hg qgoto [OPTION]... PATCH"
+msgstr ""
+
msgid "push or pop patches until named patch is at top of stack"
msgstr ""
+msgid "list all patches and guards"
+msgstr ""
+
+msgid "drop all guards"
+msgstr ""
+
+msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
+msgstr ""
+
msgid "set or print guards for a patch"
msgstr ""
@@ -3683,9 +4117,36 @@
msgid "no patch named %s"
msgstr ""
+msgid "hg qheader [PATCH]"
+msgstr "hg qheader [PATCH]"
+
msgid "print the header of the topmost or specified patch"
msgstr ""
+msgid "apply on top of local changes"
+msgstr ""
+
+msgid "apply the target patch to its recorded parent"
+msgstr "applicera patchen på dess angivna förälder"
+
+msgid "list patch name in commit text"
+msgstr ""
+
+msgid "apply all patches"
+msgstr ""
+
+msgid "merge from another queue (DEPRECATED)"
+msgstr ""
+
+msgid "merge queue name (DEPRECATED)"
+msgstr ""
+
+msgid "reorder patch series and apply only the patch"
+msgstr "omordna patchserien och applicera bara patchen"
+
+msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
+msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
+
msgid "push the next patch onto the stack"
msgstr ""
@@ -3694,13 +4155,6 @@
" will be lost."
msgstr ""
-msgid ""
-" Return 0 on succces.\n"
-" "
-msgstr ""
-" Returnerar 0 om kommandot lyckades.\n"
-" "
-
msgid "no saved queues found, please use -n\n"
msgstr ""
@@ -3708,6 +4162,18 @@
msgid "merging with queue at: %s\n"
msgstr ""
+msgid "pop all patches"
+msgstr ""
+
+msgid "queue name to pop (DEPRECATED)"
+msgstr ""
+
+msgid "forget any local changes to patched files"
+msgstr ""
+
+msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
+msgstr "hg qpop [-a] [-f] [PATCH | INDEX]"
+
msgid "pop the current patch off the stack"
msgstr ""
@@ -3721,6 +4187,9 @@
msgid "using patch queue: %s\n"
msgstr ""
+msgid "hg qrename PATCH1 [PATCH2]"
+msgstr ""
+
msgid "rename a patch"
msgstr ""
@@ -3729,12 +4198,13 @@
" With two arguments, renames PATCH1 to PATCH2."
msgstr ""
-#, python-format
-msgid "%s already exists"
-msgstr ""
-
-#, python-format
-msgid "A patch named %s already exists in the series file"
+msgid "delete save entry"
+msgstr ""
+
+msgid "update queue working directory"
+msgstr ""
+
+msgid "hg qrestore [-d] [-u] REV"
msgstr ""
msgid "restore the queue state saved by a revision (DEPRECATED)"
@@ -3743,6 +4213,21 @@
msgid " This command is deprecated, use :hg:`rebase` instead."
msgstr " Detta är ett förlegat kommando; använd :hg:`rebase` istället."
+msgid "copy patch directory"
+msgstr ""
+
+msgid "copy directory name"
+msgstr ""
+
+msgid "clear queue status file"
+msgstr ""
+
+msgid "force copy"
+msgstr ""
+
+msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
+msgstr ""
+
msgid "save current queue state (DEPRECATED)"
msgstr ""
@@ -3758,13 +4243,37 @@
msgid "copy %s to %s\n"
msgstr ""
+msgid "force removal of changesets, discard uncommitted changes (no backup)"
+msgstr ""
+"tvinga radering av ändringar, kassera oarkiverade ändringar (ingen backup)"
+
+msgid ""
+"bundle only changesets with local revision number greater than REV which are "
+"not descendants of REV (DEPRECATED)"
+msgstr ""
+"bunta bara ändringar med lokala revisionsnummer större än REV som inte är "
+"ättling till REV (FÖRLEGAD)"
+
+msgid "no backups"
+msgstr "inga säkerhetskopior"
+
+msgid "no backups (DEPRECATED)"
+msgstr "inga säkerhetskopior (FÖRÅLDRAD)"
+
+msgid "do not modify working copy during strip"
+msgstr "modifiera inte arbetskopian vid strippning"
+
+msgid "hg strip [-k] [-f] [-n] REV..."
+msgstr "hg strip [-k] [-f] [-n] REV..."
+
msgid "strip changesets and all their descendants from the repository"
msgstr ""
msgid ""
" The strip command removes the specified changesets and all their\n"
-" descendants. If the working directory has uncommitted changes,\n"
-" the operation is aborted unless the --force flag is supplied."
+" descendants. If the working directory has uncommitted changes, the\n"
+" operation is aborted unless the --force flag is supplied, in which\n"
+" case changes will be discarded."
msgstr ""
msgid ""
@@ -3791,6 +4300,21 @@
msgid "empty revision set"
msgstr "tomt revisionsset"
+msgid "disable all guards"
+msgstr ""
+
+msgid "list all guards in series file"
+msgstr ""
+
+msgid "pop to before first guarded applied patch"
+msgstr ""
+
+msgid "pop, then reapply patches"
+msgstr ""
+
+msgid "hg qselect [OPTION]... [GUARD]..."
+msgstr ""
+
msgid "set or print guarded patches to push"
msgstr ""
@@ -3803,8 +4327,8 @@
msgstr ""
msgid ""
-" qguard foo.patch -stable (negative guard)\n"
-" qguard bar.patch +stable (positive guard)\n"
+" qguard foo.patch -- -stable (negative guard)\n"
+" qguard bar.patch +stable (positive guard)\n"
" qselect stable"
msgstr ""
@@ -3867,6 +4391,12 @@
msgid "reapplying unguarded patches\n"
msgstr ""
+msgid "finish all applied changesets"
+msgstr ""
+
+msgid "hg qfinish [-a] [REV]..."
+msgstr "hg qfinish [-a] [REV]..."
+
msgid "move applied patches into repository history"
msgstr ""
@@ -3892,6 +4422,24 @@
msgid "no revisions specified"
msgstr ""
+msgid "list all available queues"
+msgstr "visa alla tillgängliga köer"
+
+msgid "create new queue"
+msgstr "skapa ny kö"
+
+msgid "rename active queue"
+msgstr "döp om aktiv kö"
+
+msgid "delete reference to queue"
+msgstr ""
+
+msgid "delete queue, and remove patch dir"
+msgstr ""
+
+msgid "[OPTION] [QUEUE]"
+msgstr "[FLAGGA] [KÖ]"
+
msgid "manage multiple patch queues"
msgstr ""
@@ -3988,296 +4536,19 @@
msgid "mq: (empty queue)\n"
msgstr "mq: (tom kö)\n"
+msgid ""
+"``mq()``\n"
+" Changesets managed by MQ."
+msgstr ""
+"``mq()``\n"
+" Ändringar hanterade av MQ."
+
+msgid "mq takes no arguments"
+msgstr "mq tar inga argument"
+
msgid "operate on patch repository"
msgstr "arbeta med patcharkiv"
-msgid "print first line of patch header"
-msgstr "skriv ut första raden i patchheadern"
-
-msgid "show only the last patch"
-msgstr "visa bara den sista patchen"
-
-msgid "hg qapplied [-1] [-s] [PATCH]"
-msgstr "hg qapplied [-1] [-s] [PATCH]"
-
-msgid "use pull protocol to copy metadata"
-msgstr "använd pull-protokollet för att kopiera metadata"
-
-msgid "do not update the new working directories"
-msgstr "uppdatera inte de nya arbetskatalogerna"
-
-msgid "use uncompressed transfer (fast over LAN)"
-msgstr "använd okomprimerad överföring (snabbt över LAN)"
-
-msgid "REPO"
-msgstr "ARKIV"
-
-msgid "location of source patch repository"
-msgstr ""
-
-msgid "hg qclone [OPTION]... SOURCE [DEST]"
-msgstr ""
-
-msgid "hg qcommit [OPTION]... [FILE]..."
-msgstr ""
-
-msgid "hg qdiff [OPTION]... [FILE]..."
-msgstr ""
-
-msgid "keep patch file"
-msgstr ""
-
-msgid "stop managing a revision (DEPRECATED)"
-msgstr ""
-
-msgid "hg qdelete [-k] [PATCH]..."
-msgstr "hg qdelete [-k] [PATCH]..."
-
-msgid "edit patch header"
-msgstr ""
-
-msgid "keep folded patch files"
-msgstr ""
-
-msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
-msgstr "hg qfold [-e] [-k] [-m TEXT] [-l FIL] PATCH..."
-
-msgid "overwrite any local changes"
-msgstr ""
-
-msgid "hg qgoto [OPTION]... PATCH"
-msgstr ""
-
-msgid "list all patches and guards"
-msgstr ""
-
-msgid "drop all guards"
-msgstr ""
-
-msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
-msgstr ""
-
-msgid "hg qheader [PATCH]"
-msgstr "hg qheader [PATCH]"
-
-msgid "import file in patch directory"
-msgstr ""
-
-msgid "NAME"
-msgstr "NAMN"
-
-msgid "name of patch file"
-msgstr ""
-
-msgid "overwrite existing files"
-msgstr ""
-
-msgid "place existing revisions under mq control"
-msgstr ""
-
-msgid "use git extended diff format"
-msgstr "använd gits utökade diff-format"
-
-msgid "qpush after importing"
-msgstr ""
-
-msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
-msgstr "hg qimport [-e] [-n NAMN] [-f] [-g] [-P] [-r REV]... FIL..."
-
-msgid "create queue repository"
-msgstr ""
-
-msgid "hg qinit [-c]"
-msgstr "hg qinit [-c]"
-
-msgid "import uncommitted changes (DEPRECATED)"
-msgstr "importera icke arkiverade ändringar (FÖRLEGAD)"
-
-msgid "add \"From: <current user>\" to patch"
-msgstr ""
-
-msgid "USER"
-msgstr ""
-
-msgid "add \"From: <USER>\" to patch"
-msgstr ""
-
-msgid "add \"Date: <current date>\" to patch"
-msgstr ""
-
-msgid "add \"Date: <DATE>\" to patch"
-msgstr ""
-
-msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
-msgstr "hg qnew [-e] [-m TEXT] [-l FIL] PATCH [FIL]..."
-
-msgid "hg qnext [-s]"
-msgstr "hg qnext [-s]"
-
-msgid "hg qprev [-s]"
-msgstr "hg qprev [-s]"
-
-msgid "pop all patches"
-msgstr ""
-
-msgid "queue name to pop (DEPRECATED)"
-msgstr ""
-
-msgid "forget any local changes to patched files"
-msgstr ""
-
-msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
-msgstr "hg qpop [-a] [-f] [PATCH | INDEX]"
-
-msgid "apply on top of local changes"
-msgstr ""
-
-msgid "apply the target patch to its recorded parent"
-msgstr "applicera patchen på dess angivna förälder"
-
-msgid "list patch name in commit text"
-msgstr ""
-
-msgid "apply all patches"
-msgstr ""
-
-msgid "merge from another queue (DEPRECATED)"
-msgstr ""
-
-msgid "merge queue name (DEPRECATED)"
-msgstr ""
-
-msgid "reorder patch series and apply only the patch"
-msgstr "omordna patchserien och applicera bara patchen"
-
-msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
-msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
-
-msgid "refresh only files already in the patch and specified files"
-msgstr ""
-
-msgid "add/update author field in patch with current user"
-msgstr ""
-
-msgid "add/update author field in patch with given user"
-msgstr ""
-
-msgid "add/update date field in patch with current date"
-msgstr ""
-
-msgid "add/update date field in patch with given date"
-msgstr ""
-
-msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
-msgstr ""
-
-msgid "hg qrename PATCH1 [PATCH2]"
-msgstr ""
-
-msgid "delete save entry"
-msgstr ""
-
-msgid "update queue working directory"
-msgstr ""
-
-msgid "hg qrestore [-d] [-u] REV"
-msgstr ""
-
-msgid "copy patch directory"
-msgstr ""
-
-msgid "copy directory name"
-msgstr ""
-
-msgid "clear queue status file"
-msgstr ""
-
-msgid "force copy"
-msgstr ""
-
-msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
-msgstr ""
-
-msgid "disable all guards"
-msgstr ""
-
-msgid "list all guards in series file"
-msgstr ""
-
-msgid "pop to before first guarded applied patch"
-msgstr ""
-
-msgid "pop, then reapply patches"
-msgstr ""
-
-msgid "hg qselect [OPTION]... [GUARD]..."
-msgstr ""
-
-msgid "print patches not in series"
-msgstr ""
-
-msgid "hg qseries [-ms]"
-msgstr ""
-
-msgid ""
-"force removal of changesets even if the working directory has uncommitted "
-"changes"
-msgstr ""
-"tvinga borttagning av ändringar även om arbetskatalogen har oarkiverade "
-"ändringar"
-
-msgid ""
-"bundle only changesets with local revision number greater than REV which are "
-"not descendants of REV (DEPRECATED)"
-msgstr ""
-"bunta bara ändringar med lokala revisionsnummer större än REV som inte är "
-"ättling till REV (FÖRLEGAD)"
-
-msgid "no backups"
-msgstr "inga säkerhetskopior"
-
-msgid "no backups (DEPRECATED)"
-msgstr "inga säkerhetskopior (FÖRÅLDRAD)"
-
-msgid "do not modify working copy during strip"
-msgstr "modifiera inte arbetskopian vid strippning"
-
-msgid "hg strip [-k] [-f] [-n] REV..."
-msgstr "hg strip [-k] [-f] [-n] REV..."
-
-msgid "hg qtop [-s]"
-msgstr "hg qtop [-s]"
-
-msgid "show only the first patch"
-msgstr "visa bara den första patchen"
-
-msgid "hg qunapplied [-1] [-s] [PATCH]"
-msgstr "hg qunapplied [-1] [-s] [PATCH]"
-
-msgid "finish all applied changesets"
-msgstr ""
-
-msgid "hg qfinish [-a] [REV]..."
-msgstr "hg qfinish [-a] [REV]..."
-
-msgid "list all available queues"
-msgstr "visa alla tillgängliga köer"
-
-msgid "create new queue"
-msgstr "skapa ny kö"
-
-msgid "rename active queue"
-msgstr "döp om aktiv kö"
-
-msgid "delete reference to queue"
-msgstr ""
-
-msgid "delete queue, and remove patch dir"
-msgstr ""
-
-msgid "[OPTION] [QUEUE]"
-msgstr "[FLAGGA] [KÖ]"
-
msgid "hooks for sending email notifications at commit/push time"
msgstr ""
@@ -4301,7 +4572,9 @@
" # one email for each incoming changeset\n"
" incoming.notify = python:hgext.notify.hook\n"
" # batch emails when many changesets incoming at one time\n"
-" changegroup.notify = python:hgext.notify.hook"
+" changegroup.notify = python:hgext.notify.hook\n"
+" # batch emails when many changesets outgoing at one time (client side)\n"
+" outgoing.notify = python:hgext.notify.hook"
msgstr ""
msgid ""
@@ -4325,7 +4598,8 @@
" style = ... # style file to use when formatting email\n"
" template = ... # template to use when formatting email\n"
" incoming = ... # template to use when run as incoming hook\n"
-" changegroup = ... # template when run as changegroup hook\n"
+" outgoing = ... # template to use when run as outgoing hook\n"
+" changegroup = ... # template to use when run as changegroup hook\n"
" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
" maxsubject = 67 # truncate subject line longer than this\n"
" diffstat = True # add a diffstat before the diff content\n"
@@ -4468,32 +4742,6 @@
msgid "when to paginate (boolean, always, auto, or never)"
msgstr "när paginering ska ske (boolean, always, auto eller never)"
-msgid "interpret suffixes to refer to ancestor revisions"
-msgstr ""
-
-msgid ""
-"This extension allows you to use git-style suffixes to refer to the\n"
-"ancestors of a specific revision."
-msgstr ""
-
-msgid "For example, if you can refer to a revision as \"foo\", then::"
-msgstr ""
-
-msgid ""
-" foo^N = Nth parent of foo\n"
-" foo^0 = foo\n"
-" foo^1 = first parent of foo\n"
-" foo^2 = second parent of foo\n"
-" foo^ = foo^1"
-msgstr ""
-
-msgid ""
-" foo~N = Nth first grandparent of foo\n"
-" foo~0 = foo\n"
-" foo~1 = foo^1 = foo^ = first parent of foo\n"
-" foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
-msgstr ""
-
msgid "command to send changesets as (a series of) patch emails"
msgstr "kommando för att sända ändringar som (en uppsättning) mail"
@@ -4532,11 +4780,11 @@
"trådade mail- och news-läsare, och i mailarkiv."
msgid ""
-"To configure other defaults, add a section like this to your hgrc\n"
-"file::"
+"To configure other defaults, add a section like this to your\n"
+"configuration file::"
msgstr ""
"För att konfigurera andra inställningar, lägg till en sådan här sektion\n"
-"till din hgrc-fil::"
+"till din konfigurationsfil::"
msgid ""
" [email]\n"
@@ -4586,6 +4834,81 @@
msgid "Please enter a valid value.\n"
msgstr "Ange ett giltigt värde.\n"
+msgid "send patches as attachments"
+msgstr ""
+
+msgid "send patches as inline attachments"
+msgstr ""
+
+msgid "email addresses of blind carbon copy recipients"
+msgstr ""
+
+msgid "email addresses of copy recipients"
+msgstr ""
+
+msgid "ask for confirmation before sending"
+msgstr "bekräfta innan sändning"
+
+msgid "add diffstat output to messages"
+msgstr ""
+
+msgid "use the given date as the sending date"
+msgstr ""
+
+msgid "use the given file as the series description"
+msgstr ""
+
+msgid "email address of sender"
+msgstr ""
+
+msgid "print messages that would be sent"
+msgstr ""
+
+msgid "write messages to mbox file instead of sending them"
+msgstr ""
+
+msgid "email addresses replies should be sent to"
+msgstr "emailadresser som svar ska skickas till"
+
+msgid "subject of first message (intro or single patch)"
+msgstr ""
+
+msgid "message identifier to reply to"
+msgstr ""
+
+msgid "flags to add in subject prefixes"
+msgstr ""
+
+msgid "email addresses of recipients"
+msgstr ""
+
+msgid "omit hg patch header"
+msgstr ""
+
+msgid "send changes not found in the target repository"
+msgstr ""
+
+msgid "send changes not in target as a binary bundle"
+msgstr ""
+
+msgid "name of the bundle attachment file"
+msgstr ""
+
+msgid "a revision to send"
+msgstr ""
+
+msgid "run even when remote repository is unrelated (with -b/--bundle)"
+msgstr ""
+
+msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
+msgstr ""
+
+msgid "send an introduction email for a single patch"
+msgstr ""
+
+msgid "hg email [OPTION]... [DEST]..."
+msgstr "hg email [FLAGGA]... [DEST]..."
+
msgid "send changesets by email"
msgstr "sänd ändringar via email"
@@ -4765,81 +5088,6 @@
msgid "sending"
msgstr "sänder"
-msgid "send patches as attachments"
-msgstr ""
-
-msgid "send patches as inline attachments"
-msgstr ""
-
-msgid "email addresses of blind carbon copy recipients"
-msgstr ""
-
-msgid "email addresses of copy recipients"
-msgstr ""
-
-msgid "ask for confirmation before sending"
-msgstr "bekräfta innan sändning"
-
-msgid "add diffstat output to messages"
-msgstr ""
-
-msgid "use the given date as the sending date"
-msgstr ""
-
-msgid "use the given file as the series description"
-msgstr ""
-
-msgid "email address of sender"
-msgstr ""
-
-msgid "print messages that would be sent"
-msgstr ""
-
-msgid "write messages to mbox file instead of sending them"
-msgstr ""
-
-msgid "email addresses replies should be sent to"
-msgstr "emailadresser som svar ska skickas till"
-
-msgid "subject of first message (intro or single patch)"
-msgstr ""
-
-msgid "message identifier to reply to"
-msgstr ""
-
-msgid "flags to add in subject prefixes"
-msgstr ""
-
-msgid "email addresses of recipients"
-msgstr ""
-
-msgid "omit hg patch header"
-msgstr ""
-
-msgid "send changes not found in the target repository"
-msgstr ""
-
-msgid "send changes not in target as a binary bundle"
-msgstr ""
-
-msgid "name of the bundle attachment file"
-msgstr ""
-
-msgid "a revision to send"
-msgstr ""
-
-msgid "run even when remote repository is unrelated (with -b/--bundle)"
-msgstr ""
-
-msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
-msgstr ""
-
-msgid "send an introduction email for a single patch"
-msgstr ""
-
-msgid "hg email [OPTION]... [DEST]..."
-msgstr "hg email [FLAGGA]... [DEST]..."
-
msgid "show progress bars for some actions"
msgstr ""
@@ -4868,9 +5116,9 @@
msgid ""
"Valid entries for the format field are topic, bar, number, unit,\n"
-"estimate, and item. item defaults to the last 20 characters of the\n"
-"item, but this can be changed by adding either ``-<num>`` which would\n"
-"take the last num characters, or ``+<num>`` for the first num\n"
+"estimate, speed, and item. item defaults to the last 20 characters of\n"
+"the item, but this can be changed by adding either ``-<num>`` which\n"
+"would take the last num characters, or ``+<num>`` for the first num\n"
"characters.\n"
msgstr ""
@@ -4904,9 +5152,28 @@
msgid "%dy%02dw"
msgstr "%då%02dv"
+#, python-format
+msgid "%d %s/sec"
+msgstr "%d %s/sek"
+
msgid "command to delete untracked files from the working directory"
msgstr ""
+msgid "abort if an error occurs"
+msgstr ""
+
+msgid "purge ignored files too"
+msgstr ""
+
+msgid "print filenames instead of deleting them"
+msgstr ""
+
+msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
+msgstr ""
+
+msgid "hg purge [OPTION]... [DIR]..."
+msgstr ""
+
msgid "removes files not tracked by Mercurial"
msgstr ""
@@ -4962,21 +5229,6 @@
msgid "Removing directory %s\n"
msgstr ""
-msgid "abort if an error occurs"
-msgstr ""
-
-msgid "purge ignored files too"
-msgstr ""
-
-msgid "print filenames instead of deleting them"
-msgstr ""
-
-msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
-msgstr ""
-
-msgid "hg purge [OPTION]... [DIR]..."
-msgstr ""
-
msgid "command to move sets of revisions to a different ancestor"
msgstr ""
@@ -4990,6 +5242,49 @@
"http://mercurial.selenic.com/wiki/RebaseExtension\n"
msgstr ""
+msgid "rebase from the specified changeset"
+msgstr ""
+
+msgid ""
+"rebase from the base of the specified changeset (up to greatest common "
+"ancestor of base and dest)"
+msgstr ""
+
+msgid "rebase onto the specified changeset"
+msgstr ""
+
+msgid "collapse the rebased changesets"
+msgstr ""
+
+msgid "use text as collapse commit message"
+msgstr "använd text som kollapsarkiveringsmeddelande"
+
+msgid "read collapse commit message from file"
+msgstr "läs kollapsarkiveringsmeddelandet från fil"
+
+msgid "keep original changesets"
+msgstr ""
+
+msgid "keep original branch names"
+msgstr ""
+
+msgid "force detaching of source from its original branch"
+msgstr ""
+
+msgid "specify merge tool"
+msgstr "ange sammanfogningsverktyg"
+
+msgid "continue an interrupted rebase"
+msgstr ""
+
+msgid "abort an interrupted rebase"
+msgstr ""
+
+msgid ""
+"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
+"hg rebase {-a|-c}"
+msgstr ""
+
msgid "move changeset (and descendants) to a different branch"
msgstr ""
@@ -5055,6 +5350,9 @@
" "
msgstr ""
+msgid "message can only be specified with collapse"
+msgstr ""
+
msgid "cannot use both abort and continue"
msgstr ""
@@ -5067,6 +5365,9 @@
msgid "abort and continue do not allow specifying revisions"
msgstr ""
+msgid "tool option will be ignored\n"
+msgstr ""
+
msgid "cannot specify both a revision and a base"
msgstr ""
@@ -5079,9 +5380,6 @@
msgid "nothing to rebase\n"
msgstr ""
-msgid "cannot use both keepbranches and extrafn"
-msgstr ""
-
msgid "rebasing"
msgstr ""
@@ -5133,46 +5431,27 @@
msgid "source is descendant of destination"
msgstr ""
+msgid "--tool can only be used with --rebase"
+msgstr ""
+
msgid "rebase working directory to branch head"
msgstr ""
-msgid "rebase from the specified changeset"
-msgstr ""
-
-msgid ""
-"rebase from the base of the specified changeset (up to greatest common "
-"ancestor of base and dest)"
-msgstr ""
-
-msgid "rebase onto the specified changeset"
-msgstr ""
-
-msgid "collapse the rebased changesets"
-msgstr ""
-
-msgid "keep original changesets"
-msgstr ""
-
-msgid "keep original branch names"
-msgstr ""
-
-msgid "force detaching of source from its original branch"
-msgstr ""
-
-msgid "continue an interrupted rebase"
-msgstr ""
-
-msgid "abort an interrupted rebase"
-msgstr ""
-
-msgid ""
-"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
-"hg rebase {-a|-c}"
-msgstr ""
+msgid "specify merge tool for rebase"
+msgstr "ange sammanfogningsverktyg för ombasering"
msgid "commands to interactively select changes for commit/qrefresh"
msgstr ""
+msgid "ignore white space when comparing lines"
+msgstr "ignorera blanktecken när rader jämförs"
+
+msgid "ignore changes in the amount of white space"
+msgstr "ignorera ändringar av antalet blanktecken"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "ignorera ändringar vars rader är tomma"
+
msgid "this modifies a binary file (all or nothing)\n"
msgstr ""
@@ -5228,6 +5507,9 @@
msgid "record change %d/%d to %r?"
msgstr ""
+msgid "hg record [OPTION]... [FILE]..."
+msgstr "hg record [FLAGGA]... [FIL]..."
+
msgid "interactively select changes to commit"
msgstr ""
@@ -5267,10 +5549,23 @@
msgid " This command is not available when committing a merge."
msgstr ""
+msgid "interactively record a new patch"
+msgstr ""
+
+msgid ""
+" See :hg:`help qnew` & :hg:`help record` for more information and\n"
+" usage.\n"
+" "
+msgstr ""
+" Se :hg:`help qnew` & :hg:`help record` för mer information och\n"
+" användning.\n"
+" "
+
msgid "'mq' extension not loaded"
msgstr ""
-msgid "running non-interactively, use commit instead"
+#, python-format
+msgid "running non-interactively, use %s instead"
msgstr ""
msgid "cannot partially commit a merge (use \"hg commit\" instead)"
@@ -5280,12 +5575,12 @@
msgid "no changes to record\n"
msgstr ""
-msgid "hg record [OPTION]... [FILE]..."
-msgstr ""
-
msgid "hg qrecord [OPTION]... PATCH [FILE]..."
msgstr ""
+msgid "interactively select changes to refresh"
+msgstr ""
+
msgid "recreates hardlinks between repository clones"
msgstr ""
@@ -5330,9 +5625,15 @@
msgid "hardlinks are not supported on this system"
msgstr "hårda länkar stöds inte av detta system"
+msgid "must specify local origin repository"
+msgstr "måste ange lokalt utgångsarkiv"
+
#, python-format
msgid "relinking %s to %s\n"
-msgstr ""
+msgstr "länkar om %s till %s\n"
+
+msgid "there is nothing to relink\n"
+msgstr "det finns inget att länka om\n"
#, python-format
msgid "tip has %d files, estimated total number of files: %s\n"
@@ -5351,10 +5652,6 @@
msgid "source and destination are on different devices"
msgstr ""
-#, python-format
-msgid "not linkable: %s\n"
-msgstr "inte länkbar: %s\n"
-
msgid "pruning"
msgstr "putsar"
@@ -5366,7 +5663,7 @@
msgstr "länkar om"
#, python-format
-msgid "relinked %d files (%d bytes reclaimed)\n"
+msgid "relinked %d files (%s reclaimed)\n"
msgstr ""
msgid "[ORIGIN]"
@@ -5426,6 +5723,10 @@
"same name.\n"
msgstr ""
+#, python-format
+msgid "custom scheme %s:// conflicts with drive letter %s:\\\n"
+msgstr ""
+
msgid "share a common history between several working directories"
msgstr ""
@@ -5515,6 +5816,9 @@
msgid "commit failed"
msgstr ""
+msgid "filter corrupted changeset (no user or date)"
+msgstr ""
+
msgid ""
"y: transplant this changeset\n"
"n: skip this changeset\n"
@@ -5538,13 +5842,50 @@
msgid "no such option\n"
msgstr "inget sådant alternativ\n"
+msgid "pull patches from REPO"
+msgstr ""
+
+msgid "BRANCH"
+msgstr "GREN"
+
+msgid "pull patches from branch BRANCH"
+msgstr ""
+
+msgid "pull all changesets up to BRANCH"
+msgstr ""
+
+msgid "skip over REV"
+msgstr ""
+
+msgid "merge at REV"
+msgstr ""
+
+msgid "append transplant info to log message"
+msgstr ""
+
+msgid "continue last transplant session after repair"
+msgstr ""
+
+msgid "filter changesets through command"
+msgstr ""
+
+msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
+msgstr ""
+
msgid "transplant changesets from another branch"
msgstr ""
msgid ""
" Selected changesets will be applied on top of the current working\n"
-" directory with the log of the original changeset. If --log is\n"
-" specified, log messages will have a comment appended of the form::"
+" directory with the log of the original changeset. The changesets\n"
+" are copied and will thus appear twice in the history. Use the\n"
+" rebase extension instead if you want to move a whole branch of\n"
+" unpublished changesets."
+msgstr ""
+
+msgid ""
+" If --log is specified, log messages will have a comment appended\n"
+" of the form::"
msgstr ""
msgid " (transplanted from CHANGESETHASH)"
@@ -5566,9 +5907,9 @@
msgstr ""
msgid ""
-" :hg:`transplant --branch REVISION --all` will rebase the selected\n"
-" branch (up to the named revision) onto your current working\n"
-" directory."
+" :hg:`transplant --branch REVISION --all` will transplant the\n"
+" selected branch (up to the named revision) onto your current\n"
+" working directory."
msgstr ""
msgid ""
@@ -5612,38 +5953,13 @@
msgstr ""
msgid ""
-"``transplanted(set)``\n"
-" Transplanted changesets in set."
-msgstr ""
-
-msgid "pull patches from REPO"
-msgstr ""
-
-msgid "BRANCH"
-msgstr "GREN"
-
-msgid "pull patches from branch BRANCH"
-msgstr ""
-
-msgid "pull all changesets up to BRANCH"
-msgstr ""
-
-msgid "skip over REV"
-msgstr ""
-
-msgid "merge at REV"
-msgstr ""
-
-msgid "append transplant info to log message"
-msgstr ""
-
-msgid "continue last transplant session after repair"
-msgstr ""
-
-msgid "filter changesets through command"
-msgstr ""
-
-msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
+"``transplanted([set])``\n"
+" Transplanted changesets in set, or all transplanted changesets."
+msgstr ""
+
+msgid ""
+":transplanted: String. The node identifier of the transplanted\n"
+" changeset if any."
msgstr ""
msgid "allow the use of MBCS paths with problematic encodings"
@@ -5852,15 +6168,24 @@
msgid "bookmark '%s' contains illegal character"
msgstr "bokmärket '%s' innehåller ogiltiga tecken"
+#, python-format
+msgid "branch %s not found"
+msgstr "grenen %s hittades inte"
+
+#, python-format
+msgid "updating bookmark %s\n"
+msgstr "uppdaterar bokmärket %s\n"
+
+#, python-format
+msgid "not updating divergent bookmark %s\n"
+msgstr "uppdaterar inte divergent bokmärke %s\n"
+
msgid "searching for changed bookmarks\n"
msgstr "söker efter ändrade bokmärken\n"
msgid "no changed bookmarks found\n"
msgstr "inga ändrade bokmärken hittades\n"
-msgid "invalid changegroup"
-msgstr ""
-
msgid "unknown parent"
msgstr ""
@@ -5916,22 +6241,21 @@
msgid "invalid format spec '%%%s' in output filename"
msgstr ""
-#, python-format
-msgid "adding %s\n"
-msgstr "lägger till %s\n"
-
-#, python-format
-msgid "removing %s\n"
-msgstr "tar bort %s\n"
-
-#, python-format
-msgid "recording removal of %s as rename to %s (%d%% similar)\n"
-msgstr ""
-
-#, python-format
-msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
-msgstr ""
-"%s har inte arkiverats än, så ingen kopieringsinformation lagras för %s.\n"
+msgid "cannot specify --changelog and --manifest at the same time"
+msgstr "kan inte ange --changelog och --manifest samtidigt"
+
+msgid "cannot specify filename with --changelog or --manifest"
+msgstr ""
+
+msgid "cannot specify --changelog or --manifest without a repository"
+msgstr ""
+
+msgid "invalid arguments"
+msgstr ""
+
+#, python-format
+msgid "revlog '%s' not found"
+msgstr "revlog '%s' hittades inte"
#, python-format
msgid "%s: not copying - file is not managed\n"
@@ -6074,6 +6398,10 @@
msgstr ""
#, python-format
+msgid "adding %s\n"
+msgstr "lägger till %s\n"
+
+#, python-format
msgid "skipping missing subrepository: %s\n"
msgstr ""
@@ -6116,8 +6444,141 @@
msgid "empty commit message"
msgstr ""
+msgid "repository root directory or name of overlay bundle file"
+msgstr "arkivrotkatalog eller namn på påläggsbuntfil"
+
+msgid "DIR"
+msgstr ""
+
+msgid "change working directory"
+msgstr "ändra arbetskatalog"
+
+msgid "do not prompt, assume 'yes' for any required answers"
+msgstr "fråga inte, anta att svaret är 'ja' på alla frågor"
+
+msgid "suppress output"
+msgstr "förhindra utmatning"
+
+msgid "enable additional output"
+msgstr "aktivera ytterligare utmatning"
+
+msgid "set/override config option (use 'section.name=value')"
+msgstr "sätt/upphäv konfigurationsflagga (använd 'sektion.namn=värde')"
+
+msgid "CONFIG"
+msgstr ""
+
+msgid "enable debugging output"
+msgstr "aktivera debugutmatning"
+
+msgid "start debugger"
+msgstr "starta debugger"
+
+msgid "set the charset encoding"
+msgstr "sätt teckenkodning"
+
+msgid "ENCODE"
+msgstr ""
+
+msgid "MODE"
+msgstr ""
+
+msgid "set the charset encoding mode"
+msgstr "sätt teckenkodningsläge"
+
+msgid "always print a traceback on exception"
+msgstr "visa alltid bakåtspårning vid undantag"
+
+msgid "time how long the command takes"
+msgstr "ta tid på hur lång tid kommandot körs"
+
+msgid "print command execution profile"
+msgstr "visa kommandoexekveringens profil"
+
+msgid "output version information and exit"
+msgstr "skriv versionsinformation och avsluta"
+
+msgid "display help and exit"
+msgstr "visa hjälp och avsluta"
+
+msgid "do not perform actions, just print output"
+msgstr "utför inget, bara visa"
+
+msgid "specify ssh command to use"
+msgstr "specificera ssh-kommando att använda"
+
+msgid "specify hg command to run on the remote side"
+msgstr "specificera hg-kommando att köra på andra sidan"
+
+msgid "do not verify server certificate (ignoring web.cacerts config)"
+msgstr ""
+"verifiera inte servercertifikatet (ignorerar web.cacerts-konfiguration)"
+
+msgid "PATTERN"
+msgstr "MÖNSTER"
+
+msgid "include names matching the given patterns"
+msgstr "inkludera namn som matchar de givna mönstren"
+
+msgid "exclude names matching the given patterns"
+msgstr "exkludera namn som matchar de givna mönstren"
+
+msgid "use text as commit message"
+msgstr "använd text som arkiveringsmeddelande"
+
+msgid "read commit message from file"
+msgstr "läs arkiveringsmeddelandet från fil"
+
+msgid "record the specified date as commit date"
+msgstr "lagra det angivna datumet som arkiveringsdatumet"
+
+msgid "record the specified user as committer"
+msgstr "lagra den angivna användaren som arkiverare"
+
+msgid "STYLE"
+msgstr "STIL"
+
+msgid "display using template map file"
+msgstr "visa med mallfil"
+
+msgid "display with template"
+msgstr "visa med mall"
+
+msgid "do not show merges"
+msgstr "visa inte sammanfogningar"
+
+msgid "output diffstat-style summary of changes"
+msgstr "visa sammanfattning av ändringar i diffstat-stil"
+
+msgid "treat all files as text"
+msgstr "behandla alla filer som text"
+
+msgid "omit dates from diff headers"
+msgstr "exkludera datum från diff-rubriker"
+
+msgid "show which function each change is in"
+msgstr "visa vilken funktion varje ändring är i"
+
+msgid "produce a diff that undoes the changes"
+msgstr "skapa en diff som ångrar ändringarna"
+
+msgid "number of lines of context to show"
+msgstr "antal sammanhangsrader att visa"
+
+msgid "SIMILARITY"
+msgstr "LIKHET"
+
+msgid "guess renamed files by similarity (0<=s<=100)"
+msgstr "gissa omdöpta filer efter likhet (0<=s<=100)"
+
+msgid "recurse into subrepositories"
+msgstr "gå in i underarkiv"
+
+msgid "[OPTION]... [FILE]..."
+msgstr "[FLAGGA]... [FIL]..."
+
msgid "add the specified files on the next commit"
-msgstr "lägg till de specificerade filerna i nästa arkivering"
+msgstr "lägg till de angivna filerna i nästa arkivering"
msgid ""
" Schedule files to be version controlled and added to the\n"
@@ -6212,6 +6673,36 @@
msgid "similarity must be between 0 and 100"
msgstr "likhet måste vara mellan 0 och 100"
+msgid "annotate the specified revision"
+msgstr "annotera den angivna revisionen"
+
+msgid "follow copies/renames and list the filename (DEPRECATED)"
+msgstr "följ kopieringar/namnbyten och visa filnamnet (FÖRLEGAD)"
+
+msgid "don't follow copies and renames"
+msgstr "följ inte kopieringar och namnbyten"
+
+msgid "list the author (long with -v)"
+msgstr "visa skapare (lång med -v)"
+
+msgid "list the filename"
+msgstr "visa filnamnet"
+
+msgid "list the date (short with -q)"
+msgstr "visa datum (kort med -q)"
+
+msgid "list the revision number (default)"
+msgstr "visa revisionsnummer (standard)"
+
+msgid "list the changeset"
+msgstr "visa ändring"
+
+msgid "show line number at the first appearance"
+msgstr "visa radnummer för första förekomsten"
+
+msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
+msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FIL..."
+
msgid "show changeset information by line for each file"
msgstr "visa ändringsinformation för varje rad i filer"
@@ -6247,6 +6738,24 @@
msgid "%s: binary file\n"
msgstr "%s: binär fil\n"
+msgid "do not pass files through decoders"
+msgstr "passera inte filer genom dekoders"
+
+msgid "directory prefix for files in archive"
+msgstr "katalogprefix för filer i arkiv"
+
+msgid "PREFIX"
+msgstr "PREFIX"
+
+msgid "revision to distribute"
+msgstr "revision att distribuera"
+
+msgid "type of distribution to create"
+msgstr "distributionstyp att skapa"
+
+msgid "[OPTION]... DEST"
+msgstr "[FLAGGA]... DEST"
+
msgid "create an unversioned archive of a repository revision"
msgstr "skapa ett icke versionshanterat arkiv från en arkivrevision"
@@ -6255,7 +6764,7 @@
" directory; use -r/--rev to specify a different revision."
msgstr ""
" Som standard används revisonen för arbetskatalogens förälder; använd\n"
-" -r/--rev för att specificera en annan revision."
+" -r/--rev för att angivna en annan revision."
msgid ""
" The archive type is automatically detected based on file\n"
@@ -6296,11 +6805,11 @@
" removed."
msgstr ""
" Varje fil som läggs till en arkivfil har ett katalogprefix. Använd\n"
-" -p/--prefix för att specificera en formatsträn för prefixet. Som\n"
-" standard används basnamnet för arkivet, med suffix borttagna."
+" -p/--prefix för att ange en formatsträng för prefixet. Som standard\n"
+" används basnamnet för arkivet, med suffix borttagna."
msgid "no working directory: please specify a revision"
-msgstr "ingen arbetskatalog: specificera en revision"
+msgstr "ingen arbetskatalog: ange en revision"
msgid "repository root cannot be destination"
msgstr "arkivroten kan inte vara destinationen"
@@ -6308,6 +6817,18 @@
msgid "cannot archive plain files to stdout"
msgstr "kan inte arkivera rena filer till stdout"
+msgid "merge with old dirstate parent after backout"
+msgstr "sammanfoga med gamla dirstate-föräldern efter återkallning"
+
+msgid "parent to choose when backing out merge"
+msgstr "förälder att välja när en sammanfogning återkallas"
+
+msgid "revision to backout"
+msgstr "revision att återkalla"
+
+msgid "[OPTION]... [-r] REV"
+msgstr "[FLAGGA]... [-r] REV"
+
msgid "reverse effect of earlier changeset"
msgstr "omvänd effekten från en tidigare ändring"
@@ -6344,15 +6865,15 @@
" separately."
msgstr ""
" Innan version 1.7, så var beteendet utan --merge ekvivalent med att\n"
-" specificera --merge följt av :hg:`update --clean .` för att ångra\n"
+" ange --merge följt av :hg:`update --clean .` för att ångra\n"
" sammanfogningen och lämna barnet till REV som ett huvud att\n"
" sammanfogas separat."
msgid "please specify just one revision"
-msgstr "specificera bara en revision"
+msgstr "ange bara en revision"
msgid "please specify a revision to backout"
-msgstr "specificera en revision att återkalla"
+msgstr "ange en revision att återkalla"
msgid "cannot backout change on a different branch"
msgstr "kan inte återkalla en ändring på en annan gren"
@@ -6378,6 +6899,30 @@
msgid "merging with changeset %s\n"
msgstr "sammanfogar med ändring %s\n"
+msgid "reset bisect state"
+msgstr "återställ bisect-tillständ"
+
+msgid "mark changeset good"
+msgstr "markera ändringen som bra"
+
+msgid "mark changeset bad"
+msgstr "markera ändringen som dålig"
+
+msgid "skip testing changeset"
+msgstr "hoppa över test av ändring"
+
+msgid "extend the bisect range"
+msgstr "utöka bisect-område"
+
+msgid "use command to check changeset state"
+msgstr "använd kommando för att kontrollera ändringsstatus"
+
+msgid "do not update to target"
+msgstr "uppdatera inte till målet"
+
+msgid "[-gbsr] [-U] [-c CMD] [REV]"
+msgstr "[-gbsr] [-U] [-c KMD] [REV]"
+
msgid "subdivision search of changesets"
msgstr "genomsökning av ändringar med halveringsmetoden"
@@ -6428,7 +6973,8 @@
#, python-format
msgid ""
"Not all ancestors of this changeset have been checked.\n"
-"To check the other ancestors, start from the common ancestor, %s.\n"
+"Use bisect --extend to continue the bisection from\n"
+"the common ancestor, %s.\n"
msgstr ""
msgid "Due to skipped revisions, the first good revision could be any of:\n"
@@ -6464,9 +7010,31 @@
msgstr "Ändring %d:%s: %s\n"
#, python-format
+msgid "Extending search to changeset %d:%s\n"
+msgstr "Utökar sökningen till ändringen %d:%s\n"
+
+msgid "nothing to extend"
+msgstr "inget att utöka"
+
+#, python-format
msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
msgstr "Testar ändring %d:%s (%d ändringar kvar, ~%d test)\n"
+msgid "force"
+msgstr "tvinga"
+
+msgid "delete a given bookmark"
+msgstr "ta bort angivet bokmärke"
+
+msgid "rename a given bookmark"
+msgstr "döp om angivet bokmärke"
+
+msgid "do not mark a new bookmark active"
+msgstr "markera inte ett nytt bokmärke som aktivt"
+
+msgid "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]"
+msgstr "hg bookmarks [-f] [-d] [-i] [-m NAMN] [-r REV] [NAMN]"
+
msgid "track a line of development with movable markers"
msgstr "spåra viss utveckling med flyttbara markörer"
@@ -6506,11 +7074,13 @@
" bookmarks-utökningen måste vara aktiverad.\n"
" "
-msgid "a bookmark of this name does not exist"
-msgstr "ett bokmärke med det namnet existerar inte"
-
-msgid "a bookmark of the same name already exists"
-msgstr "ett bokmärke med det namnet existerar redan"
+#, python-format
+msgid "bookmark '%s' does not exist"
+msgstr "bokmärket '%s' existerar inte"
+
+#, python-format
+msgid "bookmark '%s' already exists (use -f to force)"
+msgstr "bokmärket '%s' existerar redan (använd -f för att tvinga)"
msgid "new bookmark name required"
msgstr "nytt bokmärkesnamn krävs"
@@ -6530,6 +7100,15 @@
msgid "no bookmarks set\n"
msgstr "inget bokmärke satt\n"
+msgid "set branch name even if it shadows an existing branch"
+msgstr "sätt grennamnet även om det döljer en existerande gren"
+
+msgid "reset branch name to parent branch name"
+msgstr "återställ grennamn till förälderns grennamn"
+
+msgid "[-fC] [NAME]"
+msgstr "[-fC] [NAMN]"
+
msgid "set or show the current branch name"
msgstr "sätt eller visa det aktuella grennamnet"
@@ -6549,9 +7128,8 @@
" Unless -f/--force is specified, branch will not let you set a\n"
" branch name that already exists, even if it's inactive."
msgstr ""
-" Om inte -f/--force är specificerad, kommer branch inte att tillåta\n"
-" dig att sätta ett grennamn som redan existerar, även om den är\n"
-" inaktiv."
+" Om inte -f/--force är angiven, kommer branch inte att tillåta dig att\n"
+" sätta ett grennamn som redan existerar, även om den är inaktiv."
msgid ""
" Use -C/--clean to reset the working directory branch to that of\n"
@@ -6569,19 +7147,42 @@
" Använd kommandot :hg:`update` för att byta till en existerande gren.\n"
" Använd :hg:`commit --close-branch` för att markera grenen som stängd."
+msgid " .. note::"
+msgstr " .. notera::"
+
+msgid ""
+" Branch names are permanent. Use :hg:`bookmark` to create a\n"
+" light-weight bookmark instead. See :hg:`help glossary` for more\n"
+" information about named branches and bookmarks."
+msgstr ""
+" Grennamnar är permanenta. Använd :hg:`bookmark` för att skapa ett\n"
+" lättviktsbokmärke istället. Se :hg:`help glossary` för mer\n"
+" information om namngivna grenar och bokmärken."
+
#, python-format
msgid "reset working directory to branch %s\n"
msgstr "återställ arbetskatalogen till grenen %s\n"
-msgid ""
-"a branch of the same name already exists (use 'hg update' to switch to it)"
-msgstr ""
-"en gren med samma namn finns redan (kör 'hg update' för att byta till den)"
+msgid "a branch of the same name already exists"
+msgstr "ett grennamn med det namnet existerar redan"
+
+#. i18n: "it" refers to an existing branch
+msgid "use 'hg update' to switch to it"
+msgstr ""
#, python-format
msgid "marked working directory as branch %s\n"
msgstr "markerade arbetskatalogen som grenen %s\n"
+msgid "show only branches that have unmerged heads"
+msgstr "visa bara grenar som har icke-sammanfogade huvuden"
+
+msgid "show normal and closed branches"
+msgstr "visa normala och stängda grenar"
+
+msgid "[-ac]"
+msgstr "[-ac]"
+
msgid "list repository named branches"
msgstr "visa namngivna grenar i arkivet"
@@ -6618,6 +7219,27 @@
msgid " (inactive)"
msgstr " (inaktiv)"
+msgid "run even when the destination is unrelated"
+msgstr "kör även när destinationen är obesläktad"
+
+msgid "a changeset intended to be added to the destination"
+msgstr "en ändring avsedd att läggas till destinationen"
+
+msgid "a specific branch you would like to bundle"
+msgstr "en specifik gren du vill bunta"
+
+msgid "a base changeset assumed to be available at the destination"
+msgstr "en basändring som antas är tillgängliga i destinationen"
+
+msgid "bundle all changesets in the repository"
+msgstr "bunta alla ändringar i arkivet"
+
+msgid "bundle compression type to use"
+msgstr "typ av buntkompression att använda"
+
+msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
+msgstr "[-f] [-t TYP] [-a] [-r REV]... [--base REV]... FIL [DEST]"
+
msgid "create a changegroup file"
msgstr "skapa en ändringsgruppsfil"
@@ -6676,7 +7298,19 @@
msgstr "--base är inkompatibel med specificering av destination"
msgid "unknown bundle type specified with --type"
-msgstr "okänd bunttyp specificerad med --type"
+msgstr "okänd bunttyp angiven med --type"
+
+msgid "print output to file with formatted name"
+msgstr "skriv utmatning till fil med formatterat namn"
+
+msgid "print the given revision"
+msgstr "visa den angivna revisionen"
+
+msgid "apply any matching decode filter"
+msgstr "applicera valfritt överrensstämmande avkodningsfilter"
+
+msgid "[OPTION]... FILE..."
+msgstr "[FLAGGA]... FIL..."
msgid "output the current or given revision of files"
msgstr "visa den aktuella eller angivna revisionen för filer"
@@ -6708,6 +7342,21 @@
" :``%d``: katalognamn på den visade filen, eller '.' om i arkivroten\n"
" :``%p``: rotrelativ sökvägsnamn för den visade filen"
+msgid "the clone will include an empty working copy (only a repository)"
+msgstr "klonen kommer att inkludera en tom arbetskopia (bara ett arkiv)"
+
+msgid "revision, tag or branch to check out"
+msgstr "revision, märke eller gren att hämta ut"
+
+msgid "include the specified changeset"
+msgstr "inkludera den angivna ändringen"
+
+msgid "clone only the specified branch"
+msgstr "klona bara den angivna grenen"
+
+msgid "[OPTION]... SOURCE [DEST]"
+msgstr "[FLAGGA]... KÄLLA [DEST]"
+
msgid "make a copy of an existing repository"
msgstr "gör en kopia av ett existerande arkiv"
@@ -6736,8 +7385,8 @@
" ``.hg/hgrc`` and working directory will be created on the remote side.\n"
" Please see :hg:`help urls` for important details about ``ssh://`` URLs."
msgstr ""
-" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
-" ingen ``.hg/hgrc`` och arbetskatalog skapas på fjärrsidan.\n"
+" Det är möjligt att ange en ``ssh://``-URL som destination, men ingen\n"
+" ``.hg/hgrc`` och arbetskatalog skapas på fjärrsidan.\n"
" Se :hg:`help urls` för viktiga detaljer om ``ssh://``-URLer."
msgid ""
@@ -6750,9 +7399,9 @@
" No subsequent changesets (including subsequent tags) will be present\n"
" in the destination."
msgstr ""
-" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
-" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
-" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
+" En grupp ändringar (märken, eller grennamn) att dra kan anges genom\n"
+" att lista varje ändring (märke, eller grennamn) med -r/--rev. Om\n"
+" -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
@@ -6837,6 +7486,12 @@
msgid "cannot specify both --noupdate and --updaterev"
msgstr "kan inte ange både --noupdate och --updaterev"
+msgid "mark new/missing files as added/removed before committing"
+msgstr "märk nya/saknade filer som tillagda/borttagna innan arkivering"
+
+msgid "mark a branch as closed, hiding it from the branch list"
+msgstr "markera en gren som stängd, och göm den från grenlistan"
+
msgid "commit the specified files or all outstanding changes"
msgstr "arkivera de angivna filerna eller alla ändringar"
@@ -6884,6 +7539,10 @@
msgid "can only close branch heads"
msgstr "kan bara stänga grenhuvuden"
+#, python-format
+msgid "nothing changed (%d missing files, see 'hg status')\n"
+msgstr "inget ändrat (%d saknade filer, se 'hg status')\n"
+
msgid "nothing changed\n"
msgstr "inget ändrat\n"
@@ -6898,6 +7557,15 @@
msgid "committed changeset %d:%s\n"
msgstr "arkiverade ändringen %d:%s\n"
+msgid "record a copy that has already occurred"
+msgstr "lagra en kopiering som redan har inträffat"
+
+msgid "forcibly copy over an existing managed file"
+msgstr "tvinga kopiering över en eixsterande hanterad fil"
+
+msgid "[OPTION]... [SOURCE]... DEST"
+msgstr "[FLAGGA]... [KÄLLA]... DEST"
+
msgid "mark files as copied for the next commit"
msgstr "markera filer som kopierade vid nästa arkivering"
@@ -6933,13 +7601,33 @@
" Returnerar 0 om kommandot lyckades, 1 om fel uppstod.\n"
" "
+msgid "[INDEX] REV1 REV2"
+msgstr "[INDEX] REV1 REV2"
+
msgid "find the ancestor revision of two revisions in a given index"
msgstr "hitta föregående revision av två revisioner i ett givet index"
msgid "either two or three arguments required"
msgstr "endera två eller tre argument krävs"
-msgid "builds a repo with a given dag from scratch in the current empty repo"
+msgid "add single file mergeable changes"
+msgstr ""
+
+msgid "add single file all revs overwrite"
+msgstr ""
+
+msgid "add new file at each rev"
+msgstr ""
+
+msgid "[OPTION]... [TEXT]"
+msgstr "[FLAGGA]... [TEXT]"
+
+msgid "builds a repo with a given DAG from scratch in the current empty repo"
+msgstr ""
+
+msgid ""
+" The description of the DAG is read from stdin if not given on the\n"
+" command line."
msgstr ""
msgid " Elements:"
@@ -6957,8 +7645,6 @@
" - \"/p2\" is a merge of the preceding node and p2\n"
" - \":tag\" defines a local tag for the preceding node\n"
" - \"@branch\" sets the named branch for subsequent nodes\n"
-" - \"!command\" runs the command using your shell\n"
-" - \"!!my command\\n\" is like \"!\", but to the end of the line\n"
" - \"#...\\n\" is a comment up to the end of the line"
msgstr ""
@@ -6978,36 +7664,25 @@
msgid ""
" All string valued-elements are either strictly alphanumeric, or must\n"
-" be enclosed in double quotes (\"...\"), with \"\\\" as escape character."
-msgstr ""
-
-msgid ""
-" Note that the --overwritten-file and --appended-file options imply the\n"
-" use of \"HGMERGE=internal:local\" during DAG buildup.\n"
-" "
-msgstr ""
-
-msgid "need at least one of -m, -a, -o, -n"
-msgstr ""
+" be enclosed in double quotes (\"...\"), with \"\\\" as escape "
+"character.\n"
+" "
+msgstr ""
+
+msgid "reading DAG from stdin\n"
+msgstr "läser DAG från stdin\n"
msgid "repository is not empty"
msgstr "arkivet är inte tomt"
-#, python-format
-msgid "%s command %s"
-msgstr ""
-
-msgid "list all available commands and options"
-msgstr "visa alla tillgängliga kommandon och alternativ"
-
-msgid "returns the completion list associated with the given command"
-msgstr "returnerar kompletteringslistan associerad med det givna kommandot"
-
-msgid "show information detected about current filesystem"
-msgstr "visa information om det aktuella filsystemet"
-
-msgid "rebuild the dirstate as it would look like for the given revision"
-msgstr "bygg om katalogstatusen som den skulle se ut för den givna revisionen"
+msgid "building"
+msgstr "bygger"
+
+msgid "show all details"
+msgstr "visa alla detaljer"
+
+msgid "lists the contents of a bundle"
+msgstr "visa innehållet i en bunt"
msgid "validate the correctness of the current dirstate"
msgstr "validera korrektheten för den nuvarande katalogstatusen"
@@ -7031,69 +7706,35 @@
msgid ".hg/dirstate inconsistent with current parent's manifest"
msgstr ".hg/dirstate överrensstämmer inte med nuvarande förälders manifest"
-msgid "show combined config settings from all hgrc files"
-msgstr "visa kombinerade konfigurationsalternativ från alla hgrc-filer"
-
-msgid " With no arguments, print names and values of all config items."
-msgstr " Utan argument, skrivs namn och värden för alla alternativ."
-
-msgid ""
-" With one argument of the form section.name, print just the value\n"
-" of that config item."
-msgstr ""
-" Med ett argument i formen sektion.namn, visas bara värdet för det\n"
-" konfigurationsalternativet."
-
-msgid ""
-" With multiple arguments, print names and values of all config\n"
-" items with matching section names."
-msgstr ""
-" Med flera argument, visas namn och värden för alla alternativ med\n"
-" överrensstämmande sektionsnamn."
-
-msgid ""
-" With --debug, the source (filename and line number) is printed\n"
-" for each config item."
-msgstr ""
-" Med --debug, visas källan (filnamn och radnummer) för varje\n"
-" alternativ."
-
-#, python-format
-msgid "read config from: %s\n"
-msgstr "läs konfiguration från: %s\n"
-
-msgid "only one config item permitted"
-msgstr "bara ett konfigurationsalternativ tillåts"
-
-msgid "access the pushkey key/value protocol"
-msgstr ""
-
-msgid " With two args, list the keys in the given namespace."
-msgstr ""
-
-msgid ""
-" With five args, set a key to new if it currently is set to old.\n"
-" Reports success or failure.\n"
-" "
-msgstr ""
-
-msgid "parse and apply a revision specification"
-msgstr ""
-
-msgid "manually set the parents of the current working directory"
-msgstr ""
-
-msgid ""
-" This is useful for writing repository conversion tools, but should\n"
-" be used with care."
-msgstr ""
-
-msgid "show the contents of the current dirstate"
-msgstr ""
-
-#, python-format
-msgid "copy: %s -> %s\n"
-msgstr ""
+msgid "[COMMAND]"
+msgstr "[KOMMANDO]"
+
+msgid "list all available commands and options"
+msgstr "visa alla tillgängliga kommandon och alternativ"
+
+msgid "show the command options"
+msgstr "visa kommandoflaggor"
+
+msgid "[-o] CMD"
+msgstr "[-o] KMD"
+
+msgid "returns the completion list associated with the given command"
+msgstr "returnerar kompletteringslistan associerad med det givna kommandot"
+
+msgid "use tags as labels"
+msgstr ""
+
+msgid "annotate with branch names"
+msgstr ""
+
+msgid "use dots for runs"
+msgstr ""
+
+msgid "separate elements by spaces"
+msgstr ""
+
+msgid "[OPTION]... [FILE [REV]...]"
+msgstr "[FLAGGA]... [FIL] [REV]...]"
msgid "format the changelog or an index DAG as a concise textual description"
msgstr ""
@@ -7111,6 +7752,15 @@
msgid "need repo for changelog dag"
msgstr ""
+msgid "open changelog"
+msgstr "öppna ändringslogg"
+
+msgid "open manifest"
+msgstr "öppna manifest"
+
+msgid "-c|-m|FILE REV"
+msgstr "-c|-m|FIL REV"
+
msgid "dump the contents of a data file revision"
msgstr ""
@@ -7118,15 +7768,67 @@
msgid "invalid revision identifier %s"
msgstr ""
+msgid "try extended date formats"
+msgstr "pröva utökade datumformat"
+
+msgid "[-e] DATE [RANGE]"
+msgstr "[-e] DATUM [SPANN]"
+
msgid "parse and display a date"
msgstr ""
+msgid "use old-style discovery"
+msgstr ""
+
+msgid "use old-style discovery with non-heads included"
+msgstr ""
+
+msgid "[-l REV] [-r REV] [-b BRANCH]... [OTHER]"
+msgstr ""
+
+msgid "runs the changeset discovery protocol in isolation"
+msgstr ""
+
+msgid "parse and apply a fileset specification"
+msgstr ""
+
+msgid "[PATH]"
+msgstr "[SÖKVÄG]"
+
+msgid "show information detected about current filesystem"
+msgstr "visa information om det aktuella filsystemet"
+
+msgid "id of head node"
+msgstr ""
+
+msgid "id of common node"
+msgstr ""
+
+msgid "REPO FILE [-H|-C ID]..."
+msgstr ""
+
+msgid "retrieves a bundle from a repo"
+msgstr ""
+
+msgid ""
+" Every ID must be a full-length hex node id string. Saves the bundle to "
+"the\n"
+" given file.\n"
+" "
+msgstr ""
+
msgid "display the combined ignore pattern"
msgstr "visa det sammansatta ignoreringsmönstret"
msgid "no ignore patterns found"
msgstr "inget ignoreringsmönster hittades"
+msgid "revlog format"
+msgstr ""
+
+msgid "[-f FORMAT] -c|-m|FILE"
+msgstr ""
+
msgid "dump the contents of an index file"
msgstr ""
@@ -7163,28 +7865,6 @@
msgid " (templates seem to have been installed incorrectly)\n"
msgstr ""
-msgid "Checking patch...\n"
-msgstr ""
-
-msgid " patch call failed:\n"
-msgstr ""
-
-msgid " unexpected patch output!\n"
-msgstr ""
-
-msgid " patch test failed!\n"
-msgstr ""
-
-msgid ""
-" (Current patch tool may be incompatible with patch, or misconfigured. "
-"Please check your configuration file)\n"
-msgstr ""
-
-msgid ""
-" Internal patcher failure, please report this error to http://mercurial."
-"selenic.com/wiki/BugTracker\n"
-msgstr ""
-
msgid "Checking commit editor...\n"
msgstr ""
@@ -7211,6 +7891,49 @@
msgid "%s problems detected, please check your install!\n"
msgstr ""
+msgid "REPO ID..."
+msgstr ""
+
+msgid "test whether node ids are known to a repo"
+msgstr ""
+
+msgid ""
+" Every ID must be a full-length hex node id string. Returns a list of 0s "
+"and 1s\n"
+" indicating unknown/known.\n"
+" "
+msgstr ""
+
+msgid "REPO NAMESPACE [KEY OLD NEW]"
+msgstr ""
+
+msgid "access the pushkey key/value protocol"
+msgstr ""
+
+msgid " With two args, list the keys in the given namespace."
+msgstr ""
+
+msgid ""
+" With five args, set a key to new if it currently is set to old.\n"
+" Reports success or failure.\n"
+" "
+msgstr ""
+
+msgid "revision to rebuild to"
+msgstr "revision att bygga om till"
+
+msgid "[-r REV] [REV]"
+msgstr "[-r REV] [REV]"
+
+msgid "rebuild the dirstate as it would look like for the given revision"
+msgstr "bygg om katalogstatusen som den skulle se ut för den givna revisionen"
+
+msgid "revision to debug"
+msgstr "revision att debugga"
+
+msgid "[-r REV] FILE"
+msgstr "[-r REV] FIL"
+
msgid "dump rename information"
msgstr ""
@@ -7222,14 +7945,62 @@
msgid "%s not renamed\n"
msgstr ""
+msgid "dump index data"
+msgstr ""
+
+msgid "-c|-m|FILE"
+msgstr ""
+
+msgid "show data and statistics about a revlog"
+msgstr ""
+
+msgid "parse and apply a revision specification"
+msgstr ""
+
+msgid "REV1 [REV2]"
+msgstr "REV1 [REV2]"
+
+msgid "manually set the parents of the current working directory"
+msgstr ""
+
+msgid ""
+" This is useful for writing repository conversion tools, but should\n"
+" be used with care."
+msgstr ""
+
+msgid "do not display the saved mtime"
+msgstr "visa inte sparad mtime"
+
+msgid "sort by saved mtime"
+msgstr "sortera efter sparad mtime"
+
+msgid "[OPTION]..."
+msgstr "[FLAGGA]..."
+
+msgid "show the contents of the current dirstate"
+msgstr ""
+
+#, python-format
+msgid "copy: %s -> %s\n"
+msgstr "kopia: %s -> %s\n"
+
+msgid "revision to check"
+msgstr "revision att kontrollera"
+
msgid "show how files match on given patterns"
msgstr ""
+msgid "REPO [OPTIONS]... [ONE [TWO]]"
+msgstr "ARKIV [FLAGGA]... [ETT [TVÅ]]"
+
+msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
+msgstr "[FLAGGA]... ([-c REV] | [-r REV1 [-r REV2]]) [FIL]..."
+
msgid "diff repository (or selected files)"
msgstr "visa skillnader i arkivet (eller på valda filer)"
msgid " Show differences between revisions for the specified files."
-msgstr " Visa skillnader mellan revisioner för specificerade filer."
+msgstr " Visa skillnader mellan revisioner för angivna filer."
msgid " Differences between files are shown using the unified diff format."
msgstr " Skillnaderna mellan filerna visas i unified diff-format."
@@ -7268,6 +8039,15 @@
" Använd flaggan -g/--git för att skapa diffs i gits utökade format. För\n"
" mer information, läs :hg:`help diffs`."
+msgid "diff against the second parent"
+msgstr "diffa mot den andra föräldern"
+
+msgid "revisions to export"
+msgstr "revisioner att exportera"
+
+msgid "[OPTION]... [-o OUTFILESPEC] REV..."
+msgstr "[FLAGGA]... [-o UTFILSPEC] REV..."
+
msgid "dump the header and diffs for one or more changesets"
msgstr "dumpa rubrik och diff för en eller fler ändringar"
@@ -7352,14 +8132,14 @@
msgstr ""
msgid "forget the specified files on the next commit"
-msgstr "glöm de specificerade filerna vid nästa arkivering"
+msgstr "glöm de angivna filerna vid nästa arkivering"
msgid ""
" Mark the specified files so they will no longer be tracked\n"
" after the next commit."
msgstr ""
-" Märk de specificerade filerna så att de inte längre kommer att spåras\n"
-" efter nästa arkivering."
+" Märk de angivna filerna så att de inte längre kommer att spåras efter\n"
+" nästa arkivering."
msgid ""
" This only removes files from the current branch, not from the\n"
@@ -7379,6 +8159,35 @@
msgid "not removing %s: file is already untracked\n"
msgstr ""
+#, python-format
+msgid "removing %s\n"
+msgstr "tar bort %s\n"
+
+msgid "end fields with NUL"
+msgstr "avsluta fält med NUL"
+
+msgid "print all revisions that match"
+msgstr "visa alla revisioner som matchar"
+
+msgid "follow changeset history, or file history across copies and renames"
+msgstr ""
+"följ ändringshistorik, eller filhistorik över kopieringar och namnbyten"
+
+msgid "ignore case when matching"
+msgstr "ignorera versaler/gemener vid matchning"
+
+msgid "print only filenames and revisions that match"
+msgstr "visa bara filnamn och revisioner som matchar"
+
+msgid "print matching line numbers"
+msgstr "visa matchande radnummer"
+
+msgid "only search files changed within revision range"
+msgstr "sök filer enbart inom ett givet revisionsområde"
+
+msgid "[OPTION]... PATTERN [FILE]..."
+msgstr "[FLAGGA]... MÖNSTER [FIL]..."
+
msgid "search for a pattern in specified files and revisions"
msgstr "sök efter ett mänster i specificerade filer och revisioner"
@@ -7419,6 +8228,24 @@
msgid "grep: invalid match pattern: %s\n"
msgstr "grep: ogiltigt träffmönster: %s\n"
+msgid "STARTREV"
+msgstr "STARTREV"
+
+msgid "show only heads which are descendants of STARTREV"
+msgstr "visa bara huvuden som är ättlingar till STARTREV"
+
+msgid "show topological heads only"
+msgstr "visa bara topologiska huvuden"
+
+msgid "show active branchheads only (DEPRECATED)"
+msgstr "visa bara aktiva grenhuvuden (FÖRLEGAD)"
+
+msgid "show normal and closed branch heads"
+msgstr "visa normala och stängda grenhuvuden"
+
+msgid "[-ac] [-r STARTREV] [REV]..."
+msgstr "[-ac] [-r STARTREV] [REV]..."
+
msgid "show current repository heads or show branch heads"
msgstr "visa aktuella arkivhuvuden och visar grenhuvuden"
@@ -7480,6 +8307,15 @@
msgid " (started at %s)"
msgstr " (började som %s)"
+msgid "show only help for extensions"
+msgstr "visa bara hjälp för utökningar"
+
+msgid "show only help for commands"
+msgstr "visa bara hjälp för kommandon"
+
+msgid "[-ec] [TOPIC]"
+msgstr "[-ec] [ÄMNE]"
+
msgid "show help for a given topic or a help overview"
msgstr "visa hjälp för ett givet ämne eller en hjälpöversikt"
@@ -7512,6 +8348,10 @@
"använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer"
#, python-format
+msgid "use \"hg help %s\" to show the full help text"
+msgstr "använd \"hg help %s\" för att visa utförlig hjälp"
+
+#, python-format
msgid "use \"hg -v help%s\" to show builtin aliases and global options"
msgstr ""
"använd \"hg -v help%s\" för att visa inbyggda alias och globala flaggor"
@@ -7561,9 +8401,21 @@
msgid "options:\n"
msgstr "flaggor:\n"
+#, python-format
+msgid "use \"hg help -e %s\" to show help for the %s extension"
+msgstr "använd \"hg help -e %s\" för att visa hjälp för utökningen %s"
+
msgid "no commands defined\n"
msgstr "inga kommandon definierade\n"
+#, python-format
+msgid ""
+"\n"
+"use \"hg help -c %s\" to see help for the %s command\n"
+msgstr ""
+"\n"
+"använd \"hg help -c %s\" för att visa hjälp för kommandot %s\n"
+
msgid "no help text available"
msgstr "ingen hjälptext tillgänglig"
@@ -7608,11 +8460,43 @@
"\n"
"ytterligare hjälpämnen:"
+msgid "identify the specified revision"
+msgstr "identifiera den angivna revisionen"
+
+msgid "show local revision number"
+msgstr "visa lokala revisionsnummer"
+
+msgid "show global revision id"
+msgstr "visa globala revisions-id"
+
+msgid "show branch"
+msgstr "visa grenar"
+
+msgid "show tags"
+msgstr "visa märken"
+
+msgid "show bookmarks"
+msgstr "visa bokmärken"
+
+msgid "[-nibtB] [-r REV] [SOURCE]"
+msgstr "[-nibtB] [-r REV] [KÄLLA]"
+
msgid "identify the working copy or specified revision"
msgstr "identifiera arbetskopian eller angivna revisioner"
msgid ""
-" With no revision, print a summary of the current state of the\n"
+" Print a summary identifying the repository state at REV using one or\n"
+" two parent hash identifiers, followed by a \"+\" if the working\n"
+" directory has uncommitted changes, the branch name (if not default),\n"
+" a list of tags, and a list of bookmarks."
+msgstr ""
+" Visa en sammanfattning som identifierar arkivstatusen vid REV med en\n"
+" eller två föräldrars hash-identifierare, följt av ett \"+\" om det\n"
+" finns oarkiverade ändringar i arbetskatalogen, grennamnet (om inte\n"
+" default), en märkeslista, och en bokmärkeslista."
+
+msgid ""
+" When REV is not given, print a summary of the current state of the\n"
" repository."
msgstr ""
" Utan någon revision, visas en sammanfattning av den aktuella\n"
@@ -7625,19 +8509,37 @@
" Specificering av en sökväg till ett arkiv eller Mercurial-bunt\n"
" gör att kommandot jobbar mot arkivet/bunten som är angiven."
-msgid ""
-" This summary identifies the repository state using one or two\n"
-" parent hash identifiers, followed by a \"+\" if there are\n"
-" uncommitted changes in the working directory, a list of tags for\n"
-" this revision and a branch name for non-default branches."
-msgstr ""
-" Sammanfattningen identifierar arkivstatusen med en eller två\n"
-" föräldrars hash-identifierare, följt av ett \"+\" om det finns\n"
-" oarkiverade ändringar i arbetskatalogen, en lista av märken för den\n"
-" här revisionen och ett grennamn för grenar som inte är default."
-
-msgid "can't query remote revision number, branch, tags, or bookmarks"
-msgstr "kan inte efterfråga revisionsnummer, gren, märken eller bokmärken"
+msgid "can't query remote revision number, branch, or tags"
+msgstr "kan inte efterfråga revisionsnummer, gren, eller märken"
+
+msgid ""
+"directory strip option for patch. This has the same meaning as the "
+"corresponding patch option"
+msgstr ""
+
+msgid "PATH"
+msgstr "SÖKVÄG"
+
+msgid "base path (DEPRECATED)"
+msgstr "grundsökväg (FÖRÅLDRAD)"
+
+msgid "skip check for outstanding uncommitted changes"
+msgstr "hoppa över kontroll av oarkiverade ändringar"
+
+msgid "don't commit, just update the working directory"
+msgstr "arkivera inte, bara uppdatera arbetskatalogen"
+
+msgid "apply patch without touching the working directory"
+msgstr "applicera patch utan att röra arbetskatalogen"
+
+msgid "apply patch to the nodes from which it was generated"
+msgstr ""
+
+msgid "use any branch information in patch (implied by --exact)"
+msgstr ""
+
+msgid "[OPTION]... PATCH..."
+msgstr "[FLAGGA]... PATCH..."
msgid "import an ordered set of patches"
msgstr ""
@@ -7677,6 +8579,13 @@
msgstr ""
msgid ""
+" Use --bypass to apply and commit patches directly to the\n"
+" repository, not touching the working directory. Without --exact,\n"
+" patches will be applied on top of the working directory parent\n"
+" revision."
+msgstr ""
+
+msgid ""
" With -s/--similarity, hg will attempt to discover renames and\n"
" copies in the patch in the same way as 'addremove'."
msgstr ""
@@ -7687,15 +8596,21 @@
" See :hg:`help dates` for a list of formats valid for -d/--date."
msgstr ""
+msgid "cannot use --no-commit with --bypass"
+msgstr "kan inte använda --no-commit med --bypass"
+
+msgid "cannot use --similarity with --bypass"
+msgstr "kan inte använda --similarity med --bypass"
+
+msgid "patch is damaged or loses information"
+msgstr "patchen är skadad eller tappar information"
+
msgid "to working directory"
msgstr "till arbetskatalog"
msgid "not a Mercurial patch"
msgstr "inte en Mercurial-patch"
-msgid "patch is damaged or loses information"
-msgstr "patchen är skadad eller tappar information"
-
msgid "applying patch from stdin\n"
msgstr ""
@@ -7706,6 +8621,27 @@
msgid "no diffs found"
msgstr ""
+msgid "run even if remote repository is unrelated"
+msgstr "kör även om fjärrarkivet är obesläktat"
+
+msgid "show newest record first"
+msgstr "visa nyaste saken först"
+
+msgid "file to store the bundles into"
+msgstr "fil att lagra buntarna i"
+
+msgid "a remote changeset intended to be added"
+msgstr "en fjärrändring som avses att läggas till"
+
+msgid "compare bookmarks"
+msgstr "jämför bokmärken"
+
+msgid "a specific branch you would like to pull"
+msgstr "en specifik gren som du vill dra"
+
+msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
+msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAMN] [KÄLLA]"
+
msgid "show new changesets found in source"
msgstr "visa nya ändringar som hittas i källan"
@@ -7741,6 +8677,9 @@
msgid "remote doesn't support bookmarks\n"
msgstr "fjärrserver stödjer inte bokmärken\n"
+msgid "[-e CMD] [--remotecmd CMD] [DEST]"
+msgstr "[-e KMD] [--remotecmd KMD] [DEST]"
+
msgid "create a new repository in the given directory"
msgstr "skapa ett nytt arkiv i den angivna katalogen"
@@ -7761,6 +8700,18 @@
" Det är möjligt att specificera en URL med ``ssh://`` som destination.\n"
" Se :hg:`help urls` för mer informatio"
+msgid "search the repository as it is in REV"
+msgstr "sök igenom arkivet som det är vid REV"
+
+msgid "end filenames with NUL, for use with xargs"
+msgstr "filnamn slutar med NUL, för användning med xargs"
+
+msgid "print complete paths from the filesystem root"
+msgstr "visa kompletta sökvägar från filsystemsroten"
+
+msgid "[OPTION]... [PATTERN]..."
+msgstr "[FLAGGA]... [MÖNSTER]..."
+
msgid "locate files matching specific patterns"
msgstr "hitta filer som matchar givna mönster"
@@ -7798,6 +8749,42 @@
" Detta undviker problemet med att \"xargs\" behandlar filnamn som\n"
" innehåller blanktecken som multipla filnamn"
+msgid "only follow the first parent of merge changesets"
+msgstr "följ bara den första föräldern vid sammanfogningar"
+
+msgid "show revisions matching date spec"
+msgstr "visa revisioner som matchar datumspecen"
+
+msgid "show copied files"
+msgstr "visa kopierade filer"
+
+msgid "do case-insensitive search for a given text"
+msgstr "gör versalokänslig sökning efter en given text"
+
+msgid "include revisions where files were removed"
+msgstr "inkludera revisioner där filer togs bort"
+
+msgid "show only merges"
+msgstr "visa bara sammanfogningar"
+
+msgid "revisions committed by user"
+msgstr "revisioner arkiverade av användare"
+
+msgid "show only changesets within the given named branch (DEPRECATED)"
+msgstr "visa bara ändringar i den namngivna grenen (FÖRLEGAD)"
+
+msgid "show changesets within the given named branch"
+msgstr "visa ändringar i den namngivna grenen"
+
+msgid "do not display revision or any of its ancestors"
+msgstr "visa inte revision eller någon av dess föräldrar"
+
+msgid "show hidden changesets"
+msgstr "visa dolda ändringar"
+
+msgid "[OPTION]... [FILE]"
+msgstr "[FLAGGA]... [FIL]"
+
msgid "show revision history of entire repository or files"
msgstr "visa revisionshistorik för hela arkivet eller filer"
@@ -7856,6 +8843,15 @@
" den första förälder. Dessutom kommer bara filer som skiljer sig från\n"
" BÅDA föräldrarna att visas i filer:."
+msgid "revision to display"
+msgstr "revision att visa"
+
+msgid "list files from all revisions"
+msgstr "visa filer från alla revisioner"
+
+msgid "[-r REV]"
+msgstr "[-r REV]"
+
msgid "output the current or given revision of the project manifest"
msgstr "visa den nuvarande eller angivna revisionen av projektmanifestet"
@@ -7875,6 +8871,28 @@
" Med -v visas filtillstånd, symlänkar och exekverbarhetsbitar.\n"
" Med --debug visas filrevisionhashar."
+msgid ""
+" If option --all is specified, the list of all files from all revisions\n"
+" is printed. This includes deleted and renamed files."
+msgstr ""
+" Om flaggan --all är angiven, visas en lista med alla filer från alla\n"
+" revisioner. Detta inlkuderar borttagna och omdöpta filer."
+
+msgid "can't specify a revision with --all"
+msgstr "du kan inte ange en revision med --all"
+
+msgid "force a merge with outstanding changes"
+msgstr "tvinga en sammanfogning med utestående ändringar"
+
+msgid "revision to merge"
+msgstr "revision att sammanfoga"
+
+msgid "review revisions to merge (no merge is performed)"
+msgstr "granska revisioner att sammanfoga (ingen sammanfogning utförs)"
+
+msgid "[-P] [-f] [[-r] REV]"
+msgstr "[-P] [-f] [[-r] REV]"
+
msgid "merge working directory with another revision"
msgstr "sammanfoga arbetskatalogen med en annan revision"
@@ -7899,11 +8917,12 @@
msgid ""
" ``--tool`` can be used to specify the merge tool used for file\n"
" merges. It overrides the HGMERGE environment variable and your\n"
-" configuration files."
+" configuration files. See :hg:`help merge-tools` for options."
msgstr ""
" ``--tool`` kan användas för att ange sammanfogningsverktyg att\n"
" använda för filsammanfogningar. Det har högre prioritet än\n"
-" miljövariabeln HGMERGE och dina konfigurationsfiler."
+" miljövariabeln HGMERGE och dina konfigurationsfiler. Se\n"
+" :hg:`help merge-tools` för flaggor."
msgid ""
" If no revision is specified, the working directory's parent is a\n"
@@ -7936,20 +8955,18 @@
" "
#, python-format
-msgid ""
-"branch '%s' has %d heads - please merge with an explicit rev\n"
-"(run 'hg heads .' to see heads)"
-msgstr ""
-"grenen '%s' har %d huvuden - sammanfoga med en specifik rev\n"
-"(kör 'hg heads .' för att se huvuden)"
-
-#, python-format
-msgid ""
-"branch '%s' has one head - please merge with an explicit rev\n"
-"(run 'hg heads' to see all heads)"
-msgstr ""
-"grenen '%s' har ett huvud - sammanfoga med en specifik rev\n"
-"(kör 'hg heads .' för att se alla huvuden)"
+msgid "branch '%s' has %d heads - please merge with an explicit rev"
+msgstr "grenen '%s' har %d huvuden - sammanfoga med en specifik rev"
+
+msgid "run 'hg heads .' to see heads"
+msgstr "kör 'hg heads .' för att se huvuden"
+
+#, python-format
+msgid "branch '%s' has one head - please merge with an explicit rev"
+msgstr "grenen '%s' har ett huvud - sammanfoga med en specifik rev"
+
+msgid "run 'hg heads' to see all heads"
+msgstr "kör 'hg heads' för att se alla huvuden"
msgid "there is nothing to merge"
msgstr "det finns inget att sammanfoga"
@@ -7958,12 +8975,20 @@
msgid "%s - use \"hg update\" instead"
msgstr "%s - använd \"hg update\" istället"
-msgid ""
-"working dir not at a head rev - use \"hg update\" or merge with an explicit "
-"rev"
-msgstr ""
-"arbetskatalogen är inte vid huvudrevisionen - använd \"hg update\" eller "
-"sammanfoga med en speficik rev"
+msgid "working directory not at a head revision"
+msgstr "arbetskatalogen är inte vid en huvudrevision"
+
+msgid "use 'hg update' or merge with an explicit revision"
+msgstr "använd 'hg update' eller sammanfoga med en speficik rev"
+
+msgid "a changeset intended to be included in the destination"
+msgstr "en ändring avsedd att inkluderas i destinationen"
+
+msgid "a specific branch you would like to push"
+msgstr "en specifik gren som du vill trycka"
+
+msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
+msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
msgid "show changesets not found in the destination"
msgstr "visa ändringar som inte hittas i destinationen"
@@ -7987,6 +9012,12 @@
" Returnerar 0 om det finns utgående ändringar, 1 annars.\n"
" "
+msgid "show parents of the specified revision"
+msgstr "visa föräldrar för den angivna revisionen"
+
+msgid "[-r REV] [FILE]"
+msgstr "[-r REV] [FIL]"
+
msgid "show the parents of the working directory or revision"
msgstr "visa föräldrar till arbetskatalogen eller revision"
@@ -8009,6 +9040,9 @@
msgid "'%s' not found in manifest!"
msgstr "'%s' hittades inte i manifestet!"
+msgid "[NAME]"
+msgstr "[NAMN]"
+
msgid "show aliases for remote repositories"
msgstr "visa aliases för fjärrarkiv"
@@ -8020,6 +9054,13 @@
" definitionen för alla tillgängliga namn."
msgid ""
+" Option -q/--quiet suppresses all output when searching for NAME\n"
+" and shows only the path names when listing all definitions."
+msgstr ""
+" Flaggan -q/--quiet stänger av all utmatning vid sökning efter NAMN\n"
+" och visar bara sökvägarna när alla definitioner listas."
+
+msgid ""
" Path names are defined in the [paths] section of your\n"
" configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n"
" repository, ``.hg/hgrc`` is used, too."
@@ -8047,16 +9088,38 @@
msgid "not found!\n"
msgstr "hittades inte!\n"
-msgid "not updating, since new heads added\n"
-msgstr "uppdaterar inte, eftersom nya huvuden läggs till\n"
+#, python-format
+msgid "not updating: %s\n"
+msgstr "uppdaterar inte: %s\n"
msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
msgstr ""
"(kör 'hg heads' för att se nya huvuden, 'hg merge' för att sammanfoga)\n"
+msgid "(run 'hg heads .' to see heads, 'hg merge' to merge)\n"
+msgstr "(kör 'hg heads' för att se huvuden, 'hg merge' för att sammanfoga)\n"
+
+msgid "(run 'hg heads' to see heads)\n"
+msgstr "(kör 'hg heads' för att se huvuden)\n"
+
msgid "(run 'hg update' to get a working copy)\n"
msgstr "(kör 'hg update' för att få en arbetskopia)\n"
+msgid "update to new branch head if changesets were pulled"
+msgstr "uppdatera till nytt grenhuvud om ändringar drogs"
+
+msgid "run even when remote repository is unrelated"
+msgstr "kör även när fjärrarkivet är orelaterat"
+
+msgid "BOOKMARK"
+msgstr "BOKMÄRKE"
+
+msgid "bookmark to pull"
+msgstr "bokmärke att dra"
+
+msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
+msgstr "[-u] [-f] [-r REV]... [-e KMD] [--remotecmd KMD] [KÄLLA]"
+
msgid "pull changes from the specified source"
msgstr "dra ändringar från den specificerade källan"
@@ -8115,6 +9178,18 @@
msgid "importing bookmark %s\n"
msgstr "importerar bokmärket %s\n"
+msgid "force push"
+msgstr "tvinga tryckning"
+
+msgid "bookmark to push"
+msgstr "bokmärke att trycka"
+
+msgid "allow pushing a new branch"
+msgstr "tillåt att trycka en ny gren"
+
+msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
+msgstr "[-f] [-r REV]... [-e KMD] [--remotecmd KMD] [DEST]"
+
msgid "push changes to the specified destination"
msgstr "tryck ändringar till den specificerade destinationen"
@@ -8222,6 +9297,12 @@
" verifiering misslyckades.\n"
" "
+msgid "record delete for missing files"
+msgstr "markera saknade filer för radering"
+
+msgid "remove (and delete) file even if added or modified"
+msgstr "radera (och ta bort) filer även om tillagda eller modifierade"
+
msgid "remove the specified files on the next commit"
msgstr "ta bort de specificerade filerna vid nästa arkivering"
@@ -8267,6 +9348,13 @@
" -Af R R R R"
msgid ""
+" Note that remove never deletes files in Added [A] state from the\n"
+" working directory, not even if option --force is specified."
+msgstr ""
+" Notera att remove aldrig tar bort filer som är Adderade [A] från\n"
+" arbetskatalogen, inte ens om --force är angivet."
+
+msgid ""
" This command schedules the files to be removed at the next commit.\n"
" To undo a remove before that, see :hg:`revert`."
msgstr ""
@@ -8298,6 +9386,12 @@
"not removing %s: file has been marked for add (use -f to force removal)\n"
msgstr "raderar inte %s: filen har lags till (använd -f för att tvinga)\n"
+msgid "record a rename that has already occurred"
+msgstr "spara en namnändring som redan har inträffat"
+
+msgid "[OPTION]... SOURCE... DEST"
+msgstr "[FLAGGA]... KÄLLA... DEST"
+
msgid "rename files; equivalent of copy + remove"
msgstr "döp om filer; likvärdig med kopiering + radering"
@@ -8318,6 +9412,21 @@
" namnbyte innan det, se :hg:`revert`.\n"
" "
+msgid "select all unresolved files"
+msgstr "välj alla olösta filer"
+
+msgid "list state of files needing merge"
+msgstr "visa status för filer som behöver sammanfogas"
+
+msgid "mark files as resolved"
+msgstr "markera filer som lösta"
+
+msgid "mark files as unresolved"
+msgstr "markera filer som olösta"
+
+msgid "hide status prefix"
+msgstr "göm statusprefix"
+
msgid "redo merges or set/view the merge status of files"
msgstr ""
@@ -8386,75 +9495,58 @@
"inga filer eller kataloger specificerade; använd --all för att "
"återsammanfoga alla filer"
-msgid "restore individual files or directories to an earlier state"
-msgstr "återställ filer eller kataloger till ett tidigare tillstånd"
+msgid "revert all changes when no arguments given"
+msgstr "återställ alla ändringar när inga argument ges"
+
+msgid "tipmost revision matching date"
+msgstr "senaste revision matchande datum"
+
+msgid "revert to the specified revision"
+msgstr "återgå till den angivna revisionen"
+
+msgid "do not save backup copies of files"
+msgstr "spara inte backup-kopior av filer"
+
+msgid "[OPTION]... [-r REV] [NAME]..."
+msgstr "[FLAGGA]... [-r REV] [NAMN]..."
+
+msgid "restore files to their checkout state"
+msgstr "återställ filer till deras uthämtningstillstånd"
msgid ""
" .. note::\n"
-" This command is most likely not what you are looking for.\n"
-" Revert will partially overwrite content in the working\n"
-" directory without changing the working directory parents. Use\n"
-" :hg:`update -r rev` to check out earlier revisions, or\n"
-" :hg:`update --clean .` to undo a merge which has added another\n"
-" parent."
+" To check out earlier revisions, you should use :hg:`update REV`.\n"
+" To cancel a merge (and lose your changes), use :hg:`update --clean .`."
msgstr ""
" .. note::\n"
-" Det här kommandot är troligtvis inte det du letar efter. Revert\n"
-" kommer att delvis skriva över innehåll i arbetskatalogen utan att\n"
-" ändra arbetskatalogens föräldrar. Använd :hg:`update -r rev` för att\n"
-" hämta ut tidigare revisioner, eller :hg:`update --clean .` för att\n"
-" ångra en sammanfogning som har lagt till fler föräldrar."
-
-msgid ""
-" With no revision specified, revert the named files or directories\n"
-" to the contents they had in the parent of the working directory.\n"
-" This restores the contents of the affected files to an unmodified\n"
-" state and unschedules adds, removes, copies, and renames. If the\n"
-" working directory has two parents, you must explicitly specify a\n"
-" revision."
+" För att hämta ut tidigare revisioner, använd :hg:`update REV`.\n"
+" För att avbryta en sammanfogning (och bli av med alla ändringar),\n"
+" använd :hg:`update --clean .`."
+
+msgid ""
+" With no revision specified, revert the specified files or directories\n"
+" to the state they had in the first parent of the working directory.\n"
+" This restores the contents of files to an unmodified\n"
+" state and unschedules adds, removes, copies, and renames."
msgstr ""
" Om ingen revision anges, så återställs de givna filerna eller\n"
-" katalogerna till innehållet de hade i arbetskatalogens förälder. Det\n"
+" katalogerna till läget de hade i arbetskatalogens första förälder. Det\n"
" sätter filer i ett omodifierad läge och avbeställer adderingar,\n"
-" raderingar, kopior och namnbyten. Om arbetskatalogen har två\n"
-" föräldrar, så måste du ange en revision."
-
-msgid ""
-" Using the -r/--rev option, revert the given files or directories\n"
-" to their contents as of a specific revision. This can be helpful\n"
-" to \"roll back\" some or all of an earlier change. See :hg:`help\n"
-" dates` for a list of formats valid for -d/--date."
-msgstr ""
-" Med flaggan -r/--rev, återställs de givna filerna eller katalogerna\n"
-" till innehållet i den specifika revisionen. Detta kan användas för\n"
-" att ångra delar av eller hela tidigare ändringar. Se :hg:`help dates`\n"
-" för en lista med giltiga format för -d/--date."
-
-msgid ""
-" Revert modifies the working directory. It does not commit any\n"
-" changes, or change the parent of the working directory. If you\n"
-" revert to a revision other than the parent of the working\n"
-" directory, the reverted files will thus appear modified\n"
-" afterwards."
-msgstr ""
-" Revert modifierar arbetskatalogen. Det arkiverar inga ändringar, och\n"
-" ändrar inte arbetskatalogens förälder. Om du återgår till en revision\n"
-" som inte är arbetskatalogens förälder, kommer den återställda filen\n"
-" att visas som modifierad."
-
-msgid ""
-" If a file has been deleted, it is restored. If the executable mode\n"
-" of a file was changed, it is reset."
-msgstr ""
-" Om en fil har raderas, så återställs den. Om läget för exekverbarhet\n"
-" har ändrats för en fil, så återställs det."
-
-msgid ""
-" If names are given, all files matching the names are reverted.\n"
-" If no arguments are given, no files are reverted."
-msgstr ""
-" Om namn anges, så återställs alla filer med överrensstämmande namn.\n"
-" Om inga argument ges, återställs inga filer."
+" raderingar, kopior och namnbyten."
+
+msgid ""
+" Using the -r/--rev or -d/--date options, revert the given files or\n"
+" directories to their states as of a specific revision. Because\n"
+" revert does not change the working directory parents, this will\n"
+" cause these files to appear modified. This can be helpful to \"back\n"
+" out\" some or all of an earlier change. See :hg:`backout` for a\n"
+" related method."
+msgstr ""
+" Med flaggan -r/--rev eller -d/--date, återställs de givna filerna eller\n"
+" katalogerna till läget i den specifika revisionen. Eftersom revert\n"
+" inte ändrar arbetskatalogens föräldrar, kommer dessa filer att visas\n"
+" som modifierade. Detta kan användas för att ångra delar av eller hela\n"
+" tidigare ändringar. Se :hg:`backout` för en relaterad metod."
msgid ""
" Modified files are saved with a .orig suffix before reverting.\n"
@@ -8466,13 +9558,35 @@
msgid "you can't specify a revision and a date"
msgstr "du kan inte specificera en revision och ett datum"
-msgid "uncommitted merge - use \"hg update\", see \"hg help revert\""
-msgstr "oarkiverad sammanfogning - använd \"hg update\", se \"hg help revert\""
-
-msgid "no files or directories specified; use --all to revert the whole repo"
-msgstr ""
-"inga filer eller kataloger angivna; använd --all för att återställa hela "
-"arkivet"
+msgid "no files or directories specified"
+msgstr "inga filer eller kataloger angivna"
+
+msgid ""
+"uncommitted merge, use --all to discard all changes, or 'hg update -C .' to "
+"abort the merge"
+msgstr ""
+"oarkiverad sammanfogning, använd --all för att kasta alla ändringar, eller "
+"'hg update -C .' för att avbryta sammanfogningen"
+
+#, python-format
+msgid ""
+"uncommitted changes, use --all to discard all changes, or 'hg update %s' to "
+"update"
+msgstr ""
+"oarkiverade ändringar, använd --all för att kasta alla ändringar, eller 'hg "
+"update %s' för att uppdatera"
+
+#, python-format
+msgid "use --all to revert all files, or 'hg update %s' to update"
+msgstr ""
+"använd --all för att återställa alla filer, eller 'hg update %s' för att "
+"uppdatera"
+
+msgid "uncommitted changes, use --all to discard all changes"
+msgstr "oarkiverade ändringar, använd --all för att kasta alla ändringar"
+
+msgid "use --all to revert all files"
+msgstr "använd --all för att återställa filer"
#, python-format
msgid "forgetting %s\n"
@@ -8566,6 +9680,51 @@
msgid " Print the root directory of the current repository."
msgstr " Visa rotkatalogen för det aktuella arkivet."
+msgid "name of access log file to write to"
+msgstr "namn på åtkomstlogg att skriva till"
+
+msgid "name of error log file to write to"
+msgstr "namn på fellogg att skriva till"
+
+msgid "PORT"
+msgstr "PORT"
+
+msgid "port to listen on (default: 8000)"
+msgstr "port att lyssna på (standard: 8000)"
+
+msgid "address to listen on (default: all interfaces)"
+msgstr "adress att lyssna på (standard alla gränssnitt)"
+
+msgid "ADDR"
+msgstr "ADDR"
+
+msgid "prefix path to serve from (default: server root)"
+msgstr "sökvägsprefix att dela ut från (standard: serverrot)"
+
+msgid "name to show in web pages (default: working directory)"
+msgstr "namn att visa i webbsidor (standard: arbetskatalogen)"
+
+msgid "name of the hgweb config file (see \"hg help hgweb\")"
+msgstr "namn på webdir-konfigurationsfil (se \"hg help hgweb\")"
+
+msgid "name of the hgweb config file (DEPRECATED)"
+msgstr "namn på webdir-konfigurationsfil (FÖRLEGAD)"
+
+msgid "for remote clients"
+msgstr "för fjärrklienter"
+
+msgid "web templates to use"
+msgstr "webbmallar att använda"
+
+msgid "template style to use"
+msgstr "mallstil att använda"
+
+msgid "use IPv6 in addition to IPv4"
+msgstr "använd IPv6 förutom IPv4"
+
+msgid "SSL certificate file"
+msgstr "SSL-certifikatsfil"
+
msgid "start stand-alone webserver"
msgstr "starta fristående webbserver"
@@ -8610,6 +9769,9 @@
" För att låta servern välja ett ledigt portnummer att lyssna på, ange 0\n"
" som portnummer; då visar servern det portnummer som används."
+msgid "cannot use --stdio with --cmdserver"
+msgstr "kan inte använda --stdio med --cmdserver"
+
msgid "There is no Mercurial repository here (.hg not found)"
msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)"
@@ -8617,6 +9779,75 @@
msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
msgstr "lyssnar på http://%s%s/%s (bunden till %s:%d)\n"
+msgid "show untrusted configuration options"
+msgstr "visa opålitliga konfigurationsalternativ"
+
+msgid "[-u] [NAME]..."
+msgstr "[-u] [NAMN]..."
+
+msgid "show combined config settings from all hgrc files"
+msgstr "visa kombinerade konfigurationsalternativ från alla hgrc-filer"
+
+msgid " With no arguments, print names and values of all config items."
+msgstr " Utan argument, skrivs namn och värden för alla alternativ."
+
+msgid ""
+" With one argument of the form section.name, print just the value\n"
+" of that config item."
+msgstr ""
+" Med ett argument i formen sektion.namn, visas bara värdet för det\n"
+" konfigurationsalternativet."
+
+msgid ""
+" With multiple arguments, print names and values of all config\n"
+" items with matching section names."
+msgstr ""
+" Med flera argument, visas namn och värden för alla alternativ med\n"
+" överrensstämmande sektionsnamn."
+
+msgid ""
+" With --debug, the source (filename and line number) is printed\n"
+" for each config item."
+msgstr ""
+" Med --debug, visas källan (filnamn och radnummer) för varje\n"
+" alternativ."
+
+msgid "only one config item permitted"
+msgstr "bara ett konfigurationsalternativ tillåts"
+
+msgid "show status of all files"
+msgstr "visa status för alla filer"
+
+msgid "show only modified files"
+msgstr "visa bara modifierade filer"
+
+msgid "show only added files"
+msgstr "visa bara adderade filer"
+
+msgid "show only removed files"
+msgstr "visa bara raderade filer"
+
+msgid "show only deleted (but tracked) files"
+msgstr "visa bara borttagna (men spårade) filer"
+
+msgid "show only files without changes"
+msgstr "visa bara filer utan ändringar"
+
+msgid "show only unknown (not tracked) files"
+msgstr "visa bara okända (ospårade) filer"
+
+msgid "show only ignored files"
+msgstr "visa bara ignorerade filer"
+
+msgid "show source of copied files"
+msgstr "visa källan för kopierade filer"
+
+msgid "show difference from revision"
+msgstr "visa differens från revision"
+
+msgid "list the changed files of a revision"
+msgstr "visa de ändrade filerna från en revision"
+
msgid "show changed files in the working directory"
msgstr "visa ändrade filer i arbetskatalogen"
@@ -8687,6 +9918,9 @@
" I = ignorerad\n"
" = källa för den tidigare filen listad som A (adderad)"
+msgid "check for push and pull"
+msgstr "sök efter inkommande och utgående ändringar"
+
msgid "summarize working directory state"
msgstr "sammanfatta arbetskatalogens tillstånd"
@@ -8810,6 +10044,24 @@
msgid "remote: (synced)\n"
msgstr "fjärran: (synkad)\n"
+msgid "force tag"
+msgstr "tvinga märkning"
+
+msgid "make the tag local"
+msgstr "gör märket lokalt"
+
+msgid "revision to tag"
+msgstr "revision att märka"
+
+msgid "remove a tag"
+msgstr "ta bort ett märke"
+
+msgid "use <text> as commit message"
+msgstr "använd <text> som arkiveringsmeddelande"
+
+msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
+msgstr "[-f] [-l] [-m TEXT] [-d DATUM] [-u ANVÄNDARE] [-r REV] NAMN..."
+
msgid "add one or more tags for the current or given revision"
msgstr "lägg till en eller fler märken för en revision"
@@ -8906,6 +10158,9 @@
" Listar både vanliga och lokala märken. När flaggan -v/--verbose\n"
" används, visas en tredje kolumn med namnet \"local\" för lokala märken."
+msgid "[-p] [-g]"
+msgstr "[-p] [-g]"
+
msgid "show the tip revision"
msgstr "visa topprevisionen"
@@ -8928,6 +10183,12 @@
" arkivet den aktuella toppen. Märket \"tip\" är speciellt och kan inte\n"
" döpas om eller tilldelas en annan ändring."
+msgid "update to new branch head if changesets were unbundled"
+msgstr "uppdatera till nytt grenhuvud om ändringar packades upp"
+
+msgid "[-u] FILE..."
+msgstr "[-u] FIL..."
+
msgid "apply one or more changegroup files"
msgstr "applicera en eller flera filer med ändringar"
@@ -8946,6 +10207,15 @@
" filer.\n"
" "
+msgid "discard uncommitted changes (no backup)"
+msgstr "kassera oarkiverade ändringar (ingen backup)"
+
+msgid "update across branches if no uncommitted changes"
+msgstr "uppdatera över grenar om inga oarkiverade ändringar"
+
+msgid "[-c] [-C] [-d DATE] [[-r] REV]"
+msgstr "[-c] [-C] [-d DATUM] [[-r] REV]"
+
msgid "update working directory (or switch revisions)"
msgstr "uppdatera arbetskatalogen (eller växla mellan revisioner)"
@@ -8967,6 +10237,11 @@
msgstr ""
msgid ""
+" Update sets the working directory's parent revison to the specified\n"
+" changeset (see :hg:`help parents`)."
+msgstr ""
+
+msgid ""
" The following rules apply when the working directory contains\n"
" uncommitted changes:"
msgstr ""
@@ -9013,17 +10288,17 @@
" :hg:`clone -U`)."
msgid ""
-" If you want to update just one file to an older changeset, use\n"
-" :hg:`revert`."
-msgstr ""
-" Om du vill uppdatera bara en fil till en äldre ändring, använd\n"
-" :hg:`revert`."
+" If you want to revert just one file to an older revision, use\n"
+" :hg:`revert [-r REV] NAME`."
+msgstr ""
+" Om du vill uppdatera bara en fil till en äldre revision, använd\n"
+" :hg:`revert [-r REV] NAMN`."
msgid "cannot specify both -c/--check and -C/--clean"
-msgstr ""
+msgstr "kan inte både ange -c/--check och -C/--clean"
msgid "uncommitted local changes"
-msgstr ""
+msgstr "oarkiverade lokala ändringar"
msgid "verify the integrity of the repository"
msgstr "verifiera arkivets integritet"
@@ -9060,810 +10335,13 @@
"Detta är fri mjukvara; se källkoden för kopieringsvillkor. Det ges INGEN\n"
"garanti; inte ens för SÄLJBARHET eller ATT PASSA FÖR ETT VISST ÄNDAMÅL.\n"
-msgid "repository root directory or name of overlay bundle file"
-msgstr "arkivrotkatalog eller namn på påläggsbuntfil"
-
-msgid "DIR"
-msgstr ""
-
-msgid "change working directory"
-msgstr "ändra arbetskatalog"
-
-msgid "do not prompt, assume 'yes' for any required answers"
-msgstr "fråga inte, anta att svaret är 'ja' på alla frågor"
-
-msgid "suppress output"
-msgstr "förhindra utmatning"
-
-msgid "enable additional output"
-msgstr "aktivera ytterligare utmatning"
-
-msgid "set/override config option (use 'section.name=value')"
-msgstr "sätt/upphäv konfigurationsflagga (använd 'sektion.namn=värde')"
-
-msgid "CONFIG"
-msgstr ""
-
-msgid "enable debugging output"
-msgstr "aktivera debugutmatning"
-
-msgid "start debugger"
-msgstr "starta debugger"
-
-msgid "set the charset encoding"
-msgstr "sätt teckenkodning"
-
-msgid "ENCODE"
-msgstr ""
-
-msgid "MODE"
-msgstr ""
-
-msgid "set the charset encoding mode"
-msgstr "sätt teckenkodningsläge"
-
-msgid "always print a traceback on exception"
-msgstr "visa alltid bakåtspårning vid undantag"
-
-msgid "time how long the command takes"
-msgstr "ta tid på hur lång tid kommandot körs"
-
-msgid "print command execution profile"
-msgstr "visa kommandoexekveringens profil"
-
-msgid "output version information and exit"
-msgstr "skriv versionsinformation och avsluta"
-
-msgid "display help and exit"
-msgstr "visa hjälp och avsluta"
-
-msgid "do not perform actions, just print output"
-msgstr "utför inget, bara visa"
-
-msgid "specify ssh command to use"
-msgstr "specificera ssh-kommando att använda"
-
-msgid "specify hg command to run on the remote side"
-msgstr "specificera hg-kommando att köra på andra sidan"
-
-msgid "do not verify server certificate (ignoring web.cacerts config)"
-msgstr ""
-"verifiera inte servercertifikatet (ignorerar web.cacerts-konfiguration)"
-
-msgid "PATTERN"
-msgstr "MÖNSTER"
-
-msgid "include names matching the given patterns"
-msgstr "inkludera namn som matchar de givna mönstren"
-
-msgid "exclude names matching the given patterns"
-msgstr "exkludera namn som matchar de givna mönstren"
-
-msgid "use text as commit message"
-msgstr "använd text som arkiveringsmeddelande"
-
-msgid "read commit message from file"
-msgstr "läs arkiveringsmeddelandet från fil"
-
-msgid "record datecode as commit date"
-msgstr "lagra datumkod som arkiveringsdatum"
-
-msgid "record the specified user as committer"
-msgstr "lagra den specificerade användaren som arkiverare"
-
-msgid "STYLE"
-msgstr "STIL"
-
-msgid "display using template map file"
-msgstr "visa med mallfil"
-
-msgid "display with template"
-msgstr "visa med mall"
-
-msgid "do not show merges"
-msgstr "visa inte sammanfogningar"
-
-msgid "output diffstat-style summary of changes"
-msgstr "visa sammanfattning av ändringar i diffstat-stil"
-
-msgid "treat all files as text"
-msgstr "behandla alla filer som text"
-
-msgid "omit dates from diff headers"
-msgstr "exkludera datum från diff-rubriker"
-
-msgid "show which function each change is in"
-msgstr "visa vilken funktion varje ändring är i"
-
-msgid "produce a diff that undoes the changes"
-msgstr "skapa en diff som ångrar ändringarna"
-
-msgid "ignore white space when comparing lines"
-msgstr "ignorera blanktecken när rader jämförs"
-
-msgid "ignore changes in the amount of white space"
-msgstr "ignorera ändringar av antalet blanktecken"
-
-msgid "ignore changes whose lines are all blank"
-msgstr "ignorera ändringar vars rader är tomma"
-
-msgid "number of lines of context to show"
-msgstr "antal sammanhangsrader att visa"
-
-msgid "SIMILARITY"
-msgstr ""
-
-msgid "guess renamed files by similarity (0<=s<=100)"
-msgstr "gissa omdöpta filer efter likhet (0<=s<=100)"
-
-msgid "recurse into subrepositories"
-msgstr "gå in i underarkiv"
-
-msgid "[OPTION]... [FILE]..."
-msgstr "[FLAGGA]... [FIL]..."
-
-msgid "annotate the specified revision"
-msgstr "annotera den specificerade revisionen"
-
-msgid "follow copies/renames and list the filename (DEPRECATED)"
-msgstr "följ kopieringar/namnbyten och visa filnamnet (FÖRLEGAD)"
-
-msgid "don't follow copies and renames"
-msgstr "följ inte kopieringar och namnbyten"
-
-msgid "list the author (long with -v)"
-msgstr "visa skapare (lång med -v)"
-
-msgid "list the filename"
-msgstr "visa filnamnet"
-
-msgid "list the date (short with -q)"
-msgstr "visa datum (kort med -q)"
-
-msgid "list the revision number (default)"
-msgstr "visa revisionsnummer (standard)"
-
-msgid "list the changeset"
-msgstr "visa ändring"
-
-msgid "show line number at the first appearance"
-msgstr "visa radnummer för första förekomsten"
-
-msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
-msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FIL..."
-
-msgid "do not pass files through decoders"
-msgstr "passera inte filer genom dekoders"
-
-msgid "PREFIX"
-msgstr "PREFIX"
-
-msgid "directory prefix for files in archive"
-msgstr "katalogprefix för filer i arkiv"
-
-msgid "revision to distribute"
-msgstr "revision att distribuera"
-
-msgid "type of distribution to create"
-msgstr "distributionstyp att skapa"
-
-msgid "[OPTION]... DEST"
-msgstr "[FLAGGA]... DEST"
-
-msgid "merge with old dirstate parent after backout"
-msgstr "sammanfoga med gamla dirstate-föräldern efter återkallning"
-
-msgid "parent to choose when backing out merge"
-msgstr "förälder att välja när en sammanfogning återkallas"
-
-msgid "specify merge tool"
-msgstr "ange sammanfogningsverktyg"
-
-msgid "revision to backout"
-msgstr "revision att återkalla"
-
-msgid "[OPTION]... [-r] REV"
-msgstr "[FLAGGA]... [-r] REV"
-
-msgid "reset bisect state"
-msgstr "återställ bisect-tillständ"
-
-msgid "mark changeset good"
-msgstr "markera ändringen som bra"
-
-msgid "mark changeset bad"
-msgstr "markera ändringen som dålig"
-
-msgid "skip testing changeset"
-msgstr "hoppa över test av ändring"
-
-msgid "use command to check changeset state"
-msgstr "använd kommando för att kontrollera ändringsstatus"
-
-msgid "do not update to target"
-msgstr "uppdatera inte till målet"
-
-msgid "[-gbsr] [-U] [-c CMD] [REV]"
-msgstr "[-gbsr] [-U] [-c KMD] [REV]"
-
-msgid "force"
-msgstr "tvinga"
-
-msgid "delete a given bookmark"
-msgstr "ta bort angivet bokmärke"
-
-msgid "rename a given bookmark"
-msgstr "döp om angivet bokmärke"
-
-msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
-msgstr "hg bookmarks [-f] [-d] [-m NAMN] [-r REV] [NAMN]"
-
-msgid "set branch name even if it shadows an existing branch"
-msgstr "sätt grennamnet även om det döljer en existerande gren"
-
-msgid "reset branch name to parent branch name"
-msgstr "återställ grennamn till förälderns grennamn"
-
-msgid "[-fC] [NAME]"
-msgstr "[-fC] [NAMN]"
-
-msgid "show only branches that have unmerged heads"
-msgstr "visa bara grenar som har icke-sammanfogade huvuden"
-
-msgid "show normal and closed branches"
-msgstr "visa normala och stängda grenar"
-
-msgid "[-ac]"
-msgstr "[-ac]"
-
-msgid "run even when the destination is unrelated"
-msgstr "kör även när destinationen är obesläktad"
-
-msgid "a changeset intended to be added to the destination"
-msgstr "en ändring avsedd att läggas till destinationen"
-
-msgid "a specific branch you would like to bundle"
-msgstr "en specifik gren du vill bunta"
-
-msgid "a base changeset assumed to be available at the destination"
-msgstr "en basändring som antas är tillgängliga i destinationen"
-
-msgid "bundle all changesets in the repository"
-msgstr "bunta alla ändringar i arkivet"
-
-msgid "bundle compression type to use"
-msgstr "typ av buntkompression att använda"
-
-msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
-msgstr "[-f] [-t TYP] [-a] [-r REV]... [--base REV]... FIL [DEST]"
-
-msgid "print output to file with formatted name"
-msgstr "skriv utmatning till fil med formatterat namn"
-
-msgid "print the given revision"
-msgstr "visa den angivna revisionen"
-
-msgid "apply any matching decode filter"
-msgstr "applicera valfritt överrensstämmande avkodningsfilter"
-
-msgid "[OPTION]... FILE..."
-msgstr "[FLAGGA]... FIL..."
-
-msgid "the clone will include an empty working copy (only a repository)"
-msgstr "klonen kommer add inkludera en tom arbetskopia (bara ett arkiv)"
-
-msgid "revision, tag or branch to check out"
-msgstr "revision, märke eller gren att hämta ut"
-
-msgid "include the specified changeset"
-msgstr "inkludera den angivna ändringen"
-
-msgid "clone only the specified branch"
-msgstr "klona bara den angivna grenen"
-
-msgid "[OPTION]... SOURCE [DEST]"
-msgstr "[FLAGGA]... KÄLLA [DEST]"
-
-msgid "mark new/missing files as added/removed before committing"
-msgstr "märk nya/saknade filer som tillagda/borttagna innan arkivering"
-
-msgid "mark a branch as closed, hiding it from the branch list"
-msgstr "markera en gren som stängd, och göm den från grenlistan"
-
-msgid "record a copy that has already occurred"
-msgstr "lagra en kopiering som redan har inträffat"
-
-msgid "forcibly copy over an existing managed file"
-msgstr "tvinga kopiering över en eixsterande hanterad fil"
-
-msgid "[OPTION]... [SOURCE]... DEST"
-msgstr "[FLAGGA]... [KÄLLA]... DEST"
-
-msgid "[INDEX] REV1 REV2"
-msgstr "[INDEX] REV1 REV2"
-
-msgid "add single file mergeable changes"
-msgstr ""
-
-msgid "add single file all revs append to"
-msgstr ""
-
-msgid "add single file all revs overwrite"
-msgstr ""
-
-msgid "add new file at each rev"
-msgstr ""
-
-msgid "[OPTION]... TEXT"
-msgstr "[FLAGGA]... TEXT"
-
-msgid "[COMMAND]"
-msgstr "[KOMMANDO]"
-
-msgid "show the command options"
-msgstr "visa kommandoflaggor"
-
-msgid "[-o] CMD"
-msgstr "[-o] KMD"
-
-msgid "use tags as labels"
-msgstr ""
-
-msgid "annotate with branch names"
-msgstr ""
-
-msgid "use dots for runs"
-msgstr ""
-
-msgid "separate elements by spaces"
-msgstr ""
-
-msgid "[OPTION]... [FILE [REV]...]"
-msgstr "[FLAGGA]... [FIL] [REV]...]"
-
-msgid "try extended date formats"
-msgstr "pröva utökade datumformat"
-
-msgid "[-e] DATE [RANGE]"
-msgstr "[-e] DATUM [SPANN]"
-
-msgid "FILE REV"
-msgstr "FIL REV"
-
-msgid "[PATH]"
-msgstr "[SÖKVÄG]"
-
-msgid "revlog format"
-msgstr ""
-
-msgid "REPO NAMESPACE [KEY OLD NEW]"
-msgstr ""
-
-msgid "revision to rebuild to"
-msgstr "revision att bygga om till"
-
-msgid "[-r REV] [REV]"
-msgstr "[-r REV] [REV]"
-
-msgid "revision to debug"
-msgstr "revision att debugga"
-
-msgid "[-r REV] FILE"
-msgstr "[-r REV] FIL"
-
-msgid "REV1 [REV2]"
-msgstr "REV1 [REV2]"
-
-msgid "do not display the saved mtime"
-msgstr "visa inte sparad mtime"
-
-msgid "[OPTION]..."
-msgstr "[FLAGGA]..."
-
-msgid "revision to check"
-msgstr "revision att kontrollera"
-
-msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
-msgstr "[FLAGGA]... ([-c REV] | [-r REV1 [-r REV2]]) [FIL]..."
-
-msgid "diff against the second parent"
-msgstr "diffa mot den andra föräldern"
-
-msgid "revisions to export"
-msgstr "revisioner att exportera"
-
-msgid "[OPTION]... [-o OUTFILESPEC] REV..."
-msgstr "[FLAGGA]... [-o UTFILSPEC] REV..."
-
-msgid "end fields with NUL"
-msgstr "avsluta fält med NUL"
-
-msgid "print all revisions that match"
-msgstr "visa alla revisioner som matchar"
-
-msgid "follow changeset history, or file history across copies and renames"
-msgstr ""
-"följ ändringshistorik, eller filhistorik över kopieringar och namnbyten"
-
-msgid "ignore case when matching"
-msgstr "ignorera versaler/gemener vid matchning"
-
-msgid "print only filenames and revisions that match"
-msgstr "visa bara filnamn och revisioner som matchar"
-
-msgid "print matching line numbers"
-msgstr "visa matchande radnummer"
-
-msgid "only search files changed within revision range"
-msgstr "sök filer enbart inom ett givet revisionsområde"
-
-msgid "[OPTION]... PATTERN [FILE]..."
-msgstr "[FLAGGA]... MÖNSTER [FIL]..."
-
-msgid "show only heads which are descendants of STARTREV"
-msgstr "visa bara huvuden som är ättlingar till STARTREV"
-
-msgid "STARTREV"
-msgstr "STARTREV"
-
-msgid "show topological heads only"
-msgstr "visa bara topologiska huvuden"
-
-msgid "show active branchheads only (DEPRECATED)"
-msgstr "visa bara aktiva grenhuvuden (FÖRLEGAD)"
-
-msgid "show normal and closed branch heads"
-msgstr "visa normala och stängda grenhuvuden"
-
-msgid "[-ac] [-r STARTREV] [REV]..."
-msgstr "[-ac] [-r STARTREV] [REV]..."
-
-msgid "[TOPIC]"
-msgstr "[ÄMNE]"
-
-msgid "identify the specified revision"
-msgstr "identifiera den angivna revisionen"
-
-msgid "show local revision number"
-msgstr "visa lokala revisionsnummer"
-
-msgid "show global revision id"
-msgstr "visa globala revisions-id"
-
-msgid "show branch"
-msgstr "visa grenar"
-
-msgid "show tags"
-msgstr "visa märken"
-
-msgid "show bookmarks"
-msgstr "visa bokmärken"
-
-msgid "[-nibtB] [-r REV] [SOURCE]"
-msgstr "[-nibtB] [-r REV] [KÄLLA]"
-
-msgid ""
-"directory strip option for patch. This has the same meaning as the "
-"corresponding patch option"
-msgstr ""
-
-msgid "PATH"
-msgstr "SÖKVÄG"
-
-msgid "base path"
-msgstr "grundsökväg"
-
-msgid "skip check for outstanding uncommitted changes"
-msgstr "hoppa över kontroll av oarkiverade ändringar"
-
-msgid "don't commit, just update the working directory"
-msgstr "arkivera inte, uppdatera bara arbetskatalogen"
-
-msgid "apply patch to the nodes from which it was generated"
-msgstr "applicera patch till noderna som den genererades från"
-
-msgid "use any branch information in patch (implied by --exact)"
-msgstr "använd greninformation i patchen (implicit med --exact)"
-
-msgid "[OPTION]... PATCH..."
-msgstr "[FLAGGA]... PATCH..."
-
-msgid "run even if remote repository is unrelated"
-msgstr "kör även om fjärrarkivet är obesläktat"
-
-msgid "show newest record first"
-msgstr "visa nyaste saken först"
-
-msgid "file to store the bundles into"
-msgstr "fil att lagra buntarna i"
-
-msgid "a remote changeset intended to be added"
-msgstr "en fjärrändring som avses att läggas till"
-
-msgid "compare bookmarks"
-msgstr "jämför bokmärken"
-
-msgid "a specific branch you would like to pull"
-msgstr "en specifik gren som du vill dra"
-
-msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
-msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAMN] [KÄLLA]"
-
-msgid "[-e CMD] [--remotecmd CMD] [DEST]"
-msgstr "[-e KMD] [--remotecmd KMD] [DEST]"
-
-msgid "search the repository as it is in REV"
-msgstr "sök igenom arkivet som det är vid REV"
-
-msgid "end filenames with NUL, for use with xargs"
-msgstr "filnamn slutar med NUL, för användning med xargs"
-
-msgid "print complete paths from the filesystem root"
-msgstr "visa kompletta sökvägar från filsystemsroten"
-
-msgid "[OPTION]... [PATTERN]..."
-msgstr "[FLAGGA]... [MÖNSTER]..."
-
-msgid "only follow the first parent of merge changesets"
-msgstr "följ bara den första föräldern vid sammanfogningar"
-
-msgid "show revisions matching date spec"
-msgstr "visa revisioner som matchar datumspecen"
-
-msgid "show copied files"
-msgstr "visa kopierade filer"
-
-msgid "do case-insensitive search for a given text"
-msgstr "gör versalokänslig sökning efter en given text"
-
-msgid "include revisions where files were removed"
-msgstr "inkludera revisioner där filer togs bort"
-
-msgid "show only merges"
-msgstr "visa bara sammanfogningar"
-
-msgid "revisions committed by user"
-msgstr "revisioner arkiverade av användare"
-
-msgid "show only changesets within the given named branch (DEPRECATED)"
-msgstr "visa bara ändringar i den namngivna grenen (FÖRLEGAD)"
-
-msgid "show changesets within the given named branch"
-msgstr "visa ändringar i den namngivna grenen"
-
-msgid "do not display revision or any of its ancestors"
-msgstr "visa inte revision eller någon av dess föräldrar"
-
-msgid "[OPTION]... [FILE]"
-msgstr "[FLAGGA]... [FIL]"
-
-msgid "revision to display"
-msgstr "revision att visa"
-
-msgid "[-r REV]"
-msgstr "[-r REV]"
-
-msgid "force a merge with outstanding changes"
-msgstr "tvinga en sammanfogning med utestående ändringar"
-
-msgid "revision to merge"
-msgstr "revision att sammanfoga"
-
-msgid "review revisions to merge (no merge is performed)"
-msgstr "granska revisioner att sammanfoga (ingen sammanfogning utförs)"
-
-msgid "[-P] [-f] [[-r] REV]"
-msgstr "[-P] [-f] [[-r] REV]"
-
-msgid "a changeset intended to be included in the destination"
-msgstr "en ändring avsedd att inkluderas i destinationen"
-
-msgid "a specific branch you would like to push"
-msgstr "en specifik gren som du vill trycka"
-
-msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
-msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
-
-msgid "show parents of the specified revision"
-msgstr "visa föräldrar för den angivna revisionen"
-
-msgid "[-r REV] [FILE]"
-msgstr "[-r REV] [FIL]"
-
-msgid "[NAME]"
-msgstr "[NAMN]"
-
-msgid "update to new branch head if changesets were pulled"
-msgstr "uppdatera till nytt grenhuvud om ändringar drogs"
-
-msgid "run even when remote repository is unrelated"
-msgstr "kör även när fjärrarkivet är orelaterat"
-
-msgid "BOOKMARK"
-msgstr "BOKMÄRKE"
-
-msgid "bookmark to pull"
-msgstr "bokmärke att dra"
-
-msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
-msgstr "[-u] [-f] [-r REV]... [-e KMD] [--remotecmd KMD] [KÄLLA]"
-
-msgid "force push"
-msgstr "tvinga tryckning"
-
-msgid "bookmark to push"
-msgstr "bokmärke att trycka"
-
-msgid "allow pushing a new branch"
-msgstr "tillåt att trycka en ny gren"
-
-msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
-msgstr "[-f] [-r REV]... [-e KMD] [--remotecmd KMD] [DEST]"
-
-msgid "record delete for missing files"
-msgstr "markera saknade filer för radering"
-
-msgid "remove (and delete) file even if added or modified"
-msgstr "radera (och ta bort) filer även om tillagda eller modifierade"
-
-msgid "record a rename that has already occurred"
-msgstr "spara en namnändring som redan har inträffat"
-
-msgid "[OPTION]... SOURCE... DEST"
-msgstr "[FLAGGA]... KÄLLA... DEST"
-
-msgid "select all unresolved files"
-msgstr "välj alla olösta filer"
-
-msgid "list state of files needing merge"
-msgstr "visa status för filer som behöver sammanfogas"
-
-msgid "mark files as resolved"
-msgstr "markera filer som lösta"
-
-msgid "mark files as unresolved"
-msgstr "markera filer som olösta"
-
-msgid "hide status prefix"
-msgstr "göm statusprefix"
-
-msgid "revert all changes when no arguments given"
-msgstr "återställ alla ändringar när inga argument ges"
-
-msgid "tipmost revision matching date"
-msgstr "senaste revision matchande datum"
-
-msgid "revert to the specified revision"
-msgstr "återgå till den angivna revisionen"
-
-msgid "do not save backup copies of files"
-msgstr "spara inte backup-kopior av filer"
-
-msgid "[OPTION]... [-r REV] [NAME]..."
-msgstr "[FLAGGA]... [-r REV] [NAMN]..."
-
-msgid "name of access log file to write to"
-msgstr "namn på åtkomstlogg att skriva till"
-
-msgid "name of error log file to write to"
-msgstr "namn på fellogg att skriva till"
-
-msgid "PORT"
-msgstr "PORT"
-
-msgid "port to listen on (default: 8000)"
-msgstr "port att lyssna på (standard: 8000)"
-
-msgid "ADDR"
-msgstr ""
-
-msgid "address to listen on (default: all interfaces)"
-msgstr "adress att lyssna på (standard alla gränssnitt)"
-
-msgid "prefix path to serve from (default: server root)"
-msgstr "sökvägsprefix att dela ut från (standard: serverrot)"
-
-msgid "name to show in web pages (default: working directory)"
-msgstr "namn att visa i webbsidor (standard: arbetskatalogen)"
-
-msgid "name of the hgweb config file (see \"hg help hgweb\")"
-msgstr "namn på webdir-konfigurationsfil (se \"hg help hgweb\")"
-
-msgid "name of the hgweb config file (DEPRECATED)"
-msgstr "namn på webdir-konfigurationsfil (FÖRLEGAD)"
-
-msgid "for remote clients"
-msgstr "för fjärrklienter"
-
-msgid "web templates to use"
-msgstr "webbmallar att använda"
-
-msgid "template style to use"
-msgstr "mallstil att använda"
-
-msgid "use IPv6 in addition to IPv4"
-msgstr "använd IPv6 förutom IPv4"
-
-msgid "SSL certificate file"
-msgstr "SSL-certifikatsfil"
-
-msgid "show untrusted configuration options"
-msgstr "visa opålitliga konfigurationsalternativ"
-
-msgid "[-u] [NAME]..."
-msgstr "[-u] [NAMN]..."
-
-msgid "check for push and pull"
-msgstr "sök efter inkommande och utgående ändringar"
-
-msgid "show status of all files"
-msgstr "visa status för alla filer"
-
-msgid "show only modified files"
-msgstr "visa bara modifierade filer"
-
-msgid "show only added files"
-msgstr "visa bara adderade filer"
-
-msgid "show only removed files"
-msgstr "visa bara raderade filer"
-
-msgid "show only deleted (but tracked) files"
-msgstr "visa bara borttagna (men spårade) filer"
-
-msgid "show only files without changes"
-msgstr "visa bara filer utan ändringar"
-
-msgid "show only unknown (not tracked) files"
-msgstr "visa bara okända (ospårade) filer"
-
-msgid "show only ignored files"
-msgstr "visa bara ignorerade filer"
-
-msgid "show source of copied files"
-msgstr "visa källan för kopierade filer"
-
-msgid "show difference from revision"
-msgstr "visa differens från revision"
-
-msgid "list the changed files of a revision"
-msgstr "visa de ändrade filerna från en revision"
-
-msgid "force tag"
-msgstr "tvinga märkning"
-
-msgid "make the tag local"
-msgstr "gör märket lokalt"
-
-msgid "revision to tag"
-msgstr "revision att märka"
-
-msgid "remove a tag"
-msgstr "ta bort ett märke"
-
-msgid "use <text> as commit message"
-msgstr "använd <text> som arkiveringsmeddelande"
-
-msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
-msgstr "[-f] [-l] [-m TEXT] [-d DATUM] [-u ANVÄNDARE] [-r REV] NAMN..."
-
-msgid "[-p] [-g]"
-msgstr "[-p] [-g]"
-
-msgid "update to new branch head if changesets were unbundled"
-msgstr "uppdatera till nytt grenhuvud om ändringar packades upp"
-
-msgid "[-u] FILE..."
-msgstr "[-u] FIL..."
-
-msgid "discard uncommitted changes (no backup)"
-msgstr "kassera oarkiverade ändringar (ingen backup)"
-
-msgid "update across branches if no uncommitted changes"
-msgstr ""
-
-msgid "[-c] [-C] [-d DATE] [[-r] REV]"
-msgstr "[-c] [-C] [-d DATUM] [[-r] REV]"
+#, python-format
+msgid "unknown mode %s"
+msgstr "okänt läge '%s'"
+
+#, python-format
+msgid "unknown command %s"
+msgstr "okänt kommando %s"
#, python-format
msgid "cannot include %s (%s)"
@@ -9900,14 +10378,6 @@
msgstr ""
#, python-format
-msgid "%s not added!\n"
-msgstr ""
-
-#, python-format
-msgid "%s still exists!\n"
-msgstr ""
-
-#, python-format
msgid "%s not tracked!\n"
msgstr ""
@@ -9935,14 +10405,13 @@
msgid "invalid event type in dag: %s"
msgstr ""
+msgid "nullid"
+msgstr ""
+
msgid "working directory state appears damaged!"
msgstr ""
#, python-format
-msgid "'\\n' and '\\r' disallowed in filenames: %r"
-msgstr ""
-
-#, python-format
msgid "directory %r already in dirstate"
msgstr ""
@@ -9954,10 +10423,6 @@
msgid "setting %r to other parent only allowed in merges"
msgstr ""
-#, python-format
-msgid "not in dirstate: %s\n"
-msgstr ""
-
msgid "unknown"
msgstr ""
@@ -9980,24 +10445,6 @@
msgid "unsupported file type (type is %s)"
msgstr ""
-msgid "searching for changes\n"
-msgstr "söker efter ändringar\n"
-
-msgid "queries"
-msgstr "frågor"
-
-msgid "searching"
-msgstr ""
-
-msgid "already have changeset "
-msgstr "har redan ändringen "
-
-msgid "warning: repository is unrelated\n"
-msgstr "varning: arkivet är obesälktat\n"
-
-msgid "repository is unrelated"
-msgstr "arkivet är obesläktat"
-
#, python-format
msgid "push creates new remote branches: %s!"
msgstr "push skapar nya fjärrhuvuden: %s!"
@@ -10006,11 +10453,12 @@
msgstr "använd 'hg push --new-branch' för att skapa nya fjärrgrenar"
#, python-format
-msgid "push creates new remote heads on branch '%s'!"
-msgstr "push skapar nya fjärrhuvuden på grenen '%s'!"
-
-msgid "push creates new remote heads!"
-msgstr "push skapar nya fjärrhuvuden!"
+msgid "push creates new remote head %s on branch '%s'!"
+msgstr "push skapar nyt fjärrhuvud %s på grenen '%s'!"
+
+#, python-format
+msgid "push creates new remote head %s!"
+msgstr "push skapar nya fjärrhuvudet %s!"
msgid "you should pull and merge or use push -f to force"
msgstr "du kan dra och sammanfoga eller använda push -f för att tvinga"
@@ -10136,11 +10584,6 @@
#, python-format
msgid ""
-"No argument found for substitution of %i variable in alias '%s' definition."
-msgstr ""
-
-#, python-format
-msgid ""
"error in definition for alias '%s': %s may only be given on the command "
"line\n"
msgstr ""
@@ -10184,12 +10627,13 @@
msgid "repository '%s' is not local"
msgstr ""
+#, python-format
+msgid "no repository found in %r (.hg not found)"
+msgstr "inget arkiv hittades i %r (.hg hittades inte)"
+
msgid "warning: --repository ignored\n"
msgstr "varning: --repository ignorerades\n"
-msgid "invalid arguments"
-msgstr ""
-
#, python-format
msgid "unrecognized profiling format '%s' - Ignored\n"
msgstr ""
@@ -10265,6 +10709,195 @@
msgid "merging %s failed!\n"
msgstr ""
+msgid "unterminated string"
+msgstr ""
+
+msgid "syntax error"
+msgstr ""
+
+msgid "missing argument"
+msgstr ""
+
+msgid "can't use a list in this context"
+msgstr "kan inte använda en lista i detta sammanhang"
+
+msgid ""
+"``modified()``\n"
+" File that is modified according to status."
+msgstr ""
+
+#. i18n: "modified" is a keyword
+msgid "modified takes no arguments"
+msgstr "modified tar inga argument"
+
+msgid ""
+"``added()``\n"
+" File that is added according to status."
+msgstr ""
+
+#. i18n: "added" is a keyword
+msgid "added takes no arguments"
+msgstr "added tar inga argument"
+
+msgid ""
+"``removed()``\n"
+" File that is removed according to status."
+msgstr ""
+
+#. i18n: "removed" is a keyword
+msgid "removed takes no arguments"
+msgstr "removed tar inga argument"
+
+msgid ""
+"``deleted()``\n"
+" File that is deleted according to status."
+msgstr ""
+
+#. i18n: "deleted" is a keyword
+msgid "deleted takes no arguments"
+msgstr "deleted tar inga argument"
+
+msgid ""
+"``unknown()``\n"
+" File that is unknown according to status. These files will only be\n"
+" considered if this predicate is used."
+msgstr ""
+
+#. i18n: "unknown" is a keyword
+msgid "unknown takes no arguments"
+msgstr "unknown tar inga argument"
+
+msgid ""
+"``ignored()``\n"
+" File that is ignored according to status. These files will only be\n"
+" considered if this predicate is used."
+msgstr ""
+
+#. i18n: "ignored" is a keyword
+msgid "ignored takes no arguments"
+msgstr "ignored tar inga argument"
+
+msgid ""
+"``clean()``\n"
+" File that is clean according to status."
+msgstr ""
+
+#. i18n: "clean" is a keyword
+msgid "clean takes no arguments"
+msgstr "clean tar inga argument"
+
+#, python-format
+msgid "not a function: %s"
+msgstr "inte en funktion: %s"
+
+msgid ""
+"``binary()``\n"
+" File that appears to be binary (contails NUL bytes)."
+msgstr ""
+
+#. i18n: "binary" is a keyword
+msgid "binary takes no arguments"
+msgstr "binary tar inga argument"
+
+msgid ""
+"``exec()``\n"
+" File that is marked as executable."
+msgstr ""
+
+#. i18n: "exec" is a keyword
+msgid "exec takes no arguments"
+msgstr "exec tar inga argument"
+
+msgid ""
+"``symlink()``\n"
+" File that is marked as a symlink."
+msgstr ""
+
+#. i18n: "symlink" is a keyword
+msgid "symlink takes no arguments"
+msgstr "symlink tar inga argument"
+
+msgid ""
+"``resolved()``\n"
+" File that is marked resolved according to the resolve state."
+msgstr ""
+
+#. i18n: "resolved" is a keyword
+msgid "resolved takes no arguments"
+msgstr "resolved tar inga argument"
+
+msgid ""
+"``unresolved()``\n"
+" File that is marked unresolved according to the resolve state."
+msgstr ""
+
+#. i18n: "unresolved" is a keyword
+msgid "unresolved takes no arguments"
+msgstr "unresolved tar inga argument"
+
+msgid ""
+"``hgignore()``\n"
+" File that matches the active .hgignore pattern."
+msgstr ""
+
+msgid "hgignore takes no arguments"
+msgstr "hgignore tar inga argument"
+
+msgid ""
+"``grep(regex)``\n"
+" File contains the given regular expression."
+msgstr ""
+
+msgid "grep requires a pattern"
+msgstr "grep kräver ett mönster"
+
+#, python-format
+msgid "couldn't parse size: %s"
+msgstr ""
+
+msgid ""
+"``size(expression)``\n"
+" File size matches the given expression. Examples:"
+msgstr ""
+
+msgid ""
+" - 1k (files from 1024 to 2047 bytes)\n"
+" - < 20k (files less than 20480 bytes)\n"
+" - >= .5MB (files at least 524288 bytes)\n"
+" - 4k - 1MB (files from 4096 bytes to 1048576 bytes)"
+msgstr ""
+
+#. i18n: "size" is a keyword
+msgid "size requires an expression"
+msgstr "size kräver ett uttryck"
+
+msgid ""
+"``encoding(name)``\n"
+" File can be successfully decoded with the given character\n"
+" encoding. May not be useful for encodings other than ASCII and\n"
+" UTF-8."
+msgstr ""
+
+#. i18n: "encoding" is a keyword
+msgid "encoding requires an encoding name"
+msgstr ""
+
+#, python-format
+msgid "unknown encoding '%s'"
+msgstr ""
+
+msgid ""
+"``copied()``\n"
+" File that is recorded as being copied."
+msgstr ""
+
+#. i18n: "copied" is a keyword
+msgid "copied takes no arguments"
+msgstr "copied tar inga argument"
+
+msgid "invalid token"
+msgstr ""
+
msgid "starting revisions are not directly related"
msgstr ""
@@ -10300,6 +10933,9 @@
msgid "Specifying Revision Sets"
msgstr "Ange Revisionsset"
+msgid "Specifying File Sets"
+msgstr "Ange Filset"
+
msgid "Diff Formats"
msgstr "Diff-format"
@@ -10324,98 +10960,23 @@
msgid "Glossary"
msgstr "Ordlista"
-msgid ""
-"Mercurial reads configuration data from several files, if they exist.\n"
-"Below we list the most specific file first."
-msgstr ""
-"Mercurial läser konfigurationsdata från flera filer, om de existerar.\n"
-"Nedan listar vi den mest specifika filen först."
-
-msgid "On Windows, these configuration files are read:"
-msgstr "Under Windows läses dessa konfigurationsfiler:"
-
-msgid ""
-"- ``<repo>\\.hg\\hgrc``\n"
-"- ``%USERPROFILE%\\.hgrc``\n"
-"- ``%USERPROFILE%\\mercurial.ini``\n"
-"- ``%HOME%\\.hgrc``\n"
-"- ``%HOME%\\mercurial.ini``\n"
-"- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial."
-"ini found)\n"
-"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial."
-"ini found)\n"
-"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n"
-"- ``<hg.exe-dir>\\mercurial.ini``"
-msgstr ""
-"- ``<arkiv>\\.hg\\hgrc``\n"
-"- ``%USERPROFILE%\\.hgrc``\n"
-"- ``%USERPROFILE%\\mercurial.ini``\n"
-"- ``%HOME%\\.hgrc``\n"
-"- ``%HOME%\\mercurial.ini``\n"
-"- ``C:\\mercurial\\mercurial.ini`` (om inte registernyckel eller hgrc.d\\ "
-"eller mercurial.ini hittas)\n"
-"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (om inte hgrc.d\\ eller "
-"mercurial.ini hittas)\n"
-"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (om inte mercurial.ini hittas)\n"
-"- ``<hg.exe-dir>\\mercurial.ini``"
-
-msgid "On Unix, these files are read:"
-msgstr "Under Unix läses dessa filer:"
-
-msgid ""
-"- ``<repo>/.hg/hgrc``\n"
-"- ``$HOME/.hgrc``\n"
-"- ``/etc/mercurial/hgrc``\n"
-"- ``/etc/mercurial/hgrc.d/*.rc``\n"
-"- ``<install-root>/etc/mercurial/hgrc``\n"
-"- ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
-msgstr ""
-"- ``<arkiv>/.hg/hgrc``\n"
-"- ``$HOME/.hgrc``\n"
-"- ``/etc/mercurial/hgrc``\n"
-"- ``/etc/mercurial/hgrc.d/*.rc``\n"
-"- ``<installationsrot>/etc/mercurial/hgrc``\n"
-"- ``<installationsrot>/etc/mercurial/hgrc.d/*.rc``"
-
-msgid ""
-"If there is a per-repository configuration file which is not owned by\n"
-"the active user, Mercurial will warn you that the file is skipped::"
-msgstr ""
-"Om det finns en arkivkonfigurationsfil som inte ägs av den aktiva\n"
-"användaren, kommer Mercurial att varna dig att filen ignoreras::"
-
-msgid ""
-" not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP"
-msgstr ""
-" Litar inte på filen <arkiv>/.hg/hgrc från opålitlig användare ANVÄNDARE,\n"
-" grupp GRUPP"
-
-msgid ""
-"If this bothers you, the warning can be silenced (the file would still\n"
-"be ignored) or trust can be established. Use one of the following\n"
-"settings, the syntax is explained below:"
-msgstr ""
-"Om det stör dig, så kan varningen tystas (filen kommer fortfarande att\n"
-"ignoreras) eller du kan tala om att vederbörande är tillförlitlig. Använd\n"
-"en av de följande inställningarna. Den första raden tystar varningarna, de\n"
-"två andra visar att du litar på användaren:"
-
-msgid ""
-"- ``ui.report_untrusted = False``\n"
-"- ``trusted.users = USER``\n"
-"- ``trusted.groups = GROUP``"
-msgstr ""
-"- ``ui.report_untrusted = False``\n"
-"- ``trusted.users = ANVÄNDARE``\n"
-"- ``trusted.groups = GRUPP``"
-
-msgid ""
-"The configuration files for Mercurial use a simple ini-file format. A\n"
-"configuration file consists of sections, led by a ``[section]`` header\n"
-"and followed by ``name = value`` entries::"
+msgid "syntax for Mercurial ignore files"
+msgstr "syntax för Mercurials ignoreringsfiler"
+
+msgid ""
+"The Mercurial system uses a set of configuration files to control\n"
+"aspects of its behavior."
+msgstr ""
+"Mercurial använder ett antal konfigurationsfiler för att kontrollera hur\n"
+"vissa delar ska fungera."
+
+msgid ""
+"The configuration files use a simple ini-file format. A configuration\n"
+"file consists of sections, led by a ``[section]`` header and followed\n"
+"by ``name = value`` entries::"
msgstr ""
"Konfigurationsfilerna för Mercurial använder ett enkelt ini-filformat. En\n"
-"file består av sektioner, som inleds av en rubrik (ex ``[sektion]``) och\n"
+"konfigurationsfil består av sektioner, som inleds av en ``[sektion]`` och\n"
"följs av rader med ``namn = värde``::"
msgid ""
@@ -10429,19 +10990,1858 @@
msgid ""
"The above entries will be referred to as ``ui.username`` and\n"
-"``ui.verbose``, respectively. Please see the hgrc man page for a full\n"
-"description of the possible configuration values:"
+"``ui.verbose``, respectively. See the Syntax section below."
msgstr ""
"Raderna ovanför refereras till som ``ui.username`` och\n"
-"``ui.verbose``. Läs man-sidan för hgrc för en full beskrivning av alla\n"
-"möjliga konfigurationsvärden:"
-
-msgid ""
-"- on Unix-like systems: ``man hgrc``\n"
-"- online: http://www.selenic.com/mercurial/hgrc.5.html\n"
-msgstr ""
-"- under Unix-liknande system: ``man hgrc``\n"
-"- online: http://www.selenic.com/mercurial/hgrc.5.html\n"
+"``ui.verbose``, respektive. Läs Syntax-sektionen nedanför:"
+
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+"Filer\n"
+"-----"
+
+msgid ""
+"Mercurial reads configuration data from several files, if they exist.\n"
+"These files do not exist by default and you will have to create the\n"
+"appropriate configuration files yourself: global configuration like\n"
+"the username setting is typically put into\n"
+"``%USERPROFILE%\\mercurial.ini`` or ``$HOME/.hgrc`` and local\n"
+"configuration is put into the per-repository ``<repo>/.hg/hgrc`` file."
+msgstr ""
+
+msgid ""
+"The names of these files depend on the system on which Mercurial is\n"
+"installed. ``*.rc`` files from a single directory are read in\n"
+"alphabetical order, later ones overriding earlier ones. Where multiple\n"
+"paths are given below, settings from earlier paths override later\n"
+"ones."
+msgstr ""
+
+msgid "| (Unix, Windows) ``<repo>/.hg/hgrc``"
+msgstr ""
+
+msgid ""
+" Per-repository configuration options that only apply in a\n"
+" particular repository. This file is not version-controlled, and\n"
+" will not get transferred during a \"clone\" operation. Options in\n"
+" this file override options in all other configuration files. On\n"
+" Unix, most of this file will be ignored if it doesn't belong to a\n"
+" trusted user or to a trusted group. See the documentation for the\n"
+" ``[trusted]`` section below for more details."
+msgstr ""
+
+msgid ""
+"| (Unix) ``$HOME/.hgrc``\n"
+"| (Windows) ``%USERPROFILE%\\.hgrc``\n"
+"| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n"
+"| (Windows) ``%HOME%\\.hgrc``\n"
+"| (Windows) ``%HOME%\\Mercurial.ini``"
+msgstr ""
+
+msgid ""
+" Per-user configuration file(s), for the user running Mercurial. On\n"
+" Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these\n"
+" files apply to all Mercurial commands executed by this user in any\n"
+" directory. Options in these files override per-system and per-"
+"installation\n"
+" options."
+msgstr ""
+
+msgid ""
+"| (Unix) ``/etc/mercurial/hgrc``\n"
+"| (Unix) ``/etc/mercurial/hgrc.d/*.rc``"
+msgstr ""
+
+msgid ""
+" Per-system configuration files, for the system on which Mercurial\n"
+" is running. Options in these files apply to all Mercurial commands\n"
+" executed by any user in any directory. Options in these files\n"
+" override per-installation options."
+msgstr ""
+
+msgid ""
+"| (Unix) ``<install-root>/etc/mercurial/hgrc``\n"
+"| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
+msgstr ""
+
+msgid ""
+" Per-installation configuration files, searched for in the\n"
+" directory where Mercurial is installed. ``<install-root>`` is the\n"
+" parent directory of the **hg** executable (or symlink) being run. For\n"
+" example, if installed in ``/shared/tools/bin/hg``, Mercurial will look\n"
+" in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply\n"
+" to all Mercurial commands executed by any user in any directory."
+msgstr ""
+
+msgid ""
+"| (Windows) ``<install-dir>\\Mercurial.ini`` **or**\n"
+"| (Windows) ``<install-dir>\\hgrc.d\\*.rc`` **or**\n"
+"| (Windows) ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``"
+msgstr ""
+
+msgid ""
+" Per-installation/system configuration files, for the system on\n"
+" which Mercurial is running. Options in these files apply to all\n"
+" Mercurial commands executed by any user in any directory. Registry\n"
+" keys contain PATH-like strings, every part of which must reference\n"
+" a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will\n"
+" be read. Mercurial checks each of these locations in the specified\n"
+" order until one or more configuration files are detected. If the\n"
+" pywin32 extensions are not installed, Mercurial will only look for\n"
+" site-wide configuration in ``C:\\Mercurial\\Mercurial.ini``."
+msgstr ""
+
+msgid ""
+"Syntax\n"
+"------"
+msgstr ""
+
+msgid ""
+"A configuration file consists of sections, led by a ``[section]`` header\n"
+"and followed by ``name = value`` entries (sometimes called\n"
+"``configuration keys``)::"
+msgstr ""
+
+msgid ""
+" [spam]\n"
+" eggs=ham\n"
+" green=\n"
+" eggs"
+msgstr ""
+
+msgid ""
+"Each line contains one entry. If the lines that follow are indented,\n"
+"they are treated as continuations of that entry. Leading whitespace is\n"
+"removed from values. Empty lines are skipped. Lines beginning with\n"
+"``#`` or ``;`` are ignored and may be used to provide comments."
+msgstr ""
+
+msgid ""
+"Configuration keys can be set multiple times, in which case Mercurial\n"
+"will use the value that was configured last. As an example::"
+msgstr ""
+
+msgid ""
+" [spam]\n"
+" eggs=large\n"
+" ham=serrano\n"
+" eggs=small"
+msgstr ""
+
+msgid "This would set the configuration key named ``eggs`` to ``small``."
+msgstr ""
+
+msgid ""
+"It is also possible to define a section multiple times. A section can\n"
+"be redefined on the same and/or on different configuration files. For\n"
+"example::"
+msgstr ""
+
+msgid ""
+" [foo]\n"
+" eggs=large\n"
+" ham=serrano\n"
+" eggs=small"
+msgstr ""
+
+msgid ""
+" [bar]\n"
+" eggs=ham\n"
+" green=\n"
+" eggs"
+msgstr ""
+
+msgid ""
+" [foo]\n"
+" ham=prosciutto\n"
+" eggs=medium\n"
+" bread=toasted"
+msgstr ""
+
+msgid ""
+"This would set the ``eggs``, ``ham``, and ``bread`` configuration keys\n"
+"of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``,\n"
+"respectively. As you can see there only thing that matters is the last\n"
+"value that was set for each of the configuration keys."
+msgstr ""
+
+msgid ""
+"If a configuration key is set multiple times in different\n"
+"configuration files the final value will depend on the order in which\n"
+"the different configuration files are read, with settings from earlier\n"
+"paths overriding later ones as described on the ``Files`` section\n"
+"above."
+msgstr ""
+
+msgid ""
+"A line of the form ``%include file`` will include ``file`` into the\n"
+"current configuration file. The inclusion is recursive, which means\n"
+"that included files can include other files. Filenames are relative to\n"
+"the configuration file in which the ``%include`` directive is found.\n"
+"Environment variables and ``~user`` constructs are expanded in\n"
+"``file``. This lets you do something like::"
+msgstr ""
+
+msgid " %include ~/.hgrc.d/$HOST.rc"
+msgstr ""
+
+msgid "to include a different configuration file on each computer you use."
+msgstr ""
+
+msgid ""
+"A line with ``%unset name`` will remove ``name`` from the current\n"
+"section, if it has been set previously."
+msgstr ""
+
+msgid ""
+"The values are either free-form text strings, lists of text strings,\n"
+"or Boolean values. Boolean values can be set to true using any of \"1\",\n"
+"\"yes\", \"true\", or \"on\" and to false using \"0\", \"no\", \"false\", or "
+"\"off\"\n"
+"(all case insensitive)."
+msgstr ""
+
+msgid ""
+"List values are separated by whitespace or comma, except when values are\n"
+"placed in double quotation marks::"
+msgstr ""
+
+msgid " allow_read = \"John Doe, PhD\", brian, betty"
+msgstr ""
+
+msgid ""
+"Quotation marks can be escaped by prefixing them with a backslash. Only\n"
+"quotation marks at the beginning of a word is counted as a quotation\n"
+"(e.g., ``foo\"bar baz`` is the list of ``foo\"bar`` and ``baz``)."
+msgstr ""
+
+msgid ""
+"Sections\n"
+"--------"
+msgstr ""
+
+msgid ""
+"This section describes the different sections that may appear in a\n"
+"Mercurial configuration file, the purpose of each section, its possible\n"
+"keys, and their possible values."
+msgstr ""
+
+msgid ""
+"``alias``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Defines command aliases.\n"
+"Aliases allow you to define your own commands in terms of other\n"
+"commands (or aliases), optionally including arguments. Positional\n"
+"arguments in the form of ``$1``, ``$2``, etc in the alias definition\n"
+"are expanded by Mercurial before execution. Positional arguments not\n"
+"already used by ``$N`` in the definition are put at the end of the\n"
+"command to be executed."
+msgstr ""
+
+msgid "Alias definitions consist of lines of the form::"
+msgstr ""
+
+msgid " <alias> = <command> [<argument>]..."
+msgstr ""
+
+msgid "For example, this definition::"
+msgstr ""
+
+msgid " latest = log --limit 5"
+msgstr ""
+
+msgid ""
+"creates a new command ``latest`` that shows only the five most recent\n"
+"changesets. You can define subsequent aliases using earlier ones::"
+msgstr ""
+
+msgid " stable5 = latest -b stable"
+msgstr ""
+
+msgid ""
+".. note:: It is possible to create aliases with the same names as\n"
+" existing commands, which will then override the original\n"
+" definitions. This is almost always a bad idea!"
+msgstr ""
+
+msgid ""
+"An alias can start with an exclamation point (``!``) to make it a\n"
+"shell alias. A shell alias is executed with the shell and will let you\n"
+"run arbitrary commands. As an example, ::"
+msgstr ""
+
+msgid " echo = !echo"
+msgstr ""
+
+msgid ""
+"will let you do ``hg echo foo`` to have ``foo`` printed in your\n"
+"terminal. A better example might be::"
+msgstr ""
+
+msgid " purge = !$HG status --no-status --unknown -0 | xargs -0 rm"
+msgstr ""
+
+msgid ""
+"which will make ``hg purge`` delete all unknown files in the\n"
+"repository in the same manner as the purge extension."
+msgstr ""
+
+msgid ""
+"Shell aliases are executed in an environment where ``$HG`` expand to\n"
+"the path of the Mercurial that was used to execute the alias. This is\n"
+"useful when you want to call further Mercurial commands in a shell\n"
+"alias, as was done above for the purge alias. In addition,\n"
+"``$HG_ARGS`` expand to the arguments given to Mercurial. In the ``hg\n"
+"echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``."
+msgstr ""
+
+msgid ""
+"``auth``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Authentication credentials for HTTP authentication. This section\n"
+"allows you to store usernames and passwords for use when logging\n"
+"*into* HTTP servers. See the ``[web]`` configuration section if\n"
+"you want to configure *who* can login to your HTTP server."
+msgstr ""
+
+msgid "Each line has the following format::"
+msgstr ""
+
+msgid " <name>.<argument> = <value>"
+msgstr ""
+
+msgid ""
+"where ``<name>`` is used to group arguments into authentication\n"
+"entries. Example::"
+msgstr ""
+
+msgid ""
+" foo.prefix = hg.intevation.org/mercurial\n"
+" foo.username = foo\n"
+" foo.password = bar\n"
+" foo.schemes = http https"
+msgstr ""
+
+msgid ""
+" bar.prefix = secure.example.org\n"
+" bar.key = path/to/file.key\n"
+" bar.cert = path/to/file.cert\n"
+" bar.schemes = https"
+msgstr ""
+
+msgid "Supported arguments:"
+msgstr ""
+
+msgid ""
+"``prefix``\n"
+" Either ``*`` or a URI prefix with or without the scheme part.\n"
+" The authentication entry with the longest matching prefix is used\n"
+" (where ``*`` matches everything and counts as a match of length\n"
+" 1). If the prefix doesn't include a scheme, the match is performed\n"
+" against the URI with its scheme stripped as well, and the schemes\n"
+" argument, q.v., is then subsequently consulted."
+msgstr ""
+
+msgid ""
+"``username``\n"
+" Optional. Username to authenticate with. If not given, and the\n"
+" remote site requires basic or digest authentication, the user will\n"
+" be prompted for it. Environment variables are expanded in the\n"
+" username letting you do ``foo.username = $USER``."
+msgstr ""
+
+msgid ""
+"``password``\n"
+" Optional. Password to authenticate with. If not given, and the\n"
+" remote site requires basic or digest authentication, the user\n"
+" will be prompted for it."
+msgstr ""
+
+msgid ""
+"``key``\n"
+" Optional. PEM encoded client certificate key file. Environment\n"
+" variables are expanded in the filename."
+msgstr ""
+
+msgid ""
+"``cert``\n"
+" Optional. PEM encoded client certificate chain file. Environment\n"
+" variables are expanded in the filename."
+msgstr ""
+
+msgid ""
+"``schemes``\n"
+" Optional. Space separated list of URI schemes to use this\n"
+" authentication entry with. Only used if the prefix doesn't include\n"
+" a scheme. Supported schemes are http and https. They will match\n"
+" static-http and static-https respectively, as well.\n"
+" Default: https."
+msgstr ""
+
+msgid ""
+"If no suitable authentication entry is found, the user is prompted\n"
+"for credentials as usual if required by the remote."
+msgstr ""
+
+msgid ""
+"\n"
+"``decode/encode``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Filters for transforming files on checkout/checkin. This would\n"
+"typically be used for newline processing or other\n"
+"localization/canonicalization of files."
+msgstr ""
+
+msgid ""
+"Filters consist of a filter pattern followed by a filter command.\n"
+"Filter patterns are globs by default, rooted at the repository root.\n"
+"For example, to match any file ending in ``.txt`` in the root\n"
+"directory only, use the pattern ``*.txt``. To match any file ending\n"
+"in ``.c`` anywhere in the repository, use the pattern ``**.c``.\n"
+"For each file only the first matching filter applies."
+msgstr ""
+
+msgid ""
+"The filter command can start with a specifier, either ``pipe:`` or\n"
+"``tempfile:``. If no specifier is given, ``pipe:`` is used by default."
+msgstr ""
+
+msgid ""
+"A ``pipe:`` command must accept data on stdin and return the transformed\n"
+"data on stdout."
+msgstr ""
+
+msgid "Pipe example::"
+msgstr "Pipe-exempel::"
+
+msgid ""
+" [encode]\n"
+" # uncompress gzip files on checkin to improve delta compression\n"
+" # note: not necessarily a good idea, just an example\n"
+" *.gz = pipe: gunzip"
+msgstr ""
+
+msgid ""
+" [decode]\n"
+" # recompress gzip files when writing them to the working dir (we\n"
+" # can safely omit \"pipe:\", because it's the default)\n"
+" *.gz = gzip"
+msgstr ""
+
+msgid ""
+"A ``tempfile:`` command is a template. The string ``INFILE`` is replaced\n"
+"with the name of a temporary file that contains the data to be\n"
+"filtered by the command. The string ``OUTFILE`` is replaced with the name\n"
+"of an empty temporary file, where the filtered data must be written by\n"
+"the command."
+msgstr ""
+
+msgid ""
+".. note:: The tempfile mechanism is recommended for Windows systems,\n"
+" where the standard shell I/O redirection operators often have\n"
+" strange effects and may corrupt the contents of your files."
+msgstr ""
+
+msgid ""
+"This filter mechanism is used internally by the ``eol`` extension to\n"
+"translate line ending characters between Windows (CRLF) and Unix (LF)\n"
+"format. We suggest you use the ``eol`` extension for convenience."
+msgstr ""
+
+msgid ""
+"\n"
+"``defaults``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "(defaults are deprecated. Don't use them. Use aliases instead)"
+msgstr ""
+
+msgid ""
+"Use the ``[defaults]`` section to define command defaults, i.e. the\n"
+"default options/arguments to pass to the specified commands."
+msgstr ""
+
+msgid ""
+"The following example makes :hg:`log` run in verbose mode, and\n"
+":hg:`status` show only the modified files, by default::"
+msgstr ""
+
+msgid ""
+" [defaults]\n"
+" log = -v\n"
+" status = -m"
+msgstr ""
+
+msgid ""
+"The actual commands, instead of their aliases, must be used when\n"
+"defining command defaults. The command defaults will also be applied\n"
+"to the aliases of the commands defined."
+msgstr ""
+
+msgid ""
+"\n"
+"``diff``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Settings used when displaying diffs. Everything except for ``unified`` is a\n"
+"Boolean and defaults to False."
+msgstr ""
+
+msgid ""
+"``git``\n"
+" Use git extended diff format."
+msgstr ""
+"``git``\n"
+" Använd gits utökade diff-format."
+
+msgid ""
+"``nodates``\n"
+" Don't include dates in diff headers."
+msgstr ""
+
+msgid ""
+"``showfunc``\n"
+" Show which function each change is in."
+msgstr ""
+"``showfunc``\n"
+" Visa vilken funktion varje ändring är i."
+
+msgid ""
+"``ignorews``\n"
+" Ignore white space when comparing lines."
+msgstr ""
+"``ignorews``\n"
+" Ignorera blanktecken när rader jämförs."
+
+msgid ""
+"``ignorewsamount``\n"
+" Ignore changes in the amount of white space."
+msgstr ""
+"``ignorewsamount``\n"
+" Ignorera ändringar av antalet blanktecken."
+
+msgid ""
+"``ignoreblanklines``\n"
+" Ignore changes whose lines are all blank."
+msgstr ""
+"``ignoreblanklines``\n"
+" Ignorera ändringar vars rader är tomma."
+
+msgid ""
+"``unified``\n"
+" Number of lines of context to show."
+msgstr ""
+"``unified``\n"
+"Antal sammanhangsrader att visa."
+
+msgid ""
+"``email``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Settings for extensions that send email messages."
+msgstr ""
+
+msgid ""
+"``from``\n"
+" Optional. Email address to use in \"From\" header and SMTP envelope\n"
+" of outgoing messages."
+msgstr ""
+
+msgid ""
+"``to``\n"
+" Optional. Comma-separated list of recipients' email addresses."
+msgstr ""
+
+msgid ""
+"``cc``\n"
+" Optional. Comma-separated list of carbon copy recipients'\n"
+" email addresses."
+msgstr ""
+
+msgid ""
+"``bcc``\n"
+" Optional. Comma-separated list of blind carbon copy recipients'\n"
+" email addresses."
+msgstr ""
+
+msgid ""
+"``method``\n"
+" Optional. Method to use to send email messages. If value is ``smtp``\n"
+" (default), use SMTP (see the ``[smtp]`` section for configuration).\n"
+" Otherwise, use as name of program to run that acts like sendmail\n"
+" (takes ``-f`` option for sender, list of recipients on command line,\n"
+" message on stdin). Normally, setting this to ``sendmail`` or\n"
+" ``/usr/sbin/sendmail`` is enough to use sendmail to send messages."
+msgstr ""
+
+msgid ""
+"``charsets``\n"
+" Optional. Comma-separated list of character sets considered\n"
+" convenient for recipients. Addresses, headers, and parts not\n"
+" containing patches of outgoing messages will be encoded in the\n"
+" first character set to which conversion from local encoding\n"
+" (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct\n"
+" conversion fails, the text in question is sent as is. Defaults to\n"
+" empty (explicit) list."
+msgstr ""
+
+msgid " Order of outgoing email character sets:"
+msgstr ""
+
+msgid ""
+" 1. ``us-ascii``: always first, regardless of settings\n"
+" 2. ``email.charsets``: in order given by user\n"
+" 3. ``ui.fallbackencoding``: if not in email.charsets\n"
+" 4. ``$HGENCODING``: if not in email.charsets\n"
+" 5. ``utf-8``: always last, regardless of settings"
+msgstr ""
+
+msgid "Email example::"
+msgstr "Email-exempel::"
+
+msgid ""
+" [email]\n"
+" from = Joseph User <joe.user@example.com>\n"
+" method = /usr/sbin/sendmail\n"
+" # charsets for western Europeans\n"
+" # us-ascii, utf-8 omitted, as they are tried first and last\n"
+" charsets = iso-8859-1, iso-8859-15, windows-1252"
+msgstr ""
+
+msgid ""
+"\n"
+"``extensions``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Mercurial has an extension mechanism for adding new features. To\n"
+"enable an extension, create an entry for it in this section."
+msgstr ""
+
+msgid ""
+"If you know that the extension is already in Python's search path,\n"
+"you can give the name of the module, followed by ``=``, with nothing\n"
+"after the ``=``."
+msgstr ""
+
+msgid ""
+"Otherwise, give a name that you choose, followed by ``=``, followed by\n"
+"the path to the ``.py`` file (including the file name extension) that\n"
+"defines the extension."
+msgstr ""
+
+msgid ""
+"To explicitly disable an extension that is enabled in an hgrc of\n"
+"broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``\n"
+"or ``foo = !`` when path is not supplied."
+msgstr ""
+"För att explicit deaktivera en utökning som aktiverats i en\n"
+"konfigurationsfil med större omfång, börja dess sökväg med ``!``, som i\n"
+"``foo = !/ext/path`` eller ``foo = !`` när sökvägen inte anges."
+
+msgid "Example for ``~/.hgrc``::"
+msgstr "Exempel för ``~/.hgrc``::"
+
+msgid ""
+" [extensions]\n"
+" # (the mq extension will get loaded from Mercurial's path)\n"
+" mq =\n"
+" # (this extension will get loaded from the file specified)\n"
+" myfeature = ~/.hgext/myfeature.py"
+msgstr ""
+
+msgid ""
+"\n"
+"``hostfingerprints``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Fingerprints of the certificates of known HTTPS servers.\n"
+"A HTTPS connection to a server with a fingerprint configured here will\n"
+"only succeed if the servers certificate matches the fingerprint.\n"
+"This is very similar to how ssh known hosts works.\n"
+"The fingerprint is the SHA-1 hash value of the DER encoded certificate.\n"
+"The CA chain and web.cacerts is not used for servers with a fingerprint."
+msgstr ""
+
+msgid "For example::"
+msgstr "Exempelvis::"
+
+msgid ""
+" [hostfingerprints]\n"
+" hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:"
+"d6:4b:ee:cc"
+msgstr ""
+
+msgid "This feature is only supported when using Python 2.6 or later."
+msgstr ""
+
+msgid ""
+"\n"
+"``format``\n"
+"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"``usestore``\n"
+" Enable or disable the \"store\" repository format which improves\n"
+" compatibility with systems that fold case or otherwise mangle\n"
+" filenames. Enabled by default. Disabling this option will allow\n"
+" you to store longer filenames in some situations at the expense of\n"
+" compatibility and ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 0.9.4."
+msgstr ""
+
+msgid ""
+"``usefncache``\n"
+" Enable or disable the \"fncache\" repository format which enhances\n"
+" the \"store\" repository format (which has to be enabled to use\n"
+" fncache) to allow longer filenames and avoids using Windows\n"
+" reserved names, e.g. \"nul\". Enabled by default. Disabling this\n"
+" option ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 1.1."
+msgstr ""
+
+msgid ""
+"``dotencode``\n"
+" Enable or disable the \"dotencode\" repository format which enhances\n"
+" the \"fncache\" repository format (which has to be enabled to use\n"
+" dotencode) to avoid issues with filenames starting with ._ on\n"
+" Mac OS X and spaces on Windows. Enabled by default. Disabling this\n"
+" option ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 1.7."
+msgstr ""
+
+msgid ""
+"``merge-patterns``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"This section specifies merge tools to associate with particular file\n"
+"patterns. Tools matched here will take precedence over the default\n"
+"merge tool. Patterns are globs by default, rooted at the repository\n"
+"root."
+msgstr ""
+
+msgid ""
+" [merge-patterns]\n"
+" **.c = kdiff3\n"
+" **.jpg = myimgmerge"
+msgstr ""
+
+msgid ""
+"``merge-tools``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"This section configures external merge tools to use for file-level\n"
+"merges."
+msgstr ""
+
+msgid "Example ``~/.hgrc``::"
+msgstr ""
+
+msgid ""
+" [merge-tools]\n"
+" # Override stock tool location\n"
+" kdiff3.executable = ~/bin/kdiff3\n"
+" # Specify command line\n"
+" kdiff3.args = $base $local $other -o $output\n"
+" # Give higher priority\n"
+" kdiff3.priority = 1"
+msgstr ""
+
+msgid ""
+" # Define new tool\n"
+" myHtmlTool.args = -m $local $other $base $output\n"
+" myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n"
+" myHtmlTool.priority = 1"
+msgstr ""
+
+msgid ""
+"``priority``\n"
+" The priority in which to evaluate this tool.\n"
+" Default: 0."
+msgstr ""
+
+msgid ""
+"``executable``\n"
+" Either just the name of the executable or its pathname. On Windows,\n"
+" the path can use environment variables with ${ProgramFiles} syntax.\n"
+" Default: the tool name."
+msgstr ""
+
+msgid ""
+"``args``\n"
+" The arguments to pass to the tool executable. You can refer to the\n"
+" files being merged as well as the output file through these\n"
+" variables: ``$base``, ``$local``, ``$other``, ``$output``.\n"
+" Default: ``$local $base $other``"
+msgstr ""
+
+msgid ""
+"``premerge``\n"
+" Attempt to run internal non-interactive 3-way merge tool before\n"
+" launching external tool. Options are ``true``, ``false``, or ``keep``\n"
+" to leave markers in the file if the premerge fails.\n"
+" Default: True"
+msgstr ""
+
+msgid ""
+"``binary``\n"
+" This tool can merge binary files. Defaults to False, unless tool\n"
+" was selected by file pattern match."
+msgstr ""
+
+msgid ""
+"``symlink``\n"
+" This tool can merge symlinks. Defaults to False, even if tool was\n"
+" selected by file pattern match."
+msgstr ""
+
+msgid ""
+"``check``\n"
+" A list of merge success-checking options:"
+msgstr ""
+
+msgid ""
+" ``changed``\n"
+" Ask whether merge was successful when the merged file shows no changes.\n"
+" ``conflicts``\n"
+" Check whether there are conflicts even though the tool reported "
+"success.\n"
+" ``prompt``\n"
+" Always prompt for merge success, regardless of success reported by tool."
+msgstr ""
+
+msgid ""
+"``checkchanged``\n"
+" True is equivalent to ``check = changed``.\n"
+" Default: False"
+msgstr ""
+
+msgid ""
+"``checkconflicts``\n"
+" True is equivalent to ``check = conflicts``.\n"
+" Default: False"
+msgstr ""
+
+msgid ""
+"``fixeol``\n"
+" Attempt to fix up EOL changes caused by the merge tool.\n"
+" Default: False"
+msgstr ""
+
+msgid ""
+"``gui``\n"
+" This tool requires a graphical interface to run. Default: False"
+msgstr ""
+
+msgid ""
+"``regkey``\n"
+" Windows registry key which describes install location of this\n"
+" tool. Mercurial will search for this key first under\n"
+" ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n"
+" Default: None"
+msgstr ""
+
+msgid ""
+"``regkeyalt``\n"
+" An alternate Windows registry key to try if the first key is not\n"
+" found. The alternate key uses the same ``regname`` and ``regappend``\n"
+" semantics of the primary key. The most common use for this key\n"
+" is to search for 32bit applications on 64bit operating systems.\n"
+" Default: None"
+msgstr ""
+
+msgid ""
+"``regname``\n"
+" Name of value to read from specified registry key. Defaults to the\n"
+" unnamed (default) value."
+msgstr ""
+
+msgid ""
+"``regappend``\n"
+" String to append to the value read from the registry, typically\n"
+" the executable name of the tool.\n"
+" Default: None"
+msgstr ""
+
+msgid ""
+"\n"
+"``hooks``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Commands or Python functions that get automatically executed by\n"
+"various actions such as starting or finishing a commit. Multiple\n"
+"hooks can be run for the same action by appending a suffix to the\n"
+"action. Overriding a site-wide hook can be done by changing its\n"
+"value or setting it to an empty string."
+msgstr ""
+
+msgid "Example ``.hg/hgrc``::"
+msgstr ""
+
+msgid ""
+" [hooks]\n"
+" # update working directory after adding changesets\n"
+" changegroup.update = hg update\n"
+" # do not use the site-wide hook\n"
+" incoming =\n"
+" incoming.email = /my/email/hook\n"
+" incoming.autobuild = /my/build/hook"
+msgstr ""
+
+msgid ""
+"Most hooks are run with environment variables set that give useful\n"
+"additional information. For each hook below, the environment\n"
+"variables it is passed are listed with names of the form ``$HG_foo``."
+msgstr ""
+
+msgid ""
+"``changegroup``\n"
+" Run after a changegroup has been added via push, pull or unbundle.\n"
+" ID of the first new changeset is in ``$HG_NODE``. URL from which\n"
+" changes came is in ``$HG_URL``."
+msgstr ""
+
+msgid ""
+"``commit``\n"
+" Run after a changeset has been created in the local repository. ID\n"
+" of the newly created changeset is in ``$HG_NODE``. Parent changeset\n"
+" IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+
+msgid ""
+"``incoming``\n"
+" Run after a changeset has been pulled, pushed, or unbundled into\n"
+" the local repository. The ID of the newly arrived changeset is in\n"
+" ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``."
+msgstr ""
+
+msgid ""
+"``outgoing``\n"
+" Run after sending changes from local repository to another. ID of\n"
+" first changeset sent is in ``$HG_NODE``. Source of operation is in\n"
+" ``$HG_SOURCE``; see \"preoutgoing\" hook for description."
+msgstr ""
+
+msgid ""
+"``post-<command>``\n"
+" Run after successful invocations of the associated command. The\n"
+" contents of the command line are passed as ``$HG_ARGS`` and the result\n"
+" code in ``$HG_RESULT``. Parsed command line arguments are passed as \n"
+" ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of\n"
+" the python data internally passed to <command>. ``$HG_OPTS`` is a \n"
+" dictionary of options (with unspecified options set to their defaults).\n"
+" ``$HG_PATS`` is a list of arguments. Hook failure is ignored."
+msgstr ""
+
+msgid ""
+"``pre-<command>``\n"
+" Run before executing the associated command. The contents of the\n"
+" command line are passed as ``$HG_ARGS``. Parsed command line arguments\n"
+" are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string\n"
+" representations of the data internally passed to <command>. ``$HG_OPTS``\n"
+" is a dictionary of options (with unspecified options set to their\n"
+" defaults). ``$HG_PATS`` is a list of arguments. If the hook returns \n"
+" failure, the command doesn't execute and Mercurial returns the failure\n"
+" code."
+msgstr ""
+
+msgid ""
+"``prechangegroup``\n"
+" Run before a changegroup is added via push, pull or unbundle. Exit\n"
+" status 0 allows the changegroup to proceed. Non-zero status will\n"
+" cause the push, pull or unbundle to fail. URL from which changes\n"
+" will come is in ``$HG_URL``."
+msgstr ""
+
+msgid ""
+"``precommit``\n"
+" Run before starting a local commit. Exit status 0 allows the\n"
+" commit to proceed. Non-zero status will cause the commit to fail.\n"
+" Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+
+msgid ""
+"``prelistkeys``\n"
+" Run before listing pushkeys (like bookmarks) in the\n"
+" repository. Non-zero status will cause failure. The key namespace is\n"
+" in ``$HG_NAMESPACE``."
+msgstr ""
+
+msgid ""
+"``preoutgoing``\n"
+" Run before collecting changes to send from the local repository to\n"
+" another. Non-zero status will cause failure. This lets you prevent\n"
+" pull over HTTP or SSH. Also prevents against local pull, push\n"
+" (outbound) or bundle commands, but not effective, since you can\n"
+" just copy files instead then. Source of operation is in\n"
+" ``$HG_SOURCE``. If \"serve\", operation is happening on behalf of remote\n"
+" SSH or HTTP repository. If \"push\", \"pull\" or \"bundle\", operation\n"
+" is happening on behalf of repository on same system."
+msgstr ""
+
+msgid ""
+"``prepushkey``\n"
+" Run before a pushkey (like a bookmark) is added to the\n"
+" repository. Non-zero status will cause the key to be rejected. The\n"
+" key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,\n"
+" the old value (if any) is in ``$HG_OLD``, and the new value is in\n"
+" ``$HG_NEW``."
+msgstr ""
+
+msgid ""
+"``pretag``\n"
+" Run before creating a tag. Exit status 0 allows the tag to be\n"
+" created. Non-zero status will cause the tag to fail. ID of\n"
+" changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag "
+"is\n"
+" local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``."
+msgstr ""
+
+msgid ""
+"``pretxnchangegroup``\n"
+" Run after a changegroup has been added via push, pull or unbundle,\n"
+" but before the transaction has been committed. Changegroup is\n"
+" visible to hook program. This lets you validate incoming changes\n"
+" before accepting them. Passed the ID of the first new changeset in\n"
+" ``$HG_NODE``. Exit status 0 allows the transaction to commit. Non-zero\n"
+" status will cause the transaction to be rolled back and the push,\n"
+" pull or unbundle will fail. URL that was source of changes is in\n"
+" ``$HG_URL``."
+msgstr ""
+
+msgid ""
+"``pretxncommit``\n"
+" Run after a changeset has been created but the transaction not yet\n"
+" committed. Changeset is visible to hook program. This lets you\n"
+" validate commit message and changes. Exit status 0 allows the\n"
+" commit to proceed. Non-zero status will cause the transaction to\n"
+" be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset\n"
+" IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+
+msgid ""
+"``preupdate``\n"
+" Run before updating the working directory. Exit status 0 allows\n"
+" the update to proceed. Non-zero status will prevent the update.\n"
+" Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID\n"
+" of second new parent is in ``$HG_PARENT2``."
+msgstr ""
+
+msgid ""
+"``listkeys``\n"
+" Run after listing pushkeys (like bookmarks) in the repository. The\n"
+" key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a\n"
+" dictionary containing the keys and values."
+msgstr ""
+
+msgid ""
+"``pushkey``\n"
+" Run after a pushkey (like a bookmark) is added to the\n"
+" repository. The key namespace is in ``$HG_NAMESPACE``, the key is in\n"
+" ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new\n"
+" value is in ``$HG_NEW``."
+msgstr ""
+
+msgid ""
+"``tag``\n"
+" Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.\n"
+" Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in\n"
+" repository if ``$HG_LOCAL=0``."
+msgstr ""
+
+msgid ""
+"``update``\n"
+" Run after updating the working directory. Changeset ID of first\n"
+" new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is\n"
+" in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the\n"
+" update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``."
+msgstr ""
+
+msgid ""
+".. note:: It is generally better to use standard hooks rather than the\n"
+" generic pre- and post- command hooks as they are guaranteed to be\n"
+" called in the appropriate contexts for influencing transactions.\n"
+" Also, hooks like \"commit\" will be called in all contexts that\n"
+" generate a commit (e.g. tag) and not just the commit command."
+msgstr ""
+
+msgid ""
+".. note:: Environment variables with empty values may not be passed to\n"
+" hooks on platforms such as Windows. As an example, ``$HG_PARENT2``\n"
+" will have an empty value under Unix-like platforms for non-merge\n"
+" changesets, while it will not be available at all under Windows."
+msgstr ""
+
+msgid "The syntax for Python hooks is as follows::"
+msgstr ""
+
+msgid ""
+" hookname = python:modulename.submodule.callable\n"
+" hookname = python:/path/to/python/module.py:callable"
+msgstr ""
+
+msgid ""
+"Python hooks are run within the Mercurial process. Each hook is\n"
+"called with at least three keyword arguments: a ui object (keyword\n"
+"``ui``), a repository object (keyword ``repo``), and a ``hooktype``\n"
+"keyword that tells what kind of hook is used. Arguments listed as\n"
+"environment variables above are passed as keyword arguments, with no\n"
+"``HG_`` prefix, and names in lower case."
+msgstr ""
+
+msgid ""
+"If a Python hook returns a \"true\" value or raises an exception, this\n"
+"is treated as a failure."
+msgstr ""
+
+msgid ""
+"\n"
+"``http_proxy``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Used to access web-based Mercurial repositories through a HTTP\n"
+"proxy."
+msgstr ""
+
+msgid ""
+"``host``\n"
+" Host name and (optional) port of the proxy server, for example\n"
+" \"myproxy:8000\"."
+msgstr ""
+
+msgid ""
+"``no``\n"
+" Optional. Comma-separated list of host names that should bypass\n"
+" the proxy."
+msgstr ""
+
+msgid ""
+"``passwd``\n"
+" Optional. Password to authenticate with at the proxy server."
+msgstr ""
+
+msgid ""
+"``user``\n"
+" Optional. User name to authenticate with at the proxy server."
+msgstr ""
+
+msgid ""
+"``always``\n"
+" Optional. Always use the proxy, even for localhost and any entries\n"
+" in ``http_proxy.no``. True or False. Default: False."
+msgstr ""
+
+msgid ""
+"``smtp``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Configuration for extensions that need to send email messages."
+msgstr ""
+
+msgid ""
+"``host``\n"
+" Host name of mail server, e.g. \"mail.example.com\"."
+msgstr ""
+
+msgid ""
+"``port``\n"
+" Optional. Port to connect to on mail server. Default: 25."
+msgstr ""
+
+msgid ""
+"``tls``\n"
+" Optional. Method to enable TLS when connecting to mail server: "
+"starttls,\n"
+" smtps or none. Default: none."
+msgstr ""
+
+msgid ""
+"``username``\n"
+" Optional. User name for authenticating with the SMTP server.\n"
+" Default: none."
+msgstr ""
+
+msgid ""
+"``password``\n"
+" Optional. Password for authenticating with the SMTP server. If not\n"
+" specified, interactive sessions will prompt the user for a\n"
+" password; non-interactive sessions will fail. Default: none."
+msgstr ""
+
+msgid ""
+"``local_hostname``\n"
+" Optional. It's the hostname that the sender can use to identify\n"
+" itself to the MTA."
+msgstr ""
+
+msgid ""
+"\n"
+"``patch``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Settings used when applying patches, for instance through the 'import'\n"
+"command or with Mercurial Queues extension."
+msgstr ""
+
+msgid ""
+"``eol``\n"
+" When set to 'strict' patch content and patched files end of lines\n"
+" are preserved. When set to ``lf`` or ``crlf``, both files end of\n"
+" lines are ignored when patching and the result line endings are\n"
+" normalized to either LF (Unix) or CRLF (Windows). When set to\n"
+" ``auto``, end of lines are again ignored while patching but line\n"
+" endings in patched files are normalized to their original setting\n"
+" on a per-file basis. If target file does not exist or has no end\n"
+" of line, patch line endings are preserved.\n"
+" Default: strict."
+msgstr ""
+
+msgid ""
+"\n"
+"``paths``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Assigns symbolic names to repositories. The left side is the\n"
+"symbolic name, and the right gives the directory or URL that is the\n"
+"location of the repository. Default paths can be declared by setting\n"
+"the following entries."
+msgstr ""
+
+msgid ""
+"``default``\n"
+" Directory or URL to use when pulling if no source is specified.\n"
+" Default is set to repository from which the current repository was\n"
+" cloned."
+msgstr ""
+
+msgid ""
+"``default-push``\n"
+" Optional. Directory or URL to use when pushing if no destination\n"
+" is specified."
+msgstr ""
+
+msgid ""
+"\n"
+"``profiling``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Specifies profiling format and file output. In this section\n"
+"description, 'profiling data' stands for the raw data collected\n"
+"during profiling, while 'profiling report' stands for a statistical\n"
+"text report generated from the profiling data. The profiling is done\n"
+"using lsprof."
+msgstr ""
+
+msgid ""
+"``format``\n"
+" Profiling format.\n"
+" Default: text."
+msgstr ""
+
+msgid ""
+" ``text``\n"
+" Generate a profiling report. When saving to a file, it should be\n"
+" noted that only the report is saved, and the profiling data is\n"
+" not kept.\n"
+" ``kcachegrind``\n"
+" Format profiling data for kcachegrind use: when saving to a\n"
+" file, the generated file can directly be loaded into\n"
+" kcachegrind."
+msgstr ""
+
+msgid ""
+"``output``\n"
+" File path where profiling data or report should be saved. If the\n"
+" file exists, it is replaced. Default: None, data is printed on\n"
+" stderr"
+msgstr ""
+
+msgid ""
+"``revsetalias``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Alias definitions for revsets. See :hg:`help revsets` for details."
+msgstr ""
+
+msgid ""
+"``server``\n"
+"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Controls generic server settings."
+msgstr ""
+
+msgid ""
+"``uncompressed``\n"
+" Whether to allow clients to clone a repository using the\n"
+" uncompressed streaming protocol. This transfers about 40% more\n"
+" data than a regular clone, but uses less memory and CPU on both\n"
+" server and client. Over a LAN (100 Mbps or better) or a very fast\n"
+" WAN, an uncompressed streaming clone is a lot faster (~10x) than a\n"
+" regular clone. Over most WAN connections (anything slower than\n"
+" about 6 Mbps), uncompressed streaming is slower, because of the\n"
+" extra data transfer overhead. This mode will also temporarily hold\n"
+" the write lock while determining what data to transfer.\n"
+" Default is True."
+msgstr ""
+
+msgid ""
+"``validate``\n"
+" Whether to validate the completeness of pushed changesets by\n"
+" checking that all new file revisions specified in manifests are\n"
+" present. Default is False."
+msgstr ""
+
+msgid ""
+"``subpaths``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Defines subrepositories source locations rewriting rules of the form::"
+msgstr ""
+
+msgid " <pattern> = <replacement>"
+msgstr ""
+
+msgid ""
+"Where ``pattern`` is a regular expression matching the source and\n"
+"``replacement`` is the replacement string used to rewrite it. Groups\n"
+"can be matched in ``pattern`` and referenced in ``replacements``. For\n"
+"instance::"
+msgstr ""
+
+msgid " http://server/(.*)-hg/ = http://hg.server/\\1/"
+msgstr ""
+
+msgid "rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``."
+msgstr ""
+
+msgid "All patterns are applied in definition order."
+msgstr ""
+
+msgid ""
+"``trusted``\n"
+"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Mercurial will not use the settings in the\n"
+"``.hg/hgrc`` file from a repository if it doesn't belong to a trusted\n"
+"user or to a trusted group, as various hgrc features allow arbitrary\n"
+"commands to be run. This issue is often encountered when configuring\n"
+"hooks or extensions for shared repositories or servers. However,\n"
+"the web interface will use some safe settings from the ``[web]``\n"
+"section."
+msgstr ""
+
+msgid ""
+"This section specifies what users and groups are trusted. The\n"
+"current user is always trusted. To trust everybody, list a user or a\n"
+"group with name ``*``. These settings must be placed in an\n"
+"*already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the\n"
+"user or service running Mercurial."
+msgstr ""
+
+msgid ""
+"``users``\n"
+" Comma-separated list of trusted users."
+msgstr ""
+
+msgid ""
+"``groups``\n"
+" Comma-separated list of trusted groups."
+msgstr ""
+
+msgid ""
+"\n"
+"``ui``\n"
+"\"\"\"\"\"\""
+msgstr ""
+
+msgid "User interface controls."
+msgstr ""
+
+msgid ""
+"``archivemeta``\n"
+" Whether to include the .hg_archival.txt file containing meta data\n"
+" (hashes for the repository base and for tip) in archives created\n"
+" by the :hg:`archive` command or downloaded via hgweb.\n"
+" Default is True."
+msgstr ""
+
+msgid ""
+"``askusername``\n"
+" Whether to prompt for a username when committing. If True, and\n"
+" neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user "
+"will\n"
+" be prompted to enter a username. If no username is entered, the\n"
+" default ``USER@HOST`` is used instead.\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``commitsubrepos``\n"
+" Whether to commit modified subrepositories when committing the\n"
+" parent repository. If False and one subrepository has uncommitted\n"
+" changes, abort the commit.\n"
+" Default is True."
+msgstr ""
+
+msgid ""
+"``debug``\n"
+" Print debugging information. True or False. Default is False."
+msgstr ""
+
+msgid ""
+"``editor``\n"
+" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
+msgstr ""
+
+msgid ""
+"``fallbackencoding``\n"
+" Encoding to try if it's not possible to decode the changelog using\n"
+" UTF-8. Default is ISO-8859-1."
+msgstr ""
+
+msgid ""
+"``ignore``\n"
+" A file to read per-user ignore patterns from. This file should be\n"
+" in the same format as a repository-wide .hgignore file. This\n"
+" option supports hook syntax, so if you want to specify multiple\n"
+" ignore files, you can do so by setting something like\n"
+" ``ignore.other = ~/.hgignore2``. For details of the ignore file\n"
+" format, see the ``hgignore(5)`` man page."
+msgstr ""
+
+msgid ""
+"``interactive``\n"
+" Allow to prompt the user. True or False. Default is True."
+msgstr ""
+
+msgid ""
+"``logtemplate``\n"
+" Template string for commands that print changesets."
+msgstr ""
+
+msgid ""
+"``merge``\n"
+" The conflict resolution program to use during a manual merge.\n"
+" For more information on merge tools see :hg:`help merge-tools`.\n"
+" For configuring merge tools see the ``[merge-tools]`` section."
+msgstr ""
+
+msgid ""
+"``portablefilenames``\n"
+" Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n"
+" Default is ``warn``.\n"
+" If set to ``warn`` (or ``true``), a warning message is printed on POSIX\n"
+" platforms, if a file with a non-portable filename is added (e.g. a file\n"
+" with a name that can't be created on Windows because it contains "
+"reserved\n"
+" parts like ``AUX``, reserved characters like ``:``, or would cause a "
+"case\n"
+" collision with an existing file).\n"
+" If set to ``ignore`` (or ``false``), no warning is printed.\n"
+" If set to ``abort``, the command is aborted.\n"
+" On Windows, this configuration option is ignored and the command aborted."
+msgstr ""
+
+msgid ""
+"``quiet``\n"
+" Reduce the amount of output printed. True or False. Default is False."
+msgstr ""
+
+msgid ""
+"``remotecmd``\n"
+" remote command to use for clone/push/pull operations. Default is ``hg``."
+msgstr ""
+
+msgid ""
+"``report_untrusted``\n"
+" Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n"
+" trusted user or group. True or False. Default is True."
+msgstr ""
+
+msgid ""
+"``slash``\n"
+" Display paths using a slash (``/``) as the path separator. This\n"
+" only makes a difference on systems where the default path\n"
+" separator is not the slash character (e.g. Windows uses the\n"
+" backslash character (``\\``)).\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``ssh``\n"
+" command to use for SSH connections. Default is ``ssh``."
+msgstr ""
+
+msgid ""
+"``strict``\n"
+" Require exact command names, instead of allowing unambiguous\n"
+" abbreviations. True or False. Default is False."
+msgstr ""
+
+msgid ""
+"``style``\n"
+" Name of style to use for command output."
+msgstr ""
+
+msgid ""
+"``timeout``\n"
+" The timeout used when a lock is held (in seconds), a negative value\n"
+" means no timeout. Default is 600."
+msgstr ""
+
+msgid ""
+"``traceback``\n"
+" Mercurial always prints a traceback when an unknown exception\n"
+" occurs. Setting this to True will make Mercurial print a traceback\n"
+" on all exceptions, even those recognized by Mercurial (such as\n"
+" IOError or MemoryError). Default is False."
+msgstr ""
+
+msgid ""
+"``username``\n"
+" The committer of a changeset created when running \"commit\".\n"
+" Typically a person's name and email address, e.g. ``Fred Widget\n"
+" <fred@example.com>``. Default is ``$EMAIL`` or ``username@hostname``. "
+"If\n"
+" the username in hgrc is empty, it has to be specified manually or\n"
+" in a different hgrc file (e.g. ``$HOME/.hgrc``, if the admin set\n"
+" ``username =`` in the system hgrc). Environment variables in the\n"
+" username are expanded."
+msgstr ""
+
+msgid ""
+"``verbose``\n"
+" Increase the amount of output printed. True or False. Default is False."
+msgstr ""
+
+msgid ""
+"\n"
+"``web``\n"
+"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Web interface configuration. The settings in this section apply to\n"
+"both the builtin webserver (started by :hg:`serve`) and the script you\n"
+"run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI\n"
+"and WSGI)."
+msgstr ""
+
+msgid ""
+"The Mercurial webserver does no authentication (it does not prompt for\n"
+"usernames and passwords to validate *who* users are), but it does do\n"
+"authorization (it grants or denies access for *authenticated users*\n"
+"based on settings in this section). You must either configure your\n"
+"webserver to do authentication for you, or disable the authorization\n"
+"checks."
+msgstr ""
+
+msgid ""
+"For a quick setup in a trusted environment, e.g., a private LAN, where\n"
+"you want it to accept pushes from anybody, you can use the following\n"
+"command line::"
+msgstr ""
+
+msgid " $ hg --config web.allow_push=* --config web.push_ssl=False serve"
+msgstr ""
+
+msgid ""
+"Note that this will allow anybody to push anything to the server and\n"
+"that this should not be used for public servers."
+msgstr ""
+
+msgid "The full set of options is:"
+msgstr "Fullständig inställningslista:"
+
+msgid ""
+"``accesslog``\n"
+" Where to output the access log. Default is stdout."
+msgstr ""
+
+msgid ""
+"``address``\n"
+" Interface address to bind to. Default is all."
+msgstr ""
+
+msgid ""
+"``allow_archive``\n"
+" List of archive format (bz2, gz, zip) allowed for downloading.\n"
+" Default is empty."
+msgstr ""
+
+msgid ""
+"``allowbz2``\n"
+" (DEPRECATED) Whether to allow .tar.bz2 downloading of repository\n"
+" revisions.\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``allowgz``\n"
+" (DEPRECATED) Whether to allow .tar.gz downloading of repository\n"
+" revisions.\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``allowpull``\n"
+" Whether to allow pulling from the repository. Default is True."
+msgstr ""
+
+msgid ""
+"``allow_push``\n"
+" Whether to allow pushing to the repository. If empty or not set,\n"
+" push is not allowed. If the special value ``*``, any remote user can\n"
+" push, including unauthenticated users. Otherwise, the remote user\n"
+" must have been authenticated, and the authenticated user name must\n"
+" be present in this list. The contents of the allow_push list are\n"
+" examined after the deny_push list."
+msgstr ""
+
+msgid ""
+"``allow_read``\n"
+" If the user has not already been denied repository access due to\n"
+" the contents of deny_read, this list determines whether to grant\n"
+" repository access to the user. If this list is not empty, and the\n"
+" user is unauthenticated or not present in the list, then access is\n"
+" denied for the user. If the list is empty or not set, then access\n"
+" is permitted to all users by default. Setting allow_read to the\n"
+" special value ``*`` is equivalent to it not being set (i.e. access\n"
+" is permitted to all users). The contents of the allow_read list are\n"
+" examined after the deny_read list."
+msgstr ""
+
+msgid ""
+"``allowzip``\n"
+" (DEPRECATED) Whether to allow .zip downloading of repository\n"
+" revisions. Default is False. This feature creates temporary files."
+msgstr ""
+
+msgid ""
+"``baseurl``\n"
+" Base URL to use when publishing URLs in other locations, so\n"
+" third-party tools like email notification hooks can construct\n"
+" URLs. Example: ``http://hgserver/repos/``."
+msgstr ""
+
+msgid ""
+"``cacerts``\n"
+" Path to file containing a list of PEM encoded certificate\n"
+" authority certificates. Environment variables and ``~user``\n"
+" constructs are expanded in the filename. If specified on the\n"
+" client, then it will verify the identity of remote HTTPS servers\n"
+" with these certificates. The form must be as follows::"
+msgstr ""
+
+msgid ""
+" -----BEGIN CERTIFICATE-----\n"
+" ... (certificate in base64 PEM encoding) ...\n"
+" -----END CERTIFICATE-----\n"
+" -----BEGIN CERTIFICATE-----\n"
+" ... (certificate in base64 PEM encoding) ...\n"
+" -----END CERTIFICATE-----"
+msgstr ""
+
+msgid ""
+" This feature is only supported when using Python 2.6 or later. If you "
+"wish\n"
+" to use it with earlier versions of Python, install the backported\n"
+" version of the ssl library that is available from\n"
+" ``http://pypi.python.org``."
+msgstr ""
+
+msgid ""
+" You can use OpenSSL's CA certificate file if your platform has one.\n"
+" On most Linux systems this will be ``/etc/ssl/certs/ca-certificates."
+"crt``.\n"
+" Otherwise you will have to generate this file manually."
+msgstr ""
+
+msgid ""
+" To disable SSL verification temporarily, specify ``--insecure`` from\n"
+" command line."
+msgstr ""
+
+msgid ""
+"``cache``\n"
+" Whether to support caching in hgweb. Defaults to True."
+msgstr ""
+
+msgid ""
+"``contact``\n"
+" Name or email address of the person in charge of the repository.\n"
+" Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty."
+msgstr ""
+
+msgid ""
+"``deny_push``\n"
+" Whether to deny pushing to the repository. If empty or not set,\n"
+" push is not denied. If the special value ``*``, all remote users are\n"
+" denied push. Otherwise, unauthenticated users are all denied, and\n"
+" any authenticated user name present in this list is also denied. The\n"
+" contents of the deny_push list are examined before the allow_push list."
+msgstr ""
+
+msgid ""
+"``deny_read``\n"
+" Whether to deny reading/viewing of the repository. If this list is\n"
+" not empty, unauthenticated users are all denied, and any\n"
+" authenticated user name present in this list is also denied access to\n"
+" the repository. If set to the special value ``*``, all remote users\n"
+" are denied access (rarely needed ;). If deny_read is empty or not set,\n"
+" the determination of repository access depends on the presence and\n"
+" content of the allow_read list (see description). If both\n"
+" deny_read and allow_read are empty or not set, then access is\n"
+" permitted to all users by default. If the repository is being\n"
+" served via hgwebdir, denied users will not be able to see it in\n"
+" the list of repositories. The contents of the deny_read list have\n"
+" priority over (are examined before) the contents of the allow_read\n"
+" list."
+msgstr ""
+
+msgid ""
+"``descend``\n"
+" hgwebdir indexes will not descend into subdirectories. Only "
+"repositories\n"
+" directly in the current path will be shown (other repositories are "
+"still\n"
+" available from the index corresponding to their containing path)."
+msgstr ""
+
+msgid ""
+"``description``\n"
+" Textual description of the repository's purpose or contents.\n"
+" Default is \"unknown\"."
+msgstr ""
+
+msgid ""
+"``encoding``\n"
+" Character encoding name. Default is the current locale charset.\n"
+" Example: \"UTF-8\""
+msgstr ""
+
+msgid ""
+"``errorlog``\n"
+" Where to output the error log. Default is stderr."
+msgstr ""
+
+msgid ""
+"``hidden``\n"
+" Whether to hide the repository in the hgwebdir index.\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``ipv6``\n"
+" Whether to use IPv6. Default is False."
+msgstr ""
+
+msgid ""
+"``logourl``\n"
+" Base URL to use for logos. If unset, ``http://mercurial.selenic.com/``\n"
+" will be used."
+msgstr ""
+
+msgid ""
+"``name``\n"
+" Repository name to use in the web interface. Default is current\n"
+" working directory."
+msgstr ""
+
+msgid ""
+"``maxchanges``\n"
+" Maximum number of changes to list on the changelog. Default is 10."
+msgstr ""
+
+msgid ""
+"``maxfiles``\n"
+" Maximum number of files to list per changeset. Default is 10."
+msgstr ""
+
+msgid ""
+"``port``\n"
+" Port to listen on. Default is 8000."
+msgstr ""
+"``port``\n"
+"Port att lyssna på. Standard är 8000."
+
+msgid ""
+"``prefix``\n"
+" Prefix path to serve from. Default is '' (server root)."
+msgstr ""
+"``prefix``\n"
+"Sökvägsprefix att dela ut från. Standard är '' (serverrot)."
+
+msgid ""
+"``push_ssl``\n"
+" Whether to require that inbound pushes be transported over SSL to\n"
+" prevent password sniffing. Default is True."
+msgstr ""
+
+msgid ""
+"``staticurl``\n"
+" Base URL to use for static files. If unset, static files (e.g. the\n"
+" hgicon.png favicon) will be served by the CGI script itself. Use\n"
+" this setting to serve them directly with the HTTP server.\n"
+" Example: ``http://hgserver/static/``."
+msgstr ""
+
+msgid ""
+"``stripes``\n"
+" How many lines a \"zebra stripe\" should span in multiline output.\n"
+" Default is 1; set to 0 to disable."
+msgstr ""
+
+msgid ""
+"``style``\n"
+" Which template map style to use."
+msgstr ""
+"``style``\n"
+" Mallstil att använda."
+
+msgid ""
+"``templates``\n"
+" Where to find the HTML templates. Default is install path.\n"
+msgstr ""
msgid "Some commands allow the user to specify a date, e.g.:"
msgstr "Vissa kommandon tillåter att användare anger ett datum, bland dom:"
@@ -10492,29 +12892,29 @@
msgstr "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)"
msgid ""
-"This is the internal representation format for dates. unixtime is the\n"
-"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
-"the offset of the local timezone, in seconds west of UTC (negative if\n"
-"the timezone is east of UTC)."
-msgstr ""
-"Detta är det interna representationsformatet för datum. unixtime är antalet\n"
-"sekunder sedan epoken(1970-01-01 00:00 UTC). offset är offseten till den\n"
-"lokala tidszonen, i sekunder väst om UTC (negativ om tidszonen är öst om\n"
-"UTC)."
+"This is the internal representation format for dates. The first number\n"
+"is the number of seconds since the epoch (1970-01-01 00:00 UTC). The\n"
+"second is the offset of the local timezone, in seconds west of UTC\n"
+"(negative if the timezone is east of UTC)."
+msgstr ""
+"Detta är det interna representationsformatet för datum. Det första numret\n"
+"är antalet sekunder sedan epoken(1970-01-01 00:00 UTC). Det andra är\n"
+"offseten för den lokala tidszonen, i sekunder väst om UTC (negativ om\n"
+"tidszonen är öst om UTC)."
msgid "The log command also accepts date ranges:"
msgstr "Kommandot log accepterar också datumintervall:"
msgid ""
-"- ``<{datetime}`` - at or before a given date/time\n"
-"- ``>{datetime}`` - on or after a given date/time\n"
-"- ``{datetime} to {datetime}`` - a date range, inclusive\n"
-"- ``-{days}`` - within a given number of days of today\n"
-msgstr ""
-"- ``<{datumtid}`` - på eller innan datum/tid\n"
-"- ``>{datumtid}`` - på eller efter datum/tid\n"
-"- ``{datumtid} to {datumtid}`` - ett datumintervall, inklusivt\n"
-"- ``-{dagar}`` - inom ett givet antal dagar från idag\n"
+"- ``<DATE`` - at or before a given date/time\n"
+"- ``>DATE`` - on or after a given date/time\n"
+"- ``DATE to DATE`` - a date range, inclusive\n"
+"- ``-DAYS`` - within a given number of days of today\n"
+msgstr ""
+"- ``<DATUM`` - på eller innan datum/tid\n"
+"- ``>DATUM`` - på eller efter datum/tid\n"
+"- ``DATUM to DATUM`` - ett datumintervall, inklusivt\n"
+"- ``-DAGAR`` - inom ett givet antal dagar från idag\n"
msgid ""
"Mercurial's default format for showing changes between two versions of\n"
@@ -10648,6 +13048,18 @@
msgstr ""
msgid ""
+"HGPLAINEXCEPT\n"
+" This is a comma-separated list of features to preserve when\n"
+" HGPLAIN is enabled. Currently the only value supported is \"i18n\",\n"
+" which preserves internationalization in plain mode."
+msgstr ""
+
+msgid ""
+" Setting HGPLAINEXCEPT to anything (even an empty string) will\n"
+" enable plain mode."
+msgstr ""
+
+msgid ""
"HGUSER\n"
" This is the string used as the author of a commit. If not set,\n"
" available values will be considered in this order:"
@@ -10766,6 +13178,108 @@
" baz = !\n"
msgid ""
+"Mercurial supports a functional language for selecting a set of\n"
+"files. "
+msgstr ""
+"Mercurial stöder ett funktionellt språk för att välja en uppsättning filer. "
+
+msgid ""
+"Like other file patterns, this pattern type is indicated by a prefix,\n"
+"'set:'. The language supports a number of predicates which are joined\n"
+"by infix operators. Parenthesis can be used for grouping."
+msgstr ""
+
+msgid ""
+"Identifiers such as filenames or patterns must be quoted with single\n"
+"or double quotes if they contain characters outside of\n"
+"``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]`` or if they match one of the\n"
+"predefined predicates. This generally applies to file patterns other\n"
+"than globs and arguments for predicates."
+msgstr ""
+
+msgid ""
+"Special characters can be used in quoted identifiers by escaping them,\n"
+"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
+"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
+msgstr ""
+
+msgid "There is a single prefix operator:"
+msgstr ""
+
+msgid ""
+"``not x``\n"
+" Files not in x. Short form is ``! x``."
+msgstr ""
+
+msgid "These are the supported infix operators:"
+msgstr ""
+
+msgid ""
+"``x and y``\n"
+" The intersection of files in x and y. Short form is ``x & y``."
+msgstr ""
+
+msgid ""
+"``x or y``\n"
+" The union of files in x and y. There are two alternative short\n"
+" forms: ``x | y`` and ``x + y``."
+msgstr ""
+
+msgid ""
+"``x - y``\n"
+" Files in x but not in y."
+msgstr ""
+
+msgid "The following predicates are supported:"
+msgstr ""
+
+msgid ".. predicatesmarker"
+msgstr ""
+
+msgid "Some sample queries:"
+msgstr ""
+
+msgid ""
+"- Show status of files that appear to be binary in the working directory::"
+msgstr ""
+
+msgid " hg status -A \"set:binary()\""
+msgstr ""
+
+msgid "- Forget files that are in .hgignore but are already tracked::"
+msgstr ""
+
+msgid " hg forget \"set:hgignore() and not ignored()\""
+msgstr ""
+
+msgid "- Find text files that contain a string::"
+msgstr ""
+
+msgid " hg locate \"set:grep(magic) and not binary()\""
+msgstr ""
+
+msgid "- Find C files in a non-standard encoding::"
+msgstr ""
+
+msgid " hg locate \"set:**.c and not encoding(ascii)\""
+msgstr ""
+
+msgid "- Revert copies of large binary files::"
+msgstr ""
+
+msgid " hg revert \"set:copied() and binary() and size('>1M')\""
+msgstr ""
+
+msgid "- Remove files listed in files.lst that contain the letter a or b::"
+msgstr ""
+
+msgid " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""
+msgstr ""
+
+msgid "See also :hg:`help patterns`.\n"
+msgstr ""
+
+msgid ""
"Ancestor\n"
" Any changeset that can be reached by an unbroken chain of parent\n"
" changesets from a given changeset. More precisely, the ancestors\n"
@@ -10775,6 +13289,27 @@
msgstr ""
msgid ""
+"Bookmark\n"
+" Bookmarks are pointers to certain commits that move when\n"
+" committing. They are similar to tags in that it is possible to use\n"
+" bookmark names in all places where Mercurial expects a changeset\n"
+" ID, e.g., with :hg:`update`. Unlike tags, bookmarks move along\n"
+" when you make a commit."
+msgstr ""
+" Bokmärken är pekare till utvalda arkiveringar som flyttar vid\n"
+" arkivering. De liknar märken på det sättet att du kan använda\n"
+" bokmärkesnamn på alla platser där Mercurial förväntar sig ett\n"
+" ändrings-ID, exexempelvis med :hg:`update`. Till skillnad från märken,\n"
+" så förflyttas bokmärken när du arkiverar."
+
+msgid ""
+" Bookmarks can be renamed, copied and deleted. Bookmarks are local,\n"
+" unless they are explicitly pushed or pulled between repositories.\n"
+" Pushing and pulling bookmarks allow you to collaborate with others\n"
+" on a branch without creating a named branch."
+msgstr ""
+
+msgid ""
"Branch\n"
" (Noun) A child changeset that has been created from a parent that\n"
" is not a head. These are known as topological branches, see\n"
@@ -11256,6 +13791,14 @@
msgstr ""
msgid ""
+"Tag\n"
+" An alternative name given to a changeset. Tags can be used in all\n"
+" places where Mercurial expects a changeset ID, e.g., with\n"
+" :hg:`update`. The creation of a tag is stored in the history and\n"
+" will thus automatically be shared with other using push and pull."
+msgstr ""
+
+msgid ""
"Tip\n"
" The changeset with the highest revision number. It is the changeset\n"
" most recently added in a repository."
@@ -11298,6 +13841,124 @@
msgstr ""
msgid ""
+"Synopsis\n"
+"--------"
+msgstr ""
+
+msgid ""
+"The Mercurial system uses a file called ``.hgignore`` in the root\n"
+"directory of a repository to control its behavior when it searches\n"
+"for files that it is not currently tracking."
+msgstr ""
+
+msgid ""
+"Description\n"
+"-----------"
+msgstr ""
+"Beskrivning\n"
+"-----------"
+
+msgid ""
+"The working directory of a Mercurial repository will often contain\n"
+"files that should not be tracked by Mercurial. These include backup\n"
+"files created by editors and build products created by compilers.\n"
+"These files can be ignored by listing them in a ``.hgignore`` file in\n"
+"the root of the working directory. The ``.hgignore`` file must be\n"
+"created manually. It is typically put under version control, so that\n"
+"the settings will propagate to other repositories with push and pull."
+msgstr ""
+
+msgid ""
+"An untracked file is ignored if its path relative to the repository\n"
+"root directory, or any prefix path of that path, is matched against\n"
+"any pattern in ``.hgignore``."
+msgstr ""
+
+msgid ""
+"For example, say we have an untracked file, ``file.c``, at\n"
+"``a/b/file.c`` inside our repository. Mercurial will ignore ``file.c``\n"
+"if any pattern in ``.hgignore`` matches ``a/b/file.c``, ``a/b`` or ``a``."
+msgstr ""
+
+msgid ""
+"In addition, a Mercurial configuration file can reference a set of\n"
+"per-user or global ignore files. See the ``ignore`` configuration\n"
+"key on the ``[ui]`` section of :hg:`help config` for details of how to\n"
+"configure these files."
+msgstr ""
+
+msgid ""
+"To control Mercurial's handling of files that it manages, many\n"
+"commands support the ``-I`` and ``-X`` options; see\n"
+":hg:`help <command>` and :hg:`help patterns` for details."
+msgstr ""
+
+msgid ""
+"An ignore file is a plain text file consisting of a list of patterns,\n"
+"with one pattern per line. Empty lines are skipped. The ``#``\n"
+"character is treated as a comment character, and the ``\\`` character\n"
+"is treated as an escape character."
+msgstr ""
+
+msgid ""
+"Mercurial supports several pattern syntaxes. The default syntax used\n"
+"is Python/Perl-style regular expressions."
+msgstr ""
+
+msgid "To change the syntax used, use a line of the following form::"
+msgstr ""
+
+msgid " syntax: NAME"
+msgstr ""
+
+msgid "where ``NAME`` is one of the following:"
+msgstr ""
+
+msgid ""
+"``regexp``\n"
+" Regular expression, Python/Perl syntax.\n"
+"``glob``\n"
+" Shell-style glob."
+msgstr ""
+
+msgid ""
+"The chosen syntax stays in effect when parsing all patterns that\n"
+"follow, until another syntax is selected."
+msgstr ""
+
+msgid ""
+"Neither glob nor regexp patterns are rooted. A glob-syntax pattern of\n"
+"the form ``*.c`` will match a file ending in ``.c`` in any directory,\n"
+"and a regexp pattern of the form ``\\.c$`` will do the same. To root a\n"
+"regexp pattern, start it with ``^``."
+msgstr ""
+
+msgid ""
+"Example\n"
+"-------"
+msgstr ""
+
+msgid "Here is an example ignore file. ::"
+msgstr ""
+
+msgid ""
+" # use glob syntax.\n"
+" syntax: glob"
+msgstr ""
+
+msgid ""
+" *.elc\n"
+" *.pyc\n"
+" *~"
+msgstr ""
+
+msgid ""
+" # switch to regexp syntax.\n"
+" syntax: regexp\n"
+" ^\\.pc/\n"
+msgstr ""
+
+msgid ""
"Mercurial's internal web server, hgweb, can serve either a single\n"
"repository, or a collection of them. In the latter case, a special\n"
"configuration file can be used to specify the repository paths to use\n"
@@ -11309,11 +13970,11 @@
"för webbkonfiguration"
msgid ""
-"This file uses the same syntax as hgrc configuration files, but only\n"
-"the following sections are recognized:"
-msgstr ""
-"Denna fil använder samma syntax som hgrc-konfigurationsfiler, men bara de\n"
-"följande sektionerna används:"
+"This file uses the same syntax as other Mercurial configuration files,\n"
+"but only the following sections are recognized:"
+msgstr ""
+"Denna fil använder samma syntax som Mercurials övriga konfigurationsfiler,\n"
+"men bara de följande sektionerna används:"
msgid ""
" - web\n"
@@ -11326,10 +13987,12 @@
msgid ""
"The ``web`` section can specify all the settings described in the web\n"
-"section of the hgrc documentation."
+"section of the hgrc(5) documentation. See :hg:`help config` for\n"
+"information on where to find the manual page."
msgstr ""
"Sektionen ``web`` kan ange alla inställningar som beskrivs i web-sektionen\n"
-"i hgrc-dokumentationen."
+"i hgrc(5)-dokumentationen. Se :hg:`help config` för information om var\n"
+"manualsidan hittas."
msgid ""
"The ``paths`` section provides mappings of physical repository\n"
@@ -11696,7 +14359,10 @@
msgid ""
" listfile:list.txt read list from list.txt with one file pattern per line\n"
-" listfile0:list.txt read list from list.txt with null byte delimiters\n"
+" listfile0:list.txt read list from list.txt with null byte delimiters"
+msgstr ""
+
+msgid "See also :hg:`help filesets`.\n"
msgstr ""
msgid "Mercurial supports several ways to specify individual revisions."
@@ -11767,7 +14433,7 @@
msgid ""
"Mercurial supports a functional language for selecting a set of\n"
"revisions."
-msgstr "Mercurial stöder flera sött att ange individuella revisioner."
+msgstr "Mercurial stöder flera sätt att ange individuella revisioner."
msgid ""
"The language supports a number of predicates which are joined by infix\n"
@@ -11782,22 +14448,10 @@
msgstr ""
msgid ""
-"Special characters can be used in quoted identifiers by escaping them,\n"
-"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
-"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
-msgstr ""
-
-msgid "There is a single prefix operator:"
-msgstr ""
-
-msgid ""
"``not x``\n"
" Changesets not in x. Short form is ``! x``."
msgstr ""
-msgid "These are the supported infix operators:"
-msgstr ""
-
msgid ""
"``x::y``\n"
" A DAG range, meaning all changesets that are descendants of x and\n"
@@ -11832,10 +14486,59 @@
" Changesets in x but not in y."
msgstr ""
-msgid "The following predicates are supported:"
-msgstr ""
-
-msgid ".. predicatesmarker"
+msgid ""
+"``x^n``\n"
+" The nth parent of x, n == 0, 1, or 2.\n"
+" For n == 0, x; for n == 1, the first parent of each changeset in x;\n"
+" for n == 2, the second parent of changeset in x."
+msgstr ""
+
+msgid ""
+"``x~n``\n"
+" The nth first ancestor of x; ``x~0`` is x; ``x~3`` is ``x^^^``."
+msgstr ""
+
+msgid "There is a single postfix operator:"
+msgstr ""
+
+msgid ""
+"``x^``\n"
+" Equivalent to ``x^1``, the first parent of each changeset in x."
+msgstr ""
+
+msgid ""
+"\n"
+"The following predicates are supported:"
+msgstr ""
+
+msgid ""
+"New predicates (known as \"aliases\") can be defined, using any combination "
+"of\n"
+"existing predicates or other aliases. An alias definition looks like::"
+msgstr ""
+
+msgid " <alias> = <definition>"
+msgstr ""
+
+msgid ""
+"in the ``revsetalias`` section of a Mercurial configuration file. Arguments\n"
+"of the form `$1`, `$2`, etc. are substituted from the alias into the\n"
+"definition."
+msgstr ""
+
+msgid "For example,"
+msgstr "Exempelvis,"
+
+msgid ""
+" [revsetalias]\n"
+" h = heads()\n"
+" d($1) = sort($1, date)\n"
+" rs($1, $2) = reverse(sort($1, $2))"
+msgstr ""
+
+msgid ""
+"defines three aliases, ``h``, ``d``, and ``rs``. ``rs(0:tip, author)`` is\n"
+"exactly equivalent to ``reverse(sort(0:tip, author))``."
msgstr ""
msgid "Command line equivalents for :hg:`log`::"
@@ -11852,9 +14555,6 @@
" -l x -> limit(expr, x)"
msgstr ""
-msgid "Some sample queries:"
-msgstr ""
-
msgid "- Changesets on the default branch::"
msgstr "- Ändringar på default-grenen::"
@@ -11881,7 +14581,7 @@
msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
msgstr ""
-msgid "- Changesets in committed May 2008, sorted by user::"
+msgid "- Changesets committed in May 2008, sorted by user::"
msgstr ""
msgid " hg log -r \"sort(date('May 2008'), user)\""
@@ -12122,73 +14822,7 @@
"keywords are usually available for templating a log-like command:"
msgstr ""
-msgid ":author: String. The unmodified author of the changeset."
-msgstr ""
-
-msgid ""
-":branches: List of strings. The name of the branch on which the\n"
-" changeset was committed. Will be empty if the branch name was\n"
-" default."
-msgstr ""
-
-msgid ":children: List of strings. The children of the changeset."
-msgstr ""
-
-msgid ":date: Date information. The date when the changeset was committed."
-msgstr ""
-
-msgid ":desc: String. The text of the changeset description."
-msgstr ""
-
-msgid ""
-":diffstat: String. Statistics of changes with the following format:\n"
-" \"modified files: +added/-removed lines\""
-msgstr ""
-
-msgid ""
-":files: List of strings. All files modified, added, or removed by this\n"
-" changeset."
-msgstr ""
-
-msgid ":file_adds: List of strings. Files added by this changeset."
-msgstr ""
-
-msgid ""
-":file_copies: List of strings. Files copied in this changeset with\n"
-" their sources."
-msgstr ""
-
-msgid ""
-":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
-" only if the --copied switch is set."
-msgstr ""
-
-msgid ":file_mods: List of strings. Files modified by this changeset."
-msgstr ""
-
-msgid ":file_dels: List of strings. Files removed by this changeset."
-msgstr ""
-
-msgid ""
-":node: String. The changeset identification hash, as a 40 hexadecimal\n"
-" digit string."
-msgstr ""
-
-msgid ":parents: List of strings. The parents of the changeset."
-msgstr ""
-
-msgid ":rev: Integer. The repository-local changeset revision number."
-msgstr ""
-
-msgid ":tags: List of strings. Any tags associated with the changeset."
-msgstr ""
-
-msgid ""
-":latesttag: String. Most recent global tag in the ancestors of this\n"
-" changeset."
-msgstr ""
-
-msgid ":latesttagdistance: Integer. Longest path to the latest tag."
+msgid ".. keywordsmarker"
msgstr ""
msgid ""
@@ -12208,131 +14842,7 @@
msgid "List of filters:"
msgstr ""
-msgid ""
-":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
-" every line except the last."
-msgstr ""
-
-msgid ""
-":age: Date. Returns a human-readable date/time difference between the\n"
-" given date/time and the current date/time."
-msgstr ""
-
-msgid ""
-":basename: Any text. Treats the text as a path, and returns the last\n"
-" component of the path after splitting by the path separator\n"
-" (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n"
-" \"baz\" and \"foo/bar//\" becomes \"bar\"."
-msgstr ""
-
-msgid ""
-":stripdir: Treat the text as path and strip a directory level, if\n"
-" possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"."
-msgstr ""
-
-msgid ""
-":date: Date. Returns a date in a Unix date format, including the\n"
-" timezone: \"Mon Sep 04 15:13:13 2006 0700\"."
-msgstr ""
-
-msgid ""
-":domain: Any text. Finds the first string that looks like an email\n"
-" address, and extracts just the domain component. Example: ``User\n"
-" <user@example.com>`` becomes ``example.com``."
-msgstr ""
-
-msgid ""
-":email: Any text. Extracts the first string that looks like an email\n"
-" address. Example: ``User <user@example.com>`` becomes\n"
-" ``user@example.com``."
-msgstr ""
-
-msgid ""
-":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
-" and \">\" with XML entities."
-msgstr ""
-
-msgid ""
-":hex: Any text. Convert a binary Mercurial node identifier into\n"
-" its long hexadecimal representation."
-msgstr ""
-
-msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
-msgstr ""
-
-msgid ":fill76: Any text. Wraps the text to fit in 76 columns."
-msgstr ""
-
-msgid ":firstline: Any text. Returns the first line of text."
-msgstr ""
-
-msgid ":nonempty: Any text. Returns '(none)' if the string is empty."
-msgstr ""
-
-msgid ""
-":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n"
-" 25200\" (Unix timestamp, timezone offset)."
-msgstr ""
-
-msgid ""
-":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n"
-" +0200\"."
-msgstr ""
-
-msgid ""
-":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
-" seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n"
-" filter."
-msgstr ""
-
-msgid ":localdate: Date. Converts a date to local date."
-msgstr ""
-
-msgid ""
-":obfuscate: Any text. Returns the input text rendered as a sequence of\n"
-" XML entities."
-msgstr ""
-
-msgid ":person: Any text. Returns the text before an email address."
-msgstr ""
-
-msgid ""
-":rfc822date: Date. Returns a date using the same format used in email\n"
-" headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"."
-msgstr ""
-
-msgid ""
-":rfc3339date: Date. Returns a date using the Internet date format\n"
-" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"."
-msgstr ""
-
-msgid ""
-":short: Changeset hash. Returns the short form of a changeset hash,\n"
-" i.e. a 12 hexadecimal digit string."
-msgstr ""
-
-msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
-msgstr ""
-
-msgid ""
-":stringify: Any type. Turns the value into text by converting values into\n"
-" text and concatenating them."
-msgstr ""
-
-msgid ":strip: Any text. Strips all leading and trailing whitespace."
-msgstr ""
-
-msgid ""
-":tabindent: Any text. Returns the text, with every line except the\n"
-" first starting with a tab character."
-msgstr ""
-
-msgid ""
-":urlescape: Any text. Escapes all \"special\" characters. For example,\n"
-" \"foo bar\" becomes \"foo%20bar\"."
-msgstr ""
-
-msgid ":user: Any text. Returns the user portion of an email address.\n"
+msgid ".. filtersmarker\n"
msgstr ""
msgid "Valid URLs are of the form::"
@@ -12521,6 +15031,10 @@
msgstr ""
#, python-format
+msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
+msgstr ""
+
+#, python-format
msgid "calling hook %s: %s\n"
msgstr ""
@@ -12574,6 +15088,13 @@
msgid "warning: %s hook %s\n"
msgstr ""
+msgid "kb"
+msgstr "kb"
+
+#, python-format
+msgid "ignoring invalid [auth] key '%s'\n"
+msgstr "ignorerar ogiltig [auth]-nyckel '%s'\n"
+
msgid "connection ended unexpectedly"
msgstr ""
@@ -12614,6 +15135,9 @@
msgid "'%s' uses newer protocol %s"
msgstr ""
+msgid "unexpected response:"
+msgstr "oväntat svar:"
+
#, python-format
msgid "push failed: %s"
msgstr "tryckning misslyckades: %s"
@@ -12641,10 +15165,6 @@
msgstr ""
#, python-format
-msgid "requirement '%s' not supported"
-msgstr ""
-
-#, python-format
msgid ".hg/sharedpath points to nonexistent directory %s"
msgstr ""
@@ -12692,7 +15212,7 @@
msgstr "återkallar okänd transaktion\n"
#, python-format
-msgid "Named branch could not be reset, current branch still is: %s\n"
+msgid "named branch could not be reset, current branch is still: %s\n"
msgstr ""
#, python-format
@@ -12742,8 +15262,8 @@
msgid "file not tracked!"
msgstr "filen spåras inte!"
-msgid "unresolved merge conflicts (see hg resolve)"
-msgstr ""
+msgid "unresolved merge conflicts (see hg help resolve)"
+msgstr "olösta sammanfogningskonflikter (se hg help resolve)"
#, python-format
msgid "committing subrepository %s\n"
@@ -12768,14 +15288,6 @@
"changegroupsubset."
#, python-format
-msgid "updating bookmark %s\n"
-msgstr "uppdaterar bokmärket %s\n"
-
-#, python-format
-msgid "not updating divergent bookmark %s\n"
-msgstr "uppdaterar inte divergent bokmärke %s\n"
-
-#, python-format
msgid "%d changesets found\n"
msgstr "%d ändringar hittades\n"
@@ -12886,6 +15398,10 @@
msgstr "ogiltig lokal adress: %s"
#, python-format
+msgid "'\\n' and '\\r' disallowed in filenames: %r"
+msgstr ""
+
+#, python-format
msgid "failed to remove %s from manifest"
msgstr ""
@@ -12972,10 +15488,6 @@
msgid "note: possible conflict - %s was renamed multiple times to:\n"
msgstr "notera: möjlig konflikt - %s döptes om flera gånger till:\n"
-#, python-format
-msgid "branch %s not found"
-msgstr "grenen %s hittades inte"
-
msgid "merging with a working directory ancestor has no effect"
msgstr ""
@@ -12992,7 +15504,7 @@
msgid "crosses branches (merge branches or use --clean to discard changes)"
msgstr ""
-msgid "crosses branches (merge branches or use --check to force update)"
+msgid "crosses branches (merge branches or update --check to force update)"
msgstr ""
msgid "Attention:"
@@ -13023,12 +15535,24 @@
msgstr "Varning!"
#, python-format
-msgid "cannot create %s: destination already exists"
-msgstr ""
-
-#, python-format
-msgid "cannot create %s: unable to create destination directory"
-msgstr ""
+msgid "unexpected token: %s"
+msgstr ""
+
+#, python-format
+msgid "not a prefix: %s"
+msgstr "inte ett prefix: %s"
+
+#, python-format
+msgid "not an infix: %s"
+msgstr "inte en infix: %s"
+
+#, python-format
+msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
+msgstr ""
+
+#, python-format
+msgid "cannot patch %s: file is not tracked"
+msgstr "kan inte patcha %s: filen är inte hanterad"
#, python-format
msgid "unable to find '%s' for patching\n"
@@ -13039,14 +15563,14 @@
msgstr ""
#, python-format
-msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
-msgstr ""
-
-#, python-format
msgid "bad hunk #%d %s (%d %d %d %d)"
msgstr ""
#, python-format
+msgid "cannot create %s: destination already exists\n"
+msgstr "kan inte skapa %s: destinationen finns redan\n"
+
+#, python-format
msgid "file %s already exists\n"
msgstr ""
@@ -13085,7 +15609,7 @@
msgstr ""
#, python-format
-msgid "malformed patch %s %s"
+msgid "cannot create %s: destination already exists"
msgstr ""
#, python-format
@@ -13104,10 +15628,6 @@
msgstr ""
#, python-format
-msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
-msgstr ""
-
-#, python-format
msgid "exited with status %d"
msgstr ""
@@ -13177,84 +15697,212 @@
msgid "consistency error in delta"
msgstr ""
-msgid "unknown base"
-msgstr ""
-
-msgid "unterminated string"
-msgstr ""
-
-msgid "syntax error"
-msgstr ""
-
-msgid "missing argument"
-msgstr ""
+msgid "unknown delta base"
+msgstr "okänd deltabas"
#, python-format
msgid "can't use %s here"
msgstr "kan inte använda %s här"
-msgid "can't use a list in this context"
-msgstr "kan inte använda en lista i detta sammanhang"
-
-#, python-format
-msgid "not a function: %s"
-msgstr "inte en funktion: %s"
-
-msgid ""
-"``id(string)``\n"
-" Revision non-ambiguously specified by the given hex string prefix."
-msgstr ""
-
-#. i18n: "id" is a keyword
-msgid "id requires one argument"
-msgstr "id kräver ett argument"
-
-#. i18n: "id" is a keyword
-msgid "id requires a string"
-msgstr "id kräver en sträng"
-
-msgid ""
-"``rev(number)``\n"
-" Revision with the given numeric identifier."
-msgstr ""
-
-#. i18n: "rev" is a keyword
-msgid "rev requires one argument"
-msgstr "rev kräver ett argument"
-
-#. i18n: "rev" is a keyword
-msgid "rev requires a number"
-msgstr "rev kräver ett nummer"
-
-#. i18n: "rev" is a keyword
-msgid "rev expects a number"
-msgstr "rev förväntar sig ett nummer"
-
-msgid ""
-"``p1([set])``\n"
-" First parent of changesets in set, or the working directory."
-msgstr ""
-
-msgid ""
-"``p2([set])``\n"
-" Second parent of changesets in set, or the working directory."
-msgstr ""
-
-msgid ""
-"``parents([set])``\n"
-" The set of all parents for all changesets in set, or the working "
-"directory."
-msgstr ""
-
-msgid ""
-"``max(set)``\n"
-" Changeset with highest revision number in set."
-msgstr ""
-
-msgid ""
-"``min(set)``\n"
-" Changeset with lowest revision number in set."
-msgstr ""
+msgid ""
+"``adds(pattern)``\n"
+" Changesets that add a file matching pattern."
+msgstr ""
+
+#. i18n: "adds" is a keyword
+msgid "adds requires a pattern"
+msgstr "adds kräver ett mönster"
+
+msgid ""
+"``ancestor(single, single)``\n"
+" Greatest common ancestor of the two changesets."
+msgstr ""
+
+#. i18n: "ancestor" is a keyword
+msgid "ancestor requires two arguments"
+msgstr "ancestor kräver två argument"
+
+#. i18n: "ancestor" is a keyword
+msgid "ancestor arguments must be single revisions"
+msgstr "argument till ancestor måste vara revisioner"
+
+msgid ""
+"``ancestors(set)``\n"
+" Changesets that are ancestors of a changeset in set."
+msgstr ""
+
+msgid "~ expects a number"
+msgstr "~ förväntar sig ett nummer"
+
+msgid ""
+"``author(string)``\n"
+" Alias for ``user(string)``."
+msgstr ""
+
+#. i18n: "author" is a keyword
+msgid "author requires a string"
+msgstr "author kräver en sträng"
+
+msgid ""
+"``bisected(string)``\n"
+" Changesets marked in the specified bisect state (good, bad, skip)."
+msgstr ""
+
+msgid "bisect requires a string"
+msgstr "bisect kräver en sträng"
+
+msgid "invalid bisect state"
+msgstr "ogiltigt bisect-tillständ"
+
+msgid ""
+"``bookmark([name])``\n"
+" The named bookmark or all bookmarks."
+msgstr ""
+
+#. i18n: "bookmark" is a keyword
+msgid "bookmark takes one or no arguments"
+msgstr "bookmark tar ett eller inga argument"
+
+#. i18n: "bookmark" is a keyword
+msgid "the argument to bookmark must be a string"
+msgstr "argumentet till bookmark måste vara en sträng"
+
+msgid ""
+"``branch(string or set)``\n"
+" All changesets belonging to the given branch or the branches of the "
+"given\n"
+" changesets."
+msgstr ""
+
+msgid ""
+"``children(set)``\n"
+" Child changesets of changesets in set."
+msgstr ""
+
+msgid ""
+"``closed()``\n"
+" Changeset is closed."
+msgstr ""
+
+#. i18n: "closed" is a keyword
+msgid "closed takes no arguments"
+msgstr "closed tar inga argument"
+
+msgid ""
+"``contains(pattern)``\n"
+" Revision contains a file matching pattern. See :hg:`help patterns`\n"
+" for information about file patterns."
+msgstr ""
+
+#. i18n: "contains" is a keyword
+msgid "contains requires a pattern"
+msgstr "contain kräver ett mönster"
+
+msgid ""
+"``date(interval)``\n"
+" Changesets within the interval, see :hg:`help dates`."
+msgstr ""
+
+#. i18n: "date" is a keyword
+msgid "date requires a string"
+msgstr "date kräver en sträng"
+
+msgid ""
+"``desc(string)``\n"
+" Search commit message for string. The match is case-insensitive."
+msgstr ""
+
+#. i18n: "desc" is a keyword
+msgid "desc requires a string"
+msgstr "desc kräver en sträng"
+
+msgid ""
+"``descendants(set)``\n"
+" Changesets which are descendants of changesets in set."
+msgstr ""
+
+msgid ""
+"``filelog(pattern)``\n"
+" Changesets connected to the specified filelog."
+msgstr ""
+
+msgid "filelog requires a pattern"
+msgstr "filelog kräver ett mönster"
+
+msgid ""
+"``follow([file])``\n"
+" An alias for ``::.`` (ancestors of the working copy's first parent).\n"
+" If a filename is specified, the history of the given file is followed,\n"
+" including copies."
+msgstr ""
+
+#. i18n: "follow" is a keyword
+msgid "follow takes no arguments or a filename"
+msgstr "follow tar inga argument eller ett filnamn"
+
+msgid "follow expected a filename"
+msgstr "follow förväntade sig ett filnamn"
+
+#. i18n: "follow" is a keyword
+msgid "follow takes no arguments"
+msgstr "follow tar inga argument"
+
+msgid ""
+"``all()``\n"
+" All changesets, the same as ``0:tip``."
+msgstr ""
+
+#. i18n: "all" is a keyword
+msgid "all takes no arguments"
+msgstr "all tar inga argument"
+
+msgid ""
+"``grep(regex)``\n"
+" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n"
+" to ensure special escape characters are handled correctly. Unlike\n"
+" ``keyword(string)``, the match is case-sensitive."
+msgstr ""
+
+#. i18n: "grep" is a keyword
+msgid "grep requires a string"
+msgstr "grep kräver en sträng"
+
+#, python-format
+msgid "invalid match pattern: %s"
+msgstr "ogiltigt träffmönster: %s"
+
+msgid ""
+"``file(pattern)``\n"
+" Changesets affecting files matched by pattern."
+msgstr ""
+
+#. i18n: "file" is a keyword
+msgid "file requires a pattern"
+msgstr "file kräver ett mönster"
+
+msgid ""
+"``head()``\n"
+" Changeset is a named branch head."
+msgstr ""
+
+#. i18n: "head" is a keyword
+msgid "head takes no arguments"
+msgstr "head tar inga argument"
+
+msgid ""
+"``heads(set)``\n"
+" Members of set with no children in set."
+msgstr ""
+
+msgid ""
+"``keyword(string)``\n"
+" Search commit message, user name, and names of changed files for\n"
+" string. The match is case-insensitive."
+msgstr ""
+
+#. i18n: "keyword" is a keyword
+msgid "keyword requires a string"
+msgstr "keyword kräver en sträng"
msgid ""
"``limit(set, n)``\n"
@@ -13274,111 +15922,40 @@
msgstr "limit förväntar sig ett nummer"
msgid ""
-"``children(set)``\n"
-" Child changesets of changesets in set."
-msgstr ""
-
-msgid ""
-"``branch(set)``\n"
-" All changesets belonging to the branches of changesets in set."
-msgstr ""
-
-msgid ""
-"``ancestor(single, single)``\n"
-" Greatest common ancestor of the two changesets."
-msgstr ""
-
-#. i18n: "ancestor" is a keyword
-msgid "ancestor requires two arguments"
-msgstr "ancestor kräver två argument"
-
-#. i18n: "ancestor" is a keyword
-msgid "ancestor arguments must be single revisions"
-msgstr "argument till ancestor måste vara singelrevisioner"
-
-msgid ""
-"``ancestors(set)``\n"
-" Changesets that are ancestors of a changeset in set."
-msgstr ""
-
-msgid ""
-"``descendants(set)``\n"
-" Changesets which are descendants of changesets in set."
-msgstr ""
-
-msgid ""
-"``follow()``\n"
-" An alias for ``::.`` (ancestors of the working copy's first parent)."
-msgstr ""
-
-#. i18n: "follow" is a keyword
-msgid "follow takes no arguments"
-msgstr "follow tar inga argument"
-
-msgid ""
-"``date(interval)``\n"
-" Changesets within the interval, see :hg:`help dates`."
-msgstr ""
-
-#. i18n: "date" is a keyword
-msgid "date requires a string"
-msgstr "date kräver en sträng"
-
-msgid ""
-"``keyword(string)``\n"
-" Search commit message, user name, and names of changed files for\n"
-" string."
-msgstr ""
-
-#. i18n: "keyword" is a keyword
-msgid "keyword requires a string"
-msgstr "keyword kräver en sträng"
-
-msgid ""
-"``grep(regex)``\n"
-" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n"
-" to ensure special escape characters are handled correctly."
-msgstr ""
-
-#. i18n: "grep" is a keyword
-msgid "grep requires a string"
-msgstr "grep kräver en sträng"
-
-#, python-format
-msgid "invalid match pattern: %s"
-msgstr "ogiltigt träffmönster: %s"
-
-msgid ""
-"``author(string)``\n"
-" Alias for ``user(string)``."
-msgstr ""
-
-#. i18n: "author" is a keyword
-msgid "author requires a string"
-msgstr "author kräver en sträng"
-
-msgid ""
-"``user(string)``\n"
-" User name is string."
-msgstr ""
-
-msgid ""
-"``file(pattern)``\n"
-" Changesets affecting files matched by pattern."
-msgstr ""
-
-#. i18n: "file" is a keyword
-msgid "file requires a pattern"
-msgstr "file kräver ett mönster"
-
-msgid ""
-"``contains(pattern)``\n"
-" Revision contains pattern."
-msgstr ""
-
-#. i18n: "contains" is a keyword
-msgid "contains requires a pattern"
-msgstr "contains kräver ett mönster"
+"``last(set, n)``\n"
+" Last n members of set."
+msgstr ""
+
+#. i18n: "last" is a keyword
+msgid "last requires two arguments"
+msgstr "last kräver två argument"
+
+#. i18n: "last" is a keyword
+msgid "last requires a number"
+msgstr "last kräver ett nummer"
+
+#. i18n: "last" is a keyword
+msgid "last expects a number"
+msgstr "last förväntar sig ett nummer"
+
+msgid ""
+"``max(set)``\n"
+" Changeset with highest revision number in set."
+msgstr ""
+
+msgid ""
+"``merge()``\n"
+" Changeset is a merge changeset."
+msgstr ""
+
+#. i18n: "merge" is a keyword
+msgid "merge takes no arguments"
+msgstr "merge tar inga argument"
+
+msgid ""
+"``min(set)``\n"
+" Changeset with lowest revision number in set."
+msgstr ""
msgid ""
"``modifies(pattern)``\n"
@@ -13390,13 +15967,56 @@
msgstr "modifies kräver ett mönster"
msgid ""
-"``adds(pattern)``\n"
-" Changesets that add a file matching pattern."
-msgstr ""
-
-#. i18n: "adds" is a keyword
-msgid "adds requires a pattern"
-msgstr "adds kräver ett mönster"
+"``id(string)``\n"
+" Revision non-ambiguously specified by the given hex string prefix."
+msgstr ""
+
+#. i18n: "id" is a keyword
+msgid "id requires one argument"
+msgstr "id kräver ett argument"
+
+#. i18n: "id" is a keyword
+msgid "id requires a string"
+msgstr "id kräver en sträng"
+
+msgid ""
+"``outgoing([path])``\n"
+" Changesets not found in the specified destination repository, or the\n"
+" default push location."
+msgstr ""
+
+#. i18n: "outgoing" is a keyword
+msgid "outgoing takes one or no arguments"
+msgstr "outgoing tar ett eller inga argument"
+
+#. i18n: "outgoing" is a keyword
+msgid "outgoing requires a repository path"
+msgstr ""
+
+msgid ""
+"``p1([set])``\n"
+" First parent of changesets in set, or the working directory."
+msgstr ""
+
+msgid ""
+"``p2([set])``\n"
+" Second parent of changesets in set, or the working directory."
+msgstr ""
+
+msgid ""
+"``parents([set])``\n"
+" The set of all parents for all changesets in set, or the working "
+"directory."
+msgstr ""
+
+msgid "^ expects a number 0, 1, or 2"
+msgstr "^ förväntar sig ett nummer 0, 1, eller 2"
+
+msgid ""
+"``present(set)``\n"
+" An empty set, if any revision in set isn't found; otherwise,\n"
+" all revisions in set."
+msgstr ""
msgid ""
"``removes(pattern)``\n"
@@ -13405,34 +16025,24 @@
#. i18n: "removes" is a keyword
msgid "removes requires a pattern"
-msgstr "removes kräver ett mänster"
-
-msgid ""
-"``merge()``\n"
-" Changeset is a merge changeset."
-msgstr ""
-
-#. i18n: "merge" is a keyword
-msgid "merge takes no arguments"
-msgstr "merge tar inga argument"
-
-msgid ""
-"``closed()``\n"
-" Changeset is closed."
-msgstr ""
-
-#. i18n: "closed" is a keyword
-msgid "closed takes no arguments"
-msgstr "closed tar inga argument"
-
-msgid ""
-"``head()``\n"
-" Changeset is a named branch head."
-msgstr ""
-
-#. i18n: "head" is a keyword
-msgid "head takes no arguments"
-msgstr "head tar inga argument"
+msgstr "removes kräver ett mönster"
+
+msgid ""
+"``rev(number)``\n"
+" Revision with the given numeric identifier."
+msgstr ""
+
+#. i18n: "rev" is a keyword
+msgid "rev requires one argument"
+msgstr "rev kräver ett argument"
+
+#. i18n: "rev" is a keyword
+msgid "rev requires a number"
+msgstr "rev kräver ett nummer"
+
+#. i18n: "rev" is a keyword
+msgid "rev expects a number"
+msgstr "rev förväntar sig ett nummer"
msgid ""
"``reverse(set)``\n"
@@ -13440,9 +16050,8 @@
msgstr ""
msgid ""
-"``present(set)``\n"
-" An empty set, if any revision in set isn't found; otherwise,\n"
-" all revisions in set."
+"``roots(set)``\n"
+" Changesets with no parent changeset in set."
msgstr ""
msgid ""
@@ -13474,36 +16083,7 @@
msgstr "okänd sorteringsnyckel %r"
msgid ""
-"``all()``\n"
-" All changesets, the same as ``0:tip``."
-msgstr ""
-
-#. i18n: "all" is a keyword
-msgid "all takes no arguments"
-msgstr "all tar inga argument"
-
-msgid ""
-"``heads(set)``\n"
-" Members of set with no children in set."
-msgstr ""
-
-msgid ""
-"``roots(set)``\n"
-" Changesets with no parent changeset in set."
-msgstr ""
-
-msgid ""
-"``outgoing([path])``\n"
-" Changesets not found in the specified destination repository, or the\n"
-" default push location."
-msgstr ""
-
-#. i18n: "outgoing" is a keyword
-msgid "outgoing requires a repository path"
-msgstr "outgoing kräver en arkivsökväg"
-
-msgid ""
-"``tag(name)``\n"
+"``tag([name])``\n"
" The specified tag by name, or all tagged revisions if no name is given."
msgstr ""
@@ -13516,19 +16096,9 @@
msgstr "argumentet till tag måste vara en sträng"
msgid ""
-"``bookmark([name])``\n"
-" The named bookmark or all bookmarks."
-msgstr ""
-"``bookmark([namn])``\n"
-" Det angivna bokmärket eller alla bokmärken."
-
-#. i18n: "bookmark" is a keyword
-msgid "bookmark takes one or no arguments"
-msgstr "bookmark tar ett eller inga argument"
-
-#. i18n: "bookmark" is a keyword
-msgid "the argument to bookmark must be a string"
-msgstr "argumentet till bookmark måste vara en sträng"
+"``user(string)``\n"
+" User name contains string. The match is case-insensitive."
+msgstr ""
msgid "can't negate that"
msgstr "kan inte negera det"
@@ -13536,9 +16106,72 @@
msgid "not a symbol"
msgstr "inte en symbol"
+#, fuzzy, python-format
+msgid "invalid number of arguments: %s"
+msgstr "felaktigt antal argument: %s"
+
msgid "empty query"
msgstr "tom fråga"
+#, python-format
+msgid "ui.portablefilenames value is invalid ('%s')"
+msgstr ""
+
+#, python-format
+msgid "possible case-folding collision for %s"
+msgstr ""
+
+#, python-format
+msgid "path ends in directory separator: %s"
+msgstr "sökvägen slutar med en katalogseparator: %s"
+
+#, python-format
+msgid "path contains illegal component: %s"
+msgstr ""
+
+#, python-format
+msgid "path %r is inside nested repo %r"
+msgstr ""
+
+#, python-format
+msgid "path %r traverses symbolic link %r"
+msgstr ""
+
+#, python-format
+msgid "could not symlink to %r: %s"
+msgstr ""
+
+#, python-format
+msgid "recording removal of %s as rename to %s (%d%% similar)\n"
+msgstr ""
+
+#, python-format
+msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
+msgstr ""
+"%s har inte arkiverats än, så ingen kopieringsinformation lagras för %s.\n"
+
+msgid ".hg/requires file is corrupt"
+msgstr "filen .hg/requires är korrupt"
+
+#, python-format
+msgid "unknown repository format: requires features '%s' (upgrade Mercurial)"
+msgstr "okänt arkivformat: kräver att '%s' fungerar (uppgradera Mercurial)"
+
+msgid "searching for changes\n"
+msgstr "söker efter ändringar\n"
+
+msgid "queries"
+msgstr "frågor"
+
+msgid "searching"
+msgstr "söker"
+
+msgid "repository is unrelated"
+msgstr "arkivet är obesläktat"
+
+msgid "warning: repository is unrelated\n"
+msgstr "varning: arkivet är obesälktat\n"
+
msgid "searching for exact renames"
msgstr "söker efter exakta namnbyten"
@@ -13571,13 +16204,54 @@
msgid "remote: "
msgstr "fjärr: "
-msgid "unexpected response:"
-msgstr "oväntat svar:"
-
#, python-format
msgid "push refused: %s"
msgstr ""
+msgid "certificate checking requires Python 2.6"
+msgstr "certifikatkontroll kräver Python 2.6"
+
+msgid "no certificate received"
+msgstr "inget certifikat mottaget"
+
+#, python-format
+msgid "certificate is for %s"
+msgstr "certifikat är för %s"
+
+msgid "IDN in certificate not supported"
+msgstr "IDN i certifikat stöds inte"
+
+msgid "no commonName or subjectAltName found in certificate"
+msgstr "inget commonName eller subjectAltName hittades i certifikat"
+
+#, python-format
+msgid "could not find web.cacerts: %s"
+msgstr "kunde inte hitta web.cacerts: %s"
+
+#, python-format
+msgid "%s certificate error: %s (use --insecure to connect insecurely)"
+msgstr "%s-certifikatfel: %s (använd --insecure för att ansluta osäkert)"
+
+#, python-format
+msgid "invalid certificate for %s with fingerprint %s"
+msgstr "ogiltigt certifikat för %s med fingeravtrycket %s"
+
+#, python-format
+msgid ""
+"warning: %s certificate with fingerprint %s not verified (check "
+"hostfingerprints or web.cacerts config setting)\n"
+msgstr ""
+"varning: %s-certificatet med fingeravtrycket %s overifierad (kontrollera "
+"hostfingerprints inställningen web.cacerts)\n"
+
+#, python-format
+msgid "host fingerprint for %s can't be verified (Python too old)"
+msgstr ""
+
+#, python-format
+msgid "warning: certificate for %s can't be verified (Python too old)\n"
+msgstr "varning: certificatet för %s kan inte verifieras (för gammal Python)\n"
+
#, python-format
msgid "'%s' does not appear to be an hg repository"
msgstr ""
@@ -13661,6 +16335,10 @@
msgstr ""
#, python-format
+msgid "cloning subrepo %s from %s\n"
+msgstr "klonar underarkivet %s från %s\n"
+
+#, python-format
msgid "pulling subrepo %s from %s\n"
msgstr "drar underarkivet %s från %s\n"
@@ -13668,6 +16346,9 @@
msgid "pushing subrepo %s to %s\n"
msgstr "trycker underarkivet %s till %s\n"
+msgid "cannot retrieve svn tool version"
+msgstr "kan inte hämta version på svn-verktyg"
+
msgid "cannot commit svn externals"
msgstr ""
@@ -13676,14 +16357,6 @@
msgstr "raderar inte arkivet %s eftersom den har ändringar.\n"
#, python-format
-msgid "cloning subrepo %s\n"
-msgstr "klonar underarkivet %s\n"
-
-#, python-format
-msgid "pulling subrepo %s\n"
-msgstr "drar underarkivet %s\n"
-
-#, python-format
msgid "revision %s does not exist in subrepo %s\n"
msgstr "revisionen %s existerar inte i underarkivet %s\n"
@@ -13695,6 +16368,10 @@
msgstr "hämta ut en git-gren om du tänker göra ändringer\n"
#, python-format
+msgid "subrepo %s is missing"
+msgstr "underarkivet %s saknas"
+
+#, python-format
msgid "unrelated git branch checked out in subrepo %s\n"
msgstr "obesläktar git-gren hämtar i underarkivet %s\n"
@@ -13773,6 +16450,9 @@
msgid "rollback failed - please run hg recover\n"
msgstr ""
+msgid "already have changeset "
+msgstr "har redan ändringen "
+
#, python-format
msgid "Not trusting file %s from untrusted user %s, group %s\n"
msgstr "Litar inte på filen %s från opålitlig användare %s, grupp %s\n"
@@ -13786,19 +16466,19 @@
msgstr "(föråldrad '%%' i sökvägen %s=%s från %s)\n"
#, python-format
-msgid "ignoring untrusted configuration option %s.%s = %s\n"
-msgstr ""
-
-#, python-format
-msgid "%s.%s not a boolean ('%s')"
-msgstr ""
+msgid "%s.%s is not a boolean ('%s')"
+msgstr "%s.%s är inte booleskt ('%s')"
+
+#, python-format
+msgid "%s.%s is not an integer ('%s')"
+msgstr "%s.%s är inte ett heltal ('%s')"
msgid "enter a commit username:"
msgstr ""
#, python-format
msgid "No username found, using '%s' instead\n"
-msgstr ""
+msgstr "Inget användarnamn hittades, använder '%s' istället\n"
msgid "no username supplied (see \"hg help config\")"
msgstr "inget användarnamn angivet (se \"hg help config\")"
@@ -13819,10 +16499,6 @@
msgid "edit failed"
msgstr ""
-#, python-format
-msgid "ignoring invalid [auth] key '%s'\n"
-msgstr "ignorerar ogiltig [auth]-nyckel '%s'\n"
-
msgid "http authorization required"
msgstr "http-autenticiering krävs"
@@ -13844,74 +16520,20 @@
msgid "http auth: user %s, password %s\n"
msgstr "http-auth: användare %s, lösenord %s\n"
-msgid "kb"
-msgstr "kb"
-
-msgid "certificate checking requires Python 2.6"
-msgstr "certifikatkontroll kräver Python 2.6"
-
-msgid "no certificate received"
-msgstr "inget certifikat mottaget"
-
-#, python-format
-msgid "certificate is for %s"
-msgstr "certifikat är för %s"
-
-msgid "IDN in certificate not supported"
-msgstr "IDN i certifikat stöds inte"
-
-msgid "no commonName or subjectAltName found in certificate"
-msgstr "inget commonName eller subjectAltName hittades i certifikat"
-
-#, python-format
-msgid "%s certificate error: %s (use --insecure to connect insecurely)"
-msgstr "%s-certifikatfel: %s (använd --insecure för att ansluta osäkert)"
-
-#, python-format
-msgid "invalid certificate for %s with fingerprint %s"
-msgstr "ogiltigt certifikat för %s med fingeravtrycket %s"
-
-#, python-format
-msgid ""
-"warning: %s certificate with fingerprint %s not verified (check "
-"hostfingerprints or web.cacerts config setting)\n"
-msgstr ""
-"varning: %s-certificatet med fingeravtrycket %s overifierad (kontrollera "
-"hostfingerprints inställningen web.cacerts)\n"
-
-#, python-format
-msgid "no certificate for %s with configured hostfingerprint"
-msgstr "inget certifikat för %s med konfigurerat fingeravtryck"
-
-#, python-format
-msgid ""
-"warning: %s certificate not verified (check web.cacerts config setting)\n"
-msgstr ""
-"varning: %s-certificatet overifierad (kontrollera inställningen web."
-"cacerts)\n"
-
#, python-format
msgid "command '%s' failed: %s"
msgstr "kommandot '%s' misslyckades: %s"
#, python-format
-msgid "path ends in directory separator: %s"
-msgstr "sökvägen slutar med en katalogseparator: %s"
-
-#, python-format
-msgid "path contains illegal component: %s"
-msgstr ""
-
-#, python-format
-msgid "path %r is inside repo %r"
-msgstr ""
-
-#, python-format
-msgid "path %r traverses symbolic link %r"
-msgstr ""
-
-#, python-format
-msgid "could not symlink to %r: %s"
+msgid "filename contains '%s', which is reserved on Windows"
+msgstr ""
+
+#, python-format
+msgid "filename contains %r, which is invalid on Windows"
+msgstr ""
+
+#, python-format
+msgid "filename ends with '%s', which is not allowed on Windows"
msgstr ""
msgid "check your clock"
@@ -13937,11 +16559,24 @@
msgid "impossible time zone offset: %d"
msgstr "omöjlig tidzonsoffset: %d"
+msgid "dates cannot consist entirely of whitespace"
+msgstr "datum kan inte bara bestå av blanktecken"
+
+msgid "invalid day spec, use '<DATE'"
+msgstr ""
+
+msgid "invalid day spec, use '>DATE'"
+msgstr ""
+
#, python-format
msgid "invalid day spec: %s"
msgstr ""
#, python-format
+msgid "%s must be nonnegative (see 'hg help dates')"
+msgstr ""
+
+#, python-format
msgid "%.0f GB"
msgstr "%.0f GB"
@@ -13985,6 +16620,9 @@
msgid "no port number associated with service '%s'"
msgstr ""
+msgid "file:// URLs can only refer to localhost"
+msgstr ""
+
msgid "cannot verify bundle or remote repos"
msgstr ""
--- a/mercurial/fileset.py Wed Jun 29 12:54:34 2011 +0200
+++ b/mercurial/fileset.py Wed Jun 29 16:05:41 2011 -0500
@@ -114,6 +114,7 @@
"""``modified()``
File that is modified according to status.
"""
+ # i18n: "modified" is a keyword
getargs(x, 0, 0, _("modified takes no arguments"))
s = mctx.status()[0]
return [f for f in mctx.subset if f in s]
@@ -122,6 +123,7 @@
"""``added()``
File that is added according to status.
"""
+ # i18n: "added" is a keyword
getargs(x, 0, 0, _("added takes no arguments"))
s = mctx.status()[1]
return [f for f in mctx.subset if f in s]
@@ -130,6 +132,7 @@
"""``removed()``
File that is removed according to status.
"""
+ # i18n: "removed" is a keyword
getargs(x, 0, 0, _("removed takes no arguments"))
s = mctx.status()[2]
return [f for f in mctx.subset if f in s]
@@ -138,6 +141,7 @@
"""``deleted()``
File that is deleted according to status.
"""
+ # i18n: "deleted" is a keyword
getargs(x, 0, 0, _("deleted takes no arguments"))
s = mctx.status()[3]
return [f for f in mctx.subset if f in s]
@@ -147,6 +151,7 @@
File that is unknown according to status. These files will only be
considered if this predicate is used.
"""
+ # i18n: "unknown" is a keyword
getargs(x, 0, 0, _("unknown takes no arguments"))
s = mctx.status()[4]
return [f for f in mctx.subset if f in s]
@@ -156,6 +161,7 @@
File that is ignored according to status. These files will only be
considered if this predicate is used.
"""
+ # i18n: "ignored" is a keyword
getargs(x, 0, 0, _("ignored takes no arguments"))
s = mctx.status()[5]
return [f for f in mctx.subset if f in s]
@@ -164,6 +170,7 @@
"""``clean()``
File that is clean according to status.
"""
+ # i18n: "clean" is a keyword
getargs(x, 0, 0, _("clean takes no arguments"))
s = mctx.status()[6]
return [f for f in mctx.subset if f in s]
@@ -190,6 +197,7 @@
"""``binary()``
File that appears to be binary (contails NUL bytes).
"""
+ # i18n: "binary" is a keyword
getargs(x, 0, 0, _("binary takes no arguments"))
return [f for f in mctx.subset if util.binary(mctx.ctx[f].data())]
@@ -197,6 +205,7 @@
"""``exec()``
File that is marked as executable.
"""
+ # i18n: "exec" is a keyword
getargs(x, 0, 0, _("exec takes no arguments"))
return [f for f in mctx.subset if mctx.ctx.flags(f) == 'x']
@@ -204,6 +213,7 @@
"""``symlink()``
File that is marked as a symlink.
"""
+ # i18n: "symlink" is a keyword
getargs(x, 0, 0, _("symlink takes no arguments"))
return [f for f in mctx.subset if mctx.ctx.flags(f) == 'l']
@@ -211,6 +221,7 @@
"""``resolved()``
File that is marked resolved according to the resolve state.
"""
+ # i18n: "resolved" is a keyword
getargs(x, 0, 0, _("resolved takes no arguments"))
if mctx.ctx.rev() is not None:
return []
@@ -221,6 +232,7 @@
"""``unresolved()``
File that is marked unresolved according to the resolve state.
"""
+ # i18n: "unresolved" is a keyword
getargs(x, 0, 0, _("unresolved takes no arguments"))
if mctx.ctx.rev() is not None:
return []
@@ -282,6 +294,7 @@
- 4k - 1MB (files from 4096 bytes to 1048576 bytes)
"""
+ # i18n: "size" is a keyword
expr = getstring(x, _("size requires an expression")).strip()
if '-' in expr: # do we have a range?
a, b = expr.split('-', 1)
@@ -316,6 +329,7 @@
UTF-8.
"""
+ # i18n: "encoding" is a keyword
enc = getstring(x, _("encoding requires an encoding name"))
s = []
@@ -335,6 +349,7 @@
"""``copied()``
File that is recorded as being copied.
"""
+ # i18n: "copied" is a keyword
getargs(x, 0, 0, _("copied takes no arguments"))
s = []
for f in mctx.subset: