Mercurial > hg
changeset 14655:4d36013ab330
i18n-ro: outstanding changes
| author | Daniel Dumitriu <daniel.dumitriu@gmail.com> |
|---|---|
| date | Wed, 08 Jun 2011 15:17:23 +0200 |
| parents | 3c7907dc95ca |
| children | d80e06575547 |
| files | i18n/ro.po |
| diffstat | 1 files changed, 6585 insertions(+), 3023 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/ro.po Mon Jun 06 21:02:48 2011 +0200 +++ b/i18n/ro.po Wed Jun 08 15:17:23 2011 +0200 @@ -30,7 +30,7 @@ # head capăt # imply a implica, a sugera # incoming de primit -# hook hook, acțiune, ancoră +# hook hook, acțiune, ancoră # merge a fuziona (a contopi, a îmbina) # notation notație # pattern tipar @@ -106,8 +106,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-08-25 11:46+0200\n" -"PO-Revision-Date: 2010-08-26 16:19+0200\n" +"POT-Creation-Date: 2011-06-08 15:03+0200\n" +"PO-Revision-Date: 2010-11-04 12:56+0100\n" "Last-Translator: Daniel Dumitriu <daniel.dumitriu@gmail.com>\n" "Language-Team: Romanian <>\n" "MIME-Version: 1.0\n" @@ -127,8 +127,17 @@ msgid "Commands" msgstr "Comenzi" -msgid " options:" -msgstr " opțiuni:" +msgid "Extensions" +msgstr "Extensii" + +msgid "" +"This section contains help for extensions that are distributed together with " +"Mercurial. Help for other extensions is available in the help system." +msgstr "" + +#, fuzzy +msgid "Options:" +msgstr "Opțiuni" #, python-format msgid " aliases: %s" @@ -190,10 +199,8 @@ msgid "" "Branch-based Access Control\n" -"---------------------------" -msgstr "" -"Controlul accesului pe bază de ramură\n" -"-------------------------------------" +"..........................." +msgstr "" msgid "" "Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" @@ -223,7 +230,7 @@ msgid "" "Path-based Access Control\n" -"-------------------------" +"........................." msgstr "" msgid "" @@ -235,7 +242,7 @@ msgid "" "Groups\n" -"------" +"......" msgstr "" msgid "" @@ -252,7 +259,7 @@ msgid "" "Example Configuration\n" -"---------------------" +"....................." msgstr "" msgid "::" @@ -395,289 +402,236 @@ msgid "acl: access denied for changeset %s" msgstr "" -msgid "track a line of development with movable markers" -msgstr "" - -msgid "" -"Bookmarks are local movable markers to changesets. Every bookmark\n" -"points to a changeset identified by its hash. If you commit a\n" -"changeset that is based on a changeset that has a bookmark on it, the\n" -"bookmark shifts to the new changeset." -msgstr "" - -msgid "" -"It is possible to use bookmark names in every revision lookup (e.g.\n" -":hg:`merge`, :hg:`update`)." -msgstr "" - -msgid "" -"By default, when several bookmarks point to the same changeset, they\n" -"will all move forward together. It is possible to obtain a more\n" -"git-like experience by adding the following configuration option to\n" -"your .hgrc::" -msgstr "" - -msgid "" -" [bookmarks]\n" -" track.current = True" -msgstr "" - -msgid "" -"This will cause Mercurial to track the bookmark that you are currently\n" -"using, and only update it. This is similar to git's approach to\n" -"branching.\n" -msgstr "" - -msgid "" -" Bookmarks are pointers to certain commits that move when\n" -" committing. Bookmarks are local. They can be renamed, copied and\n" -" deleted. It is possible to use bookmark names in :hg:`merge` and\n" -" :hg:`update` to merge and update respectively to a given bookmark." -msgstr "" - -msgid "" -" You can use :hg:`bookmark NAME` to set a bookmark on the working\n" -" directory's parent revision with the given name. If you specify\n" -" a revision using -r REV (where REV may be an existing bookmark),\n" -" the bookmark is assigned to that revision.\n" -" " -msgstr "" - -msgid "a bookmark of this name does not exist" -msgstr "" - -msgid "a bookmark of the same name already exists" -msgstr "" - -msgid "new bookmark name required" -msgstr "" - -msgid "bookmark name required" -msgstr "" - -msgid "bookmark name cannot contain newlines" -msgstr "" - -msgid "bookmark names cannot consist entirely of whitespace" -msgstr "" - -msgid "a bookmark cannot have the name of an existing branch" -msgstr "" - -msgid "no bookmarks set\n" -msgstr "" - -#, python-format -msgid "updating bookmark %s\n" -msgstr "se actualizează semnul de carte %s\n" - -#, python-format -msgid "not updating divergent bookmark %s\n" -msgstr "nu se actualizează semnul de carte divergent %s\n" - -#, python-format -msgid "updating bookmark %s failed!\n" -msgstr "actualizarea semnului de carte %s a eșuat!\n" - -#, python-format -msgid "remote bookmark %s not found!" -msgstr "" - -#, python-format -msgid "importing bookmark %s\n" -msgstr "" - -#, python-format -msgid "exporting bookmark %s\n" -msgstr "" - -#, python-format -msgid "deleting remote bookmark %s\n" -msgstr "" - -#, python-format -msgid "bookmark %s does not exist on the local or remote repository!\n" -msgstr "" - -msgid "searching for changes\n" -msgstr "se caută modificări\n" - -msgid "no changes found\n" -msgstr "nu s-au găsit modificări\n" - -#, python-format -msgid "comparing with %s\n" -msgstr "se compară cu %s\n" - -msgid "bookmark to import" -msgstr "" - -msgid "bookmark to export" -msgstr "" - -msgid "compare bookmark" -msgstr "" - -msgid "force" -msgstr "" - -msgid "REV" -msgstr "REV" - -msgid "revision" -msgstr "revizia" - -msgid "delete a given bookmark" -msgstr "" - -msgid "NAME" -msgstr "NUME" - -msgid "rename a given bookmark" -msgstr "" - -msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" -msgstr "" - msgid "hooks for integrating with the Bugzilla bug tracker" msgstr "" 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::" @@ -694,13 +648,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 "Fișiere de configurare" + +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`` wityh 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 "" @@ -716,28 +727,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 "" @@ -786,6 +791,14 @@ msgid "cannot find bugzilla user id for %s or %s" msgstr "" +#, fuzzy +msgid "configuration 'bzemail' missing" +msgstr "Fișiere de configurare" + +#, fuzzy, python-format +msgid "default bugzilla user %s email not found" +msgstr "calea implicită pentru subdepozitul %s nu a fost găsită" + #, python-format msgid "bugzilla version %s not supported" msgstr "" @@ -797,19 +810,15 @@ 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 "" +#, fuzzy, python-format +msgid "Bugzilla error: %s" +msgstr "hg: eroare de parsare: %s\n" msgid "command to display child changesets" -msgstr "" +msgstr "comandă pentru afișarea seturilor de modificări fii" msgid "show the children of the given or working directory revision" msgstr "afișează copiii reviziei specificate sau a celei din directorul curent" @@ -823,6 +832,9 @@ " " msgstr "" +msgid "REV" +msgstr "REV" + msgid "show children of the specified revision" msgstr "afișează fiii reviziei specificate" @@ -830,7 +842,7 @@ msgstr "" msgid "command to display statistics about repository history" -msgstr "" +msgstr "comandă pentru afișarea statisticilor despre istoricul depozitului" #, python-format msgid "Revision %d is a merge, ignoring...\n" @@ -893,6 +905,10 @@ " " msgstr "" +#, python-format +msgid "skipping malformed alias: %s\n" +msgstr "se omite alias-ul eronat %s\n" + msgid "count rate for the specified revision or range" msgstr "" @@ -933,25 +949,25 @@ msgstr "" msgid "colorize output from some commands" -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." +msgstr "colorează afișajul unor comenzi" + +msgid "" +"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." -msgstr "" - -msgid "Default effects may be overridden from the .hgrc file::" +"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::" msgstr "" msgid "" @@ -1004,8 +1020,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 "" @@ -1013,24 +1058,35 @@ " 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 "" -msgid "win32console not found, please install pywin32\n" -msgstr "" - -msgid "when to colorize (always, auto, or never)" -msgstr "când să se coloreze (întotdeauna, auto, sau niciodată)" +#. i18n: 'always', 'auto', and 'never' are keywords and should +#. not be translated +msgid "when to colorize (boolean, always, auto, or never)" +msgstr "" +"când să se coloreze (boolean, `always`=întotdeauna, auto, sau " +"`never`=niciodată)" msgid "TYPE" msgstr "" msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "" +"importă în Mercurial revizii din alte sisteme de control al versiunilor" msgid "convert a foreign SCM repository to a Mercurial one." msgstr "" @@ -1066,9 +1122,12 @@ msgid "" " If no destination directory name is specified, it defaults to the\n" -" basename of the source with '-hg' appended. If the destination\n" +" basename of the source with ``-hg`` appended. If the destination\n" " repository doesn't exist, it will be created." msgstr "" +" Dacă nu se specifică numele directorului destinație, acesta va fi\n" +" implicit numele de bază (basename) al sursei, plus sufixul ``-hg``.\n" +" Dacă depozitul destinație nu există, va fi creat." msgid "" " By default, all sources except Mercurial will use --branchsort.\n" @@ -1095,10 +1154,10 @@ msgstr "" 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 text file\n" -" that maps each source commit ID to the destination ID for that\n" -" revision, like so::" +" 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" +" text file that maps each source commit ID to the destination ID\n" +" for that revision, like so::" msgstr "" msgid " <source ID> <destination ID>" @@ -1106,16 +1165,21 @@ msgid "" " If the file doesn't exist, it's automatically created. It's\n" -" updated on each commit copied, so convert-repo can be interrupted\n" +" updated on each commit copied, so :hg:`convert` can be interrupted\n" " and can be run repeatedly to copy new commits." msgstr "" msgid "" -" The [username mapping] file is a simple text file that maps each\n" -" source commit author to a destination commit author. It is handy\n" -" for source SCMs that use unix logins to identify authors (eg:\n" -" CVS). One line per author mapping and the line format is:\n" -" srcauthor=whatever string you want" +" The authormap is a simple text file that maps each source commit\n" +" author to a destination commit author. It is handy for source SCMs\n" +" that use unix logins to identify authors (eg: CVS). One line per\n" +" author mapping and the line format is::" +msgstr "" + +msgid " source author = destination author" +msgstr "" + +msgid " Empty lines and lines starting with a ``#`` are ignored." msgstr "" msgid "" @@ -1134,20 +1198,20 @@ msgstr "" msgid "" -" Comment lines start with '#'. A specified path matches if it\n" +" Comment lines start with ``#``. A specified path matches if it\n" " equals the full relative name of a file or one of its parent\n" -" directories. The 'include' or 'exclude' directive with the longest\n" -" matching path applies, so line order does not matter." -msgstr "" - -msgid "" -" The 'include' directive causes a file, or all files under a\n" +" directories. The ``include`` or ``exclude`` directive with the\n" +" longest matching path applies, so line order does not matter." +msgstr "" + +msgid "" +" The ``include`` directive causes a file, or all files under a\n" " directory, to be included in the destination repository, and the\n" " exclusion of all other files and directories not explicitly\n" -" included. The 'exclude' directive causes files or directories to\n" -" be omitted. The 'rename' directive renames a file or directory if\n" +" included. The ``exclude`` directive causes files or directories to\n" +" be omitted. The ``rename`` directive renames a file or directory if\n" " it is converted. To rename from a subdirectory into the root of\n" -" the repository, use '.' as the path to rename to." +" the repository, use ``.`` as the path to rename to." msgstr "" msgid "" @@ -1156,7 +1220,14 @@ " useful if you want to e.g. give a Subversion merge two parents, or\n" " graft two disconnected series of history together. Each entry\n" " contains a key, followed by a space, followed by one or two\n" -" comma-separated values. The key is the revision ID in the source\n" +" comma-separated values::" +msgstr "" + +msgid " key parent1, parent2" +msgstr "" + +msgid "" +" The key is the revision ID in the source\n" " revision control system whose parents should be modified (same\n" " format as a key in .hg/shamap). The values are the revision IDs\n" " (in either the source or destination revision control system) that\n" @@ -1172,78 +1243,109 @@ " conjunction with a splicemap, it allows for a powerful combination\n" " to help fix even the most badly mismanaged repositories and turn them\n" " into nicely structured Mercurial repositories. The branchmap contains\n" -" lines of the form \"original_branch_name new_branch_name\".\n" -" \"original_branch_name\" is the name of the branch in the source\n" -" repository, and \"new_branch_name\" is the name of the branch is the\n" -" destination repository. This can be used to (for instance) move code\n" -" in one repository from \"default\" to a named branch." +" lines of the form::" +msgstr "" + +msgid " original_branch_name new_branch_name" +msgstr "" + +msgid "" +" where \"original_branch_name\" is the name of the branch in the\n" +" source repository, and \"new_branch_name\" is the name of the branch\n" +" is the destination repository. No whitespace is allowed in the\n" +" branch names. This can be used to (for instance) move code in one\n" +" repository from \"default\" to a named branch." msgstr "" msgid "" " Mercurial Source\n" -" ----------------" -msgstr "" - -msgid "" -" --config convert.hg.ignoreerrors=False (boolean)\n" -" ignore integrity errors when reading. Use it to fix Mercurial\n" -" repositories with missing revlogs, by converting from and to\n" -" Mercurial.\n" -" --config convert.hg.saverev=False (boolean)\n" -" store original revision ID in changeset (forces target IDs to\n" -" change)\n" -" --config convert.hg.startrev=0 (hg revision identifier)\n" -" convert start revision and its descendants" +" ''''''''''''''''" +msgstr "" + +msgid "" +" The Mercurial source recognizes the following configuration\n" +" options, which you can set on the command line with ``--config``:" +msgstr "" + +msgid "" +" :convert.hg.ignoreerrors: ignore integrity errors when reading.\n" +" Use it to fix Mercurial repositories with missing revlogs, by\n" +" converting from and to Mercurial. Default is False." +msgstr "" + +msgid "" +" :convert.hg.saverev: store original revision ID in changeset\n" +" (forces target IDs to change). It takes and boolean argument\n" +" and defaults to False." +msgstr "" + +msgid "" +" :convert.hg.startrev: convert start revision and its descendants.\n" +" It takes a hg revision identifier and defaults to 0." msgstr "" msgid "" " CVS Source\n" -" ----------" +" ''''''''''" msgstr "" msgid "" " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" " to indicate the starting point of what will be converted. Direct\n" " access to the repository files is not needed, unless of course the\n" -" repository is :local:. The conversion uses the top level directory\n" -" in the sandbox to find the CVS repository, and then uses CVS rlog\n" -" commands to find files to convert. This means that unless a\n" -" filemap is given, all files under the starting directory will be\n" +" repository is ``:local:``. The conversion uses the top level\n" +" directory in the sandbox to find the CVS repository, and then uses\n" +" CVS rlog commands to find files to convert. This means that unless\n" +" a filemap is given, all files under the starting directory will be\n" " converted, and that any directory reorganization in the CVS\n" " sandbox is ignored." msgstr "" -msgid " The options shown are the defaults." -msgstr "" - -msgid "" -" --config convert.cvsps.cache=True (boolean)\n" -" Set to False to disable remote log caching, for testing and\n" -" debugging purposes.\n" -" --config convert.cvsps.fuzz=60 (integer)\n" -" Specify the maximum time (in seconds) that is allowed between\n" -" commits with identical user and log message in a single\n" -" changeset. When very large files were checked in as part of a\n" -" changeset then the default may not be long enough.\n" -" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" -" Specify a regular expression to which commit log messages are\n" -" matched. If a match occurs, then the conversion process will\n" -" insert a dummy revision merging the branch on which this log\n" -" message occurs to the branch indicated in the regex.\n" -" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" -" Specify a regular expression to which commit log messages are\n" -" matched. If a match occurs, then the conversion process will\n" -" add the most recent revision on the branch indicated in the\n" -" regex as the second parent of the changeset.\n" -" --config hook.cvslog\n" -" Specify a Python function to be called at the end of gathering\n" -" the CVS log. The function is passed a list with the log entries,\n" -" and can modify the entries in-place, or add or delete them.\n" -" --config hook.cvschangesets\n" -" Specify a Python function to be called after the changesets\n" -" are calculated from the the CVS log. The function is passed\n" -" a list with the changeset entries, and can modify the changesets\n" -" in-place, or add or delete them." +msgid " The following options can be used with ``--config``:" +msgstr "" + +msgid "" +" :convert.cvsps.cache: Set to False to disable remote log caching,\n" +" for testing and debugging purposes. Default is True." +msgstr "" + +msgid "" +" :convert.cvsps.fuzz: Specify the maximum time (in seconds) that is\n" +" allowed between commits with identical user and log message in\n" +" a single changeset. When very large files were checked in as\n" +" part of a changeset then the default may not be long enough.\n" +" The default is 60." +msgstr "" + +msgid "" +" :convert.cvsps.mergeto: Specify a regular expression to which\n" +" commit log messages are matched. If a match occurs, then the\n" +" conversion process will insert a dummy revision merging the\n" +" branch on which this log message occurs to the branch\n" +" indicated in the regex. Default is ``{{mergetobranch\n" +" ([-\\w]+)}}``" +msgstr "" + +msgid "" +" :convert.cvsps.mergefrom: Specify a regular expression to which\n" +" commit log messages are matched. If a match occurs, then the\n" +" conversion process will add the most recent revision on the\n" +" branch indicated in the regex as the second parent of the\n" +" changeset. Default is ``{{mergefrombranch ([-\\w]+)}}``" +msgstr "" + +msgid "" +" :hook.cvslog: Specify a Python function to be called at the end of\n" +" gathering the CVS log. The function is passed a list with the\n" +" log entries, and can modify the entries in-place, or add or\n" +" delete them." +msgstr "" + +msgid "" +" :hook.cvschangesets: Specify a Python function to be called after\n" +" the changesets are calculated from the the CVS log. The\n" +" function is passed a list with the changeset entries, and can\n" +" modify the changesets in-place, or add or delete them." msgstr "" msgid "" @@ -1255,29 +1357,38 @@ msgid "" " Subversion Source\n" -" -----------------" +" '''''''''''''''''" msgstr "" msgid "" " Subversion source detects classical trunk/branches/tags layouts.\n" -" By default, the supplied \"svn://repo/path/\" source URL is\n" -" converted as a single branch. If \"svn://repo/path/trunk\" exists it\n" -" replaces the default branch. If \"svn://repo/path/branches\" exists,\n" -" its subdirectories are listed as possible branches. If\n" -" \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" -" converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" -" can be overridden with following options. Set them to paths\n" +" By default, the supplied ``svn://repo/path/`` source URL is\n" +" converted as a single branch. If ``svn://repo/path/trunk`` exists\n" +" it replaces the default branch. If ``svn://repo/path/branches``\n" +" exists, its subdirectories are listed as possible branches. If\n" +" ``svn://repo/path/tags`` exists, it is looked for tags referencing\n" +" converted branches. Default ``trunk``, ``branches`` and ``tags``\n" +" values can be overridden with following options. Set them to paths\n" " relative to the source URL, or leave them blank to disable auto\n" " detection." msgstr "" -msgid "" -" --config convert.svn.branches=branches (directory name)\n" -" specify the directory containing branches\n" -" --config convert.svn.tags=tags (directory name)\n" -" specify the directory containing tags\n" -" --config convert.svn.trunk=trunk (directory name)\n" -" specify the name of the trunk branch" +msgid " The following options can be set with ``--config``:" +msgstr "" + +msgid "" +" :convert.svn.branches: specify the directory containing branches.\n" +" The default is ``branches``." +msgstr "" + +msgid "" +" :convert.svn.tags: specify the directory containing tags. The\n" +" default is ``tags``." +msgstr "" + +msgid "" +" :convert.svn.trunk: specify the name of the trunk branch. The\n" +" default is ``trunk``." msgstr "" msgid "" @@ -1287,13 +1398,13 @@ msgstr "" msgid "" -" --config convert.svn.startrev=0 (svn revision number)\n" -" specify start Subversion revision." +" :convert.svn.startrev: specify start Subversion revision number.\n" +" The default is 0." msgstr "" msgid "" " Perforce Source\n" -" ---------------" +" '''''''''''''''" msgstr "" msgid "" @@ -1302,34 +1413,41 @@ " source to a flat Mercurial repository, ignoring labels, branches\n" " and integrations. Note that when a depot path is given you then\n" " usually should specify a target directory, because otherwise the\n" -" target may be named ...-hg." +" target may be named ``...-hg``." msgstr "" msgid "" " It is possible to limit the amount of source history to be\n" -" converted by specifying an initial Perforce revision." -msgstr "" - -msgid "" -" --config convert.p4.startrev=0 (perforce changelist number)\n" -" specify initial Perforce revision." +" converted by specifying an initial Perforce revision:" +msgstr "" + +msgid "" +" :convert.p4.startrev: specify initial Perforce revision (a\n" +" Perforce changelist number)." msgstr "" msgid "" " Mercurial Destination\n" -" ---------------------" -msgstr "" - -msgid "" -" --config convert.hg.clonebranches=False (boolean)\n" -" dispatch source branches in separate clones.\n" -" --config convert.hg.tagsbranch=default (branch name)\n" -" tag revisions branch name\n" -" --config convert.hg.usebranchnames=True (boolean)\n" -" preserve branch names" -msgstr "" - -msgid " " +" '''''''''''''''''''''" +msgstr "" + +msgid " The following options are supported:" +msgstr "" + +msgid "" +" :convert.hg.clonebranches: dispatch source branches in separate\n" +" clones. The default is False." +msgstr "" + +msgid "" +" :convert.hg.tagsbranch: branch name for tag revisions, defaults to\n" +" ``default``." +msgstr "" + +msgid "" +" :convert.hg.usebranchnames: preserve branch names. The default is\n" +" True.\n" +" " msgstr "" msgid "create changeset information from CVS" @@ -1348,21 +1466,24 @@ " dates." msgstr "" -msgid "username mapping filename" +msgid "username mapping filename (DEPRECATED, use --authormap instead)" +msgstr "" + +msgid "source repository type" msgstr "" msgid "destination repository type" msgstr "" +msgid "import up to target revision REV" +msgstr "" + +msgid "remap usernames using this file" +msgstr "" + msgid "remap file names using contents of file" msgstr "" -msgid "import up to target revision REV" -msgstr "" - -msgid "source repository type" -msgstr "" - msgid "splice synthesized history into place" msgstr "" @@ -1414,6 +1535,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 "" @@ -1650,6 +1780,13 @@ msgid "Python ElementTree module is not available" msgstr "" +#, python-format +msgid "%s repository format is unsupported, please upgrade" +msgstr "" + +msgid "failed to detect repository format!" +msgstr "" + msgid "internal calling inconsistency" msgstr "" @@ -1736,6 +1873,10 @@ msgid "updating tags\n" msgstr "se actualizează etichetele\n" +#, fuzzy +msgid "updating bookmarks\n" +msgstr "se actualizează semnul de carte %s\n" + #, python-format msgid "%s is not a valid start revision" msgstr "" @@ -1748,10 +1889,45 @@ msgid "%s does not look like a monotone repository" msgstr "" +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 "" + #, 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 "" @@ -1774,7 +1950,7 @@ msgid "%s does not look like a Subversion repository" msgstr "%s nu pare a fi un depozit Subversion" -msgid "Subversion python bindings could not be loaded" +msgid "Could not load Subversion python bindings" msgstr "" #, python-format @@ -1867,27 +2043,29 @@ msgid "" "The extension reads its configuration from a versioned ``.hgeol``\n" -"configuration file every time you run an ``hg`` command. The\n" +"configuration file found in the root of the working copy. The\n" "``.hgeol`` file use the same syntax as all other Mercurial\n" "configuration files. It uses two sections, ``[patterns]`` and\n" "``[repository]``." msgstr "" msgid "" -"The ``[patterns]`` section specifies the line endings used in the\n" -"working directory. The format is specified by a file pattern. The\n" -"first match is used, so put more specific patterns first. The\n" -"available line endings are ``LF``, ``CRLF``, and ``BIN``." +"The ``[patterns]`` section specifies how line endings should be\n" +"converted between the working copy and the repository. The format is\n" +"specified by a file pattern. The first match is used, so put more\n" +"specific patterns first. The available line endings are ``LF``,\n" +"``CRLF``, and ``BIN``." msgstr "" msgid "" "Files with the declared format of ``CRLF`` or ``LF`` are always\n" -"checked out in that format and files declared to be binary (``BIN``)\n" -"are left unchanged. Additionally, ``native`` is an alias for the\n" -"platform's default line ending: ``LF`` on Unix (including Mac OS X)\n" -"and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n" -"endings) is Mercurial's default behaviour; it is only needed if you\n" -"need to override a later, more general pattern." +"checked out and stored in the repository in that format and files\n" +"declared to be binary (``BIN``) are left unchanged. Additionally,\n" +"``native`` is an alias for checking out in the platform's default line\n" +"ending: ``LF`` on Unix (including Mac OS X) and ``CRLF`` on\n" +"Windows. Note that ``BIN`` (do nothing to line endings) is Mercurial's\n" +"default behaviour; it is only needed if you need to override a later,\n" +"more general pattern." msgstr "" msgid "" @@ -1920,6 +2098,12 @@ msgstr "" msgid "" +".. note::\n" +" The rules will first apply when files are touched in the working\n" +" copy, e.g. by updating to null and back to tip to touch all files." +msgstr "" + +msgid "" "The extension uses an optional ``[eol]`` section in your hgrc file\n" "(not the ``.hgeol`` file) for settings that control the overall\n" "behavior. There are two settings:" @@ -1927,7 +2111,7 @@ msgid "" "- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n" -" ``CRLF`` override the default interpretation of ``native`` for\n" +" ``CRLF`` to override the default interpretation of ``native`` for\n" " checkout. This can be used with :hg:`archive` on Unix, say, to\n" " generate an archive where files have line endings for Windows." msgstr "" @@ -1941,26 +2125,47 @@ msgstr "" msgid "" +"The extension provides ``cleverencode:`` and ``cleverdecode:`` filters\n" +"like the deprecated win32text extension does. This means that you can\n" +"disable win32text and enable eol and your filters will still work. You\n" +"only need to these filters until you have prepared a ``.hgeol`` file." +msgstr "" + +msgid "" +"The ``win32text.forbid*`` hooks provided by the win32text extension\n" +"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 "" "See :hg:`help patterns` for more information about the glob patterns\n" "used.\n" msgstr "" #, 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 "" - -#, python-format 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 "" + +#, python-format +msgid " %s in %s should not have %s line endings" +msgstr "" + +msgid "end-of-line check failed:\n" +msgstr "" + +msgid "the eol extension is incompatible with the win32text extension\n" +msgstr "" + +#, python-format msgid "inconsistent newline style in %s\n" msgstr "" @@ -1976,7 +2181,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 "" @@ -2014,6 +2219,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 "" @@ -2089,6 +2295,9 @@ msgid "pass option to comparison program" msgstr "" +msgid "revision" +msgstr "revizia" + msgid "change made by revision" msgstr "" @@ -2114,11 +2323,15 @@ msgid "pull changes from a remote repository, merge new changes if needed." msgstr "" +"preia modificări dintr-un depozit la distanță, fuzionează modificările noi " +"dacă este necesar" msgid "" " This finds all changes from the repository at the specified path\n" " or URL and adds them to the local repository." msgstr "" +" Găsește toate modificările din depozit la calea sau URL-ul\n" +" specificat și le adaugă la depozitul local." msgid "" " If the pulled changes add a new branch head, the head is\n" @@ -2134,11 +2347,15 @@ " order, use --switch-parent." msgstr "" -msgid "" -" See :hg:`help dates` for a list of formats valid for -d/--date.\n" -" " -msgstr "" -" Vezi :hg:`help dates` pentru o listă de formate valide cu d/--date.\n" +msgid " See :hg:`help dates` for a list of formats valid for -d/--date." +msgstr "" +" Vezi :hg:`help dates` pentru o listă de formate valide cu d/--date." + +msgid "" +" Returns 0 on success.\n" +" " +msgstr "" +" Returnează 0 în caz de succes.\n" " " msgid "" @@ -2218,6 +2435,9 @@ msgid "%s Note: This key has expired (signed by: \"%s\")\n" msgstr "" +msgid "hg sigs" +msgstr "" + msgid "list signed changesets" msgstr "" @@ -2225,6 +2445,9 @@ msgid "%s:%d node does not exist\n" msgstr "" +msgid "hg sigcheck REVISION" +msgstr "" + msgid "verify all the signatures there may be for a particular revision" msgstr "" @@ -2232,32 +2455,6 @@ msgid "No valid signature for %s\n" msgstr "" -msgid "add a signature for the current or given revision" -msgstr "" - -msgid "" -" If no revision is given, the parent of the working directory is used,\n" -" or tip if no revision is checked out." -msgstr "" - -msgid "uncommitted merge - please provide a specific revision" -msgstr "" - -#, python-format -msgid "Signing %d:%s\n" -msgstr "" - -msgid "Error while signing" -msgstr "" - -msgid "" -"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" -"force)" -msgstr "" - -msgid "unknown signature version" -msgstr "" - msgid "make the signature local" msgstr "" @@ -2282,10 +2479,37 @@ msgid "hg sign [OPTION]... [REVISION]..." msgstr "hg sign [OPȚIUNE]... [REVIZIE].." -msgid "hg sigcheck REVISION" -msgstr "" - -msgid "hg sigs" +msgid "add a signature for the current or given revision" +msgstr "" + +msgid "" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out." +msgstr "" + +msgid "" +" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +" " +msgstr "" +" Vezi :hg:`help dates` pentru o listă de formate valide cu d/--date.\n" +" " + +msgid "uncommitted merge - please provide a specific revision" +msgstr "" + +#, python-format +msgid "Signing %d:%s\n" +msgstr "" + +msgid "error while signing" +msgstr "" + +msgid "" +"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" +"force)" +msgstr "" + +msgid "unknown signature version" msgstr "" msgid "command to view revision graphs from a shell" @@ -2298,7 +2522,25 @@ msgstr "" #, python-format -msgid "--graph option is incompatible with --%s" +msgid "-G/--graph option is incompatible with --%s" +msgstr "" + +msgid "-G/--graph option is incompatible with --follow with file argument" +msgstr "" + +msgid "NUM" +msgstr "" + +msgid "limit number of changes displayed" +msgstr "limitează numărul de modificări afișat" + +msgid "show patch" +msgstr "afișează patch-ul" + +msgid "show the specified revision or range" +msgstr "afișează revizia sau intervalul specificat" + +msgid "hg glog [OPTION]... [FILE]" msgstr "" msgid "show revision history alongside an ASCII revision graph" @@ -2323,21 +2565,6 @@ msgid "show the revision DAG" msgstr "afișează graful (DAG) reviziilor" -msgid "NUM" -msgstr "" - -msgid "limit number of changes displayed" -msgstr "limitează numărul de modificări afișat" - -msgid "show patch" -msgstr "afișează patch-ul" - -msgid "show the specified revision or range" -msgstr "afișează revizia sau intervalul specificat" - -msgid "hg glog [OPTION]... [FILE]" -msgstr "" - msgid "hooks for integrating with the CIA.vc notification service" msgstr "" @@ -2357,7 +2584,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" @@ -2366,7 +2593,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 "" @@ -2413,7 +2642,7 @@ msgid "" "The :hg:`view` command will launch the hgk Tcl script. For this command\n" "to work, hgk must be in your search path. Alternately, you can specify\n" -"the path to hgk in your .hgrc file::" +"the path to hgk in your configuration file::" msgstr "" msgid "" @@ -2461,7 +2690,7 @@ msgstr "" msgid "start interactive history viewer" -msgstr "" +msgstr "pornește vizualizatorul interactiv al istoricului" msgid "hg view [-l LIMIT] [REVRANGE]" msgstr "" @@ -2742,6 +2971,11 @@ msgstr "" msgid "" +"Keywords expand to the changeset data pertaining to the latest change\n" +"relative to the working directory parent of each file." +msgstr "" + +msgid "" "Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n" "sections of hgrc files." msgstr "" @@ -2763,8 +2997,9 @@ msgstr "" msgid "" -"NOTE: the more specific you are in your filename patterns the less you\n" -"lose speed in huge repositories." +".. note::\n" +" The more specific you are in your filename patterns the less you\n" +" lose speed in huge repositories." msgstr "" msgid "" @@ -2773,25 +3008,24 @@ "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 "" "The default template mappings (view with :hg:`kwdemo -d`) can be\n" "replaced with customized keywords and templates. Again, run\n" -":hg:`kwdemo` to control the results of your config changes." -msgstr "" - -msgid "" -"Before changing/disabling active keywords, run :hg:`kwshrink` to avoid\n" -"the risk of inadvertently storing expanded keywords in the change\n" -"history." +":hg:`kwdemo` to control the results of your configuration changes." +msgstr "" + +msgid "" +"Before changing/disabling active keywords, you must run :hg:`kwshrink`\n" +"to avoid storing expanded keywords in the change history." msgstr "" msgid "" @@ -2819,6 +3053,16 @@ msgid "no [keyword] patterns configured" msgstr "" +#, fuzzy +msgid "show default keyword template maps" +msgstr "afișează corespondențele șabloanelor implicite de cuvinte cheie" + +msgid "read maps from rcfile" +msgstr "" + +msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..." +msgstr "" + msgid "print [keywordmaps] configuration and an expansion example" msgstr "" @@ -2852,12 +3096,20 @@ msgid "\textending current template maps\n" msgstr "" -msgid "\toverriding default template maps\n" +msgid "\toverriding default svn keywordset\n" +msgstr "" + +msgid "\toverriding default cvs keywordset\n" msgstr "" msgid "" "\n" -"\tconfiguration using default keyword template maps\n" +"\tconfiguration using default svn keywordset\n" +msgstr "" + +msgid "" +"\n" +"\tconfiguration using default cvs keywordset\n" msgstr "" msgid "\tdisabling current template maps\n" @@ -2882,6 +3134,9 @@ "\tkeywords expanded\n" msgstr "" +msgid "hg kwexpand [OPTION]... [FILE]..." +msgstr "" + msgid "expand keywords in the working directory" msgstr "" @@ -2893,6 +3148,18 @@ " " msgstr "" +msgid "show keyword status flags of all files" +msgstr "" + +msgid "show files excluded from expansion" +msgstr "afișează fișierele excluse de la expandare" + +msgid "only show unknown (not tracked) files" +msgstr "afișează doar fișierele necunoscute (neurmărite)" + +msgid "hg kwfiles [OPTION]... [FILE]..." +msgstr "" + msgid "show files configured for keyword expansion" msgstr "afișează fișierele configurate pentru expandarea cuvintelor cheie" @@ -2925,12 +3192,13 @@ " " msgstr "" +msgid "hg kwshrink [OPTION]... [FILE]..." +msgstr "" + msgid "revert expanded keywords in the working directory" msgstr "" -msgid "" -" Run before changing/disabling active keywords or if you experience\n" -" problems with :hg:`import` or :hg:`merge`." +msgid " Must be run before changing/disabling active keywords." msgstr "" msgid "" @@ -2938,34 +3206,6 @@ " " msgstr "" -#, fuzzy -msgid "show default keyword template maps" -msgstr "afișează corespondențele șabloanelor implicite de cuvinte cheie" - -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 "afișează fișierele excluse de la expandare" - -msgid "only show unknown (not tracked) files" -msgstr "afișează doar fișierele necunoscute (neurmărite)" - -msgid "hg kwfiles [OPTION]... [FILE]..." -msgstr "" - -msgid "hg kwshrink [OPTION]... [FILE]..." -msgstr "" - msgid "manage a stack of patches" msgstr "" @@ -3022,6 +3262,13 @@ "create other, independent patch queues with the :hg:`qqueue` command.\n" msgstr "" +msgid "print first line of patch header" +msgstr "" + +#, fuzzy, python-format +msgid "malformated mq status line: %s\n" +msgstr "se omite alias-ul eronat %s\n" + #, python-format msgid "mq.git option can be auto/keep/yes/no got %s" msgstr "" @@ -3057,12 +3304,12 @@ msgid "allowing %s - no matching negative guards\n" msgstr "" -#, python-format -msgid "allowing %s - guarded by %r\n" -msgstr "" - -#, python-format -msgid "skipping %s - guarded by %r\n" +#, fuzzy, python-format +msgid "allowing %s - guarded by %s\n" +msgstr "se omite %s - gardat de către %r\n" + +#, fuzzy, python-format +msgid "skipping %s - guarded by %s\n" msgstr "se omite %s - gardat de către %r\n" #, python-format @@ -3115,12 +3362,24 @@ msgid "patch %s is empty\n" msgstr "" +#, fuzzy +msgid "repository commit failed" +msgstr "depozitul %s nu a fost găsit" + msgid "patch failed, rejects left in working dir\n" msgstr "" msgid "fuzz found when applying patch, stopping\n" msgstr "" +#, fuzzy, python-format +msgid "revision %s refers to unknown patches: %s\n" +msgstr "alias-ul '%s' corespunde comenzii necunoscute '%s'\n" + +#, fuzzy, python-format +msgid "unknown patches: %s\n" +msgstr "hg: comandă necunoscută '%s'\n" + #, python-format msgid "revision %d is not managed" msgstr "" @@ -3150,6 +3409,10 @@ msgid "working directory revision is not qtip" msgstr "" +#, fuzzy, python-format +msgid "uncommitted changes in subrepository %s" +msgstr "înlătură modificările nedepozitate (fără copie de siguranță)" + msgid "local changes found, refresh first" msgstr "" @@ -3161,6 +3424,18 @@ 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 "" + +#, python-format msgid "patch \"%s\" already exists" msgstr "" @@ -3168,6 +3443,10 @@ msgstr "" #, python-format +msgid "cannot write patch \"%s\": %s" +msgstr "" + +#, python-format msgid "error unlinking %s\n" msgstr "" @@ -3186,15 +3465,15 @@ msgstr "" #, python-format +msgid "qpush: %s is already at the top\n" +msgstr "" + +#, python-format msgid "cannot push to a previous patch: %s" msgstr "" #, python-format -msgid "qpush: %s is already at the top\n" -msgstr "" - -#, python-format -msgid "guarded by %r" +msgid "guarded by %s" msgstr "" msgid "no matching guards" @@ -3210,6 +3489,17 @@ msgid "patch series already fully applied\n" msgstr "" +msgid "cannot use --exact and --move together" +msgstr "" + +#, fuzzy +msgid "cannot push --exact with applied patches" +msgstr "detach nu se poate folosi cu continue sau abort" + +#, python-format +msgid "%s does not have a parent recorded" +msgstr "" + msgid "please specify the patch to move" msgstr "" @@ -3289,8 +3579,8 @@ msgstr "" #, fuzzy -msgid "queue directory updating\n" -msgstr "actualizarea directorului se introduce în coadă\n" +msgid "updating queue directory\n" +msgstr "se actualizează directorul de lucru\n" msgid "Unable to load queue repository\n" msgstr "" @@ -3363,6 +3653,15 @@ msgid "adding %s to series file\n" msgstr "" +msgid "keep patch file" +msgstr "păstrează fișierul patch" + +msgid "stop managing a revision (DEPRECATED)" +msgstr "" + +msgid "hg qdelete [-k] [PATCH]..." +msgstr "" + msgid "remove patches from queue" msgstr "" @@ -3377,18 +3676,59 @@ " use the :hg:`qfinish` command." msgstr "" +msgid "show only the last patch" +msgstr "afișează doar ultimul patch" + +msgid "hg qapplied [-1] [-s] [PATCH]" +msgstr "" + msgid "print the patches already applied" msgstr "" +msgid " Returns 0 on success." +msgstr "" +" Returnează 0 în caz de succes.\n" +" " + msgid "only one patch applied\n" msgstr "" +msgid "show only the first patch" +msgstr "afișează doar primul patch" + +msgid "hg qunapplied [-1] [-s] [PATCH]" +msgstr "" + msgid "print the patches not yet applied" msgstr "" msgid "all patches applied\n" msgstr "" +msgid "import file in patch directory" +msgstr "" + +msgid "NAME" +msgstr "NUME" + +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 "folosește formatul diff extins al lui git" + +msgid "qpush after importing" +msgstr "" + +msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." +msgstr "" + msgid "import a patch" msgstr "" @@ -3419,7 +3759,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 "" @@ -3431,9 +3771,20 @@ msgid " To import an existing patch while renaming it::" msgstr "" -msgid "" -" hg qimport -e existing-patch -n new-name\n" -" " +msgid " hg qimport -e existing-patch -n new-name" +msgstr "" + +msgid "" +" Returns 0 if import succeeded.\n" +" " +msgstr "" +" Returnează 0 dacă importarea a avut loc cu succes.\n" +" " + +msgid "create queue repository" +msgstr "" + +msgid "hg qinit [-c]" msgstr "" msgid "init a new queue repository (DEPRECATED)" @@ -3452,6 +3803,24 @@ " commands. With -c, use :hg:`init --mq` instead." msgstr "" +msgid "use pull protocol to copy metadata" +msgstr "folosește protocolul 'pull' pentru a copia metadatele" + +msgid "do not update the new working directories" +msgstr "" + +msgid "use uncompressed transfer (fast over LAN)" +msgstr "folosește transfer necomprimat (rapid în LAN)" + +msgid "REPO" +msgstr "" + +msgid "location of source patch repository" +msgstr "" + +msgid "hg qclone [OPTION]... SOURCE [DEST]" +msgstr "" + msgid "clone main and patch repository at same time" msgstr "" @@ -3470,9 +3839,15 @@ msgid "" " The patch directory must be a nested Mercurial repository, as\n" -" would be created by :hg:`init --mq`.\n" -" " -msgstr "" +" would be created by :hg:`init --mq`." +msgstr "" + +msgid "" +" Return 0 on success.\n" +" " +msgstr "" +" Returnează 0 în caz de succes.\n" +" " msgid "versioned patch repository not found (see init --mq)" msgstr "" @@ -3489,26 +3864,65 @@ msgid "updating destination repository\n" msgstr "se actualizează depozitul destinație\n" +msgid "hg qcommit [OPTION]... [FILE]..." +msgstr "" + msgid "commit changes in the queue repository (DEPRECATED)" msgstr "" msgid " This command is deprecated; use :hg:`commit --mq` instead." msgstr "" +msgid "print patches not in series" +msgstr "" + +msgid "hg qseries [-ms]" +msgstr "" + msgid "print the entire series file" msgstr "" +msgid "hg qtop [-s]" +msgstr "" + msgid "print the name of the current patch" msgstr "" +msgid "hg qnext [-s]" +msgstr "" + msgid "print the name of the next patch" msgstr "" +msgid "hg qprev [-s]" +msgstr "" + msgid "print the name of the previous patch" msgstr "" +msgid "import uncommitted changes (DEPRECATED)" +msgstr "" + +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 "" + msgid "create a new patch" -msgstr "" +msgstr "creează un nou patch" msgid "" " qnew creates a new patch on top of the currently-applied patch (if\n" @@ -3535,12 +3949,36 @@ " Use the -g/--git option to keep the patch in the git extended diff\n" " format. Read the diffs help topic for more information on why this\n" " is important for preserving permission changes and copy/rename\n" -" information.\n" -" " +" information." +msgstr "" + +msgid "" +" Returns 0 on successful creation of a new patch.\n" +" " +msgstr "" +" Returnează 0 dacă patch-ul a fost creat cu succes.\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 "" +msgstr "actualizează patch-ul curent" msgid "" " If any file patterns are provided, the refreshed patch will\n" @@ -3565,15 +4003,17 @@ " hg add/remove/copy/rename work as usual, though you might want to\n" " use git-style patches (-g/--git or [diff] git=1) to track copies\n" " and renames. See the diffs help topic for more information on the\n" -" git diff format.\n" -" " +" git diff format." msgstr "" 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 "" +msgstr "diff pentru patch-ul curent și modificările ulterioare" msgid "" " Shows a diff which includes the current patch as well as any\n" @@ -3586,8 +4026,16 @@ " Use :hg:`diff` if you only want to see the changes made since the\n" " last qrefresh, or :hg:`export qtip` if you want to see changes\n" " made by the current patch without including changes made since the\n" -" qrefresh.\n" -" " +" qrefresh." +msgstr "" + +msgid "edit patch header" +msgstr "" + +msgid "keep folded patch files" +msgstr "" + +msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." msgstr "" msgid "fold the named patches into the current patch" @@ -3604,17 +4052,14 @@ msgid "" " The header for each folded patch will be concatenated with the\n" -" current patch header, separated by a line of '* * *'." +" current patch header, separated by a line of ``* * *``." msgstr "" msgid "qfold requires at least one patch name" msgstr "" -msgid "No patches applied" -msgstr "" - -#, python-format -msgid "Skipping already folded patch %s" +#, fuzzy, python-format +msgid "Skipping already folded patch %s\n" msgstr "Se omite patch-ul deja pliat %s" #, python-format @@ -3622,12 +4067,27 @@ msgstr "" #, python-format -msgid "Error folding patch %s" +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 "" @@ -3642,16 +4102,18 @@ msgid "" " With no arguments, print the currently active guards.\n" -" With arguments, set guards for the named patch.\n" -" NOTE: Specifying negative guards now requires '--'." +" With arguments, set guards for the named patch." +msgstr "" + +msgid "" +" .. note::\n" +" Specifying negative guards now requires '--'." msgstr "" msgid " To set guards on another patch::" msgstr "" -msgid "" -" hg qguard other.patch -- +2.6.17 -stable\n" -" " +msgid " hg qguard other.patch -- +2.6.17 -stable" msgstr "" msgid "cannot mix -l/--list with options or arguments" @@ -3664,16 +4126,42 @@ msgid "no patch named %s" msgstr "" +msgid "hg qheader [PATCH]" +msgstr "" + 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 "" + msgid "push the next patch onto the stack" -msgstr "" +msgstr "pune patch-ul următor pe stivă" msgid "" " When -f/--force is applied, all local changes in patched files\n" -" will be lost.\n" -" " +" will be lost." msgstr "" msgid "no saved queues found, please use -n\n" @@ -3683,20 +4171,34 @@ 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 "uită orice modificare locală adusă fișierelor peticite" + +msgid "hg qpop [-a] [-f] [PATCH | INDEX]" +msgstr "" + msgid "pop the current patch off the stack" -msgstr "" +msgstr "scoate patch-ul curent de pe stivă" msgid "" " By default, pops off the top of the patch stack. If given a patch\n" " name, keeps popping off patches until the named patch is at the\n" -" top of the stack.\n" -" " +" top of the stack." msgstr "" #, python-format msgid "using patch queue: %s\n" msgstr "" +msgid "hg qrename PATCH1 [PATCH2]" +msgstr "" + msgid "rename a patch" msgstr "" @@ -3705,18 +4207,34 @@ " 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)" msgstr "" -msgid " This command is deprecated, use rebase --mq instead." +msgid " This command is deprecated, use :hg:`rebase` instead." +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 "save current queue state (DEPRECATED)" @@ -3734,13 +4252,35 @@ msgid "copy %s to %s\n" msgstr "" +#, fuzzy +msgid "force removal of changesets, discard uncommitted changes (no backup)" +msgstr "înlătură modificările nedepozitate (fără copie de siguranță)" + +msgid "" +"bundle only changesets with local revision number greater than REV which are " +"not descendants of REV (DEPRECATED)" +msgstr "" + +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 "" msgid "" @@ -3760,9 +4300,26 @@ msgstr "" msgid "" -" Use the --nobackup option to discard the backup bundle once the\n" -" operation completes.\n" -" " +" Use the --no-backup option to discard the backup bundle once the\n" +" operation completes." +msgstr "" + +msgid "empty revision set" +msgstr "setul de revizii este vid" + +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" @@ -3777,8 +4334,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 "" @@ -3841,6 +4398,12 @@ msgid "reapplying unguarded patches\n" msgstr "" +msgid "finish all applied changesets" +msgstr "" + +msgid "hg qfinish [-a] [REV]..." +msgstr "" + msgid "move applied patches into repository history" msgstr "" @@ -3860,13 +4423,30 @@ msgid "" " This can be especially useful if your changes have been applied to\n" " an upstream repository, or if you are about to push your changes\n" -" to upstream.\n" -" " +" to upstream." msgstr "" 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 "[OPȚIUNE] [COADĂ]" + msgid "manage multiple patch queues" msgstr "" @@ -3893,8 +4473,7 @@ msgid "" " To delete an existing queue, use --delete. You cannot delete the " "currently\n" -" active queue.\n" -" " +" active queue." msgstr "" msgid "patches applied - cannot set new queue active" @@ -3920,7 +4499,7 @@ msgid "can't rename \"%s\" to its current name" msgstr "" -#, fuzzy, python-format +#, python-format msgid "non-queue directory \"%s\" already exists" msgstr "depozitul %s neaflat în coadă există deja" @@ -3947,7 +4526,7 @@ msgid "only a local queue repository may be initialized" msgstr "" -msgid "There is no Mercurial repository here (.hg not found)" +msgid "there is no Mercurial repository here (.hg not found)" msgstr "" msgid "no queue repository" @@ -3964,280 +4543,17 @@ msgid "mq: (empty queue)\n" msgstr "" +msgid "" +"``mq()``\n" +" Changesets managed by MQ." +msgstr "" + +msgid "mq takes no arguments" +msgstr "" + msgid "operate on patch repository" msgstr "operează pe depozitul de patch-uri" -msgid "print first line of patch header" -msgstr "" - -msgid "show only the last patch" -msgstr "afișează doar ultimul patch" - -msgid "hg qapplied [-1] [-s] [PATCH]" -msgstr "" - -msgid "use pull protocol to copy metadata" -msgstr "folosește protocolul 'pull' pentru a copia metadatele" - -msgid "do not update the new working directories" -msgstr "" - -msgid "use uncompressed transfer (fast over LAN)" -msgstr "folosește transfer necomprimat (rapid în LAN)" - -msgid "REPO" -msgstr "" - -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 "păstrează fișierul patch" - -msgid "stop managing a revision (DEPRECATED)" -msgstr "" - -msgid "hg qdelete [-k] [-r REV]... [PATCH]..." -msgstr "" - -msgid "edit patch header" -msgstr "" - -msgid "keep folded patch files" -msgstr "" - -msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." -msgstr "" - -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 "" - -msgid "import file in patch directory" -msgstr "" - -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 "folosește formatul diff extins al lui git" - -msgid "qpush after importing" -msgstr "" - -msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." -msgstr "" - -msgid "create queue repository" -msgstr "" - -msgid "hg qinit [-c]" -msgstr "" - -msgid "import uncommitted changes (DEPRECATED)" -msgstr "" - -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 "" - -msgid "hg qnext [-s]" -msgstr "" - -msgid "hg qprev [-s]" -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] [-n NAME] [-f] [PATCH | INDEX]" -msgstr "" - -msgid "apply if the patch has rejects" -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] [-m] [-n NAME] [--move] [PATCH | INDEX]" -msgstr "" - -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 "" - -msgid "" -"bundle only changesets with local revision number greater than REV which are " -"not descendants of REV (DEPRECATED)" -msgstr "" - -msgid "no backups" -msgstr "" - -msgid "hg strip [-f] [-n] REV..." -msgstr "" - -msgid "hg qtop [-s]" -msgstr "" - -msgid "show only the first patch" -msgstr "afișează doar primul patch" - -msgid "hg qunapplied [-1] [-s] [PATCH]" -msgstr "" - -msgid "finish all applied changesets" -msgstr "" - -msgid "hg qfinish [-a] [REV]..." -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 "[OPȚIUNE] [COADĂ]" - msgid "hooks for sending email notifications at commit/push time" msgstr "" @@ -4324,6 +4640,9 @@ "If you like, you can put notify config file in repository that users\n" "can push changes to, they can manage their own subscriptions.\n" msgstr "" +"Dacă doriți, puteți pune un fișier de configurare pentru `notify` în\n" +"depozitul spre care utilizatorii pot trimite modificări, ei își pot\n" +"gestiona propriile abonări.\n" #, python-format msgid "%s: %d new changesets" @@ -4357,7 +4676,7 @@ msgid "" " [pager]\n" -" pager = LESS='FSRX' less" +" pager = less -FRSX" msgstr "" msgid "" @@ -4405,34 +4724,19 @@ msgid "" "To ignore global commands like :hg:`version` or :hg:`help`, you have\n" -"to specify them in the global .hgrc\n" -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 "" +"to specify them in your user configuration file." +msgstr "" + +msgid "" +"The --pager=... option can also be used to control when the pager is\n" +"used. Use a boolean value like yes, no, on, off, or use auto for\n" +"normal behavior.\n" +msgstr "" + +msgid "when to paginate (boolean, always, auto, or never)" +msgstr "" +"când să se pagineze (boolean, `always`=întotdeauna, auto, sau " +"`never`=niciodată)" msgid "command to send changesets as (a series of) patch emails" msgstr "" @@ -4461,14 +4765,8 @@ msgstr "" msgid "" -"With the -d/--diffstat option, you will be prompted for each changeset\n" -"with a diffstat summary and the changeset summary, so you can be sure\n" -"you are sending the right changes." -msgstr "" - -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 "" msgid "" @@ -4491,39 +4789,6 @@ msgstr "" msgid "" -"To avoid sending patches prematurely, it is a good idea to first run\n" -"the :hg:`email` command with the \"-n\" option (test only). You will be\n" -"prompted for an email recipient address, a subject and an introductory\n" -"message describing the patches of your patchbomb. Then when all is\n" -"done, patchbomb messages are displayed. If the PAGER environment\n" -"variable is set, your pager will be fired up once for each patchbomb\n" -"message, so you can verify everything is alright." -msgstr "" - -msgid "" -"The -m/--mbox option is also very useful. Instead of previewing each\n" -"patchbomb message in a pager or sending the messages directly, it will\n" -"create a UNIX mailbox file with the patch emails. This mailbox file\n" -"can be previewed with any mail user agent which supports UNIX mbox\n" -"files, e.g. with mutt::" -msgstr "" - -msgid " % mutt -R -f mbox" -msgstr "" - -msgid "" -"When you are previewing the patchbomb messages, you can use ``formail``\n" -"(a utility that is commonly installed as part of the procmail\n" -"package), to send each message out::" -msgstr "" - -msgid " % formail -s sendmail -bm -t < mbox" -msgstr "" - -msgid "That should be all. Now your patchbomb is on its way out." -msgstr "" - -msgid "" "You can also either configure the method option in the email section\n" "to be a sendmail compatible mailer or fill out the [smtp] section so\n" "that the patchbomb extension can automatically send patchbombs\n" @@ -4538,111 +4803,6 @@ msgid "Please enter a valid value.\n" msgstr "" -msgid "does the diffstat above look okay?" -msgstr "" - -msgid "diffstat rejected" -msgstr "" - -msgid "send changesets by email" -msgstr "" - -msgid "" -" By default, diffs are sent in the format generated by\n" -" :hg:`export`, one per message. The series starts with a \"[PATCH 0\n" -" of N]\" introduction, which describes the series as a whole." -msgstr "" - -msgid "" -" Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" -" the first line of the changeset description as the subject text.\n" -" The message contains two or three parts. First, the changeset\n" -" description. Next, (optionally) if the diffstat program is\n" -" installed and -d/--diffstat is used, the result of running\n" -" diffstat on the patch. Finally, the patch itself, as generated by\n" -" :hg:`export`." -msgstr "" - -msgid "" -" By default the patch is included as text in the email body for\n" -" easy reviewing. Using the -a/--attach option will instead create\n" -" an attachment for the patch. With -i/--inline an inline attachment\n" -" will be created." -msgstr "" - -msgid "" -" With -o/--outgoing, emails will be generated for patches not found\n" -" in the destination repository (or only those which are ancestors\n" -" of the specified revisions if any are provided)" -msgstr "" - -msgid "" -" With -b/--bundle, changesets are selected as for --outgoing, but a\n" -" single email containing a binary Mercurial bundle as an attachment\n" -" will be sent." -msgstr "" - -msgid "" -" hg email -r 3000 # send patch 3000 only\n" -" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" -" hg email -r 3000:3005 # send patches 3000 through 3005\n" -" hg email 3000 # send patch 3000 (deprecated)" -msgstr "" - -msgid "" -" hg email -o # send all patches not in default\n" -" hg email -o DEST # send all patches not in DEST\n" -" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" -" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST" -msgstr "" - -msgid "" -" hg email -b # send bundle of all patches not in default\n" -" hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " -"default\n" -" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" -msgstr "" - -msgid "" -" Before using this command, you will need to enable email in your\n" -" hgrc. See the [email] section in hgrc(5) for details.\n" -" " -msgstr "" - -msgid "specify at least one changeset with -r or -o" -msgstr "" - -msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing" -msgstr "" - -msgid "too many destinations" -msgstr "" - -msgid "use only one form to specify the revision" -msgstr "" - -msgid "" -"\n" -"Write the introductory message for the patch series." -msgstr "" - -#, python-format -msgid "This patch series consists of %d patches." -msgstr "" - -msgid "Final summary:\n" -msgstr "" - -msgid "Displaying " -msgstr "" - -msgid "Writing " -msgstr "" - -msgid "Sending " -msgstr "" - msgid "send patches as attachments" msgstr "" @@ -4655,6 +4815,9 @@ msgid "email addresses of copy recipients" msgstr "" +msgid "ask for confirmation before sending" +msgstr "" + msgid "add diffstat output to messages" msgstr "" @@ -4715,6 +4878,174 @@ msgid "hg email [OPTION]... [DEST]..." msgstr "" +msgid "send changesets by email" +msgstr "" + +msgid "" +" By default, diffs are sent in the format generated by\n" +" :hg:`export`, one per message. The series starts with a \"[PATCH 0\n" +" of N]\" introduction, which describes the series as a whole." +msgstr "" + +msgid "" +" Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" +" the first line of the changeset description as the subject text.\n" +" The message contains two or three parts. First, the changeset\n" +" description." +msgstr "" + +msgid "" +" With the -d/--diffstat option, if the diffstat program is\n" +" installed, the result of running diffstat on the patch is inserted." +msgstr "" + +msgid " Finally, the patch itself, as generated by :hg:`export`." +msgstr "" + +msgid "" +" With the -d/--diffstat or -c/--confirm options, you will be presented\n" +" with a final summary of all messages and asked for confirmation before\n" +" the messages are sent." +msgstr "" + +msgid "" +" By default the patch is included as text in the email body for\n" +" easy reviewing. Using the -a/--attach option will instead create\n" +" an attachment for the patch. With -i/--inline an inline attachment\n" +" will be created." +msgstr "" + +msgid "" +" With -o/--outgoing, emails will be generated for patches not found\n" +" in the destination repository (or only those which are ancestors\n" +" of the specified revisions if any are provided)" +msgstr "" + +msgid "" +" With -b/--bundle, changesets are selected as for --outgoing, but a\n" +" single email containing a binary Mercurial bundle as an attachment\n" +" will be sent." +msgstr "" + +msgid "" +" With -m/--mbox, instead of previewing each patchbomb message in a\n" +" pager or sending the messages directly, it will create a UNIX\n" +" mailbox file with the patch emails. This mailbox file can be\n" +" previewed with any mail user agent which supports UNIX mbox\n" +" files." +msgstr "" + +msgid "" +" With -n/--test, all steps will run, but mail will not be sent.\n" +" You will be prompted for an email recipient address, a subject and\n" +" an introductory message describing the patches of your patchbomb.\n" +" Then when all is done, patchbomb messages are displayed. If the\n" +" PAGER environment variable is set, your pager will be fired up once\n" +" for each patchbomb message, so you can verify everything is alright." +msgstr "" + +msgid "" +" In case email sending fails, you will find a backup of your series\n" +" introductory message in ``.hg/last-email.txt``." +msgstr "" + +msgid "" +" hg email -r 3000 # send patch 3000 only\n" +" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" +" hg email -r 3000:3005 # send patches 3000 through 3005\n" +" hg email 3000 # send patch 3000 (deprecated)" +msgstr "" + +msgid "" +" hg email -o # send all patches not in default\n" +" hg email -o DEST # send all patches not in DEST\n" +" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST" +msgstr "" + +msgid "" +" hg email -b # send bundle of all patches not in default\n" +" hg email -b DEST # send bundle of all patches not in DEST\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +"default\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" +msgstr "" + +msgid "" +" hg email -o -m mbox && # generate an mbox file...\n" +" mutt -R -f mbox # ... and view it with mutt\n" +" hg email -o -m mbox && # generate an mbox file ...\n" +" formail -s sendmail \\ # ... and use formail to send from the " +"mbox\n" +" -bm -t < mbox # ... using sendmail" +msgstr "" + +msgid "" +" Before using this command, you will need to enable email in your\n" +" hgrc. See the [email] section in hgrc(5) for details.\n" +" " +msgstr "" + +#, python-format +msgid "comparing with %s\n" +msgstr "se compară cu %s\n" + +msgid "no changes found\n" +msgstr "nu s-au găsit modificări\n" + +msgid "specify at least one changeset with -r or -o" +msgstr "" + +msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing" +msgstr "" + +msgid "too many destinations" +msgstr "" + +msgid "use only one form to specify the revision" +msgstr "" + +msgid "" +"\n" +"Write the introductory message for the patch series." +msgstr "" + +#, python-format +msgid "This patch series consists of %d patches." +msgstr "" + +msgid "" +"\n" +"Final summary:" +msgstr "" + +msgid "are you sure you want to send (yn)?" +msgstr "" + +msgid "&No" +msgstr "" + +msgid "&Yes" +msgstr "" + +msgid "patchbomb canceled" +msgstr "" + +msgid "Displaying " +msgstr "" + +msgid "Writing " +msgstr "" + +msgid "writing" +msgstr "" + +msgid "Sending " +msgstr "" + +msgid "sending" +msgstr "" + msgid "show progress bars for some actions" msgstr "afișează bare de progres pentru anumite acțiuni" @@ -4732,7 +5063,7 @@ " [progress]\n" " delay = 3 # number of seconds (float) before showing the progress bar\n" " refresh = 0.1 # time in seconds between refreshes of the progress bar\n" -" format = topic bar number # format of the progress bar\n" +" format = topic bar number estimate # format of the progress bar\n" " width = <none> # if set, the maximum width of the progress information\n" " # (that is, min(width, term width) will be used)\n" " clear-complete = True # clear the progress bar after it's done\n" @@ -4742,15 +5073,65 @@ msgstr "" msgid "" -"Valid entries for the format field are topic, bar, number, unit, and\n" -"item. item defaults to the last 20 characters of the item, but this\n" -"can be changed by adding either ``-<num>`` which would take the last\n" -"num characters, or ``+<num>`` for the first num characters.\n" +"Valid entries for the format field are topic, bar, number, unit,\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 "" + +#. i18n: format XX seconds as "XXs" +#, python-format +msgid "%02ds" +msgstr "" + +#. i18n: format X minutes and YY seconds as "XmYYs" +#, python-format +msgid "%dm%02ds" +msgstr "" + +#. i18n: format X hours and YY minutes as "XhYYm" +#, python-format +msgid "%dh%02dm" +msgstr "" + +#. i18n: format X days and YY hours as "XdYYh" +#, python-format +msgid "%dd%02dh" +msgstr "" + +#. i18n: format X weeks and YY days as "XwYYd" +#, python-format +msgid "%dw%02dd" +msgstr "" + +#. i18n: format X years and YY weeks as "XyYYw" +#, python-format +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 "" + +msgid "hg purge [OPTION]... [DIR]..." +msgstr "" + msgid "removes files not tracked by Mercurial" msgstr "" @@ -4806,21 +5187,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 "" @@ -4834,6 +5200,53 @@ "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 "repoziționează la setul de modificări specificat" + +msgid "collapse the rebased changesets" +msgstr "restrânge seturile de modificări repoziționate" + +#, fuzzy +msgid "use text as collapse commit message" +msgstr "folosește textul drept mesaj de depozitare" + +#, fuzzy +msgid "read collapse commit message from file" +msgstr "citește mesajul pentru depozitare din fișier" + +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 "specifică instrumentul pentru fuziune" + +msgid "continue an interrupted rebase" +msgstr "continuă o repoziționare întreruptă" + +msgid "abort an interrupted rebase" +msgstr "abandonează o repoziționare întreruptă" + +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țiuni]\n" +"hg rebase {-a|-c}" + msgid "move changeset (and descendants) to a different branch" msgstr "" @@ -4899,6 +5312,9 @@ " " msgstr "" +msgid "message can only be specified with collapse" +msgstr "" + msgid "cannot use both abort and continue" msgstr "abort și continue nu se pot folosi împreună" @@ -4911,6 +5327,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 "" @@ -4923,16 +5342,13 @@ msgid "nothing to rebase\n" msgstr "" -msgid "cannot use both keepbranches and extrafn" -msgstr "" - msgid "rebasing" msgstr "" -msgid " changesets" -msgstr "seturi de modificări" - -msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" +msgid "changesets" +msgstr "" + +msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)" msgstr "" #, python-format @@ -4979,44 +5395,15 @@ 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 "dislocă către setul de modificări specificat" - -msgid "collapse the rebased changesets" -msgstr "restrânge seturile de modificări repoziționate" - -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 "continuă o repoziționare întreruptă" - -msgid "abort an interrupted rebase" -msgstr "abandonează o repoziționare întreruptă" - -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țiuni]\n" -"hg rebase {-a|-c}" +msgstr "repoziționează directorul de lucru la capătul de ramură" + +#, fuzzy +msgid "specify merge tool for rebase" +msgstr "specifică instrumentul pentru fuziune" msgid "commands to interactively select changes for commit/qrefresh" msgstr "" @@ -5076,6 +5463,9 @@ msgid "record change %d/%d to %r?" msgstr "" +msgid "hg record [OPTION]... [FILE]..." +msgstr "hg record [OPȚIUNE]... [FIȘIER]..." + msgid "interactively select changes to commit" msgstr "" @@ -5084,10 +5474,6 @@ " will be candidates for recording." msgstr "" -msgid " See :hg:`help dates` for a list of formats valid for -d/--date." -msgstr "" -" Vezi :hg:`help dates` pentru o listă de formate valide cu d/--date." - msgid "" " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" @@ -5124,27 +5510,35 @@ msgid " This command is not available when committing a merge." msgstr "" +#, fuzzy +msgid "interactively record a new patch" +msgstr "creează un nou patch" + +msgid "" +" See :hg:`help qnew` & :hg:`help record` for more information and\n" +" usage.\n" +" " +msgstr "" + msgid "'mq' extension not loaded" msgstr "" -msgid "running non-interactively, use commit instead" -msgstr "" - -msgid "cannot partially commit a merge (use hg commit instead)" +#, python-format +msgid "running non-interactively, use %s instead" +msgstr "" + +msgid "cannot partially commit a merge (use \"hg commit\" instead)" msgstr "" msgid "no changes to record\n" msgstr "" -msgid "patch failed to apply" -msgstr "" - -msgid "hg record [OPTION]... [FILE]..." -msgstr "hg record [OPȚIUNE]... [FIȘIER]..." - msgid "hg qrecord [OPTION]... PATCH [FILE]..." msgstr "" +msgid "interactively select changes to refresh" +msgstr "" + msgid "recreates hardlinks between repository clones" msgstr "" @@ -5189,10 +5583,17 @@ msgid "hardlinks are not supported on this system" msgstr "" +#, fuzzy +msgid "must specify local origin repository" +msgstr "realizează o copie a unui depozit existent" + #, python-format msgid "relinking %s to %s\n" msgstr "" +msgid "there is nothing to relink\n" +msgstr "" + #, python-format msgid "tip has %d files, estimated total number of files: %s\n" msgstr "" @@ -5214,9 +5615,6 @@ msgid "not linkable: %s\n" msgstr "" -msgid " files" -msgstr "" - msgid "pruning" msgstr "" @@ -5228,7 +5626,7 @@ msgstr "" #, python-format -msgid "relinked %d files (%d bytes reclaimed)\n" +msgid "relinked %d files (%s reclaimed)\n" msgstr "" msgid "[ORIGIN]" @@ -5288,6 +5686,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 "" @@ -5300,15 +5702,16 @@ msgstr "" msgid "" -" NOTE: using rollback or extensions that destroy/modify history\n" -" (mq, rebase, etc.) can cause considerable confusion with shared\n" -" clones. In particular, if two shared clones are both updated to\n" -" the same changeset, and one of them destroys that changeset with\n" -" rollback, the other clone will suddenly stop working: all\n" -" operations will fail with \"abort: working directory has unknown\n" -" parent\". The only known workaround is to use debugsetparents on\n" -" the broken clone to reset it to a changeset that still exists\n" -" (e.g. tip).\n" +" .. note::\n" +" using rollback or extensions that destroy/modify history (mq,\n" +" rebase, etc.) can cause considerable confusion with shared\n" +" clones. In particular, if two shared clones are both updated to\n" +" the same changeset, and one of them destroys that changeset\n" +" with rollback, the other clone will suddenly stop working: all\n" +" operations will fail with \"abort: working directory has unknown\n" +" parent\". The only known workaround is to use debugsetparents on\n" +" the broken clone to reset it to a changeset that still exists\n" +" (e.g. tip).\n" " " msgstr "" @@ -5359,7 +5762,7 @@ msgid "%s: empty changeset" msgstr "" -msgid "Fix up the merge and run hg transplant --continue" +msgid "fix up the merge and run hg transplant --continue" msgstr "" #, python-format @@ -5376,6 +5779,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" @@ -5399,13 +5805,50 @@ msgid "no such option\n" msgstr "opțiune inexistentă\n" +msgid "pull patches from REPO" +msgstr "" + +msgid "BRANCH" +msgstr "RAMURĂ" + +msgid "pull patches from branch BRANCH" +msgstr "" + +msgid "pull all changesets up to BRANCH" +msgstr "" + +msgid "skip over REV" +msgstr "omite REV" + +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 "hg transplant [-s DEPOZIT] [-b RAMURĂ [-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. 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)" @@ -5427,9 +5870,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 "" @@ -5472,35 +5915,15 @@ msgid "outstanding local changes" msgstr "modificări locale în suspensie" -msgid "pull patches from REPO" -msgstr "" - -msgid "BRANCH" -msgstr "RAMURĂ" - -msgid "pull patches from branch BRANCH" -msgstr "" - -msgid "pull all changesets up to BRANCH" -msgstr "" - -msgid "skip over REV" -msgstr "omite REV" - -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 "hg transplant [-s DEPOZIT] [-b RAMURĂ [-a]] [-p REV] [-m REV] [REV]..." +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 "" @@ -5535,11 +5958,13 @@ msgid "Note that there are some limitations on using this extension:" msgstr "" -msgid "- You should use single encoding in one repository." -msgstr "" - -msgid "" -"\n" +msgid "" +"- You should use single encoding in one repository.\n" +"- If the repository path ends with 0x5c, .hg/hgrc cannot be read.\n" +"- win32mbcs is not compatible with fixutf8 extension." +msgstr "" + +msgid "" "By default, win32mbcs uses encoding.encoding decided by Mercurial.\n" "You can specify the encoding by config option::" msgstr "" @@ -5655,6 +6080,11 @@ "** = %sdecode:\n" msgstr "" +msgid "" +"win32text is deprecated: http://mercurial.selenic.com/wiki/" +"Win32TextExtension\n" +msgstr "" + msgid "discover and advertise repositories on the local network" msgstr "" @@ -5694,8 +6124,32 @@ msgid "unknown archive type '%s'" msgstr "" -msgid "invalid changegroup" -msgstr "" +msgid "archiving" +msgstr "" + +#, python-format +msgid "bookmark '%s' contains illegal character" +msgstr "" + +#, python-format +msgid "branch %s not found" +msgstr "" + +#, python-format +msgid "updating bookmark %s\n" +msgstr "se actualizează semnul de carte %s\n" + +#, python-format +msgid "not updating divergent bookmark %s\n" +msgstr "nu se actualizează semnul de carte divergent %s\n" + +#, fuzzy +msgid "searching for changed bookmarks\n" +msgstr "se caută modificări\n" + +#, fuzzy +msgid "no changed bookmarks found\n" +msgstr "nu s-au găsit modificări\n" msgid "unknown parent" msgstr "" @@ -5704,23 +6158,23 @@ msgid "integrity check failed on %s:%d" msgstr "" -#, python-format -msgid "%s: not a Mercurial bundle file" -msgstr "" - -#, python-format -msgid "%s: unknown bundle version" -msgstr "" - -#, python-format -msgid "%s: unknown bundle compression type" -msgstr "" - msgid "cannot create new bundle repository" msgstr "" #, python-format -msgid "premature EOF reading chunk (got %d bytes, expected %d)" +msgid "stream ended unexpectedly (got %d bytes, expected %d)" +msgstr "" + +#, python-format +msgid "invalid chunk length %d" +msgstr "" + +#, python-format +msgid "%s: not a Mercurial bundle" +msgstr "" + +#, python-format +msgid "%s: unknown bundle version %s" msgstr "" msgid "empty username" @@ -5747,24 +6201,25 @@ msgid "limit must be positive" msgstr "" -msgid "too many revisions specified" -msgstr "" - #, python-format msgid "invalid format spec '%%%s' in output filename" msgstr "" -#, python-format -msgid "adding %s\n" -msgstr "se adaugă %s\n" - -#, python-format -msgid "removing %s\n" -msgstr "" - -#, python-format -msgid "recording removal of %s as rename to %s (%d%% similar)\n" -msgstr "" +msgid "cannot specify --changelog and --manifest at the same time" +msgstr "" + +msgid "cannot specify filename with --changelog or --manifest" +msgstr "" + +msgid "cannot specify --changelog or --manifest without a repository" +msgstr "" + +msgid "invalid arguments" +msgstr "" + +#, fuzzy, python-format +msgid "revlog '%s' not found" +msgstr "depozitul %s nu a fost găsit" #, python-format msgid "%s: not copying - file is not managed\n" @@ -5806,10 +6261,6 @@ msgid "copying %s to %s\n" msgstr "" -#, python-format -msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" -msgstr "" - msgid "no source or destination specified" msgstr "" @@ -5840,6 +6291,10 @@ msgid "branch: %s\n" msgstr "ramură: %s\n" +#, fuzzy, python-format +msgid "bookmark: %s\n" +msgstr "rezumat: %s\n" + #, python-format msgid "tag: %s\n" msgstr "etichetă: %s\n" @@ -5906,6 +6361,14 @@ msgid "can only follow copies/renames for explicit filenames" msgstr "" +#, python-format +msgid "adding %s\n" +msgstr "se adaugă %s\n" + +#, python-format +msgid "skipping missing subrepository: %s\n" +msgstr "" + msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." msgstr "" @@ -5945,6 +6408,151 @@ msgid "empty commit message" msgstr "" +msgid "repository root directory or name of overlay bundle file" +msgstr "" + +msgid "DIR" +msgstr "DIR" + +msgid "change working directory" +msgstr "schimbă directorul de lucru " + +msgid "do not prompt, assume 'yes' for any required answers" +msgstr "nu întreba, presupune 'da' pentru orice răspuns solicitat" + +msgid "suppress output" +msgstr "suprimă afișarea" + +msgid "enable additional output" +msgstr "activează afișarea informațiilor suplimentare" + +msgid "set/override config option (use 'section.name=value')" +msgstr "" +"setează/suprascrie opțiunea de configurare (folosiți 'secțiune.nume=valoare')" + +msgid "CONFIG" +msgstr "" + +msgid "enable debugging output" +msgstr "activează afișarea informațiilor pentru depanare" + +msgid "start debugger" +msgstr "pornește depanatorul (debugger)" + +msgid "set the charset encoding" +msgstr "setează codificarea pentru setul de caractere" + +msgid "ENCODE" +msgstr "" + +msgid "MODE" +msgstr "" + +msgid "set the charset encoding mode" +msgstr "setează modul de codificare pentru setul de caractere" + +msgid "always print a traceback on exception" +msgstr "" + +msgid "time how long the command takes" +msgstr "durata de execuție a comenzii" + +msgid "print command execution profile" +msgstr "afișează profilul executării comenzii" + +msgid "output version information and exit" +msgstr "afișează informații despre versiune și ieși" + +msgid "display help and exit" +msgstr "afișează ajutorul și ieși" + +msgid "do not perform actions, just print output" +msgstr "acțiunea nu se execută, doar se afișează mesajele" + +msgid "specify ssh command to use" +msgstr "specifică comanda ssh care va fi folosită" + +msgid "specify hg command to run on the remote side" +msgstr "specifică comanda hg care va fi executată pe mașina la distanță" + +msgid "do not verify server certificate (ignoring web.cacerts config)" +msgstr "" + +msgid "PATTERN" +msgstr "TIPAR" + +msgid "include names matching the given patterns" +msgstr "include numele care se potrivesc cu tiparele specificate" + +msgid "exclude names matching the given patterns" +msgstr "exclude numele care se potrivesc cu tiparele specificate" + +msgid "use text as commit message" +msgstr "folosește textul drept mesaj de depozitare" + +msgid "read commit message from file" +msgstr "citește mesajul pentru depozitare din fișier" + +#, fuzzy +msgid "record the specified date as commit date" +msgstr "" +"înregistrează utilizatorul specificat ca fiind cel care a făcut depozitarea" + +msgid "record the specified user as committer" +msgstr "" +"înregistrează utilizatorul specificat ca fiind cel care a făcut depozitarea" + +msgid "STYLE" +msgstr "STIL" + +msgid "display using template map file" +msgstr "afișează folosind fișierul cu harta de șabloane" + +msgid "display with template" +msgstr "afișează cu șablon" + +msgid "do not show merges" +msgstr "nu afișa fuziunile" + +msgid "output diffstat-style summary of changes" +msgstr "afișează sumarul modificărilor în stil diffstat" + +msgid "treat all files as text" +msgstr "tratează toate fișierele ca text" + +msgid "omit dates from diff headers" +msgstr "omite datele din antetele diff" + +msgid "show which function each change is in" +msgstr "afișează funcția în care se află fiecare modificare" + +msgid "produce a diff that undoes the changes" +msgstr "" + +msgid "ignore white space when comparing lines" +msgstr "ignoră spațiul alb la compararea liniilor" + +msgid "ignore changes in the amount of white space" +msgstr "ignoră modificările cantității de spațiu alb" + +msgid "ignore changes whose lines are all blank" +msgstr "ignoră modificările ale căror linii sunt toate vide" + +msgid "number of lines of context to show" +msgstr "numărul liniilor de context care vor fi afișate" + +msgid "SIMILARITY" +msgstr "ASEMĂNARE" + +msgid "guess renamed files by similarity (0<=s<=100)" +msgstr "ghicește fișierele redenumite după asemănare (0<=s<=100)" + +msgid "recurse into subrepositories" +msgstr "operează recursiv în subdepozite" + +msgid "[OPTION]... [FILE]..." +msgstr "[OPȚIUNE]... [FIȘIER]..." + msgid "add the specified files on the next commit" msgstr "adaugă fișierele specificate la următoarea depozitare ('commit')" @@ -6004,7 +6612,7 @@ msgid "" " New files are ignored if they match any of the patterns in\n" -" .hgignore. As with add, these changes take effect at the next\n" +" ``.hgignore``. As with add, these changes take effect at the next\n" " commit." msgstr "" @@ -6024,10 +6632,42 @@ msgid "similarity must be between 0 and 100" msgstr "" +msgid "annotate the specified revision" +msgstr "adnotează revizia specificată" + +msgid "follow copies/renames and list the filename (DEPRECATED)" +msgstr "" +"urmărește copierile/redenumirile și afișează numele\n" +"fișierului (ÎNVECHIT)" + +msgid "don't follow copies and renames" +msgstr "nu urmări copierile și redenumirile" + +msgid "list the author (long with -v)" +msgstr "afișează autorul (lung cu -v)" + +msgid "list the filename" +msgstr "afișează numele fișierului" + +msgid "list the date (short with -q)" +msgstr "afișează data (scurt cu -q)" + +msgid "list the revision number (default)" +msgstr "afișează numele reviziei (implicit)" + +msgid "list the changeset" +msgstr "afișează setul de modificări" + +msgid "show line number at the first appearance" +msgstr "afișează numărul liniei la prima apariție" + +msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." +msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FIȘIER..." + msgid "show changeset information by line for each file" msgstr "" -"afișează informațiile despre setul de modificări line cu linie\n " -"pentru fiecare fișier" +"afișează informațiile despre setul de modificări line cu linie\n" +" pentru fiecare fișier" msgid "" " List changes in files, showing the revision id responsible for\n" @@ -6046,13 +6686,6 @@ " nor desirable." msgstr "" -msgid "" -" Returns 0 on success.\n" -" " -msgstr "" -" Returnează 0 în caz de succes.\n" -" " - msgid "at least one filename or pattern is required" msgstr "" @@ -6063,6 +6696,24 @@ msgid "%s: binary file\n" msgstr "" +msgid "do not pass files through decoders" +msgstr "" + +msgid "directory prefix for files in archive" +msgstr "" + +msgid "PREFIX" +msgstr "PREFIX" + +msgid "revision to distribute" +msgstr "" + +msgid "type of distribution to create" +msgstr "" + +msgid "[OPTION]... DEST" +msgstr "[OPȚIUNE]... DEST" + msgid "create an unversioned archive of a repository revision" msgstr "" @@ -6109,25 +6760,44 @@ 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 "[OPȚIUNE]... [-r] REV" + msgid "reverse effect of earlier changeset" msgstr "" msgid "" -" Commit the backed out changes as a new changeset. The new\n" -" changeset is a child of the backed out changeset." -msgstr "" - -msgid "" -" If you backout a changeset other than the tip, a new head is\n" -" created. This head will be the new tip and you should merge this\n" -" backout changeset with another head." -msgstr "" - -msgid "" -" The --merge option remembers the parent of the working directory\n" -" before starting the backout, then merges the new head with that\n" -" changeset afterwards. This saves you from doing the merge by hand.\n" -" The result of this merge is not committed, as with a normal merge." +" Prepare a new changeset with the effect of REV undone in the\n" +" current working directory." +msgstr "" + +msgid "" +" If REV is the parent of the working directory, then this new changeset\n" +" is committed automatically. Otherwise, hg needs to merge the\n" +" changes and the merged result is left uncommitted." +msgstr "" + +msgid "" +" By default, the pending changeset will have one parent,\n" +" maintaining a linear history. With --merge, the pending changeset\n" +" will instead have two parents: the old parent of the working\n" +" directory and a new child of REV that simply undoes REV." +msgstr "" + +msgid "" +" Before version 1.7, the behavior without --merge was equivalent to\n" +" specifying --merge followed by :hg:`update --clean .` to cancel\n" +" the merge and leave the child of REV as a head to be merged\n" +" separately." msgstr "" msgid "please specify just one revision" @@ -6160,11 +6830,29 @@ msgid "merging with changeset %s\n" msgstr "" -msgid "the backout changeset is a new head - do not forget to merge\n" -msgstr "" - -msgid "(use \"backout --merge\" if you want to auto-merge)\n" -msgstr "" +msgid "reset bisect state" +msgstr "" + +msgid "mark changeset good" +msgstr "marchează setul de modificări drept bun" + +msgid "mark changeset bad" +msgstr "marchează setul de modificări drept rău" + +msgid "skip testing changeset" +msgstr "omite testarea setului de modificări" + +msgid "extend the bisect range" +msgstr "" + +msgid "use command to check changeset state" +msgstr "" + +msgid "do not update to target" +msgstr "nu actualiza la destinație" + +msgid "[-gbsr] [-U] [-c CMD] [REV]" +msgstr "[-gbsr] [-U] [-c CMD] [REV]" msgid "subdivision search of changesets" msgstr "" @@ -6206,6 +6894,13 @@ msgid "The first bad revision is:\n" msgstr "" +#, python-format +msgid "" +"Not all ancestors of this changeset have been checked.\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" msgstr "" "Datorită reviziilor omise, prima revizie bună ar putea fi oricare\n" @@ -6240,10 +6935,94 @@ msgid "Changeset %d:%s: %s\n" msgstr "" +#, fuzzy, python-format +msgid "Extending search to changeset %d:%s\n" +msgstr "se omite setul de modificări de fuziune %s:%s\n" + +msgid "nothing to extend" +msgstr "" + #, python-format msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" msgstr "" +msgid "force" +msgstr "" + +msgid "delete a given bookmark" +msgstr "" + +msgid "rename a given bookmark" +msgstr "" + +msgid "do not mark a new bookmark active" +msgstr "" + +#, fuzzy +msgid "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]" +msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" + +msgid "track a line of development with movable markers" +msgstr "urmărește cu marcatori mobili o linie de dezvoltare " + +msgid "" +" Bookmarks are pointers to certain commits that move when\n" +" committing. Bookmarks are local. They can be renamed, copied and\n" +" deleted. It is possible to use bookmark names in :hg:`merge` and\n" +" :hg:`update` to merge and update respectively to a given bookmark." +msgstr "" + +msgid "" +" You can use :hg:`bookmark NAME` to set a bookmark on the working\n" +" directory's parent revision with the given name. If you specify\n" +" a revision using -r REV (where REV may be an existing bookmark),\n" +" the bookmark is assigned to that revision." +msgstr "" + +msgid "" +" Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" +" push` and :hg:`help pull`). This requires both the local and remote\n" +" repositories to support bookmarks. For versions prior to 1.8, this " +"means\n" +" the bookmarks extension must be enabled.\n" +" " +msgstr "" + +#, fuzzy, python-format +msgid "bookmark '%s' does not exist" +msgstr "semnul de carte de exportat" + +#, python-format +msgid "bookmark '%s' already exists (use -f to force)" +msgstr "" + +msgid "new bookmark name required" +msgstr "" + +msgid "bookmark name required" +msgstr "" + +msgid "bookmark name cannot contain newlines" +msgstr "" + +msgid "bookmark names cannot consist entirely of whitespace" +msgstr "" + +msgid "a bookmark cannot have the name of an existing branch" +msgstr "" + +msgid "no bookmarks set\n" +msgstr "" + +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 "setează sau afișează numele ramurii curente" @@ -6275,14 +7054,26 @@ msgid "reset working directory to branch %s\n" msgstr "" -msgid "" -"a branch of the same name already exists (use 'hg update' to switch to it)" +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 "" #, python-format msgid "marked working directory as branch %s\n" msgstr "" +msgid "show only branches that have unmerged heads" +msgstr "afișează doar ramurile care au capete nefuzionate" + +msgid "show normal and closed branches" +msgstr "afișează ramurile normale și închise" + +msgid "[-ac]" +msgstr "" + msgid "list repository named branches" msgstr "" @@ -6311,6 +7102,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 "o ramură specifică pe care ați dori să o împachetați (bundle)" + +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 "" + msgid "create a changegroup file" msgstr "" @@ -6357,6 +7169,18 @@ msgid "unknown bundle type specified with --type" msgstr "" +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 "[OPȚIUNE]... FIȘIER" + msgid "output the current or given revision of files" msgstr "" @@ -6378,6 +7202,21 @@ " :``%p``: root-relative path name of file being printed" msgstr "" +msgid "the clone will include an empty working copy (only a repository)" +msgstr "clona va include o copie de lucru vidă (doar un depozit)" + +msgid "revision, tag or branch to check out" +msgstr "revizia, eticheta sau ramura care va fi actualizată" + +msgid "include the specified changeset" +msgstr "include setul de modificări specificat" + +msgid "clone only the specified branch" +msgstr "clonează doar ramura specificată" + +msgid "[OPTION]... SOURCE [DEST]" +msgstr "[OPȚIUNE]... SURSĂ [DEST]" + msgid "make a copy of an existing repository" msgstr "realizează o copie a unui depozit existent" @@ -6391,9 +7230,10 @@ " Dacă nu se specifică numele directorului destinație, acesta va fi\n" " implicit numele de bază (basename) al sursei." +#, fuzzy msgid "" " The location of the source is added to the new repository's\n" -" .hg/hgrc file, as the default to be used for future pulls." +" ``.hg/hgrc`` file, as the default to be used for future pulls." msgstr "" " Amplasarea sursei este adăugată în fișierul .hg/hgrc al noului\n" " depozit, ca amplasarea implicită pentru viitoarele comenzi 'pull'." @@ -6402,9 +7242,10 @@ msgstr "" " Vezi :hg:`help urls` pentru detalii legate de formate valide de surse." +#, fuzzy msgid "" " It is possible to specify an ``ssh://`` URL as the destination, but no\n" -" .hg/hgrc and working directory will be created on the remote side.\n" +" ``.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 "" " Ca destinație se poate specifica un URL ``ssh://``, dar nu va fi creat.\n" @@ -6478,7 +7319,7 @@ " sigur. Operația nu este atomică (rămâne în sarcina dvs. să vă asigurați\n" " că DEP nu este modificat în timpul operației) și trebuie să vă\n" " asigurați că editorul dvs. desface link-urile hard (Emacs si cele mai\n" -" multe unelte din kernelul Linux o vor face ). De asemenea, acest mod\n" +" multe unelte din kernelul Linux o vor face). De asemenea, acest mod\n" " nu este compatibil cu anumite extensii care își plasează metadatele\n" " în directorul .hg, precum mq." @@ -6518,12 +7359,20 @@ msgid "cannot specify both --noupdate and --updaterev" msgstr "" +msgid "mark new/missing files as added/removed before committing" +msgstr "" +"marchează fișierele noi/lipsă ca adăugate/eliminate înainte de depozitare" + +msgid "mark a branch as closed, hiding it from the branch list" +msgstr "marchează o ramură ca închisă, ascunzând-o din lista ramurilor" + msgid "commit the specified files or all outstanding changes" msgstr "depozitează fișierele specificate sau toate modificările în suspensie" +#, fuzzy msgid "" " Commit changes to the given files into the repository. Unlike a\n" -" centralized RCS, this operation is a local operation. See\n" +" centralized SCM, this operation is a local operation. See\n" " :hg:`push` for a way to actively distribute your changes." msgstr "" " Depozitează modificările fișierelor date în depozit. Spre deosebire\n" @@ -6566,6 +7415,10 @@ msgid "can only close branch heads" msgstr "" +#, python-format +msgid "nothing changed (%d missing files, see 'hg status')\n" +msgstr "" + msgid "nothing changed\n" msgstr "" @@ -6580,6 +7433,15 @@ msgid "committed changeset %d:%s\n" msgstr "" +msgid "record a copy that has already occurred" +msgstr "" + +msgid "forcibly copy over an existing managed file" +msgstr "" + +msgid "[OPTION]... [SOURCE]... DEST" +msgstr "[OPȚIUNE]... [SURSĂ]... DEST" + msgid "mark files as copied for the next commit" msgstr "" @@ -6607,13 +7469,34 @@ " Returnează 0 în caz de succes, 1 dacă au apărut erori.\n" " " +msgid "[INDEX] REV1 REV2" +msgstr "" + msgid "find the ancestor revision of two revisions in a given index" msgstr "" msgid "either two or three arguments required" msgstr "" -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 "" + +#, fuzzy +msgid "[OPTION]... [TEXT]" +msgstr "[OPȚIUNE]... 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:" @@ -6631,8 +7514,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 "" @@ -6652,36 +7533,28 @@ 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" +" 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 "afișează toate comenzile și opțiunile disponibile" - -msgid "returns the completion list associated with the given command" -msgstr "" - -msgid "show information detected about current filesystem" -msgstr "afișează informațiile detectate despre sistemul de fișiere curent" - -msgid "rebuild the dirstate as it would look like for the given revision" -msgstr "" +#, fuzzy +msgid "building" +msgstr "se actualizează" + +#, fuzzy +msgid "show all details" +msgstr "afișează doar fișierele adăugate" + +#, fuzzy +msgid "lists the contents of a bundle" +msgstr "afișează conținutul unui fișier index" msgid "validate the correctness of the current dirstate" msgstr "" @@ -6705,63 +7578,35 @@ msgid ".hg/dirstate inconsistent with current parent's manifest" msgstr "" -msgid "show combined config settings from all hgrc files" -msgstr "afișează setările de configurare combinate din toate fișierele hgrc" - -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 "" - -msgid "" -" With multiple arguments, print names and values of all config\n" -" items with matching section names." -msgstr "" - -msgid "" -" With --debug, the source (filename and line number) is printed\n" -" for each config item." -msgstr "" - -#, python-format -msgid "read config from: %s\n" -msgstr "" - -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 "" - -msgid "show the contents of the current dirstate" -msgstr "afișează conținutul dirstate-ului curent" - -#, python-format -msgid "copy: %s -> %s\n" -msgstr "" +msgid "[COMMAND]" +msgstr "" + +msgid "list all available commands and options" +msgstr "afișează toate comenzile și opțiunile disponibile" + +msgid "show the command options" +msgstr "afișează opțiunile comenzii" + +msgid "[-o] CMD" +msgstr "" + +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 "[OPȚIUNE]... [FIȘIER [REV]...]" msgid "format the changelog or an index DAG as a concise textual description" msgstr "" @@ -6779,6 +7624,17 @@ msgid "need repo for changelog dag" msgstr "" +#, fuzzy +msgid "open changelog" +msgstr "afișează seturile de modificări părinte" + +#, fuzzy +msgid "open manifest" +msgstr "se verifică manifestele\n" + +msgid "-c|-m|FILE REV" +msgstr "" + msgid "dump the contents of a data file revision" msgstr "" @@ -6786,14 +7642,77 @@ msgid "invalid revision identifier %s" msgstr "" +msgid "try extended date formats" +msgstr "" + +msgid "[-e] DATE [RANGE]" +msgstr "" + 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 "" + +msgid "show information detected about current filesystem" +msgstr "afișează informațiile detectate despre sistemul de fișiere curent" + +msgid "id of head node" +msgstr "" + +#, fuzzy +msgid "id of common node" +msgstr "lista comenzilor:" + +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 "" +msgstr "afișează conținutul unui fișier index" + +#, fuzzy, python-format +msgid "unknown format %d" +msgstr "hg: comandă necunoscută '%s'\n" msgid "dump an index DAG as a graphviz dot file" -msgstr "" +msgstr "afișează un DAG index sub forma unui fișier dot graphviz" msgid "test Mercurial installation" msgstr "" @@ -6821,35 +7740,13 @@ msgid " (templates seem to have been installed incorrectly)\n" msgstr "" -msgid "Checking patch...\n" -msgstr "Se verifică patch-ul\n" - -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 .hgrc file)\n" -msgstr "" - -msgid "" -" Internal patcher failure, please report this error to http://mercurial." -"selenic.com/bts/\n" -msgstr "" - msgid "Checking commit editor...\n" msgstr "Se verifică editorul pentru commit...\n" msgid " No commit editor set and can't find vi in PATH\n" msgstr "" -msgid " (specify a commit editor in your .hgrc file)\n" +msgid " (specify a commit editor in your configuration file)\n" msgstr "" #, python-format @@ -6859,7 +7756,7 @@ msgid "Checking username...\n" msgstr "Se verifică numele de utilizator...\n" -msgid " (specify a username in your .hgrc file)\n" +msgid " (specify a username in your configuration file)\n" msgstr "" msgid "No problems detected\n" @@ -6869,8 +7766,51 @@ 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 "" + +msgid "[-r REV] [REV]" +msgstr "" + +msgid "rebuild the dirstate as it would look like for the given revision" +msgstr "" + +msgid "revision to debug" +msgstr "" + +msgid "[-r REV] FILE" +msgstr "" + msgid "dump rename information" -msgstr "" +msgstr "afișează informații despre redenumiri" #, python-format msgid "%s renamed from %s:%s\n" @@ -6880,11 +7820,60 @@ 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 "" + +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 "" + +msgid "sort by saved mtime" +msgstr "" + +msgid "[OPTION]..." +msgstr "[OPȚIUNE]..." + +msgid "show the contents of the current dirstate" +msgstr "afișează conținutul dirstate-ului curent" + +#, python-format +msgid "copy: %s -> %s\n" +msgstr "" + +msgid "revision to check" +msgstr "" + msgid "show how files match on given patterns" msgstr "afișează modul în care fișierele se potrivesc cu tiparele specificate" +#, fuzzy +msgid "REPO [OPTIONS]... [ONE [TWO]]" +msgstr "[OPȚIUNE]... SURSĂ [DEST]" + +msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..." +msgstr "[OPȚIUNE]... ([-c REV] | [-r REV1 [-r REV2]]) [FIȘIER]..." + msgid "diff repository (or selected files)" -msgstr "" +msgstr "afișează diferențele (diff) în depozit (sau fișierele selectate)" msgid " Show differences between revisions for the specified files." msgstr "" @@ -6893,10 +7882,15 @@ msgstr "" msgid "" -" NOTE: diff may generate unexpected results for merges, as it will\n" -" default to comparing against the working directory's first parent\n" -" changeset if no revisions are specified." -msgstr "" +" .. note::\n" +" diff may generate unexpected results for merges, as it will\n" +" default to comparing against the working directory's first\n" +" parent changeset if no revisions are specified." +msgstr "" +" Notă:\n" +" `diff` poate genera afișaj diff neașteptat pentru seturi\n" +" de modificări de fuziune, deoarece va compara setul de modificări de\n" +" fuziune doar cu primul părinte, dacă nu se specifică nicio revizie." msgid "" " Alternatively you can specify -c/--change with a revision to see\n" @@ -6914,8 +7908,19 @@ " format. For more information, read :hg:`help diffs`." msgstr "" +msgid "diff against the second parent" +msgstr "" + +msgid "revisions to export" +msgstr "" + +msgid "[OPTION]... [-o OUTFILESPEC] REV..." +msgstr "[OPȚIUNE]... [-o SPECFIȘIEȘIRE] REV..." + msgid "dump the header and diffs for one or more changesets" msgstr "" +"afișează antetul și diferențele pentru unul sau mai multe seturi de " +"modificări" msgid " Print the changeset header and diffs for one or more revisions." msgstr "" @@ -6927,10 +7932,15 @@ msgstr "" msgid "" -" NOTE: export may generate unexpected diff output for merge\n" -" changesets, as it will compare the merge changeset against its\n" -" first parent only." -msgstr "" +" .. note::\n" +" export may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only." +msgstr "" +" Notă:\n" +" `export` poate genera afișaj diff neașteptat pentru seturi\n" +" de modificări de fuziune, deoarece va compara setul de modificări de\n" +" fuziune doar cu primul părinte." msgid "" " Output may be to a file, in which case the name of the file is\n" @@ -6974,21 +7984,27 @@ msgstr "" msgid "forget the specified files on the next commit" -msgstr "" +msgstr "uită fișierele specificate la următoarea depozitare" msgid "" " Mark the specified files so they will no longer be tracked\n" " after the next commit." msgstr "" +" Marchează fișierele specificate astfel încât nu vor mai fi\n" +" urmărite după următoarea depozitare." msgid "" " This only removes files from the current branch, not from the\n" " entire project history, and it does not delete them from the\n" " working directory." msgstr "" +" Aceasta înlătură fișierele doar din ramura curentă, nu din întregul\n" +" istoric al proiectului, și nu le șterge din directorul de lucru." msgid " To undo a forget before the next commit, see :hg:`add`." msgstr "" +" Pentru a anula efectul lui `forget` înainte de următoarea\n" +" depozitare, vezi :hg:`add`." msgid "no files specified" msgstr "" @@ -6997,6 +8013,36 @@ msgid "not removing %s: file is already untracked\n" msgstr "" +#, python-format +msgid "removing %s\n" +msgstr "" + +msgid "end fields with NUL" +msgstr "" + +msgid "print all revisions that match" +msgstr "" + +msgid "follow changeset history, or file history across copies and renames" +msgstr "" +"urmărește istoricul seturilor de modificări sau al fișierelor, ținând cont " +"de copieri și redenumiri" + +msgid "ignore case when matching" +msgstr "ignoră minuscule/majuscule la potrivire" + +msgid "print only filenames and revisions that match" +msgstr "afișează doar numele de fișiere și reviziile care se potrivesc" + +msgid "print matching line numbers" +msgstr "afișează numerele liniilor care se potrivesc" + +msgid "only search files changed within revision range" +msgstr "caută doar fișierele modificate în intervalul de revizii" + +msgid "[OPTION]... PATTERN [FILE]..." +msgstr "[OPȚIUNE]... TIPAR [FIȘIER]..." + msgid "search for a pattern in specified files and revisions" msgstr "" @@ -7029,6 +8075,24 @@ msgid "grep: invalid match pattern: %s\n" msgstr "" +msgid "STARTREV" +msgstr "" + +msgid "show only heads which are descendants of STARTREV" +msgstr "afișează doar capetele care sunt descendenți ai REVSTART" + +msgid "show topological heads only" +msgstr "afișează doar capetele topologice" + +msgid "show active branchheads only (DEPRECATED)" +msgstr "afișează doar capetele de ramură active [ÎNVECHIT]" + +msgid "show normal and closed branch heads" +msgstr " afișează capetele de ramură normale și închise" + +msgid "[-ac] [-r STARTREV] [REV]..." +msgstr "[-ac] [-r REV] [REVSTART]..." + msgid "show current repository heads or show branch heads" msgstr "afișează capetele curente ale depozitului sau capetele de ramură" @@ -7078,6 +8142,18 @@ msgid " (started at %s)" msgstr "" +#, fuzzy +msgid "show only help for extensions" +msgstr "afișează fișierele excluse de la expandare" + +#, fuzzy +msgid "show only help for commands" +msgstr "afișează doar primul patch" + +#, fuzzy +msgid "[-ec] [TOPIC]" +msgstr "[SUBIECT]" + msgid "show help for a given topic or a help overview" msgstr "" "afișează ajutorul pentru un anumit subiect sau un rezumat al ajutorului" @@ -7109,8 +8185,14 @@ "folosiți \"hg help\" pentru lista completă a comenzilor sau \"hg -v\" pentru " "detalii" -#, python-format -msgid "use \"hg -v help%s\" to show aliases and global options" +#, fuzzy, python-format +msgid "use \"hg help %s\" to show the full help text" +msgstr "" +"\n" +"folosiți \"hg -v help %s\" pentru afișarea ajutorului detaliat\n" + +#, fuzzy, python-format +msgid "use \"hg -v help%s\" to show builtin aliases and global options" msgstr "" "folosiți \"hg -v help%s\" pentru afișarea alias-urilor și a opțiunilor " "globale" @@ -7160,9 +8242,19 @@ msgid "options:\n" msgstr "opțiuni:\n" +#, fuzzy, python-format +msgid "use \"hg help -e %s\" to show help for the %s extension" +msgstr "folosiți \"hg -v help %s\" pentru afișarea opțiunilor globale" + msgid "no commands defined\n" msgstr "" +#, fuzzy, python-format +msgid "" +"\n" +"use \"hg help -c %s\" to see help for the %s command\n" +msgstr "folosiți \"hg help\" pentru lista completă a comenzilor" + msgid "no help text available" msgstr "" @@ -7181,7 +8273,7 @@ msgstr "Mercurial - gestionar distribuit pentru controlul codului sursă\n" msgid "basic commands:" -msgstr "" +msgstr "comenzi de bază:" msgid "enabled extensions:" msgstr "extensii activate:" @@ -7206,11 +8298,41 @@ "\n" "subiecte de ajutor suplimentare:" +msgid "identify the specified revision" +msgstr "identifică revizia specificată" + +msgid "show local revision number" +msgstr "afișează numărul de revizie local" + +msgid "show global revision id" +msgstr "afișează id-ul global al reviziei" + +msgid "show branch" +msgstr "afișează ramura" + +msgid "show tags" +msgstr "afișează etichetele" + +#, fuzzy +msgid "show bookmarks" +msgstr "se actualizează semnul de carte %s\n" + +#, fuzzy +msgid "[-nibtB] [-r REV] [SOURCE]" +msgstr "[-nibt] [-r REV] [SURSĂ]" + 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 "" + +msgid "" +" When REV is not given, print a summary of the current state of the\n" " repository." msgstr "" @@ -7219,12 +8341,36 @@ " cause lookup to operate on that repository/bundle." msgstr "" -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 "" +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 "" + +msgid "PATH" +msgstr "CALE" + +msgid "base path (DEPRECATED)" +msgstr "" + +msgid "skip check for outstanding uncommitted changes" +msgstr "omite verificarea pentru modificări nedepozitate în suspensie" + +msgid "don't commit, just update the working directory" +msgstr "nu depozita, doar actualizează directorul de lucru" + +msgid "apply patch to the nodes from which it was generated" +msgstr "aplică patch-ul nodurilor pentru care a fost generat" + +msgid "use any branch information in patch (implied by --exact)" +msgstr "" +"folosește orice informație despre ramură din patch\n" +"(implicat de --exact)" + +msgid "[OPTION]... PATCH..." +msgstr "[OPȚIUNE]... PATCH" msgid "import an ordered set of patches" msgstr "" @@ -7293,6 +8439,30 @@ msgid "no diffs found" msgstr "" +msgid "run even if remote repository is unrelated" +msgstr "execută chiar dacă depozitul la distanță este neînrudit" + +msgid "show newest record first" +msgstr "afișează începând cu cea mai nouă înregistrare" + +msgid "file to store the bundles into" +msgstr "" + +msgid "a remote changeset intended to be added" +msgstr "" +"un set de modificări la distanță care se intenționează a fi\n" +"adăugat" + +#, fuzzy +msgid "compare bookmarks" +msgstr "se actualizează semnul de carte %s\n" + +msgid "a specific branch you would like to pull" +msgstr "o ramură specifică pe care ați dori să o trimiteți" + +msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" +msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle NUMEFIȘIER] [SURSĂ]" + msgid "show new changesets found in source" msgstr "afișează seturile de modificări noi găsite în sursă" @@ -7317,6 +8487,15 @@ " Returnează 0 dacă există modificări de primit, 1 altfel.\n" " " +msgid "cannot combine --bundle and --subrepos" +msgstr "" + +msgid "remote doesn't support bookmarks\n" +msgstr "" + +msgid "[-e CMD] [--remotecmd CMD] [DEST]" +msgstr "[-e CMD] [--remotecmd CMD] [DEST]" + msgid "create a new repository in the given directory" msgstr "creează un nou depozit în directorul specificat" @@ -7338,6 +8517,18 @@ " Ca destinație se poate specifica un URL ``ssh://``.\n" " Vezi :hg:`help urls` pentru mai multe detalii." +msgid "search the repository as it is in REV" +msgstr "caută depozitul așa cum este el în REV" + +msgid "end filenames with NUL, for use with xargs" +msgstr "termină numele de fișiere cu NUL, pentru utilizare cu xargs" + +msgid "print complete paths from the filesystem root" +msgstr "afișează căi complete de la rădăcina sistemului de fișiere" + +msgid "[OPTION]... [PATTERN]..." +msgstr "[OPȚIUNE]... [TIPAR]..." + msgid "locate files matching specific patterns" msgstr "" @@ -7364,6 +8555,42 @@ " contain whitespace as multiple filenames." msgstr "" +msgid "only follow the first parent of merge changesets" +msgstr "urmărește doar primul părinte al seturilor de modificări de fuziune" + +msgid "show revisions matching date spec" +msgstr "afișează reviziile care se potrivesc cu data" + +msgid "show copied files" +msgstr "afișează fișierele copiate" + +msgid "do case-insensitive search for a given text" +msgstr "caută textul specificat fără a diferenția între minuscule și majuscule" + +msgid "include revisions where files were removed" +msgstr "include reviziile în care au fost eliminate fișiere" + +msgid "show only merges" +msgstr "afișează doar fuziunile" + +msgid "revisions committed by user" +msgstr "reviziile depozitate de utilizatorul" + +msgid "show only changesets within the given named branch (DEPRECATED)" +msgstr "" +"afișează doar seturile de modificări din interiorul ramurii denumite\n" +"specificate (ÎNVECHIT)" + +msgid "show changesets within the given named branch" +msgstr "" +"afișează seturile de modificări din cadrul ramurii denumite specificate" + +msgid "do not display revision or any of its ancestors" +msgstr "nu afișa revizia sau oricare din strămoșii ei" + +msgid "[OPTION]... [FILE]" +msgstr "[OPȚIUNE]... [FIȘIER]" + msgid "show revision history of entire repository or files" msgstr "" "afișează istoricul reviziilor pentru întregul depozit sau pentru unele " @@ -7389,8 +8616,9 @@ " strămoși sau descendenți ai reviziei de stat. --follow-first\n" " urmărește doar primul părinte al reviziilor fuzionate." -msgid "" -" If no revision range is specified, the default is tip:0 unless\n" +#, fuzzy +msgid "" +" If no revision range is specified, the default is ``tip:0`` unless\n" " --follow is set, in which case the working directory parent is\n" " used as the starting revision. You can specify a revision set for\n" " log, see :hg:`help revsets` for more information." @@ -7415,15 +8643,27 @@ " se afișează lista fișierelor modificate și mesajul de depozitare complet." msgid "" -" NOTE: log -p/--patch may generate unexpected diff output for merge\n" -" changesets, as it will only compare the merge changeset against\n" -" its first parent. Also, only files different from BOTH parents\n" -" will appear in files:." -msgstr "" -" NOTĂ: log -p/--patch poate genera afișaj diff neașteptat pentru seturi\n" -" de modificări de fuziune, deoarece va compara setul de modificări de\n" -" fuziune doar cu primul părinte. De asemenea, doar fișierele diferite\n" -" față de AMBII părinți vor apărea în lista de fișiere." +" .. note::\n" +" log -p/--patch may generate unexpected diff output for merge\n" +" changesets, as it will only compare the merge changeset against\n" +" its first parent. Also, only files different from BOTH parents\n" +" will appear in files:." +msgstr "" +" Notă:\n" +" `log -p/--patch` poate genera afișaj diff neașteptat pentru seturi\n" +" de modificări de fuziune, deoarece va compara setul de modificări de\n" +" fuziune doar cu primul părinte. De asemenea, doar fișierele diferite\n" +" față de AMBII părinți vor apărea în lista de fișiere." + +msgid "revision to display" +msgstr "revizia de afișat" + +#, fuzzy +msgid "list files from all revisions" +msgstr "afișează fișierele modificate ale unei revizii" + +msgid "[-r REV]" +msgstr "[-r REV]" msgid "output the current or given revision of the project manifest" msgstr "" @@ -7439,6 +8679,28 @@ " With --debug, print file revision hashes." msgstr "" +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 "" + +msgid "force a merge with outstanding changes" +msgstr "forțează o fuziune cu modificări în suspensie" + +msgid "revision to merge" +msgstr "revizia de fuzionat" + +msgid "review revisions to merge (no merge is performed)" +msgstr "" +"treci în revistă reviziile de fuzionat (nu se execută\n" +"nicio fuziune)" + +msgid "[-P] [-f] [[-r] REV]" +msgstr "[-P] [-f] [[-r] REV]" + msgid "merge working directory with another revision" msgstr "fuzionează directorul de lucru cu o altă revizie" @@ -7461,6 +8723,17 @@ " altă actualizare a depozitului. Următoarea depozitare va avea\n" " doi părinți." +#, fuzzy +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. See :hg:`help merge-tools` for options." +msgstr "" +" ``--tool`` poate fi folosit pentru a specifica instrumentul\n" +" pentru fuziune folosit la fuziunile de fișiere. Acesta\n" +" prevalează asupra variabilei de mediu HGMERGE și a fișierelor\n" +" dvs. de configurare." + msgid "" " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" @@ -7473,6 +8746,11 @@ " capăt. Altfel, o revizie explicită cu care să aibă loc fuziunea\n" " trebuie specificată." +msgid " :hg:`resolve` must be used to resolve unresolved files." +msgstr "" +" :hg:`resolve` trebuie folosit pentru a rezolva fișierele\n" +" nerezolvate." + 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" @@ -7490,15 +8768,17 @@ " " #, python-format -msgid "" -"branch '%s' has %d heads - please merge with an explicit rev\n" -"(run 'hg heads .' to see heads)" -msgstr "" - -#, python-format -msgid "" -"branch '%s' has one head - please merge with an explicit rev\n" -"(run 'hg heads' to see all heads)" +msgid "branch '%s' has %d heads - please merge with an explicit rev" +msgstr "" + +msgid "run 'hg heads .' to see heads" +msgstr "" + +#, python-format +msgid "branch '%s' has one head - please merge with an explicit rev" +msgstr "" + +msgid "run 'hg heads' to see all heads" msgstr "" msgid "there is nothing to merge" @@ -7508,10 +8788,21 @@ msgid "%s - use \"hg update\" instead" msgstr "" -msgid "" -"working dir not at a head rev - use \"hg update\" or merge with an explicit " -"rev" -msgstr "" +#, fuzzy +msgid "working directory not at a head revision" +msgstr "fuzionează directorul de lucru cu o altă revizie" + +msgid "use 'hg update' or merge with an explicit revision" +msgstr "" + +msgid "a changeset intended to be included in the destination" +msgstr "un set de modificări care se dorește a fi inclus în destinație" + +msgid "a specific branch you would like to push" +msgstr "o ramură specifică pe care ați dori să o preluați" + +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 "afișează seturile de modificări negăsite în destinație" @@ -7532,6 +8823,12 @@ " Returnează 0 dacă există modificări de trimis, 1 altfel.\n" " " +msgid "show parents of the specified revision" +msgstr "afișează părinții reviziei specificate" + +msgid "[-r REV] [FILE]" +msgstr "[-r REV] [FIȘIER]" + msgid "show the parents of the working directory or revision" msgstr "afișează părinții directorului de lucru sau al reviziei" @@ -7550,6 +8847,9 @@ msgid "'%s' not found in manifest!" msgstr "'%s' nu a fost găsit în manifest!" +msgid "[NAME]" +msgstr "[NUME]" + msgid "show aliases for remote repositories" msgstr "afișează alias-urile pentru depozitele la distanță" @@ -7559,8 +8859,13 @@ msgstr "" msgid "" -" Path names are defined in the [paths] section of\n" -" ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n" +" Option -q/--quiet suppresses all output when searching for NAME\n" +" and shows only the path names when listing all definitions." +msgstr "" + +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." msgstr "" @@ -7583,20 +8888,45 @@ msgid "not found!\n" msgstr "" -msgid "not updating, since new heads added\n" -msgstr "nu se actualizează deoarece au fost adăugate noi capete\n" +#, fuzzy, python-format +msgid "not updating: %s\n" +msgstr "se actualizează etichetele\n" msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" msgstr "" +msgid "(run 'hg heads .' to see heads, 'hg merge' to merge)\n" +msgstr "" + +msgid "(run 'hg heads' to see heads)\n" +msgstr "" + msgid "(run 'hg update' to get a working copy)\n" msgstr "" +msgid "update to new branch head if changesets were pulled" +msgstr "" +"actualizează la noul capăt de ramură, dacă au fost preluate\n" +"seturi de modificări" + +msgid "run even when remote repository is unrelated" +msgstr "execută chiar când depozitul la distanță este neînrudit" + +msgid "BOOKMARK" +msgstr "" + +#, fuzzy +msgid "bookmark to pull" +msgstr "semnul de carte de importat" + +msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" +msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SURSĂ]" + msgid "pull changes from the specified source" -msgstr "" +msgstr "preia modificări de la sursa specificată" msgid " Pull changes from a remote repository to a local one." -msgstr "" +msgstr " Preia modificări dintr-un depozit la distanță într-unul local." msgid "" " This finds all changes from the repository at the specified path\n" @@ -7604,6 +8934,10 @@ " -R is specified). By default, this does not update the copy of the\n" " project in the working directory." msgstr "" +" Găsește toate modificările din depozit la calea sau URL-ul\n" +" specificat și le adaugă la un depozit local (cel curent, dacă nu\n" +" se specifică -R). Implicit, copia proiectului din directorul\n" +" curent nu este actualizată." msgid "" " Use :hg:`incoming` if you want to see what would have been added\n" @@ -7611,11 +8945,18 @@ " to add those changes to the repository, you should use :hg:`pull\n" " -r X` where ``X`` is the last changeset listed by :hg:`incoming`." msgstr "" +" Folosiți :hg:`incoming` dacă doriți să vedeți ce ar fi adăugat un\n" +" `pull` la momentul la care ați emis această comandă. Dacă după\n" +" aceasta decideți să adăugați aceste modificări în depozit,\n" +" folosiți :hg:`pull -r X`, unde ``X`` este ultimul set de\n" +" modificări afișat de :hg:`incoming`." msgid "" " If SOURCE is omitted, the 'default' path will be used.\n" " See :hg:`help urls` for more information." msgstr "" +" Dacă SURSĂ este omis, va fi folosită calea 'implicită'.\n" +" Pentru mai multe informații, vezi :hg:`help urls`." msgid "" " Returns 0 on success, 1 if an update had unresolved files.\n" @@ -7625,18 +8966,48 @@ " fișiere nerezolvate.\n" " " +#, python-format +msgid "remote bookmark %s not found!" +msgstr "" + +msgid "" +"other repository doesn't support revision lookup, so a rev cannot be " +"specified." +msgstr "" + +#, python-format +msgid "importing bookmark %s\n" +msgstr "" + +msgid "force push" +msgstr "forțează `push`" + +#, fuzzy +msgid "bookmark to push" +msgstr "semnul de carte de importat" + +msgid "allow pushing a new branch" +msgstr "permite trimiterea unei ramuri noi" + +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 "" +msgstr "trimite modificări către destinația specificată" msgid "" " Push changesets from the local repository to the specified\n" " destination." msgstr "" +" Trimite seturi de modificări din depozitul local către\n" +" destinația specificată." msgid "" " This operation is symmetrical to pull: it is identical to a pull\n" " in the destination repository from the current one." msgstr "" +" Această operație este simetrică cu `pull`: este identică cu un\n" +" `pull` din directorul curent, aplicat în directorul destinație." msgid "" " By default, push will not allow creation of new heads at the\n" @@ -7644,40 +9015,72 @@ " to use. In this situation, it is recommended to pull and merge\n" " before pushing." msgstr "" +" Implicit, `push` nu va permite crearea de capete noi la\n" +" destinație, deoarece capetele multiple ar crea neclarități\n" +" privind capătul care trebuie folosit. În această situație\n" +" este recomandat să executați `pull` și `merge` înainte de\n" +" `push`." msgid "" " Use --new-branch if you want to allow push to create a new named\n" " branch that is not present at the destination. This allows you to\n" " only create a new branch without forcing other changes." msgstr "" +" Folosiți --new-branch dacă doriți să permiteți lui `push` să\n" +" creeze o nouă ramură cu nume care nu este prezentă la\n" +" destinație. Aceasta vă permite să creați doar o ramură nouă,\n" +" fără a forța alte modificări." msgid "" " Use -f/--force to override the default behavior and push all\n" " changesets on all branches." msgstr "" +" Folosiți -f/--force pentru a înlocui comportamentul implicit\n" +" și a trimite toate modificările din toate ramurile." msgid "" " If -r/--rev is used, the specified revision and all its ancestors\n" " will be pushed to the remote repository." msgstr "" +" Dacă se folosește -r/--rev, revizia specificată și toți\n" +" strămoșii ei vor fi trimiși către depozitul la distanță." msgid "" " Please see :hg:`help urls` for important details about ``ssh://``\n" " URLs. If DESTINATION is omitted, a default path will be used." msgstr "" +" Vezi :hg:`help urls` pentru detalii importante despre URL-urile\n" +" ``ssh://``. Dacă DESTINAȚIA este omisă, se va folosi o cale\n" +" implicită." msgid "" " Returns 0 if push was successful, 1 if nothing to push.\n" " " msgstr "" -" Returnează 0 dacă 'push' s-a încheiat cu succes, 1 dacă nu există\n" -" nimic pentru 'push'.\n" +" Returnează 0 dacă trimiterea s-a încheiat cu succes, 1 dacă nu există\n" +" nimic de trimis.\n" " " #, python-format msgid "pushing to %s\n" msgstr "" +#, python-format +msgid "exporting bookmark %s\n" +msgstr "" + +#, python-format +msgid "deleting remote bookmark %s\n" +msgstr "" + +#, python-format +msgid "bookmark %s does not exist on the local or remote repository!\n" +msgstr "" + +#, python-format +msgid "updating bookmark %s failed!\n" +msgstr "actualizarea semnului de carte %s a eșuat!\n" + msgid "roll back an interrupted transaction" msgstr "" @@ -7698,6 +9101,12 @@ " sau verificarea eșuează.\n" " " +msgid "record delete for missing files" +msgstr "înregistrează ștergere pentru fișierele lipsă" + +msgid "remove (and delete) file even if added or modified" +msgstr "înlătură (și șterge) fișierul chiar dacă este adăugat sau modificat" + msgid "remove the specified files on the next commit" msgstr "înlătură fișierele specificate la următoarea depozitare" @@ -7745,6 +9154,11 @@ " -Af Î Î Î Î" 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 "" @@ -7764,17 +9178,23 @@ msgstr "" #, python-format -msgid "not removing %s: file %s (use -f to force removal)\n" -msgstr "" - -msgid "still exists" -msgstr "" - -msgid "is modified" -msgstr "" - -msgid "has been marked for add" -msgstr "" +msgid "not removing %s: file still exists (use -f to force removal)\n" +msgstr "" + +#, python-format +msgid "not removing %s: file is modified (use -f to force removal)\n" +msgstr "" + +#, python-format +msgid "" +"not removing %s: file has been marked for add (use -f to force removal)\n" +msgstr "" + +msgid "record a rename that has already occurred" +msgstr "înregistrează o redenumire care a avut deja loc" + +msgid "[OPTION]... SOURCE... DEST" +msgstr "[OPȚIUNE]... SURSĂ... DEST" msgid "rename files; equivalent of copy + remove" msgstr "" @@ -7790,26 +9210,44 @@ " before that, see :hg:`revert`." msgstr "" +msgid "select all unresolved files" +msgstr "selectează toate fișierele nerezolvate" + +msgid "list state of files needing merge" +msgstr "afișează starea fișierelor care au nevoie de fuziune" + +msgid "mark files as resolved" +msgstr "marchează fișierul drept rezolvat" + +msgid "mark files as unresolved" +msgstr "marchează fișierul drept rezolvat" + +msgid "hide status prefix" +msgstr "ascunde prefixul stării" + msgid "redo merges or set/view the merge status of files" msgstr "" msgid "" " Merges with unresolved conflicts are often the result of\n" -" non-interactive merging using the ``internal:merge`` hgrc setting,\n" -" or a command-line merge tool like ``diff3``. The resolve command\n" -" is used to manage the files involved in a merge, after :hg:`merge`\n" -" has been run, and before :hg:`commit` is run (i.e. the working\n" -" directory must have two parents)." +" non-interactive merging using the ``internal:merge`` configuration\n" +" setting, or a command-line merge tool like ``diff3``. The resolve\n" +" command is used to manage the files involved in a merge, after\n" +" :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n" +" working directory must have two parents)." msgstr "" msgid " The resolve command can be used in the following ways:" msgstr "" msgid "" -" - :hg:`resolve FILE...`: attempt to re-merge the specified files,\n" -" discarding any previous merge attempts. Re-merging is not\n" +" - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the " +"specified\n" +" files, discarding any previous merge attempts. Re-merging is not\n" " performed for files already marked as resolved. Use ``--all/-a``\n" -" to selects all unresolved files." +" to selects all unresolved files. ``--tool`` can be used to specify\n" +" the merge tool used for the given files. It overrides the HGMERGE\n" +" environment variable and your configuration files." msgstr "" msgid "" @@ -7851,17 +9289,32 @@ msgid "no files or directories specified; use --all to remerge all files" msgstr "" +msgid "revert all changes when no arguments given" +msgstr "" + +msgid "tipmost revision matching date" +msgstr "revizia cea mai apropiată de vârf care se potrivește cu data" + +msgid "revert to the specified revision" +msgstr "" + +msgid "do not save backup copies of files" +msgstr "nu salva copii de siguranță ale fișierelor" + +msgid "[OPTION]... [-r REV] [NAME]..." +msgstr "[OPȚIUNE]... [-r REV] [NUME]..." + msgid "restore individual files or directories to an earlier state" msgstr "" msgid "" -" NOTE: This command is most likely not what you are looking for. revert\n" -" will partially overwrite content in the working directory without " -"changing\n" -" the working directory parents. Use :hg:`update -r rev` to check out " -"earlier\n" -" revisions, or :hg:`update --clean .` to undo a merge which has added\n" -" another parent." +" .. 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 "" msgid "" @@ -7889,8 +9342,9 @@ msgstr "" msgid "" -" If a file has been deleted, it is restored. If the executable mode\n" -" of a file was changed, it is reset." +" 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 "" msgid "" @@ -7906,6 +9360,9 @@ msgid "you can't specify a revision and a date" msgstr "" +msgid "uncommitted merge - use \"hg update\", see \"hg help revert\"" +msgstr "" + msgid "no files or directories specified; use --all to revert the whole repo" msgstr "" @@ -7979,12 +9436,58 @@ msgid " Print the root directory of the current repository." msgstr "" +msgid "name of access log file to write to" +msgstr "numele fișierului jurnal de acces în care să se scrie" + +msgid "name of error log file to write to" +msgstr "numele fișierului jurnal de eroare în care să se scrie" + +msgid "PORT" +msgstr "PORT" + +msgid "port to listen on (default: 8000)" +msgstr "portul pe care se va asculta (implicit: 8000)" + +msgid "address to listen on (default: all interfaces)" +msgstr "" + +msgid "ADDR" +msgstr "ADRESĂ" + +msgid "prefix path to serve from (default: server root)" +msgstr "" + +msgid "name to show in web pages (default: working directory)" +msgstr "" +"numele care va fi afișat în paginile web (implicit: directorul de lucru)" + +msgid "name of the hgweb config file (see \"hg help hgweb\")" +msgstr "" + +msgid "name of the hgweb config file (DEPRECATED)" +msgstr "" + +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 "" + +msgid "SSL certificate file" +msgstr "" + msgid "start stand-alone webserver" -msgstr "" +msgstr "pornește serverul web autonom" msgid "" " Start a local HTTP repository browser and pull server. You can use\n" -" this for ad-hoc sharing and browing of repositories. It is\n" +" this for ad-hoc sharing and browsing of repositories. It is\n" " recommended to use a real web server to serve a repository for\n" " longer periods of time." msgstr "" @@ -8009,10 +9512,80 @@ " number it uses." msgstr "" +msgid "There is no Mercurial repository here (.hg not found)" +msgstr "" + #, python-format msgid "listening at http://%s%s/%s (bound to %s:%d)\n" msgstr "" +msgid "show untrusted configuration options" +msgstr "afișează opțiunile de configurare 'untrusted'" + +msgid "[-u] [NAME]..." +msgstr "" + +msgid "show combined config settings from all hgrc files" +msgstr "afișează setările de configurare combinate din toate fișierele hgrc" + +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 "" + +msgid "" +" With multiple arguments, print names and values of all config\n" +" items with matching section names." +msgstr "" + +msgid "" +" With --debug, the source (filename and line number) is printed\n" +" for each config item." +msgstr "" + +#, python-format +msgid "read config from: %s\n" +msgstr "" + +msgid "only one config item permitted" +msgstr "" + +msgid "show status of all files" +msgstr "afișează starea tuturor fișierelor" + +msgid "show only modified files" +msgstr "afișează doar fișierele modificate" + +msgid "show only added files" +msgstr "afișează doar fișierele adăugate" + +msgid "show only removed files" +msgstr "afișează doar fișierele înlăturate" + +msgid "show only deleted (but tracked) files" +msgstr "afișează doar fișierele șterse (dar urmărite)" + +msgid "show only files without changes" +msgstr "afișează doar fișierele fără modificări" + +msgid "show only unknown (not tracked) files" +msgstr "afișează doar fișierele necunoscute (neurmărite)" + +msgid "show only ignored files" +msgstr "afișează doar fișierele ignorate" + +msgid "show source of copied files" +msgstr "afișează sursa fișierelor copiate" + +msgid "show difference from revision" +msgstr "afișează diferențele față de revizie" + +msgid "list the changed files of a revision" +msgstr "afișează fișierele modificate ale unei revizii" + msgid "show changed files in the working directory" msgstr "afișează fișierele modificate în directorul de lucru" @@ -8024,18 +9597,35 @@ " Unless options described with \"show only ...\" are given, the\n" " options -mardu are used." msgstr "" +" Afișează starea fișierelor din depozit. Dacă sunt furnizate nume,\n" +" se arată doar fișierele care se potrivesc. Fișierele curate, ignorate\n" +" sau care nu sunt sursa unei operații de copiere/mutare nu sunt afișate,\n" +" cu excepția cazului când se furnizează `-c/--clean`, `-i/--ignored`,\n" +" `-C/--copies` sau `-A/--all`. Dacă nu se furnizează opțiunile a căror\n" +" descriere începe cu ``afișează doar...``, vor fi folosite opțiunile\n" +" -mardu." msgid "" " Option -q/--quiet hides untracked (unknown and ignored) files\n" " unless explicitly requested with -u/--unknown or -i/--ignored." msgstr "" - -msgid "" -" NOTE: status may appear to disagree with diff if permissions have\n" -" changed or a merge has occurred. The standard diff format does not\n" -" report permission changes and diff only reports changes relative\n" -" to one merge parent." -msgstr "" +" Opțiunea `-q/--quiet` ascunde fișierele neurmărite (necunoscute\n" +" sau ignorate), cu excepția cazului când se solicită explicit\n" +" afișarea lor cu `-u/--unknown` sau `-i/--ignored`." + +msgid "" +" .. note::\n" +" status may appear to disagree with diff if permissions have\n" +" changed or a merge has occurred. The standard diff format does\n" +" not report permission changes and diff only reports changes\n" +" relative to one merge parent." +msgstr "" +" Notă:\n" +" `status` poate apărea în dezacord cu `diff` dacă s-au\n" +" modificat permisiuni sau a avut loc o fuziune. Formatul\n" +" diff standard nu raportează modificările permisiunilor,\n" +" iar `diff` raportează modificările doar relativ la un\n" +" părinte din fuziune." msgid "" " If one revision is given, it is used as the base revision.\n" @@ -8043,6 +9633,12 @@ " shown. The --change option can also be used as a shortcut to list\n" " the changed files of a revision from its first parent." msgstr "" +" Dacă se furnizează o revizie, va fi folosită ca revizie\n" +" de bază. Dacă se furnizează două revizii, se arată\n" +" diferențele dintre ele. Opțiunea `--change` poate fi\n" +" de asemenea folosită drept scurtătură pentru a afișa\n" +" fișierele modificate de către o revizie în raport cu\n" +" primul ei părinte." msgid " The codes used to show the status of files are::" msgstr " Codurile folosite pentru a arăta starea fișierelor sunt::" @@ -8066,18 +9662,25 @@ " I = ignorat\n" " = originea fișierului precedent listat ca A (adăugat)" +msgid "check for push and pull" +msgstr "Verifică pentru `push` și `pull`" + msgid "summarize working directory state" -msgstr "" +msgstr "sumarizează starea directorului de lucru" msgid "" " This generates a brief summary of the working directory state,\n" " including parents, branch, commit status, and available updates." msgstr "" +" Generează un sumar al stării directorului curent, incluzând\n" +" părinții, ramura, starea depozitării și actualizările disponibile." msgid "" " With the --remote option, this will check the default paths for\n" " incoming and outgoing changes. This can be time-consuming." msgstr "" +" Cu opțiunea --remote, vor fi verificate căile implicite pentru\n" +" modificări de primit și de trimis. Acțiunea poate consuma timp." #, python-format msgid "parent: %d:%s " @@ -8086,7 +9689,6 @@ msgid " (empty repository)" msgstr " (depozit vid)" -#, fuzzy msgid " (no revision checked out)" msgstr " (nu există nicio revizie extrasă)" @@ -8172,6 +9774,14 @@ msgid "%d outgoing" msgstr "%d de trimis" +#, fuzzy, python-format +msgid "%d incoming bookmarks" +msgstr "se actualizează semnul de carte %s\n" + +#, fuzzy, python-format +msgid "%d outgoing bookmarks" +msgstr "se actualizează semnul de carte %s\n" + #, python-format msgid "remote: %s\n" msgstr "la distanță: %s\n" @@ -8179,6 +9789,25 @@ msgid "remote: (synced)\n" msgstr "la distanță: (sincronizat)\n" +#, fuzzy +msgid "force tag" +msgstr "forțează `push`" + +msgid "make the tag local" +msgstr "fă eticheta locală" + +msgid "revision to tag" +msgstr "" + +msgid "remove a tag" +msgstr "înlătură o etichetă" + +msgid "use <text> as commit message" +msgstr "folosește <text> drept mesaj de depozitare" + +msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." +msgstr "[-f] [-l] [-m TEXT] [-d DATĂ] [-u UTILIZATOR] [-r REV] NUME..." + msgid "add one or more tags for the current or given revision" msgstr "" "adaugă una sau mai multe etichete pentru revizia curentă\n" @@ -8190,7 +9819,8 @@ msgid "" " Tags are used to name particular revisions of the repository and are\n" " very useful to compare different revisions, to go back to significant\n" -" earlier versions or to mark branch points as releases, etc." +" earlier versions or to mark branch points as releases, etc. Changing\n" +" an existing tag is normally disallowed; use -f/--force to override." msgstr "" msgid "" @@ -8200,10 +9830,18 @@ msgid "" " To facilitate version control, distribution, and merging of tags,\n" -" they are stored as a file named \".hgtags\" which is managed\n" -" similarly to other project files and can be hand-edited if\n" -" necessary. The file '.hg/localtags' is used for local tags (not\n" -" shared among repositories)." +" they are stored as a file named \".hgtags\" which is managed similarly\n" +" to other project files and can be hand-edited if necessary. This\n" +" also means that tagging creates a new commit. The file\n" +" \".hg/localtags\" is used for local tags (not shared among\n" +" repositories)." +msgstr "" + +msgid "" +" Tag commits are usually made at the head of a branch. If the parent\n" +" of the working directory is not a branch head, :hg:`tag` aborts; use\n" +" -f/--force to force the tag commit to be based on a non-head\n" +" changeset." msgstr "" msgid "" @@ -8236,6 +9874,13 @@ msgid "tag '%s' already exists (use -f to force)" msgstr "" +#, fuzzy +msgid "uncommitted merge" +msgstr "fuziune nedepozitată în suspensie" + +msgid "not at a branch head (use -f to force)" +msgstr "" + msgid "list repository tags" msgstr "" @@ -8244,6 +9889,9 @@ " switch is used, a third column \"local\" is printed for local tags." msgstr "" +msgid "[-p] [-g]" +msgstr "[-p] [-g]" + msgid "show the tip revision" msgstr "afișează revizia vârf" @@ -8260,6 +9908,14 @@ " and cannot be renamed or assigned to a different changeset." msgstr "" +msgid "update to new branch head if changesets were unbundled" +msgstr "" +"actualizează la noul capăt de ramură, dacă au fost despachetate\n" +"(unbundled) seturi de modificări" + +msgid "[-u] FILE..." +msgstr "[-u] FIȘIER..." + msgid "apply one or more changegroup files" msgstr "" @@ -8276,33 +9932,47 @@ " fișiere nerezolvate.\n" " " +msgid "discard uncommitted changes (no backup)" +msgstr "înlătură modificările nedepozitate (fără copie de siguranță)" + +msgid "update across branches if no uncommitted changes" +msgstr "actualizează peste ramuri dacă nu există modificări nedepozitate" + +msgid "[-c] [-C] [-d DATE] [[-r] REV]" +msgstr "[-c] [-C] [-d DATĂ] [[-r] REV]" + msgid "update working directory (or switch revisions)" msgstr "actualizează directorul de lucru (sau comută între revizii)" msgid "" " Update the repository's working directory to the specified\n" -" changeset." +" changeset. If no changeset is specified, update to the tip of the\n" +" current named branch." msgstr "" " Actualizează directorul de lucru al depozitului la setul de\n" +" modificări specificat. Dacă nu se specifică niciun set de\n" +" modificări, actualizarea are loc la vârful ramurii cu nume\n" +" curente." + +msgid "" +" If the changeset is not a descendant of the working directory's\n" +" parent, the update is aborted. With the -c/--check option, the\n" +" working directory is checked for uncommitted changes; if none are\n" +" found, the working directory is updated to the specified\n" +" changeset." +msgstr "" +" Dacă setul de modificări nu e un descendent al părintelui directorului\n" +" de lucru, actualizarea este abandonată. Cu opțiunea `-c/--check`,\n" +" se verifică în directorul de lucru modificări nedepozitate; dacă nu se\n" +" găsește niciuna, directorul de lucru este actualizat la setul de\n" " modificări specificat." msgid "" -" If no changeset is specified, attempt to update to the tip of the\n" -" current branch. If this changeset is a descendant of the working\n" -" directory's parent, update to it, otherwise abort." -msgstr "" -" Dacă nu se specifică nici un set de modificări, se încearcă " -"actualizarea\n" -" la vârful ramurii curente. Dacă acest set de modificări este descendent\n" -" al părintelui directorului de lucru, se actualizează la el, altfel se " -"renunță." - -msgid "" " The following rules apply when the working directory contains\n" " uncommitted changes:" msgstr "" -" Când directorul de lucru conține modificări nedepozitate, se\n" -" aplică următoarele reguli:" +" Când directorul de lucru conține modificări nedepozitate, se\n" +" aplică următoarele reguli:" msgid "" " 1. If neither -c/--check nor -C/--clean is specified, and if\n" @@ -8345,8 +10015,8 @@ " lucru (similar cu :hg:`clone -U`)." msgid "" -" If you want to update just one file to an older changeset, use :hg:" -"`revert`." +" If you want to update just one file to an older changeset, use\n" +" :hg:`revert`." msgstr "" " Dacă doriți să actualizați doar un singur fișier la un set de\n" " modificări mai vechi, folosiți :hg:`revert`." @@ -8379,9 +10049,12 @@ "Mercurial - gestionar distribuit pentru controlul codului sursă\n" "(versiunea %s)\n" -msgid "" -"\n" -"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n" +msgid "(see http://mercurial.selenic.com for more information)" +msgstr "" + +#, fuzzy +msgid "" +"Copyright (C) 2005-2011 Matt Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" @@ -8391,783 +10064,6 @@ "Nu există NICIO garanție; nici măcar pentru COMERCIALIZARE sau\n" "COMPATIBILITATE ÎN ANUMITE SCOPURI.\n" -msgid "repository root directory or name of overlay bundle file" -msgstr "" - -msgid "DIR" -msgstr "DIR" - -msgid "change working directory" -msgstr "schimbă directorul de lucru " - -msgid "do not prompt, assume 'yes' for any required answers" -msgstr "nu întreba, presupune 'da' pentru orice răspuns solicitat" - -msgid "suppress output" -msgstr "suprimă afișarea" - -msgid "enable additional output" -msgstr "activează afișarea informațiilor suplimentare" - -msgid "set/override config option (use 'section.name=value')" -msgstr "" -"setează/suprascrie opțiunea de configurare (folosiți 'secțiune.nume=valoare')" - -msgid "CONFIG" -msgstr "" - -msgid "enable debugging output" -msgstr "activează afișarea informațiilor pentru depanare" - -msgid "start debugger" -msgstr "pornește depanatorul (debugger)" - -msgid "set the charset encoding" -msgstr "setează codificarea pentru setul de caractere" - -msgid "ENCODE" -msgstr "" - -msgid "MODE" -msgstr "" - -msgid "set the charset encoding mode" -msgstr "setează modul de codificare pentru setul de caractere" - -msgid "always print a traceback on exception" -msgstr "" - -msgid "time how long the command takes" -msgstr "durata de execuție a comenzii" - -msgid "print command execution profile" -msgstr "afișează profilul executării comenzii" - -msgid "output version information and exit" -msgstr "afișează informații despre versiune și ieși" - -msgid "display help and exit" -msgstr "afișează ajutorul și ieși" - -msgid "do not perform actions, just print output" -msgstr "acțiunea nu se execută, doar se afișează mesajele" - -msgid "specify ssh command to use" -msgstr "specifică comanda ssh care va fi folosită" - -msgid "specify hg command to run on the remote side" -msgstr "specifică comanda hg care va fi executată pe mașina la distanță" - -msgid "PATTERN" -msgstr "TIPAR" - -msgid "include names matching the given patterns" -msgstr "include numele care se potrivesc cu tiparele specificate" - -msgid "exclude names matching the given patterns" -msgstr "exclude numele care se potrivesc cu tiparele specificate" - -msgid "use text as commit message" -msgstr "folosește textul drept mesaj de depozitare" - -msgid "read commit message from file" -msgstr "citește mesajul pentru depozitare din fișier" - -msgid "record datecode as commit date" -msgstr "înregistrează codul de dată ca dată a depozitării" - -msgid "record the specified user as committer" -msgstr "" -"înregistrează utilizatorul specificat ca fiind cel care a făcut depozitarea" - -msgid "STYLE" -msgstr "STIL" - -msgid "display using template map file" -msgstr "afișează folosind fișierul cu harta de șabloane" - -msgid "display with template" -msgstr "afișează cu șablon" - -msgid "do not show merges" -msgstr "nu afișa fuziunile" - -msgid "output diffstat-style summary of changes" -msgstr "" - -msgid "treat all files as text" -msgstr "tratează toate fișierele ca text" - -msgid "omit dates from diff headers" -msgstr "omite datele din antetele diff" - -msgid "show which function each change is in" -msgstr "afișează funcția în care se află fiecare modificare" - -msgid "produce a diff that undoes the changes" -msgstr "" - -msgid "ignore white space when comparing lines" -msgstr "ignoră spațiul alb la compararea liniilor" - -msgid "ignore changes in the amount of white space" -msgstr "ignoră modificările cantității de spațiu alb" - -msgid "ignore changes whose lines are all blank" -msgstr "ignoră modificările ale căror linii sunt toate vide" - -msgid "number of lines of context to show" -msgstr "numărul liniilor de context care vor fi afișate" - -msgid "SIMILARITY" -msgstr "ASEMĂNARE" - -msgid "guess renamed files by similarity (0<=s<=100)" -msgstr "ghicește fișierele redenumite după asemănare (0<=s<=100)" - -msgid "[OPTION]... [FILE]..." -msgstr "[OPȚIUNE]... [FIȘIER]..." - -msgid "annotate the specified revision" -msgstr "adnotează revizia specificată" - -msgid "follow copies/renames and list the filename (DEPRECATED)" -msgstr "" -"urmărește copierile/redenumirile și afișează numele\n" -"fișierului (ÎNVECHIT)" - -msgid "don't follow copies and renames" -msgstr "nu urmări copierile și redenumirile" - -msgid "list the author (long with -v)" -msgstr "afișează autorul (lung cu -v)" - -msgid "list the filename" -msgstr "afișează numele fișierului" - -msgid "list the date (short with -q)" -msgstr "afișează data (scurt cu -q)" - -msgid "list the revision number (default)" -msgstr "afișează numele reviziei (implicit)" - -msgid "list the changeset" -msgstr "afișează setul de modificări" - -msgid "show line number at the first appearance" -msgstr "afișează numărul liniei la prima apariție" - -msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." -msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FIȘIER..." - -msgid "do not pass files through decoders" -msgstr "" - -msgid "PREFIX" -msgstr "PREFIX" - -msgid "directory prefix for files in archive" -msgstr "" - -msgid "revision to distribute" -msgstr "" - -msgid "type of distribution to create" -msgstr "" - -msgid "[OPTION]... DEST" -msgstr "[OPȚIUNE]... DEST" - -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 "[OPȚIUNE]... [-r] REV" - -msgid "reset bisect state" -msgstr "" - -msgid "mark changeset good" -msgstr "marchează setul de modificări drept bun" - -msgid "mark changeset bad" -msgstr "marchează setul de modificări drept rău" - -msgid "skip testing changeset" -msgstr "omite testarea setului de modificări" - -msgid "use command to check changeset state" -msgstr "" - -msgid "do not update to target" -msgstr "nu actualiza la destinație" - -msgid "[-gbsr] [-U] [-c CMD] [REV]" -msgstr "[-gbsr] [-U] [-c CMD] [REV]" - -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 "afișează doar ramurile care au capete nefuzionate" - -msgid "show normal and closed branches" -msgstr "afișează ramurile normale și închise" - -msgid "[-ac]" -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 "" - -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 "[OPȚIUNE]... FIȘIER" - -msgid "the clone will include an empty working copy (only a repository)" -msgstr "clona va include o copie de lucru vidă (doar un depozit)" - -msgid "revision, tag or branch to check out" -msgstr "revizia, eticheta sau ramura care va fi actualizată" - -msgid "include the specified changeset" -msgstr "include setul de modificări specificat" - -msgid "clone only the specified branch" -msgstr "clonează doar ramura specificată" - -msgid "[OPTION]... SOURCE [DEST]" -msgstr "[OPȚIUNE]... SURSĂ [DEST]" - -msgid "mark new/missing files as added/removed before committing" -msgstr "" -"marchează fișierele noi/lipsă ca adăugate/eliminate înainte de depozitare" - -msgid "mark a branch as closed, hiding it from the branch list" -msgstr "marchează o ramură ca închisă, ascunzând-o din lista ramurilor" - -msgid "record a copy that has already occurred" -msgstr "" - -msgid "forcibly copy over an existing managed file" -msgstr "" - -msgid "[OPTION]... [SOURCE]... DEST" -msgstr "[OPȚIUNE]... [SURSĂ]... DEST" - -msgid "[INDEX] REV1 REV2" -msgstr "" - -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 "[OPȚIUNE]... TEXT" - -msgid "[COMMAND]" -msgstr "" - -msgid "show the command options" -msgstr "afișează opțiunile comenzii" - -msgid "[-o] CMD" -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 "[OPȚIUNE]... [FIȘIER [REV]...]" - -msgid "try extended date formats" -msgstr "" - -msgid "[-e] DATE [RANGE]" -msgstr "" - -msgid "FILE REV" -msgstr "" - -msgid "[PATH]" -msgstr "" - -msgid "REPO NAMESPACE [KEY OLD NEW]" -msgstr "" - -msgid "revision to rebuild to" -msgstr "" - -msgid "[-r REV] [REV]" -msgstr "" - -msgid "revision to debug" -msgstr "" - -msgid "[-r REV] FILE" -msgstr "" - -msgid "REV1 [REV2]" -msgstr "" - -msgid "do not display the saved mtime" -msgstr "" - -msgid "[OPTION]..." -msgstr "[OPȚIUNE]..." - -msgid "revision to check" -msgstr "" - -msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..." -msgstr "[OPȚIUNE]... ([-c REV] | [-r REV1 [-r REV2]]) [FIȘIER]..." - -msgid "diff against the second parent" -msgstr "" - -msgid "revisions to export" -msgstr "" - -msgid "[OPTION]... [-o OUTFILESPEC] REV..." -msgstr "[OPȚIUNE]... [-o SPECFIȘIEȘIRE] REV..." - -msgid "end fields with NUL" -msgstr "" - -msgid "print all revisions that match" -msgstr "" - -msgid "follow changeset history, or file history across copies and renames" -msgstr "" -"urmărește istoricul seturilor de modificări sau al fișierelor, ținând cont " -"de copieri și redenumiri" - -msgid "ignore case when matching" -msgstr "ignoră minuscule/majuscule la potrivire" - -msgid "print only filenames and revisions that match" -msgstr "afișează doar numele de fișiere și reviziile care se potrivesc" - -msgid "print matching line numbers" -msgstr "afișează numerele liniilor care se potrivesc" - -msgid "only search files changed within revision range" -msgstr "caută doar fișierele modificate în intervalul de revizii" - -msgid "[OPTION]... PATTERN [FILE]..." -msgstr "[OPȚIUNE]... TIPAR [FIȘIER]..." - -msgid "show only heads which are descendants of REV" -msgstr "afișează doar capetele care sunt descendenți ai REV" - -msgid "show topological heads only" -msgstr "afișează doar capetele topologice" - -msgid "show active branchheads only (DEPRECATED)" -msgstr "afișează doar capetele de ramură active [ÎNVECHIT]" - -msgid "show normal and closed branch heads" -msgstr " afișează capetele de ramură normale și închise" - -msgid "[-ac] [-r REV] [REV]..." -msgstr "[-ac] [-r REV] [REV]..." - -msgid "[TOPIC]" -msgstr "[SUBIECT]" - -msgid "identify the specified revision" -msgstr "identifică revizia specificată" - -msgid "show local revision number" -msgstr "afișează numărul de revizie local" - -msgid "show global revision id" -msgstr "afișează id-ul global al reviziei" - -msgid "show branch" -msgstr "afișează ramura" - -msgid "show tags" -msgstr "afișează etichetele" - -msgid "[-nibt] [-r REV] [SOURCE]" -msgstr "[-nibt] [-r REV] [SURSĂ]" - -msgid "" -"directory strip option for patch. This has the same meaning as the " -"corresponding patch option" -msgstr "" - -msgid "PATH" -msgstr "CALE" - -msgid "base path" -msgstr "calea de bază" - -msgid "skip check for outstanding uncommitted changes" -msgstr "omite verificarea pentru modificări nedepozitate în suspensie" - -msgid "don't commit, just update the working directory" -msgstr "nu depozita, doar actualizează directorul de lucru" - -msgid "apply patch to the nodes from which it was generated" -msgstr "aplică patch-ul nodurilor pentru care a fost generat" - -msgid "use any branch information in patch (implied by --exact)" -msgstr "" -"folosește orice informație despre ramură din patch\n" -"(implicat de --exact)" - -msgid "[OPTION]... PATCH..." -msgstr "[OPȚIUNE]... PATCH" - -msgid "run even if remote repository is unrelated" -msgstr "execută chiar dacă depozitul la distanță este neînrudit" - -msgid "show newest record first" -msgstr "afișează începând cu cea mai nouă înregistrare" - -msgid "file to store the bundles into" -msgstr "" - -msgid "a remote changeset intended to be added" -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 NUMEFIȘIER] [SURSĂ]" - -msgid "[-e CMD] [--remotecmd CMD] [DEST]" -msgstr "[-e CMD] [--remotecmd CMD] [DEST]" - -msgid "search the repository as it is in REV" -msgstr "caută depozitul așa cum este el în REV" - -msgid "end filenames with NUL, for use with xargs" -msgstr "termină numele de fișiere cu NUL, pentru utilizare cu xargs" - -msgid "print complete paths from the filesystem root" -msgstr "afișează căi complete de la rădăcina sistemului de fișiere" - -msgid "[OPTION]... [PATTERN]..." -msgstr "[OPȚIUNE]... [TIPAR]..." - -msgid "only follow the first parent of merge changesets" -msgstr "urmărește doar primul părinte al seturilor de modificări de fuziune" - -msgid "show revisions matching date spec" -msgstr "afișează reviziile care se potrivesc cu data" - -msgid "show copied files" -msgstr "afișează fișierele copiate" - -msgid "do case-insensitive search for a given text" -msgstr "caută textul specificat fără a diferenția între minuscule și majuscule" - -msgid "include revisions where files were removed" -msgstr "include reviziile în care au fost eliminate fișiere" - -msgid "show only merges" -msgstr "afișează doar fuziunile" - -msgid "revisions committed by user" -msgstr "reviziile depozitate de utilizatorul" - -msgid "show only changesets within the given named branch (DEPRECATED)" -msgstr "" -"afișează doar seturile de modificări din interiorul ramurii denumite\n" -"specificate (ÎNVECHIT)" - -msgid "show changesets within the given named branch" -msgstr "" -"afișează seturile de modificări din cadrul ramurii denumite specificate" - -msgid "do not display revision or any of its ancestors" -msgstr "nu afișa revizia sau oricare din strămoșii ei" - -msgid "[OPTION]... [FILE]" -msgstr "[OPȚIUNE]... [FIȘIER]" - -msgid "revision to display" -msgstr "revizia de afișat" - -msgid "[-r REV]" -msgstr "[-r REV]" - -msgid "force a merge with outstanding changes" -msgstr "forțează o fuziune cu modificări în suspensie" - -msgid "revision to merge" -msgstr "revizia de fuzionat" - -msgid "review revisions to merge (no merge is performed)" -msgstr "" -"treci în revistă reviziile de fuzionat (nu se execută\n" -"nicio fuziune)" - -msgid "[-P] [-f] [[-r] REV]" -msgstr "[-P] [-f] [[-r] REV]" - -msgid "a changeset intended to be included in the destination" -msgstr "un set de modificări care se dorește a fi inclus în destinație" - -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 "afișează părinții reviziei specificate" - -msgid "[-r REV] [FILE]" -msgstr "[-r REV] [FIȘIER]" - -msgid "[NAME]" -msgstr "[NUME]" - -msgid "update to new branch head if changesets were pulled" -msgstr "" - -msgid "run even when remote repository is unrelated" -msgstr "execută chiar când depozitul la distanță este neînrudit" - -msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" -msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SURSĂ]" - -msgid "force 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 "înregistrează ștergere pentru fișierele lipsă" - -msgid "remove (and delete) file even if added or modified" -msgstr "înlătură (și șterge) fișierul chiar dacă este adăugat sau modificat" - -msgid "record a rename that has already occurred" -msgstr "înregistrează o redenumire care a avut deja loc" - -msgid "[OPTION]... SOURCE... DEST" -msgstr "[OPȚIUNE]... SURSĂ... DEST" - -msgid "select all unresolved files" -msgstr "selectează toate fișierele nerezolvate" - -msgid "list state of files needing merge" -msgstr "afișează starea fișierelor care au nevoie de fuziune" - -msgid "mark files as resolved" -msgstr "marchează fișierul drept rezolvat" - -msgid "mark files as unresolved" -msgstr "marchează fișierul drept rezolvat" - -msgid "hide status prefix" -msgstr "ascunde prefixul stării" - -msgid "revert all changes when no arguments given" -msgstr "" - -msgid "tipmost revision matching date" -msgstr "revizia cea mai apropiată de vârf care se potrivește cu data" - -msgid "revert to the specified revision" -msgstr "" - -msgid "do not save backup copies of files" -msgstr "nu salva copii de siguranță ale fișierelor" - -msgid "[OPTION]... [-r REV] [NAME]..." -msgstr "[OPȚIUNE]... [-r REV] [NUME]..." - -msgid "name of access log file to write to" -msgstr "numele fișierului jurnal de acces în care să se scrie" - -msgid "name of error log file to write to" -msgstr "numele fișierului jurnal de eroare în care să se scrie" - -msgid "PORT" -msgstr "PORT" - -msgid "port to listen on (default: 8000)" -msgstr "portul pe care se va asculta (implicit: 8000)" - -msgid "ADDR" -msgstr "ADRESĂ" - -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 "" -"numele care va fi afișat în paginile web (implicit: directorul de lucru)" - -msgid "name of the hgweb config file (serve more than one repository)" -msgstr "" - -msgid "name of the hgweb config file (DEPRECATED)" -msgstr "" - -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 "" - -msgid "SSL certificate file" -msgstr "" - -#, fuzzy -msgid "show untrusted configuration options" -msgstr "afișează opțiunile de configurare 'untrusted'" - -msgid "[-u] [NAME]..." -msgstr "" - -msgid "check for push and pull" -msgstr "" - -msgid "show status of all files" -msgstr "afișează starea tuturor fișierelor" - -msgid "show only modified files" -msgstr "afișează doar fișierele modificate" - -msgid "show only added files" -msgstr "afișează doar fișierele adăugate" - -msgid "show only removed files" -msgstr "afișează doar fișierele înlăturate" - -msgid "show only deleted (but tracked) files" -msgstr "afișează doar fișierele șterse (dar urmărite)" - -msgid "show only files without changes" -msgstr "afișează doar fișierele fără modificări" - -msgid "show only unknown (not tracked) files" -msgstr "afișează doar fișierele necunoscute (neurmărite)" - -msgid "show only ignored files" -msgstr "afișează doar fișierele ignorate" - -msgid "show source of copied files" -msgstr "afișează sursa fișierelor copiate" - -msgid "show difference from revision" -msgstr "afișează diferențele față de revizie" - -msgid "list the changed files of a revision" -msgstr "afișează fișierele modificate ale unei revizii" - -msgid "replace existing tag" -msgstr "înlocuiește o etichetă existentă" - -msgid "make the tag local" -msgstr "fă eticheta locală" - -msgid "revision to tag" -msgstr "" - -msgid "remove a tag" -msgstr "înlătură o etichetă" - -msgid "use <text> as commit message" -msgstr "folosește <text> drept mesaj de depozitare" - -msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." -msgstr "[-f] [-l] [-m TEXT] [-d DATĂ] [-u UTILIZATOR] [-r REV] NUME..." - -msgid "[-p] [-g]" -msgstr "[-p] [-g]" - -msgid "update to new branch head if changesets were unbundled" -msgstr "" - -msgid "[-u] FILE..." -msgstr "[-u] FIȘIER..." - -msgid "discard uncommitted changes (no backup)" -msgstr "înlătură modificările nedepozitate (fără copie de siguranță)" - -msgid "check for uncommitted changes" -msgstr "verifică dacă există modificări nedepozitate" - -msgid "[-c] [-C] [-d DATE] [[-r] REV]" -msgstr "[-c] [-C] [-d DATĂ] [[-r] REV]" - #, python-format msgid "cannot include %s (%s)" msgstr "" @@ -9175,6 +10071,10 @@ msgid "not found in manifest" msgstr "nu s-a găsit în manifest" +#, python-format +msgid "no such file in rev %s" +msgstr "" + msgid "branch name not in UTF-8!" msgstr "" @@ -9197,14 +10097,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 "" @@ -9217,17 +10109,28 @@ msgstr "" #, python-format +msgid "invalid character in dag description: %s..." +msgstr "" + +#, python-format +msgid "expected id %i, got %i" +msgstr "" + +#, python-format +msgid "parent id %i is larger than current id %i" +msgstr "" + +#, python-format 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 "" @@ -9239,10 +10142,6 @@ msgid "setting %r to other parent only allowed in merges" msgstr "" -#, python-format -msgid "not in dirstate: %s\n" -msgstr "" - msgid "unknown" msgstr "" @@ -9265,21 +10164,6 @@ msgid "unsupported file type (type is %s)" msgstr "" -msgid "queries" -msgstr "" - -msgid "searching" -msgstr "" - -msgid "already have changeset " -msgstr "" - -msgid "warning: repository is unrelated\n" -msgstr "" - -msgid "repository is unrelated" -msgstr "" - #, python-format msgid "push creates new remote branches: %s!" msgstr "" @@ -9288,10 +10172,11 @@ msgstr "" #, python-format -msgid "push creates new remote heads on branch '%s'!" -msgstr "" - -msgid "push creates new remote heads!" +msgid "push creates new remote head %s on branch '%s'!" +msgstr "" + +#, python-format +msgid "push creates new remote head %s!" msgstr "" msgid "you should pull and merge or use push -f to force" @@ -9299,6 +10184,7 @@ msgid "did you forget to merge? use push -f to force" msgstr "" +"ați uitat să executați fuziunea? folosiți `push -f` pentru a forța acțiunea" msgid "note: unsynced remote changes!\n" msgstr "" @@ -9396,13 +10282,10 @@ msgid "abort: out of memory\n" msgstr "abandon: memorie epuizată\n" -msgid "** unknown exception encountered, details follow\n" -msgstr "" - -msgid "** report bug details to http://mercurial.selenic.com/bts/\n" -msgstr "" - -msgid "** or mercurial@selenic.com\n" +msgid "** unknown exception encountered, please report by visiting\n" +msgstr "" + +msgid "** http://mercurial.selenic.com/wiki/BugTracker\n" msgstr "" #, python-format @@ -9425,6 +10308,11 @@ #, 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 "" @@ -9449,10 +10337,10 @@ msgid "extension '%s' overrides commands: %s\n" msgstr "" -msgid "Option --config may not be abbreviated!" -msgstr "" - -msgid "Option --cwd may not be abbreviated!" +msgid "option --config may not be abbreviated!" +msgstr "" + +msgid "option --cwd may not be abbreviated!" msgstr "" msgid "" @@ -9468,12 +10356,13 @@ msgid "repository '%s' is not local" msgstr "" +#, fuzzy, python-format +msgid "no repository found in %r (.hg not found)" +msgstr "depozitul %s nu a fost găsit" + msgid "warning: --repository ignored\n" msgstr "" -msgid "invalid arguments" -msgstr "" - #, python-format msgid "unrecognized profiling format '%s' - Ignored\n" msgstr "" @@ -9492,6 +10381,10 @@ msgstr "" #, python-format +msgid "warning: error finding commands in %s\n" +msgstr "" + +#, python-format msgid "couldn't find merge tool %s\n" msgstr "" @@ -9535,12 +10428,6 @@ msgid "was merge of '%s' successful (yn)?" msgstr "" -msgid "&No" -msgstr "" - -msgid "&Yes" -msgstr "" - #, python-format msgid "" " output file %s appears unchanged\n" @@ -9551,11 +10438,17 @@ msgid "merging %s failed!\n" msgstr "" +msgid "unterminated string" +msgstr "" + +msgid "syntax error" +msgstr "" + msgid "starting revisions are not directly related" msgstr "" #, python-format -msgid "Inconsistent state, %s:%s is good and bad" +msgid "inconsistent state, %s:%s is good and bad" msgstr "" #, python-format @@ -9589,6 +10482,9 @@ msgid "Diff Formats" msgstr "Formate pentru diff" +msgid "Merge Tools" +msgstr "" + msgid "Template Usage" msgstr "Folosirea șabloanelor" @@ -9598,74 +10494,29 @@ msgid "Using additional features" msgstr "Folosirea facilităților suplimentare" +#, fuzzy +msgid "Subrepositories" +msgstr "depozitul %s" + msgid "Configuring hgweb" msgstr "Configurarea hgweb" msgid "Glossary" msgstr "Glosar" -msgid "" -"Mercurial reads configuration data from several files, if they exist.\n" -"Below we list the most specific file first." -msgstr "" - -msgid "On Windows, these configuration files are read:" -msgstr "" - -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 "" - -msgid "On Unix, these files are read:" -msgstr "" - -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 "" - -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 "" -"Dacă există un fișier de configurare la nivelul depozitului care nu\n" -"este proprietatea utilizatorului activ, Mercurial vă va avertiza că\n" -"fișierul este omis::" - -msgid "" -" not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP" -msgstr "" - -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 "" - -msgid "" -"- ``ui.report_untrusted = False``\n" -"- ``trusted.users = USER``\n" -"- ``trusted.groups = GROUP``" -msgstr "" - -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::" +#, fuzzy +msgid "syntax for Mercurial ignore files" +msgstr "afișează doar fișierele ignorate" + +msgid "" +"The Mercurial system uses a set of configuration files to control\n" +"aspects of its behavior." +msgstr "" + +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 "" msgid "" @@ -9676,13 +10527,1831 @@ 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 "" - -msgid "" -"- on Unix-like systems: ``man hgrc``\n" -"- online: http://www.selenic.com/mercurial/hgrc.5.html\n" +"``ui.verbose``, respectively. See the Syntax section below." +msgstr "" + +msgid "" +"Files\n" +"-----" +msgstr "" + +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 hgrc files. For 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 \"hgrc\" file, the purpose of each section, its possible keys,\n" +"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 you want to\n" +"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 "" + +#, fuzzy +msgid "" +"``git``\n" +" Use git extended diff format." +msgstr "folosește formatul diff extins al lui git" + +msgid "" +"``nodates``\n" +" Don't include dates in diff headers." +msgstr "" + +#, fuzzy +msgid "" +"``showfunc``\n" +" Show which function each change is in." +msgstr "afișează funcția în care se află fiecare modificare" + +#, fuzzy +msgid "" +"``ignorews``\n" +" Ignore white space when comparing lines." +msgstr "ignoră spațiul alb la compararea liniilor" + +#, fuzzy +msgid "" +"``ignorewsamount``\n" +" Ignore changes in the amount of white space." +msgstr "ignoră modificările cantității de spațiu alb" + +#, fuzzy +msgid "" +"``ignoreblanklines``\n" +" Ignore changes whose lines are all blank." +msgstr "ignoră modificările ale căror linii sunt toate vide" + +#, fuzzy +msgid "" +"``unified``\n" +" Number of lines of context to show." +msgstr "numărul liniilor de context care vor fi afișate" + +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 "" + +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 "" +"``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 "" + +#, fuzzy +msgid "The full set of options is:" +msgstr " opțiuni:" + +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 "" + +#, fuzzy +msgid "" +"``port``\n" +" Port to listen on. Default is 8000." +msgstr "portul pe care se va asculta (implicit: 8000)" + +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.:" @@ -9733,20 +12402,20 @@ msgstr "" 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)." +"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 "" msgid "The log command also accepts date ranges:" msgstr "" 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" +"- ``<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 "" msgid "" @@ -9787,8 +12456,8 @@ msgid "" "To make Mercurial produce the git extended diff format, use the --git\n" "option available for many commands, or set 'git = True' in the [diff]\n" -"section of your hgrc. You do not need to set this option when\n" -"importing diffs in this format or using them in the mq extension.\n" +"section of your configuration file. You do not need to set this option\n" +"when importing diffs in this format or using them in the mq extension.\n" msgstr "" msgid "" @@ -9805,7 +12474,7 @@ " This is the name of the editor to run when committing. See EDITOR." msgstr "" -msgid " (deprecated, use .hgrc)" +msgid " (deprecated, use configuration file)" msgstr "" msgid "" @@ -9827,6 +12496,15 @@ msgstr "" msgid "" +"HGENCODINGAMBIGUOUS\n" +" This sets Mercurial's behavior for handling characters with\n" +" \"ambiguous\" widths like accented Latin characters with East Asian\n" +" fonts. By default, Mercurial assumes ambiguous characters are\n" +" narrow, set this variable to \"wide\" if such characters cause\n" +" formatting problems." +msgstr "" + +msgid "" "HGMERGE\n" " An executable to use for resolving merge conflicts. The program\n" " will be executed with three arguments: local file, remote file,\n" @@ -9835,10 +12513,10 @@ msgid "" "HGRCPATH\n" -" A list of files or directories to search for hgrc files. Item\n" -" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" -" platform default search path is used. If empty, only the .hg/hgrc\n" -" from the current repository is read." +" A list of files or directories to search for configuration\n" +" files. Item separator is \":\" on Unix, \";\" on Windows. If HGRCPATH\n" +" is not set, platform default search path is used. If empty, only\n" +" the .hg/hgrc from the current repository is read." msgstr "" msgid " For each element in HGRCPATH:" @@ -9851,9 +12529,9 @@ msgid "" "HGPLAIN\n" -" When set, this disables any options in .hgrc that might change\n" -" Mercurial's default output. This includes encoding, defaults,\n" -" verbose mode, debug mode, quiet mode, tracebacks, and\n" +" When set, this disables any configuration settings that might\n" +" change Mercurial's default output. This includes encoding,\n" +" defaults, verbose mode, debug mode, quiet mode, tracebacks, and\n" " localization. This can be useful when scripting against Mercurial\n" " in the face of existing user configuration." msgstr "" @@ -9864,6 +12542,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:" @@ -9871,7 +12561,7 @@ msgid "" " - HGUSER (deprecated)\n" -" - hgrc files from the HGRCPATH\n" +" - configuration files from the HGRCPATH\n" " - EMAIL\n" " - interactive prompt\n" " - LOGNAME (with ``@hostname`` appended)" @@ -9926,9 +12616,9 @@ msgstr "" msgid "" -"To enable the \"foo\" extension, either shipped with Mercurial or in\n" -"the Python search path, create an entry for it in your hgrc, like\n" -"this::" +"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 "" msgid "" @@ -9945,8 +12635,8 @@ msgstr "" msgid "" -"To explicitly disable an extension enabled in an hgrc of broader\n" -"scope, prepend its path with !::" +"To explicitly disable an extension enabled in a configuration file of\n" +"broader scope, prepend its path with !::" msgstr "" msgid "" @@ -10485,6 +13175,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 "" + +#, fuzzy +msgid "" +"Description\n" +"-----------" +msgstr "descriere:\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\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 "" +"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" @@ -10492,8 +13300,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 "" @@ -10504,7 +13312,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 "" @@ -10552,6 +13361,182 @@ "``bar`` and ``quux/baz`` respectively.\n" msgstr "" +msgid "To merge files Mercurial uses merge tools." +msgstr "" + +msgid "" +"A merge tool combines two different versions of a file into a merged\n" +"file. Merge tools are given the two files and the greatest common\n" +"ancestor of the two file versions, so they can determine the changes\n" +"made on both branches." +msgstr "" + +msgid "" +"Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n" +":hg:`backout` and in several extensions." +msgstr "" + +msgid "" +"Usually, the merge tool tries to automatically reconcile the files by\n" +"combining all non-overlapping changes that occurred separately in\n" +"the two different evolutions of the same initial base file. Furthermore, " +"some\n" +"interactive merge programs make it easier to manually resolve\n" +"conflicting merges, either in a graphical way, or by inserting some\n" +"conflict markers. Mercurial does not include any interactive merge\n" +"programs but relies on external tools for that." +msgstr "" + +msgid "" +"Available merge tools\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +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 "" + +msgid "" +"A merge tool is generally usable if its executable can be found on the\n" +"system and if it can handle the merge. The executable is found if it\n" +"is an absolute or relative executable path or the name of an\n" +"application in the executable search path. The tool is assumed to be\n" +"able to handle the merge if it can handle symlinks if the file is a\n" +"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 "" + +msgid "" +"There are some internal merge tools which can be used. The internal\n" +"merge tools are:" +msgstr "" + +msgid "" +"``internal:merge``\n" +" Uses the internal non-interactive simple merge algorithm for merging\n" +" files. It will fail if there are any conflicts and leave markers in\n" +" the partially merged file." +msgstr "" + +msgid "" +"``internal:fail``\n" +" Rather than attempting to merge files that were modified on both\n" +" branches, it marks them as unresolved. The resolve command must be\n" +" used to resolve these conflicts." +msgstr "" + +msgid "" +"``internal:local``\n" +" Uses the local version of files as the merged version." +msgstr "" + +msgid "" +"``internal:other``\n" +" Uses the other version of files as the merged version." +msgstr "" + +msgid "" +"``internal:prompt``\n" +" Asks the user which of the local or the other version to keep as\n" +" the merged version." +msgstr "" + +msgid "" +"``internal:dump``\n" +" Creates three versions of the files to merge, containing the\n" +" contents of local, other and base. These files can then be used to\n" +" perform a merge manually. If the file to be merged is named\n" +" ``a.txt``, these files will accordingly be named ``a.txt.local``,\n" +" ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" +" same directory as ``a.txt``." +msgstr "" + +msgid "" +"Internal tools are always available and do not require a GUI but will by " +"default\n" +"not handle symlinks or binary files." +msgstr "" + +msgid "" +"Choosing a merge tool\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "Mercurial uses these rules when deciding which merge tool to use:" +msgstr "" + +msgid "" +"1. If a tool has been specified with the --tool option to merge or resolve, " +"it\n" +" is used. If it is the name of a tool in the merge-tools configuration, " +"its\n" +" configuration is used. Otherwise the specified tool must be executable " +"by\n" +" the shell." +msgstr "" + +msgid "" +"2. If the ``HGMERGE`` environment variable is present, its value is used " +"and\n" +" must be executable by the shell." +msgstr "" + +msgid "" +"3. If the filename of the file to be merged matches any of the patterns in " +"the\n" +" merge-patterns configuration section, the first usable merge tool\n" +" corresponding to a matching pattern is used. Here, binary capabilities of " +"the\n" +" merge tool are not considered." +msgstr "" + +msgid "" +"4. If ui.merge is set it will be considered next. If the value is not the " +"name\n" +" of a configured tool, the specified value is used and must be executable " +"by\n" +" the shell. Otherwise the named tool is used if it is usable." +msgstr "" + +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 "" + +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 "" + +msgid "" +"7. If the file to be merged is not binary and is not a symlink, then\n" +" ``internal:merge`` is used." +msgstr "" + +msgid "8. The merge of the file fails and must be resolved before commit." +msgstr "" + +msgid "" +".. note::\n" +" After selecting a merge program, Mercurial will by default attempt\n" +" to merge the files using a simple merge algorithm first. Only if it " +"doesn't\n" +" succeed because of conflicting changes Mercurial will actually execute " +"the\n" +" merge program. Whether to use the simple merge algorithm first can be\n" +" controlled by the premerge setting of the merge tool. Premerge is enabled " +"by\n" +" default unless the file is binary or a symlink." +msgstr "" + +msgid "" +"See the merge-tools and ui sections of hgrc(5) for details on the\n" +"configuration of merge tools.\n" +msgstr "" + msgid "" "When Mercurial accepts more than one revision, they may be specified\n" "individually, or provided as a topologically continuous range,\n" @@ -10608,6 +13593,13 @@ "Regexp pattern matching is anchored at the root of the repository." msgstr "" +msgid "" +"To read name patterns from a file, use ``listfile:`` or ``listfile0:``.\n" +"The latter expects null delimited patterns while the former expects line\n" +"feeds. Each string read from the file is itself treated as a file\n" +"pattern." +msgstr "" + msgid "Plain examples::" msgstr "" @@ -10633,8 +13625,15 @@ msgid "Regexp examples::" msgstr "" -msgid "" -" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository" +msgstr "" + +msgid "File examples::" +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 "" msgid "Mercurial supports several ways to specify individual revisions." @@ -10696,8 +13695,13 @@ "Identifiers such as branch names must be quoted with single or double\n" "quotes if they contain characters outside of\n" "``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" -"predicates. Special characters can be used in quoted identifiers by\n" -"escaping them, e.g., ``\\n`` is interpreted as a newline." +"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:" @@ -10742,193 +13746,63 @@ msgid "" "``x - y``\n" -" Changesets in x but not in y." -msgstr "" - -msgid "The following predicates are supported:" -msgstr "" - -msgid "" -"``adds(pattern)``\n" -" Changesets that add a file matching pattern." -msgstr "" - -msgid "" -"``all()``\n" -" All changesets, the same as ``0:tip``." -msgstr "" - -msgid "" -"``ancestor(single, single)``\n" -" Greatest common ancestor of the two changesets." -msgstr "" - -msgid "" -"``ancestors(set)``\n" -" Changesets that are ancestors of a changeset in set." -msgstr "" - -msgid "" -"``author(string)``\n" -" Alias for ``user(string)``." -msgstr "" - -msgid "" -"``branch(set)``\n" -" All changesets belonging to the branches of changesets in set." -msgstr "" - -msgid "" -"``children(set)``\n" -" Child changesets of changesets in set." -msgstr "" - -msgid "" -"``closed()``\n" -" Changeset is closed." -msgstr "" - -msgid "" -"``contains(pattern)``\n" -" Revision contains pattern." -msgstr "" - -msgid "" -"``date(interval)``\n" -" Changesets within the interval, see :hg:`help dates`." -msgstr "" - -msgid "" -"``descendants(set)``\n" -" Changesets which are descendants of changesets in set." -msgstr "" - -msgid "" -"``file(pattern)``\n" -" Changesets affecting files matched by pattern." -msgstr "" - -msgid "" -"``follow()``\n" -" An alias for ``::.`` (ancestors of the working copy's first parent)." -msgstr "" - -msgid "" -"``grep(regex)``\n" -" Like ``keyword(string)`` but accepts a regex." -msgstr "" - -msgid "" -"``head()``\n" -" Changeset is a head." -msgstr "" - -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." -msgstr "" - -msgid "" -"``limit(set, n)``\n" -" First n members of set." -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 "" -"``merge()``\n" -" Changeset is a merge changeset." -msgstr "" - -msgid "" -"``modifies(pattern)``\n" -" Changesets modifying files matched by pattern." -msgstr "" - -msgid "" -"``outgoing([path])``\n" -" Changesets not found in the specified destination repository, or the\n" -" default push location." -msgstr "" -"``outgoing([cale])``\n" -" Nu s-au găsit seturi de modificări în depozitul destinație specificat\n" -" sau în amplasarea implicită pentru `push`." - -msgid "" -"``p1(set)``\n" -" First parent of changesets in set." -msgstr "" - -msgid "" -"``p2(set)``\n" -" Second parent of changesets in set." -msgstr "" - -msgid "" -"``parents(set)``\n" -" The set of all parents for all changesets in set." -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" -" Changesets which remove files matching pattern." -msgstr "" - -msgid "" -"``reverse(set)``\n" -" Reverse order of set." -msgstr "" - -msgid "" -"``roots(set)``\n" -" Changesets with no parent changeset in set." -msgstr "" - -msgid "" -"``sort(set[, [-]key...])``\n" -" Sort set by keys. The default sort order is ascending, specify a key\n" -" as ``-key`` to sort in descending order." -msgstr "" - -msgid " The keys can be:" -msgstr "" - -msgid "" -" - ``rev`` for the revision number,\n" -" - ``branch`` for the branch name,\n" -" - ``desc`` for the commit message (description),\n" -" - ``user`` for user name (``author`` can be used as an alias),\n" -" - ``date`` for the commit date" -msgstr "" - -msgid "" -"``tagged()``\n" -" Changeset is tagged." -msgstr "" - -msgid "" -"``user(string)``\n" -" User name is string." +" Changesets in x but not in y.\n" +" \n" +"``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 ".. predicatesmarker" +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 ``.hgrc``. Arguments of the form `$1`, `" +"$2`,\n" +"etc. are substituted from the alias into the 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`::" @@ -10945,15 +13819,248 @@ " -l x -> limit(expr, x)" msgstr "" -msgid "Some sample queries::" -msgstr "" - -msgid "" -" hg log -r 'branch(default)'\n" -" hg log -r 'branch(default) and 1.5:: and not merge()'\n" -" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" -" hg log -r 'sort(date(\"May 2008\"), user)'\n" -" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" +msgid "Some sample queries:" +msgstr "" + +msgid "- Changesets on the default branch::" +msgstr "- Seturi de modificări pe ramura curentă::" + +msgid " hg log -r \"branch(default)\"" +msgstr "" + +msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::" +msgstr "" + +msgid " hg log -r \"branch(default) and 1.5:: and not merge()\"" +msgstr "" + +msgid "- Open branch heads::" +msgstr "- Capete de ramură deschise::" + +msgid " hg log -r \"head() and not closed()\"" +msgstr "" + +msgid "" +"- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n" +" ``hgext/*``::" +msgstr "" + +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 "" + +msgid " hg log -r \"sort(date('May 2008'), user)\"" +msgstr "" + +msgid "" +"- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n" +" release::" +msgstr "" + +msgid "" +" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())" +"\"\n" +msgstr "" + +msgid "" +"Subrepositories let you nest external repositories or projects into a\n" +"parent Mercurial repository, and make commands operate on them as a\n" +"group. External Mercurial and Subversion projects are currently\n" +"supported." +msgstr "" + +msgid "Subrepositories are made of three components:" +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 "" + +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 "" + +msgid " path/to/nested = https://example.com/nested/repo/path" +msgstr "" + +msgid "" +" where ``path/to/nested`` is the checkout location relatively to the\n" +" parent Mercurial root, and ``https://example.com/nested/repo/path``\n" +" is the source repository path. The source can also reference a\n" +" filesystem path. Subversion repositories are defined with:" +msgstr "" + +msgid " path/to/nested = [svn]https://example.com/nested/trunk/path" +msgstr "" + +msgid "" +" Note that ``.hgsub`` does not exist by default in Mercurial\n" +" repositories, you have to create and add it to the parent\n" +" repository before using subrepositories." +msgstr "" + +msgid "" +"3. Nested repository states. They are defined in ``.hgsubstate`` and\n" +" capture whatever information is required to restore the\n" +" subrepositories to the state they were committed in a parent\n" +" repository changeset. Mercurial automatically record the nested\n" +" repositories states when committing in the parent repository." +msgstr "" + +msgid "" +" .. note::\n" +" The ``.hgsubstate`` file should not be edited manually." +msgstr "" + +msgid "" +"\n" +"Adding a Subrepository\n" +"----------------------" +msgstr "" + +msgid "" +"If ``.hgsub`` does not exist, create it and add it to the parent\n" +"repository. Clone or checkout the external projects where you want it\n" +"to live in the parent repository. Edit ``.hgsub`` and add the\n" +"subrepository entry as described above. At this point, the\n" +"subrepository is tracked and the next commit will record its state in\n" +"``.hgsubstate`` and bind it to the committed changeset." +msgstr "" + +#, fuzzy +msgid "" +"Synchronizing a Subrepository\n" +"-----------------------------" +msgstr "" +"Controlul accesului pe bază de ramură\n" +"-------------------------------------" + +msgid "" +"Subrepos do not automatically track the latest changeset of their\n" +"sources. Instead, they are updated to the changeset that corresponds\n" +"with the changeset checked out in the top-level changeset. This is so\n" +"developers always get a consistent set of compatible code and\n" +"libraries when they update." +msgstr "" + +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 "" + +#, fuzzy +msgid "" +"Deleting a Subrepository\n" +"------------------------" +msgstr "" +"Controlul accesului pe bază de ramură\n" +"-------------------------------------" + +msgid "" +"To remove a subrepository from the parent repository, delete its\n" +"reference from ``.hgsub``, then remove its files." +msgstr "" + +#, fuzzy +msgid "" +"Interaction with Mercurial Commands\n" +"-----------------------------------" +msgstr "" +"Controlul accesului pe bază de ramură\n" +"-------------------------------------" + +msgid "" +":add: add does not recurse in subrepos unless -S/--subrepos is\n" +" specified. Subversion subrepositories are currently silently\n" +" ignored." +msgstr "" + +msgid "" +":archive: archive does not recurse in subrepositories unless\n" +" -S/--subrepos is specified." +msgstr "" + +msgid "" +":commit: commit creates a consistent snapshot of the state of the\n" +" entire project and its subrepositories. It does this by first\n" +" attempting to commit all modified subrepositories, then recording\n" +" their state and finally committing it in the parent\n" +" repository. Mercurial can be made to abort if any subrepository\n" +" content is modified by setting \"ui.commitsubrepos=no\" in a\n" +" configuration file (see :hg:`help config`)." +msgstr "" + +msgid "" +":diff: diff does not recurse in subrepos unless -S/--subrepos is\n" +" specified. Changes are displayed as usual, on the subrepositories\n" +" elements. Subversion subrepositories are currently silently\n" +" ignored." +msgstr "" + +msgid "" +":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n" +" is specified. Subversion subrepositories are currently silently\n" +" ignored." +msgstr "" + +msgid "" +":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n" +" is specified. Subversion subrepositories are currently silently\n" +" ignored." +msgstr "" + +msgid "" +":pull: pull is not recursive since it is not clear what to pull prior\n" +" to running :hg:`update`. Listing and retrieving all\n" +" subrepositories changes referenced by the parent repository pulled\n" +" changesets is expensive at best, impossible in the Subversion\n" +" case." +msgstr "" + +msgid "" +":push: Mercurial will automatically push all subrepositories first\n" +" when the parent repository is being pushed. This ensures new\n" +" subrepository changes are available when referenced by top-level\n" +" repositories." +msgstr "" + +msgid "" +":status: status does not recurse into subrepositories unless\n" +" -S/--subrepos is specified. Subrepository changes are displayed as\n" +" regular Mercurial changes on the subrepository\n" +" elements. Subversion subrepositories are currently silently\n" +" ignored." +msgstr "" + +msgid "" +":update: update restores the subrepos in the state they were\n" +" originally committed in target changeset. If the recorded\n" +" changeset is not available in the current subrepository, Mercurial\n" +" will pull it in first before updating. This means that updating\n" +" can require network access when using subrepositories." +msgstr "" + +#, fuzzy +msgid "" +"Remapping Subrepositories Sources\n" +"---------------------------------" +msgstr "" +"Controlul accesului pe bază de ramură\n" +"-------------------------------------" + +msgid "" +"A subrepository source location may change during a project life,\n" +"invalidating references stored in the parent repository history. To\n" +"fix this, rewriting rules can be defined in parent repository ``hgrc``\n" +"file or in Mercurial configuration. See the ``[subpaths]`` section in\n" +"hgrc(5) for more details." msgstr "" msgid "" @@ -10994,72 +14101,7 @@ "keywords are usually available for templating a log-like command:" msgstr "" -msgid ":author: String. The unmodified author of the changeset." -msgstr "" - -msgid "" -":branches: String. The name of the branch on which the changeset was\n" -" committed. Will be empty if the branch name was 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 "" @@ -11079,128 +14121,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 "" - -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 ":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" -msgstr "" -":user: Orice text. Returnează porțiunea utilizator a unei adrese de e-mail.\n" +msgid ".. filtersmarker\n" +msgstr "" msgid "Valid URLs are of the form::" msgstr "" @@ -11210,13 +14132,13 @@ " file://local/filesystem/path[#revision]\n" " http://[user[:pass]@]host[:port]/[path][#revision]\n" " https://[user[:pass]@]host[:port]/[path][#revision]\n" -" ssh://[user[:pass]@]host[:port]/[path][#revision]" +" ssh://[user@]host[:port]/[path][#revision]" msgstr "" msgid "" "Paths in the local filesystem can either point to Mercurial\n" "repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n" -"incoming --bundle`)." +"incoming --bundle`). See also :hg:`help paths`." msgstr "" msgid "" @@ -11231,6 +14153,11 @@ "server." msgstr "" +msgid "" +"Note that the security of HTTPS URLs depends on proper configuration of\n" +"web.cacerts." +msgstr "" + msgid "Some notes about using SSH with Mercurial:" msgstr "" @@ -11257,13 +14184,13 @@ msgstr "" msgid "" -" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" -" with the --ssh command line option." -msgstr "" - -msgid "" -"These URLs can all be stored in your hgrc with path aliases under the\n" -"[paths] section like so::" +" Alternatively specify \"ssh -C\" as your ssh command in your\n" +" configuration file or with the --ssh command line option." +msgstr "" + +msgid "" +"These URLs can all be stored in your configuration file with path\n" +"aliases under the [paths] section like so::" msgstr "" msgid "" @@ -11351,17 +14278,25 @@ msgstr "" msgid "" -"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " +"use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to " "abandon\n" msgstr "" msgid "(branch merge, don't forget to commit)\n" -msgstr "" +msgstr "(fuziune între ramuri, nu uitați să depozitați)\n" + +#, fuzzy, python-format +msgid "config file %s not found!" +msgstr "depozitul %s nu a fost găsit" #, python-format msgid "error reading %s/.hg/hgrc: %s\n" msgstr "" +#, python-format +msgid "error accessing repository at %s\n" +msgstr "" + msgid "SSL support is unavailable" msgstr "" @@ -11426,6 +14361,13 @@ msgid "warning: %s hook %s\n" msgstr "" +msgid "kb" +msgstr "" + +#, python-format +msgid "ignoring invalid [auth] key '%s'\n" +msgstr "" + msgid "connection ended unexpectedly" msgstr "" @@ -11489,14 +14431,14 @@ msgstr "depozitul %s există deja" #, python-format -msgid "requirement '%s' not supported" -msgstr "" - -#, python-format msgid ".hg/sharedpath points to nonexistent directory %s" msgstr "" #, python-format +msgid "warning: ignoring unknown working parent %s!\n" +msgstr "" + +#, python-format msgid "%r cannot be used in a tag name" msgstr "" @@ -11525,19 +14467,27 @@ msgstr "" #, python-format -msgid "rolling back to revision %s (undo %s: %s)\n" -msgstr "" - -#, python-format -msgid "rolling back to revision %s (undo %s)\n" +msgid "repository tip rolled back to revision %s (undo %s: %s)\n" +msgstr "" + +#, python-format +msgid "repository tip rolled back to revision %s (undo %s)\n" msgstr "" msgid "rolling back unknown transaction\n" msgstr "" #, python-format -msgid "Named branch could not be reset, current branch still is: %s\n" -msgstr "" +msgid "named branch could not be reset, current branch is still: %s\n" +msgstr "" + +#, fuzzy, python-format +msgid "working directory now based on revisions %d and %d\n" +msgstr "fuzionează directorul de lucru cu o altă revizie" + +#, fuzzy, python-format +msgid "working directory now based on revision %d\n" +msgstr "fuzionează directorul de lucru cu o altă revizie" msgid "no rollback information available\n" msgstr "" @@ -11554,12 +14504,20 @@ msgid "working directory of %s" msgstr "directorul de lucrul al %s" +#, python-format +msgid "warning: can't find ancestor for '%s' copied from '%s'!\n" +msgstr "" + msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "" msgid "can't commit subrepos without .hgsub" msgstr "" +#, fuzzy, python-format +msgid "uncommitted changes in subrepo %s" +msgstr "înlătură modificările nedepozitate (fără copie de siguranță)" + msgid "file not found!" msgstr "" @@ -11569,7 +14527,7 @@ msgid "file not tracked!" msgstr "" -msgid "unresolved merge conflicts (see hg resolve)" +msgid "unresolved merge conflicts (see hg help resolve)" msgstr "" #, python-format @@ -11588,7 +14546,7 @@ msgstr "se solicită toate modificările\n" msgid "" -"Partial pull cannot be done because other repository doesn't support " +"partial pull cannot be done because other repository doesn't support " "changegroupsubset." msgstr "" @@ -11596,26 +14554,21 @@ msgid "%d changesets found\n" msgstr "" -msgid "bundling changes" -msgstr "" - -msgid "chunks" -msgstr "" - -msgid "bundling manifests" +#, fuzzy +msgid "bundling" +msgstr "se actualizează" + +msgid "manifests" msgstr "" #, python-format msgid "empty or missing revlog for %s" msgstr "" -msgid "bundling files" -msgstr "" - msgid "adding changesets\n" msgstr "se adaugă seturile de modificări\n" -msgid "changesets" +msgid "chunks" msgstr "" msgid "received changelog group is empty" @@ -11624,9 +14577,6 @@ msgid "adding manifests\n" msgstr "se adaugă manifestele\n" -msgid "manifests" -msgstr "" - msgid "adding file changes\n" msgstr "se adaugă modificările fișierelor\n" @@ -11670,17 +14620,20 @@ msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "" -msgid "no [smtp]host in hgrc - cannot send mail" +msgid "can't use TLS: Python SSL support not installed" +msgstr "" + +msgid "(using smtps)\n" +msgstr "" + +msgid "smtp.host not configured - cannot send mail" msgstr "" #, python-format msgid "sending mail: smtp host %s, port %s\n" msgstr "" -msgid "can't use TLS: Python SSL support not installed" -msgstr "" - -msgid "(using tls)\n" +msgid "(using starttls)\n" msgstr "" #, python-format @@ -11711,10 +14664,25 @@ msgstr "" #, python-format +msgid "'\\n' and '\\r' disallowed in filenames: %r" +msgstr "" + +#, python-format msgid "failed to remove %s from manifest" msgstr "" #, python-format +msgid "invalid pattern (%s): %s" +msgstr "" + +msgid "invalid pattern" +msgstr "" + +#, python-format +msgid "unable to read file list (%s)" +msgstr "" + +#, python-format msgid "diff context lines count must be an integer, not %r" msgstr "" @@ -11783,11 +14751,7 @@ msgstr "se obține %s în %s\n" #, python-format -msgid "warning: detected divergent renames of %s to:\n" -msgstr "" - -#, python-format -msgid "branch %s not found" +msgid "note: possible conflict - %s was renamed multiple times to:\n" msgstr "" msgid "merging with a working directory ancestor has no effect" @@ -11801,20 +14765,49 @@ "modificări nedepozitate în suspensie (folosiți 'hg status' pentru a afișa " "modificările)" -msgid "" -"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " -"changes)" -msgstr "" - -msgid "crosses branches (use 'hg merge' or use 'hg update -c')" -msgstr "" - -#, python-format -msgid "cannot create %s: destination already exists" -msgstr "" - -#, python-format -msgid "cannot create %s: unable to create destination directory" +#, fuzzy, python-format +msgid "outstanding uncommitted changes in subrepository '%s'" +msgstr "înlătură modificările nedepozitate (fără copie de siguranță)" + +msgid "crosses branches (merge branches or use --clean to discard changes)" +msgstr "" + +msgid "crosses branches (merge branches or update --check to force update)" +msgstr "" + +msgid "Attention:" +msgstr "" + +msgid "Caution:" +msgstr "" + +msgid "!Danger!" +msgstr "" + +msgid "Error:" +msgstr "" + +msgid "Hint:" +msgstr "" + +msgid "Important:" +msgstr "" + +msgid "Note:" +msgstr "Notă:" + +msgid "Tip:" +msgstr "" + +msgid "Warning!" +msgstr "" + +#, 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 "" #, python-format @@ -11826,14 +14819,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 "" + +#, python-format msgid "file %s already exists\n" msgstr "" @@ -11872,7 +14865,7 @@ msgstr "" #, python-format -msgid "malformed patch %s %s" +msgid "cannot create %s: destination already exists" msgstr "" #, python-format @@ -11884,13 +14877,10 @@ msgstr "" #, python-format -msgid "Unsupported line endings type: %s" -msgstr "" - -msgid "" -"internal patcher failed\n" -"please report details to http://mercurial.selenic.com/bts/\n" -"or mercurial@selenic.com\n" +msgid "unsupported line endings type: %s" +msgstr "" + +msgid "patch failed to apply" msgstr "" #, python-format @@ -11964,17 +14954,12 @@ msgid "%s not found in the transaction" msgstr "%s nu a fost găsit în tranzacție" -msgid "unknown base" -msgstr "" - -msgid "consistency error adding group" -msgstr "eroare de consistență la adăugarea grupului" - -msgid "unterminated string" -msgstr "" - -msgid "syntax error" -msgstr "" +msgid "consistency error in delta" +msgstr "eroare de consistență în delta" + +#, fuzzy +msgid "unknown delta base" +msgstr "hg: comandă necunoscută '%s'\n" msgid "missing argument" msgstr "" @@ -11990,61 +14975,363 @@ msgid "not a function: %s" msgstr "" -msgid "limit wants two arguments" -msgstr "" - -msgid "limit wants a number" -msgstr "" - -msgid "limit expects a number" -msgstr "" - -msgid "ancestor wants two arguments" -msgstr "" - +msgid "" +"``adds(pattern)``\n" +" Changesets that add a file matching pattern." +msgstr "" + +#. i18n: "adds" is a keyword +msgid "adds requires a pattern" +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 "" + +#. i18n: "ancestor" is a keyword msgid "ancestor arguments must be single revisions" msgstr "" +msgid "" +"``ancestors(set)``\n" +" Changesets that are ancestors of a changeset in set." +msgstr "" + +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 "" + +msgid "" +"``bisected(string)``\n" +" Changesets marked in the specified bisect state (good, bad, skip)." +msgstr "" + +msgid "bisect requires a string" +msgstr "" + +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 "" + +#. 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 "" + +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 "" + +msgid "" +"``date(interval)``\n" +" Changesets within the interval, see :hg:`help dates`." +msgstr "" + +#. i18n: "date" is a keyword +msgid "date requires a string" +msgstr "" + +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 "" + +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 "" + +#. i18n: "follow" is a keyword msgid "follow takes no arguments" msgstr "" -msgid "date wants a string" -msgstr "" - -msgid "keyword wants a string" -msgstr "" - -msgid "grep wants a string" -msgstr "" - -msgid "author wants a string" -msgstr "" - -msgid "file wants a pattern" -msgstr "" - -msgid "contains wants a pattern" -msgstr "" - -msgid "modifies wants a pattern" -msgstr "" - -msgid "adds wants a pattern" -msgstr "" - -msgid "removes wants a pattern" -msgstr "" - +msgid "" +"``all()``\n" +" All changesets, the same as ``0:tip``." +msgstr "" + +#. i18n: "all" is a keyword +msgid "all takes no arguments" +msgstr "" + +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 "" + +#, python-format +msgid "invalid match pattern: %s" +msgstr "" + +msgid "" +"``file(pattern)``\n" +" Changesets affecting files matched by pattern." +msgstr "" + +#. i18n: "file" is a keyword +msgid "file requires a pattern" +msgstr "" + +msgid "" +"``head()``\n" +" Changeset is a named branch head." +msgstr "" + +#. i18n: "head" is a keyword +msgid "head takes no arguments" +msgstr "" + +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 "" + +msgid "" +"``limit(set, n)``\n" +" First n members of set." +msgstr "" + +#. i18n: "limit" is a keyword +msgid "limit requires two arguments" +msgstr "" + +#. i18n: "limit" is a keyword +msgid "limit requires a number" +msgstr "" + +#. i18n: "limit" is a keyword +msgid "limit expects a number" +msgstr "" + +msgid "" +"``last(set, n)``\n" +" Last n members of set." +msgstr "" + +#. i18n: "last" is a keyword +msgid "last requires two arguments" +msgstr "" + +#. i18n: "last" is a keyword +msgid "last requires a number" +msgstr "" + +#. i18n: "last" is a keyword +msgid "last expects a number" +msgstr "" + +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 "" -msgid "closed takes no arguments" -msgstr "" - -msgid "head takes no arguments" -msgstr "" - -msgid "sort wants one or two arguments" +msgid "" +"``min(set)``\n" +" Changeset with lowest revision number in set." +msgstr "" + +msgid "" +"``modifies(pattern)``\n" +" Changesets modifying files matched by pattern." +msgstr "" + +#. i18n: "modifies" is a keyword +msgid "modifies requires a pattern" +msgstr "" + +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 "" + +#. i18n: "id" is a keyword +msgid "id requires a string" +msgstr "" + +#, fuzzy +msgid "" +"``outgoing([path])``\n" +" Changesets not found in the specified destination repository, or the\n" +" default push location." +msgstr "" +"``outgoing([cale])``\n" +" Nu s-au găsit seturi de modificări în depozitul destinație specificat\n" +" sau în amplasarea implicită pentru `push`." + +#. 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 "" + +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" +" Changesets which remove files matching pattern." +msgstr "" + +#. i18n: "removes" is a keyword +msgid "removes requires a pattern" +msgstr "" + +msgid "" +"``rev(number)``\n" +" Revision with the given numeric identifier." +msgstr "" + +#. i18n: "rev" is a keyword +msgid "rev requires one argument" +msgstr "" + +#. i18n: "rev" is a keyword +msgid "rev requires a number" +msgstr "" + +#. i18n: "rev" is a keyword +msgid "rev expects a number" +msgstr "" + +msgid "" +"``reverse(set)``\n" +" Reverse order of set." +msgstr "" + +msgid "" +"``roots(set)``\n" +" Changesets with no parent changeset in set." +msgstr "" + +msgid "" +"``sort(set[, [-]key...])``\n" +" Sort set by keys. The default sort order is ascending, specify a key\n" +" as ``-key`` to sort in descending order." +msgstr "" + +msgid " The keys can be:" +msgstr "" + +msgid "" +" - ``rev`` for the revision number,\n" +" - ``branch`` for the branch name,\n" +" - ``desc`` for the commit message (description),\n" +" - ``user`` for user name (``author`` can be used as an alias),\n" +" - ``date`` for the commit date" +msgstr "" + +#. i18n: "sort" is a keyword +msgid "sort requires one or two arguments" msgstr "" msgid "sort spec must be a string" @@ -12054,13 +15341,22 @@ msgid "unknown sort key %r" msgstr "" -msgid "all takes no arguments" -msgstr "" - -msgid "outgoing wants a repository path" -msgstr "" - -msgid "tagged takes no arguments" +msgid "" +"``tag([name])``\n" +" The specified tag by name, or all tagged revisions if no name is given." +msgstr "" + +#. i18n: "tag" is a keyword +msgid "tag takes one or no arguments" +msgstr "" + +#. i18n: "tag" is a keyword +msgid "the argument to tag must be a string" +msgstr "" + +msgid "" +"``user(string)``\n" +" User name contains string. The match is case-insensitive." msgstr "" msgid "can't negate that" @@ -12072,6 +15368,64 @@ msgid "empty query" msgstr "" +#, 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 "" + +#, 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 "" + +msgid ".hg/requires file is corrupt" +msgstr "" + +#, python-format +msgid "unknown repository format: requires feature '%s' (upgrade Mercurial)" +msgstr "" + +msgid "searching for changes\n" +msgstr "se caută modificări\n" + +msgid "queries" +msgstr "" + +msgid "searching" +msgstr "" + +msgid "repository is unrelated" +msgstr "" + +msgid "warning: repository is unrelated\n" +msgstr "" + msgid "searching for exact renames" msgstr "" @@ -12092,6 +15446,9 @@ msgid "couldn't parse location %s" msgstr "" +msgid "password in URL not supported" +msgstr "" + msgid "could not create remote repo" msgstr "" @@ -12108,6 +15465,49 @@ msgid "push refused: %s" msgstr "" +msgid "certificate checking requires Python 2.6" +msgstr "verificarea certificatului necesită Python 2.6" + +msgid "no certificate received" +msgstr "" + +#, python-format +msgid "certificate is for %s" +msgstr "" + +msgid "IDN in certificate not supported" +msgstr "" + +msgid "no commonName or subjectAltName found in certificate" +msgstr "" + +#, python-format +msgid "could not find web.cacerts: %s" +msgstr "" + +#, python-format +msgid "%s certificate error: %s (use --insecure to connect insecurely)" +msgstr "" + +#, python-format +msgid "invalid certificate for %s with fingerprint %s" +msgstr "" + +#, python-format +msgid "" +"warning: %s certificate with fingerprint %s not verified (check " +"hostfingerprints or web.cacerts config setting)\n" +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" +msgstr "" + #, python-format msgid "'%s' does not appear to be an hg repository" msgstr "" @@ -12122,6 +15522,10 @@ msgid "invalid entry in fncache, line %s" msgstr "" +#, fuzzy, python-format +msgid "warning: subrepo spec file %s not found\n" +msgstr "depozitul %s nu a fost găsit" + #, python-format msgid "subrepo spec file %s not found" msgstr "" @@ -12155,13 +15559,41 @@ msgstr "" #, python-format +msgid "" +" subrepository sources for %s differ\n" +"use (l)ocal source (%s) or (r)emote source (%s)?\n" +msgstr "" + +#, python-format +msgid "" +" subrepository sources for %s differ (in checked out version)\n" +"use (l)ocal source (%s) or (r)emote source (%s)?\n" +msgstr "" + +#, python-format +msgid "default path for subrepository %s not found" +msgstr "calea implicită pentru subdepozitul %s nu a fost găsită" + +#, python-format msgid "unknown subrepo type %s" msgstr "" #, python-format +msgid "archiving (%s)" +msgstr "" + +#, python-format +msgid "warning: error \"%s\" in subrepository \"%s\"\n" +msgstr "" + +#, python-format msgid "removing subrepo %s\n" msgstr "" +#, fuzzy, python-format +msgid "cloning subrepo %s from %s\n" +msgstr "%d subdepozite" + #, python-format msgid "pulling subrepo %s from %s\n" msgstr "" @@ -12170,6 +15602,9 @@ msgid "pushing subrepo %s to %s\n" msgstr "" +msgid "cannot retrieve svn tool version" +msgstr "" + msgid "cannot commit svn externals" msgstr "" @@ -12178,6 +15613,35 @@ msgstr "" #, python-format +msgid "revision %s does not exist in subrepo %s\n" +msgstr "" + +#, python-format +msgid "checking out detached HEAD in subrepo %s\n" +msgstr "" + +msgid "check out a git branch if you intend to make changes\n" +msgstr "" + +#, python-format +msgid "subrepo %s is missing" +msgstr "" + +#, python-format +msgid "unrelated git branch checked out in subrepo %s\n" +msgstr "" + +#, python-format +msgid "pushing branch %s of subrepo %s\n" +msgstr "" + +#, python-format +msgid "" +"no branch checked out in subrepo %s\n" +"cannot push revision %s" +msgstr "" + +#, python-format msgid "%s, line %s: %s\n" msgstr "" @@ -12188,21 +15652,38 @@ msgid "node '%s' is not well formed" msgstr "" +msgid ".hg/cache/tags is corrupt, rebuilding it\n" +msgstr "" + +#, fuzzy, python-format +msgid "unknown method '%s'" +msgstr "hg: comandă necunoscută '%s'\n" + +msgid "expected a symbol" +msgstr "" + +#, fuzzy, python-format +msgid "unknown function '%s'" +msgstr "hg: comandă necunoscută '%s'\n" + +msgid "expected template specifier" +msgstr "" + +#, python-format +msgid "filter %s expects one argument" +msgstr "" + msgid "unmatched quotes" msgstr "" #, python-format -msgid "error expanding '%s%%%s'" -msgstr "" - -#, python-format -msgid "unknown filter '%s'" -msgstr "" - -#, python-format msgid "style not found: %s" msgstr "" +#, fuzzy, python-format +msgid "\"%s\" not in template map" +msgstr "afișează folosind fișierul cu harta de șabloane" + #, python-format msgid "template file %s: %s" msgstr "" @@ -12223,6 +15704,9 @@ msgid "rollback failed - please run hg recover\n" msgstr "" +msgid "already have changeset " +msgstr "" + #, python-format msgid "Not trusting file %s from untrusted user %s, group %s\n" msgstr "" @@ -12232,11 +15716,19 @@ msgstr "" #, python-format +msgid "(deprecated '%%' in path %s=%s from %s)\n" +msgstr "" + +#, python-format msgid "ignoring untrusted configuration option %s.%s = %s\n" msgstr "" #, python-format -msgid "%s.%s not a boolean ('%s')" +msgid "%s.%s is not a boolean ('%s')" +msgstr "" + +#, python-format +msgid "%s.%s is not an integer ('%s')" msgstr "" msgid "enter a commit username:" @@ -12253,10 +15745,6 @@ msgid "username %s contains a newline\n" msgstr "" -#, python-format -msgid "(deprecated '%%' in path %s=%s from %s)\n" -msgstr "" - msgid "response expected" msgstr "" @@ -12291,40 +15779,30 @@ msgstr "" #, python-format -msgid "ignoring invalid [auth] key '%s'\n" -msgstr "" - -msgid "certificate checking requires Python 2.6" -msgstr "verificarea certificatului necesită Python 2.6" - -msgid "server identity verification succeeded\n" -msgstr "" - -#, python-format msgid "command '%s' failed: %s" msgstr "" #, 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 "" - -msgid "Hardlinks not supported" -msgstr "" - -#, python-format -msgid "could not symlink to %r: %s" -msgstr "" - -#, python-format -msgid "invalid date: %r " +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" +msgstr "" + +#, python-format +msgid "negative timestamp: %d" +msgstr "" + +#, python-format +msgid "invalid date: %r" msgstr "" #, python-format @@ -12332,14 +15810,31 @@ msgstr "" #, python-format +msgid "negative date value: %d" +msgstr "" + +#, python-format msgid "impossible time zone offset: %d" msgstr "" +msgid "dates cannot consist entirely of whitespace" +msgstr "" + +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 "" @@ -12379,6 +15874,13 @@ msgid "%.0f bytes" msgstr "" +#, python-format +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 "" @@ -12443,6 +15945,9 @@ msgid "checking changesets\n" msgstr "se verifică seturile de modificări\n" +msgid "checking" +msgstr "se verifică" + #, python-format msgid "unpacking changeset %s" msgstr "" @@ -12485,9 +15990,6 @@ msgid "cannot decode filename '%s'" msgstr "" -msgid "checking" -msgstr "se verifică" - #, python-format msgid "broken revlog! (%s)" msgstr "" @@ -12547,20 +16049,80 @@ msgid "(first damaged changeset appears to be %d)\n" msgstr "" -msgid "user name not available - set USERNAME environment variable" -msgstr "" - msgid "look up remote revision" msgstr "se caută revizia" +msgid "push failed (unexpected response):" +msgstr "" + msgid "look up remote changes" msgstr "se caută modificări la distanță" msgid "push failed:" msgstr "" -msgid "push failed (unexpected response):" -msgstr "" +#~ msgid "not updating, since new heads added\n" +#~ msgstr "nu se actualizează deoarece au fost adăugate noi capete\n" + +#~ msgid "record datecode as commit date" +#~ msgstr "înregistrează codul de dată ca dată a depozitării" + +#~ msgid "base path" +#~ msgstr "calea de bază" + +#~ 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 "" +#~ "Dacă există un fișier de configurare la nivelul depozitului care nu\n" +#~ "este proprietatea utilizatorului activ, Mercurial vă va avertiza că\n" +#~ "fișierul este omis::" + +#~ msgid "" +#~ " Return 0 on succces.\n" +#~ " " +#~ msgstr "" +#~ " Returnează 0 în caz de succes.\n" +#~ " " + +#~ msgid "Checking patch...\n" +#~ msgstr "Se verifică patch-ul\n" + +#~ msgid ":user: Any text. Returns the user portion of an email address.\n" +#~ msgstr "" +#~ ":user: Orice text. Returnează porțiunea utilizator a unei adrese de e-" +#~ "mail.\n" + +#, fuzzy +#~ msgid "pulling subrepo %s\n" +#~ msgstr "%d subdepozite" + +#~ msgid "options:" +#~ msgstr "opțiuni:" + +#~ msgid "queue directory updating\n" +#~ msgstr "actualizarea directorului se introduce în coadă\n" + +#~ msgid "replace existing tag" +#~ msgstr "înlocuiește o etichetă existentă" + +#~ msgid " changesets" +#~ msgstr "seturi de modificări" + +#~ msgid "" +#~ " If no changeset is specified, attempt to update to the tip of the\n" +#~ " current branch. If this changeset is a descendant of the working\n" +#~ " directory's parent, update to it, otherwise abort." +#~ msgstr "" +#~ " Dacă nu se specifică nici un set de modificări, se încearcă " +#~ "actualizarea\n" +#~ " la vârful ramurii curente. Dacă acest set de modificări este " +#~ "descendent\n" +#~ " al părintelui directorului de lucru, se actualizează la el, altfel se " +#~ "renunță." + +#~ msgid "check for uncommitted changes" +#~ msgstr "verifică dacă există modificări nedepozitate" #~ msgid "" #~ " If no commit message is specified, the configured editor is\n"