Mercurial > hg
changeset 14626:92f5c244e3a8
i18n-ru: translated push-rename
| author | Alexander Sauta <demosito@gmail.com> |
|---|---|
| date | Fri, 10 Jun 2011 01:39:22 +0400 |
| parents | 72613f4a9016 |
| children | 166776f97c9c |
| files | i18n/ru.po |
| diffstat | 1 files changed, 267 insertions(+), 1918 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/ru.po Thu Jun 09 20:37:32 2011 +0400 +++ b/i18n/ru.po Fri Jun 10 01:39:22 2011 +0400 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2011-06-08 20:49+0400\n" +"POT-Creation-Date: 2011-06-09 20:39+0400\n" "PO-Revision-Date: 2011-05-12 23:48+0400\n" "Last-Translator: Alexander Sauta <demosito@gmail.com>\n" "Language-Team: Russian\n" @@ -3363,11 +3363,11 @@ msgstr "" #, python-format -msgid "allowing %s - guarded by %s\n" -msgstr "" - -#, python-format -msgid "skipping %s - guarded by %s\n" +msgid "allowing %s - guarded by %r\n" +msgstr "" + +#, python-format +msgid "skipping %s - guarded by %r\n" msgstr "" #, python-format @@ -3530,7 +3530,7 @@ msgstr "" #, python-format -msgid "guarded by %s" +msgid "guarded by %r" msgstr "" msgid "no matching guards" @@ -4254,6 +4254,14 @@ " With two arguments, renames PATCH1 to PATCH2." msgstr "" +#, fuzzy, python-format +msgid "%s already exists" +msgstr "файл %s уже существует\n" + +#, python-format +msgid "A patch named %s already exists in the series file" +msgstr "" + msgid "delete save entry" msgstr "" @@ -5431,15 +5439,9 @@ msgid "source is descendant of destination" msgstr "" -msgid "--tool can only be used with --rebase" -msgstr "" - msgid "rebase working directory to branch head" msgstr "перебазировать рабочий каталог поверх головы ветви" -msgid "specify merge tool for rebase" -msgstr "задать программу для слияния при перебазировании" - msgid "commands to interactively select changes for commit/qrefresh" msgstr "" @@ -5498,9 +5500,6 @@ msgid "record change %d/%d to %r?" msgstr "" -msgid "hg record [OPTION]... [FILE]..." -msgstr "" - msgid "interactively select changes to commit" msgstr "" @@ -5550,8 +5549,7 @@ msgid "'mq' extension not loaded" msgstr "" -#, python-format -msgid "running non-interactively, use %s instead" +msgid "running non-interactively, use commit instead" msgstr "" msgid "cannot partially commit a merge (use \"hg commit\" instead)" @@ -5560,12 +5558,12 @@ msgid "no changes to record\n" msgstr "" +msgid "hg record [OPTION]... [FILE]..." +msgstr "" + msgid "hg qrecord [OPTION]... PATCH [FILE]..." msgstr "" -msgid "interactively select changes to refresh" -msgstr "" - msgid "recreates hardlinks between repository clones" msgstr "" @@ -8826,9 +8824,6 @@ msgid "revision to display" msgstr "" -msgid "list files from all revisions" -msgstr "" - msgid "[-r REV]" msgstr "" @@ -8846,15 +8841,6 @@ " 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 "" - -#, fuzzy -msgid "can't specify a revision with --all" -msgstr "пожалуйста, укажите ревизию для отмены" - msgid "force a merge with outstanding changes" msgstr "" @@ -8937,13 +8923,13 @@ msgstr "" msgid "a changeset intended to be included in the destination" -msgstr "" +msgstr "набора изменений для добавления в удаленный репозиторий" msgid "a specific branch you would like to push" -msgstr "" +msgstr "ветвь которую вы хотите втолкнуть" msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" -msgstr "" +msgstr "[-M] [-p] [-n] [-f] [-r РЕВИЗИЯ]... [НАЗН]" msgid "show changesets not found in the destination" msgstr "" @@ -9051,9 +9037,8 @@ msgid "not found!\n" msgstr "не найден!\n" -#, python-format -msgid "not updating: %s\n" -msgstr "не обновлено: %s\n" +msgid "not updating, since new heads added\n" +msgstr "" msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" msgstr "" @@ -9143,29 +9128,33 @@ msgstr "импорируется закладка %s\n" msgid "force push" -msgstr "" +msgstr "протолкнуть принудительно" msgid "bookmark to push" -msgstr "" +msgstr "протолкнуть закладку" msgid "allow pushing a new branch" -msgstr "" +msgstr "разрешить создать новую ветвь в удаленном репозитории" msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" -msgstr "" +msgstr "[-f] [-r РЕВ]... [-e КОМ-ДА] [--remotecmd КОМ-ДА] [НАЗН]" msgid "push changes to the specified destination" -msgstr "" +msgstr "\"протолкнуть\" изменения в удаленный репозиторий" msgid "" " Push changesets from the local repository to the specified\n" " destination." msgstr "" +" Передает изменения из локального репозитория в удаленный\n" +" " msgid "" " This operation is symmetrical to pull: it is identical to a pull\n" " in the destination repository from the current one." msgstr "" +" Эта операция симметрична pull: она имеет такой же эффект, как\n" +" если бы в удаленном репозитория был выполнен pull из текущего." msgid "" " By default, push will not allow creation of new heads at the\n" @@ -9173,44 +9162,60 @@ " to use. In this situation, it is recommended to pull and merge\n" " before pushing." msgstr "" +" По умолчанию push не даст создать новые \"головы\" в удаленном\n" +" репозитории, потому что в этом случае было бы не ясно, какую\n" +" голову использовать. В такой ситуации рекомендуется\n" +" подтянуть (pull) и слить (merge) изменения перед 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 "" +" Используйте --new-branch, если вы хотите разрешить создание\n" +" именованной ветви, которой нет в удаленном репозитории. Это\n" +" позволяет просто создать новую ветвь в удаленном репозитории,\n" +" не проталкивая остальные изменения." msgid "" " Use -f/--force to override the default behavior and push all\n" " changesets on all branches." msgstr "" +" Используйте -f/--force чтобы игнорировать поведение по\n" +" умолчанию и протолкнуть все изменения на всех ветвях." msgid "" " If -r/--rev is used, the specified revision and all its ancestors\n" " will be pushed to the remote repository." msgstr "" +" Если указан -r/--rev, то заданная ревизия и все ее потомки\n" +" будут переданы в удаленный репозиторий." msgid "" " Please see :hg:`help urls` for important details about ``ssh://``\n" " URLs. If DESTINATION is omitted, a default path will be used." msgstr "" +" См. :hg:`help urls` о важных подробностях об URL вида ``ssh://``.\n" +" Если НАЗНАЧЕНИЕ опущено, используется путь по умолчанию (default)." msgid "" " Returns 0 if push was successful, 1 if nothing to push.\n" " " msgstr "" +" Возвращает 0 в случае успехе, 1 если нет изменений для push'а.\n" +" " #, python-format msgid "pushing to %s\n" -msgstr "" +msgstr "проталкиваю в %s\n" #, python-format msgid "exporting bookmark %s\n" -msgstr "" +msgstr "экспортируется закладка %s\n" #, python-format msgid "deleting remote bookmark %s\n" -msgstr "" +msgstr "удаляется удаленная закладка %s\n" #, python-format msgid "bookmark %s does not exist on the local or remote repository!\n" @@ -9221,33 +9226,40 @@ msgstr "" msgid "roll back an interrupted transaction" -msgstr "" +msgstr "откатить прерванную транзакцию" msgid " Recover from an interrupted commit or pull." -msgstr "" +msgstr " Восстанавливает репозиторий после прерванного push или pull" msgid "" " This command tries to fix the repository status after an\n" " interrupted operation. It should only be necessary when Mercurial\n" " suggests it." msgstr "" +" Эта команда пытается исправить состояние репозитория после\n" +" прерванной операции. Это должно быть необходимо только если\n" +" Mercurial сам предлагает это сделать." msgid "" " Returns 0 if successful, 1 if nothing to recover or verify fails.\n" " " msgstr "" +" Возвращает 0 в случае успеха, 1 если нечего восстанавливать или\n" +" проверка целостности не прошла." msgid "record delete for missing files" -msgstr "" +msgstr "удалить отсутствующие файлы" msgid "remove (and delete) file even if added or modified" msgstr "" +"удалять файлы из каталога и репозитория даже если они были добавлены или " +"изменены" msgid "remove the specified files on the next commit" -msgstr "" +msgstr "удалить указанные файлы при следующем коммите" msgid " Schedule the indicated files for removal from the repository." -msgstr "" +msgstr " Помечает заданные файлы для удаления из репозитория." msgid "" " This only removes files from the current branch, not from the\n" @@ -9256,6 +9268,12 @@ " force deletion, and -Af can be used to remove files from the next\n" " revision without deleting them from the working directory." msgstr "" +" Удаляются только файлы с текущей ветки, а не из всей истории\n" +" проекта. Используйте -A/--after, чтобы удалить из репозитория\n" +" файлы, которые были удалены из рабочего каталога. -f/--force\n" +" удаляет файлы принудительно, -Af можно использовать чтобы\n" +" удалить файлы из следующей ревизии, не удаляя их из рабочего\n" +" каталога." msgid "" " The following table details the behavior of remove for different\n" @@ -9264,6 +9282,13 @@ " reported by :hg:`status`). The actions are Warn, Remove (from\n" " branch) and Delete (from disk)::" msgstr "" +" Приведенная ниже таблица поясняет поведение команды remove для\n" +" разных состояний файла (столбцы) и комбинаций параметров (строки).\n" +" Состояния файлов (как их показывает :hg:`status`):\n" +" Добавлен (Added) [A], Без изменений (Clean) [C],\n" +" Изменен (Modified) [M], Отсутствует (Missing) [!]. Действия:\n" +" Предупредить (Warn - W), удалить из ветви (Remove - R), удалить\n" +" из каталога (Delete - D)." msgid "" " A C M !\n" @@ -9272,58 +9297,67 @@ " -A W W W R\n" " -Af R R R R" msgstr "" - -msgid "" -" Note that remove never deletes files in Added [A] state from the\n" -" working directory, not even if option --force is specified." -msgstr "" +" A C M !\n" +" нет W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R" msgid "" " This command schedules the files to be removed at the next commit.\n" " To undo a remove before that, see :hg:`revert`." msgstr "" +" Эта команда помечает файлы для удаления при следующем коммите.\n" +" Чтобы отменить удаление до коммита, см. :hg:`revert`." msgid "" " Returns 0 on success, 1 if any warnings encountered.\n" " " -msgstr "" +msgstr " При успехе возвращает 0, 1 если были придупреждения." #, python-format msgid "not removing %s: file is untracked\n" -msgstr "" +msgstr "%s не удален: файл не контролируется\n" #, python-format msgid "not removing %s: file still exists (use -f to force removal)\n" -msgstr "" +msgstr "%s не удален: файл еще существует (-f - удалить принудительно)\n" #, python-format msgid "not removing %s: file is modified (use -f to force removal)\n" -msgstr "" +msgstr "%s не удален: файл изменен (-f - удалить принудительно)\n" #, python-format msgid "" "not removing %s: file has been marked for add (use -f to force removal)\n" msgstr "" +"%s не удален: файл был помечен для добавления (-f - удалить принудительно)\n" msgid "record a rename that has already occurred" -msgstr "" +msgstr "записать переименование, которое уже было сделано" msgid "[OPTION]... SOURCE... DEST" -msgstr "" +msgstr "[ПАРАМЕТР]... ИСТОЧНИК... НАЗНАЧЕНИЕ" msgid "rename files; equivalent of copy + remove" -msgstr "" +msgstr "переименовать файлы; эквивалентно copy + remove" msgid "" " Mark dest as copies of sources; mark sources for deletion. If dest\n" " is a directory, copies are put in that directory. If dest is a\n" " file, there can only be one source." msgstr "" +" Помечает файлы назначения как копии файлов-источников; помечает\n" +" источники для удаления. Если НАЗНАЧЕНИЕ - каталог, копии\n" +" помещаются в этот каталог. Если НАЗНАЧЕНИЕ - файл, то ИСТОЧНИК\n" +" может быть только один." msgid "" " This command takes effect at the next commit. To undo a rename\n" " before that, see :hg:`revert`." msgstr "" +" Эффект команды закрепляется при следующем коммите. чтобы отменить\n" +" переимнование, см. :hg:`revert`." msgid "select all unresolved files" msgstr "" @@ -10130,6 +10164,14 @@ msgstr "" #, python-format +msgid "%s not added!\n" +msgstr "" + +#, fuzzy, python-format +msgid "%s still exists!\n" +msgstr "файл %s уже существует\n" + +#, python-format msgid "%s not tracked!\n" msgstr "" @@ -10175,6 +10217,10 @@ msgid "setting %r to other parent only allowed in merges" msgstr "" +#, fuzzy, python-format +msgid "not in dirstate: %s\n" +msgstr "не обновлено: %s\n" + msgid "unknown" msgstr "неизвесно" @@ -10530,14 +10576,72 @@ msgstr "" 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::" +"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 "" +"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 "" +"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 "" + +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::" msgstr "" msgid "" @@ -10548,1834 +10652,13 @@ msgid "" "The above entries will be referred to as ``ui.username`` and\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 "" - -#, fuzzy -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 "использовать расширенный формат git для diff'ов" - -msgid "" -"``nodates``\n" -" Don't include dates in diff headers." -msgstr "" - -#, fuzzy -msgid "" -"``showfunc``\n" -" Show which function each change is in." -msgstr "для каждого изменения показать, в какой оно сделано функции" - -#, fuzzy -msgid "" -"``ignorews``\n" -" Ignore white space when comparing lines." -msgstr "игнорировать пробельные символы при сравнении строк" - -#, fuzzy -msgid "" -"``ignorewsamount``\n" -" Ignore changes in the amount of white space." -msgstr "игнорировать изменения в количестве пробельных символов" - -#, fuzzy -msgid "" -"``ignoreblanklines``\n" -" Ignore changes whose lines are all blank." -msgstr "игнорировать пустые строки" - -#, fuzzy -msgid "" -"``unified``\n" -" Number of lines of context to show." -msgstr "показываемое количество строк контекста" - -msgid "" -"``email``\n" -"\"\"\"\"\"\"\"\"\"" -msgstr "" - -msgid "Settings for extensions that send email messages." -msgstr "" - -msgid "" -"``from``\n" -" Optional. Email address to use in \"From\" header and SMTP envelope\n" -" of outgoing messages." -msgstr "" - -msgid "" -"``to``\n" -" Optional. Comma-separated list of recipients' email addresses." -msgstr "" - -msgid "" -"``cc``\n" -" Optional. Comma-separated list of carbon copy recipients'\n" -" email addresses." -msgstr "" - -msgid "" -"``bcc``\n" -" Optional. Comma-separated list of blind carbon copy recipients'\n" -" email addresses." -msgstr "" - -msgid "" -"``method``\n" -" Optional. Method to use to send email messages. If value is ``smtp``\n" -" (default), use SMTP (see the SMTP_ section for configuration).\n" -" Otherwise, use as name of program to run that acts like sendmail\n" -" (takes ``-f`` option for sender, list of recipients on command line,\n" -" message on stdin). Normally, setting this to ``sendmail`` or\n" -" ``/usr/sbin/sendmail`` is enough to use sendmail to send messages." -msgstr "" - -msgid "" -"``charsets``\n" -" Optional. Comma-separated list of character sets considered\n" -" convenient for recipients. Addresses, headers, and parts not\n" -" containing patches of outgoing messages will be encoded in the\n" -" first character set to which conversion from local encoding\n" -" (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct\n" -" conversion fails, the text in question is sent as is. Defaults to\n" -" empty (explicit) list." -msgstr "" - -msgid " Order of outgoing email character sets:" -msgstr "" - -msgid "" -" 1. ``us-ascii``: always first, regardless of settings\n" -" 2. ``email.charsets``: in order given by user\n" -" 3. ``ui.fallbackencoding``: if not in email.charsets\n" -" 4. ``$HGENCODING``: if not in email.charsets\n" -" 5. ``utf-8``: always last, regardless of settings" -msgstr "" - -msgid "Email example::" -msgstr "" - -msgid "" -" [email]\n" -" from = Joseph User <joe.user@example.com>\n" -" method = /usr/sbin/sendmail\n" -" # charsets for western Europeans\n" -" # us-ascii, utf-8 omitted, as they are tried first and last\n" -" charsets = iso-8859-1, iso-8859-15, windows-1252" -msgstr "" - -msgid "" -"\n" -"``extensions``\n" -"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" -msgstr "" - -msgid "" -"Mercurial has an extension mechanism for adding new features. To\n" -"enable an extension, create an entry for it in this section." -msgstr "" - -msgid "" -"If you know that the extension is already in Python's search path,\n" -"you can give the name of the module, followed by ``=``, with nothing\n" -"after the ``=``." -msgstr "" - -msgid "" -"Otherwise, give a name that you choose, followed by ``=``, followed by\n" -"the path to the ``.py`` file (including the file name extension) that\n" -"defines the extension." -msgstr "" - -msgid "" -"To explicitly disable an extension that is enabled in an hgrc of\n" -"broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``\n" -"or ``foo = !`` when path is not supplied." -msgstr "" - -msgid "Example for ``~/.hgrc``::" -msgstr "" - -msgid "" -" [extensions]\n" -" # (the mq extension will get loaded from Mercurial's path)\n" -" mq =\n" -" # (this extension will get loaded from the file specified)\n" -" myfeature = ~/.hgext/myfeature.py" -msgstr "" - -msgid "" -"\n" -"``hostfingerprints``\n" -"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" -msgstr "" - -msgid "" -"Fingerprints of the certificates of known HTTPS servers.\n" -"A HTTPS connection to a server with a fingerprint configured here will\n" -"only succeed if the servers certificate matches the fingerprint.\n" -"This is very similar to how ssh known hosts works.\n" -"The fingerprint is the SHA-1 hash value of the DER encoded certificate.\n" -"The CA chain and web.cacerts is not used for servers with a fingerprint." -msgstr "" - -msgid "For example::" -msgstr "" - -msgid "" -" [hostfingerprints]\n" -" hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:" -"d6:4b:ee:cc" -msgstr "" - -msgid "This feature is only supported when using Python 2.6 or later." -msgstr "" - -msgid "" -"\n" -"``format``\n" -"\"\"\"\"\"\"\"\"\"\"" -msgstr "" - -msgid "" -"``usestore``\n" -" Enable or disable the \"store\" repository format which improves\n" -" compatibility with systems that fold case or otherwise mangle\n" -" filenames. Enabled by default. Disabling this option will allow\n" -" you to store longer filenames in some situations at the expense of\n" -" compatibility and ensures that the on-disk format of newly created\n" -" repositories will be compatible with Mercurial before version 0.9.4." -msgstr "" - -msgid "" -"``usefncache``\n" -" Enable or disable the \"fncache\" repository format which enhances\n" -" the \"store\" repository format (which has to be enabled to use\n" -" fncache) to allow longer filenames and avoids using Windows\n" -" reserved names, e.g. \"nul\". Enabled by default. Disabling this\n" -" option ensures that the on-disk format of newly created\n" -" repositories will be compatible with Mercurial before version 1.1." -msgstr "" - -msgid "" -"``dotencode``\n" -" Enable or disable the \"dotencode\" repository format which enhances\n" -" the \"fncache\" repository format (which has to be enabled to use\n" -" dotencode) to avoid issues with filenames starting with ._ on\n" -" Mac OS X and spaces on Windows. Enabled by default. Disabling this\n" -" option ensures that the on-disk format of newly created\n" -" repositories will be compatible with Mercurial before version 1.7." -msgstr "" - -msgid "" -"``merge-patterns``\n" -"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" -msgstr "" - -msgid "" -"This section specifies merge tools to associate with particular file\n" -"patterns. Tools matched here will take precedence over the default\n" -"merge tool. Patterns are globs by default, rooted at the repository\n" -"root." -msgstr "" - -msgid "" -" [merge-patterns]\n" -" **.c = kdiff3\n" -" **.jpg = myimgmerge" -msgstr "" - -msgid "" -"``merge-tools``\n" -"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" -msgstr "" - -msgid "" -"This section configures external merge tools to use for file-level\n" -"merges." -msgstr "" - -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 "Первая хорошая ревизия:\n" - -msgid "" -"``accesslog``\n" -" Where to output the access log. Default is stdout." -msgstr "" - -msgid "" -"``address``\n" -" Interface address to bind to. Default is all." -msgstr "" - -msgid "" -"``allow_archive``\n" -" List of archive format (bz2, gz, zip) allowed for downloading.\n" -" Default is empty." -msgstr "" - -msgid "" -"``allowbz2``\n" -" (DEPRECATED) Whether to allow .tar.bz2 downloading of repository\n" -" revisions.\n" -" Default is False." -msgstr "" - -msgid "" -"``allowgz``\n" -" (DEPRECATED) Whether to allow .tar.gz downloading of repository\n" -" revisions.\n" -" Default is False." -msgstr "" - -msgid "" -"``allowpull``\n" -" Whether to allow pulling from the repository. Default is True." -msgstr "" - -msgid "" -"``allow_push``\n" -" Whether to allow pushing to the repository. If empty or not set,\n" -" push is not allowed. If the special value ``*``, any remote user can\n" -" push, including unauthenticated users. Otherwise, the remote user\n" -" must have been authenticated, and the authenticated user name must\n" -" be present in this list. The contents of the allow_push list are\n" -" examined after the deny_push list." -msgstr "" - -msgid "" -"``allow_read``\n" -" If the user has not already been denied repository access due to\n" -" the contents of deny_read, this list determines whether to grant\n" -" repository access to the user. If this list is not empty, and the\n" -" user is unauthenticated or not present in the list, then access is\n" -" denied for the user. If the list is empty or not set, then access\n" -" is permitted to all users by default. Setting allow_read to the\n" -" special value ``*`` is equivalent to it not being set (i.e. access\n" -" is permitted to all users). The contents of the allow_read list are\n" -" examined after the deny_read list." -msgstr "" - -msgid "" -"``allowzip``\n" -" (DEPRECATED) Whether to allow .zip downloading of repository\n" -" revisions. Default is False. This feature creates temporary files." -msgstr "" - -msgid "" -"``baseurl``\n" -" Base URL to use when publishing URLs in other locations, so\n" -" third-party tools like email notification hooks can construct\n" -" URLs. Example: ``http://hgserver/repos/``." -msgstr "" - -msgid "" -"``cacerts``\n" -" Path to file containing a list of PEM encoded certificate\n" -" authority certificates. Environment variables and ``~user``\n" -" constructs are expanded in the filename. If specified on the\n" -" client, then it will verify the identity of remote HTTPS servers\n" -" with these certificates. The form must be as follows::" -msgstr "" - -msgid "" -" -----BEGIN CERTIFICATE-----\n" -" ... (certificate in base64 PEM encoding) ...\n" -" -----END CERTIFICATE-----\n" -" -----BEGIN CERTIFICATE-----\n" -" ... (certificate in base64 PEM encoding) ...\n" -" -----END CERTIFICATE-----" -msgstr "" - -msgid "" -" This feature is only supported when using Python 2.6 or later. If you " -"wish\n" -" to use it with earlier versions of Python, install the backported\n" -" version of the ssl library that is available from\n" -" ``http://pypi.python.org``." -msgstr "" - -msgid "" -" You can use OpenSSL's CA certificate file if your platform has one.\n" -" On most Linux systems this will be ``/etc/ssl/certs/ca-certificates." -"crt``.\n" -" Otherwise you will have to generate this file manually." -msgstr "" - -msgid "" -" To disable SSL verification temporarily, specify ``--insecure`` from\n" -" command line." -msgstr "" - -msgid "" -"``cache``\n" -" Whether to support caching in hgweb. Defaults to True." -msgstr "" - -msgid "" -"``contact``\n" -" Name or email address of the person in charge of the repository.\n" -" Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty." -msgstr "" - -msgid "" -"``deny_push``\n" -" Whether to deny pushing to the repository. If empty or not set,\n" -" push is not denied. If the special value ``*``, all remote users are\n" -" denied push. Otherwise, unauthenticated users are all denied, and\n" -" any authenticated user name present in this list is also denied. The\n" -" contents of the deny_push list are examined before the allow_push list." -msgstr "" - -msgid "" -"``deny_read``\n" -" Whether to deny reading/viewing of the repository. If this list is\n" -" not empty, unauthenticated users are all denied, and any\n" -" authenticated user name present in this list is also denied access to\n" -" the repository. If set to the special value ``*``, all remote users\n" -" are denied access (rarely needed ;). If deny_read is empty or not set,\n" -" the determination of repository access depends on the presence and\n" -" content of the allow_read list (see description). If both\n" -" deny_read and allow_read are empty or not set, then access is\n" -" permitted to all users by default. If the repository is being\n" -" served via hgwebdir, denied users will not be able to see it in\n" -" the list of repositories. The contents of the deny_read list have\n" -" priority over (are examined before) the contents of the allow_read\n" -" list." -msgstr "" - -msgid "" -"``descend``\n" -" hgwebdir indexes will not descend into subdirectories. Only " -"repositories\n" -" directly in the current path will be shown (other repositories are " -"still\n" -" available from the index corresponding to their containing path)." -msgstr "" - -msgid "" -"``description``\n" -" Textual description of the repository's purpose or contents.\n" -" Default is \"unknown\"." -msgstr "" - -msgid "" -"``encoding``\n" -" Character encoding name. Default is the current locale charset.\n" -" Example: \"UTF-8\"" -msgstr "" - -msgid "" -"``errorlog``\n" -" Where to output the error log. Default is stderr." -msgstr "" - -msgid "" -"``hidden``\n" -" Whether to hide the repository in the hgwebdir index.\n" -" Default is False." -msgstr "" - -msgid "" -"``ipv6``\n" -" Whether to use IPv6. Default is False." -msgstr "" - -msgid "" -"``logourl``\n" -" Base URL to use for logos. If unset, ``http://mercurial.selenic.com/``\n" -" will be used." -msgstr "" - -msgid "" -"``name``\n" -" Repository name to use in the web interface. Default is current\n" -" working directory." -msgstr "" - -msgid "" -"``maxchanges``\n" -" Maximum number of changes to list on the changelog. Default is 10." -msgstr "" - -msgid "" -"``maxfiles``\n" -" Maximum number of files to list per changeset. Default is 10." -msgstr "" - -msgid "" -"``port``\n" -" Port to listen on. Default is 8000." -msgstr "" - -#, fuzzy -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 "" - -#, fuzzy -msgid "" -"``style``\n" -" Which template map style to use." -msgstr "используемый стиль шаблона" - -msgid "" -"``templates``\n" -" Where to find the HTML templates. Default is install path.\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" msgstr "" msgid "Some commands allow the user to specify a date, e.g.:" @@ -13237,6 +11520,11 @@ msgstr "" msgid "" +"Syntax\n" +"------" +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" @@ -14426,6 +12714,10 @@ msgstr "" #, python-format +msgid "requirement '%s' not supported" +msgstr "" + +#, python-format msgid ".hg/sharedpath points to nonexistent directory %s" msgstr "" @@ -14762,7 +13054,7 @@ msgid "crosses branches (merge branches or use --clean to discard changes)" msgstr "" -msgid "crosses branches (merge branches or update --check to force update)" +msgid "crosses branches (merge branches or use --check to force update)" msgstr "" msgid "Attention:" @@ -14796,9 +13088,13 @@ msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" msgstr "" +#, python-format +msgid "cannot create %s: destination already exists" +msgstr "" + #, fuzzy, python-format -msgid "cannot patch %s: file is not tracked" -msgstr "%s не удален, он и так не отслеживается\n" +msgid "cannot create %s: unable to create destination directory" +msgstr "ветвь с таким именем уже существует" #, python-format msgid "unable to find '%s' for patching\n" @@ -14812,10 +13108,6 @@ msgid "bad hunk #%d %s (%d %d %d %d)" msgstr "плохая полоса #%d %s (%d %d %d %d)" -#, fuzzy, python-format -msgid "cannot create %s: destination already exists\n" -msgstr "ветвь с таким именем уже существует" - #, python-format msgid "file %s already exists\n" msgstr "файл %s уже существует\n" @@ -14856,10 +13148,6 @@ msgstr "" #, python-format -msgid "cannot create %s: destination already exists" -msgstr "" - -#, python-format msgid "unsupported parser state: %s" msgstr "" @@ -15396,13 +13684,6 @@ 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 "" @@ -16051,3 +14332,71 @@ msgid "push failed:" msgstr "" + +#~ msgid "specify merge tool for rebase" +#~ msgstr "задать программу для слияния при перебазировании" + +#, fuzzy +#~ msgid "can't specify a revision with --all" +#~ msgstr "пожалуйста, укажите ревизию для отмены" + +#, fuzzy +#~ msgid "Supported arguments:" +#~ msgstr "несовместимые аргументы" + +#, fuzzy +#~ msgid "" +#~ "``git``\n" +#~ " Use git extended diff format." +#~ msgstr "использовать расширенный формат git для diff'ов" + +#, fuzzy +#~ msgid "" +#~ "``showfunc``\n" +#~ " Show which function each change is in." +#~ msgstr "для каждого изменения показать, в какой оно сделано функции" + +#, fuzzy +#~ msgid "" +#~ "``ignorews``\n" +#~ " Ignore white space when comparing lines." +#~ msgstr "игнорировать пробельные символы при сравнении строк" + +#, fuzzy +#~ msgid "" +#~ "``ignorewsamount``\n" +#~ " Ignore changes in the amount of white space." +#~ msgstr "игнорировать изменения в количестве пробельных символов" + +#, fuzzy +#~ msgid "" +#~ "``ignoreblanklines``\n" +#~ " Ignore changes whose lines are all blank." +#~ msgstr "игнорировать пустые строки" + +#, fuzzy +#~ msgid "" +#~ "``unified``\n" +#~ " Number of lines of context to show." +#~ msgstr "показываемое количество строк контекста" + +#, fuzzy +#~ msgid "The full set of options is:" +#~ msgstr "Первая хорошая ревизия:\n" + +#, fuzzy +#~ msgid "" +#~ "``prefix``\n" +#~ " Prefix path to serve from. Default is '' (server root)." +#~ msgstr "" +#~ "префикс пути для предоставления доступа (по умолчанию: в корне сервера)" + +#, fuzzy +#~ msgid "" +#~ "``style``\n" +#~ " Which template map style to use." +#~ msgstr "используемый стиль шаблона" + +#, fuzzy +#~ msgid "cannot patch %s: file is not tracked" +#~ msgstr "%s не удален, он и так не отслеживается\n"