--- a/i18n/ru.po Sun May 29 02:33:36 2011 +0400
+++ b/i18n/ru.po Mon May 30 01:24:21 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-05-12 21:40+0400\n"
+"POT-Creation-Date: 2011-05-29 01:27+0400\n"
"PO-Revision-Date: 2011-05-12 23:48+0400\n"
"Last-Translator: Alexander Sauta <demosito@gmail.com>\n"
"Language-Team: Russian\n"
@@ -789,7 +789,7 @@
msgstr ""
msgid "DATE"
-msgstr ""
+msgstr "ДАТА"
msgid "count rate for revisions matching date spec"
msgstr ""
@@ -801,7 +801,7 @@
msgstr ""
msgid "FORMAT"
-msgstr ""
+msgstr "ФОРМАТ"
msgid "strftime-compatible format for grouping by date"
msgstr ""
@@ -1088,7 +1088,8 @@
msgid " source author = destination author"
msgstr " автор в источнике = автор на выходе"
-msgid " Empty lines and lines starting with a ``#`` are ignored.\n"
+#, fuzzy
+msgid " Empty lines and lines starting with a ``#`` are ignored."
msgstr " Пустые строки и строки, начинающиеся с ``#`` игнорируются\n"
msgid ""
@@ -2237,7 +2238,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 ""
@@ -2316,13 +2317,16 @@
msgstr "очистка временного каталога\n"
msgid "use external program to diff repository (or selected files)"
-msgstr ""
+msgstr "Использовать внешнюю программу поиска отличий между ревизиями"
msgid ""
" Show differences between revisions for the specified files, using\n"
" an external program. The default program used is diff, with\n"
" default options \"-Npru\"."
msgstr ""
+" Показывает различия между ревизиями для указанных файлов, используя\n"
+" внешнюю программу. По умолчанию используется diff с параметрами\n"
+" \"-Npru\"."
msgid ""
" To select a different program, use the -p/--program option. The\n"
@@ -2330,6 +2334,10 @@
" pass additional options to the program, use -o/--option. These\n"
" will be passed before the names of the directories to compare."
msgstr ""
+" Чтобы выбрать другую программу, используйте параметр -p/--program.\n"
+" Программе будут переданы имена двух директорий для сравнения.\n"
+" Чтобы передать дополнительные параметры, используйте -o/--option.\n"
+" Они будут переданы перед именами сравниваемых директорий."
msgid ""
" When two revision arguments are given, then changes are shown\n"
@@ -2338,41 +2346,48 @@
" revisions are specified, the working directory files are compared\n"
" to its parent."
msgstr ""
+" Если указаны две ревизии, показываются отличия между этими\n"
+" ревизиями. Если указана только одна ревизия, то эта ревизия\n"
+" сравнивается с рабочей копией, а если не указано ни одной\n"
+" ревизии, рабочая копия сравнивается с родительской ревизией\n"
+" репозитория."
msgid "CMD"
-msgstr ""
+msgstr "КОМАНДА"
msgid "comparison program to run"
msgstr ""
msgid "OPT"
-msgstr ""
+msgstr "ОПЦИЯ"
msgid "pass option to comparison program"
-msgstr ""
+msgstr "передать ОПЦИЮ программе сравнения"
msgid "revision"
-msgstr ""
+msgstr "ревизия"
msgid "change made by revision"
-msgstr ""
+msgstr "изменения, сделанные в ревизии"
msgid "hg extdiff [OPT]... [FILE]..."
-msgstr ""
+msgstr "hg extdiff [ПАРАМЕТР]... [ФАЙЛ]..."
#, python-format
msgid "use %(path)s to diff repository (or selected files)"
-msgstr ""
+msgstr "использовать %(path)s для сравнения репозитория (или выбранных файлов)"
#, python-format
msgid ""
" Show differences between revisions for the specified files, using\n"
" the %(path)s program."
msgstr ""
+" Показать различия между ревизиями для указанных файлов, используя\n"
+" программу %(path)s."
#, python-format
msgid "hg %s [OPTION]... [FILE]..."
-msgstr ""
+msgstr "hg %s [ПАРАМЕТР]... [ФАЙЛ]..."
msgid "pull, update and merge in one command"
msgstr ""
@@ -2486,6 +2501,9 @@
msgid "%s Note: This key has expired (signed by: \"%s\")\n"
msgstr ""
+msgid "hg sigs"
+msgstr ""
+
msgid "list signed changesets"
msgstr ""
@@ -2493,6 +2511,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 ""
@@ -2500,6 +2521,30 @@
msgid "No valid signature for %s\n"
msgstr ""
+msgid "make the signature local"
+msgstr ""
+
+msgid "sign even if the sigfile is modified"
+msgstr ""
+
+msgid "do not commit the sigfile after signing"
+msgstr ""
+
+msgid "ID"
+msgstr "ID"
+
+msgid "the key id to sign with"
+msgstr ""
+
+msgid "TEXT"
+msgstr "ТЕКСТ"
+
+msgid "commit message"
+msgstr ""
+
+msgid "hg sign [OPTION]... [REVISION]..."
+msgstr ""
+
msgid "add a signature for the current or given revision"
msgstr ""
@@ -2531,36 +2576,6 @@
msgid "unknown signature version"
msgstr ""
-msgid "make the signature local"
-msgstr ""
-
-msgid "sign even if the sigfile is modified"
-msgstr ""
-
-msgid "do not commit the sigfile after signing"
-msgstr ""
-
-msgid "ID"
-msgstr "ID"
-
-msgid "the key id to sign with"
-msgstr ""
-
-msgid "TEXT"
-msgstr ""
-
-msgid "commit message"
-msgstr ""
-
-msgid "hg sign [OPTION]... [REVISION]..."
-msgstr ""
-
-msgid "hg sigcheck REVISION"
-msgstr ""
-
-msgid "hg sigs"
-msgstr ""
-
msgid "command to view revision graphs from a shell"
msgstr ""
@@ -2577,6 +2592,21 @@
msgid "-G/--graph option is incompatible with --follow with file argument"
msgstr ""
+msgid "NUM"
+msgstr ""
+
+msgid "limit number of changes displayed"
+msgstr "ограничивать количество отображаемых изменений"
+
+msgid "show patch"
+msgstr ""
+
+msgid "show the specified revision or range"
+msgstr ""
+
+msgid "hg glog [OPTION]... [FILE]"
+msgstr ""
+
msgid "show revision history alongside an ASCII revision graph"
msgstr ""
@@ -2594,21 +2624,6 @@
msgid "show the revision DAG"
msgstr ""
-msgid "NUM"
-msgstr ""
-
-msgid "limit number of changes displayed"
-msgstr "ограничивать количество отображаемых изменений"
-
-msgid "show patch"
-msgstr ""
-
-msgid "show the specified revision or range"
-msgstr ""
-
-msgid "hg glog [OPTION]... [FILE]"
-msgstr ""
-
msgid "hooks for integrating with the CIA.vc notification service"
msgstr ""
@@ -2628,7 +2643,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"
@@ -2637,7 +2652,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 ""
@@ -3095,6 +3112,15 @@
msgid "no [keyword] patterns configured"
msgstr ""
+msgid "show default keyword template maps"
+msgstr ""
+
+msgid "read maps from rcfile"
+msgstr ""
+
+msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
+msgstr ""
+
msgid "print [keywordmaps] configuration and an expansion example"
msgstr ""
@@ -3166,6 +3192,9 @@
"\tkeywords expanded\n"
msgstr ""
+msgid "hg kwexpand [OPTION]... [FILE]..."
+msgstr ""
+
msgid "expand keywords in the working directory"
msgstr ""
@@ -3177,6 +3206,18 @@
" "
msgstr ""
+msgid "show keyword status flags of all files"
+msgstr ""
+
+msgid "show files excluded from expansion"
+msgstr ""
+
+msgid "only show unknown (not tracked) files"
+msgstr ""
+
+msgid "hg kwfiles [OPTION]... [FILE]..."
+msgstr ""
+
msgid "show files configured for keyword expansion"
msgstr ""
@@ -3209,6 +3250,9 @@
" "
msgstr ""
+msgid "hg kwshrink [OPTION]... [FILE]..."
+msgstr ""
+
msgid "revert expanded keywords in the working directory"
msgstr ""
@@ -3220,33 +3264,6 @@
" "
msgstr ""
-msgid "show default keyword template maps"
-msgstr ""
-
-msgid "read maps from rcfile"
-msgstr ""
-
-msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
-msgstr ""
-
-msgid "hg kwexpand [OPTION]... [FILE]..."
-msgstr ""
-
-msgid "show keyword status flags of all files"
-msgstr ""
-
-msgid "show files excluded from expansion"
-msgstr ""
-
-msgid "only show unknown (not tracked) files"
-msgstr ""
-
-msgid "hg kwfiles [OPTION]... [FILE]..."
-msgstr ""
-
-msgid "hg kwshrink [OPTION]... [FILE]..."
-msgstr ""
-
msgid "manage a stack of patches"
msgstr ""
@@ -3303,6 +3320,9 @@
"create other, independent patch queues with the :hg:`qqueue` command.\n"
msgstr ""
+msgid "print first line of patch header"
+msgstr ""
+
#, python-format
msgid "malformated mq status line: %s\n"
msgstr ""
@@ -3688,6 +3708,15 @@
msgid "adding %s to series file\n"
msgstr ""
+msgid "keep patch file"
+msgstr ""
+
+msgid "stop managing a revision (DEPRECATED)"
+msgstr ""
+
+msgid "hg qdelete [-k] [PATCH]..."
+msgstr ""
+
msgid "remove patches from queue"
msgstr ""
@@ -3702,6 +3731,12 @@
" use the :hg:`qfinish` command."
msgstr ""
+msgid "show only the last patch"
+msgstr ""
+
+msgid "hg qapplied [-1] [-s] [PATCH]"
+msgstr ""
+
msgid "print the patches already applied"
msgstr ""
@@ -3711,12 +3746,42 @@
msgid "only one patch applied\n"
msgstr ""
+msgid "show only the first patch"
+msgstr ""
+
+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 ""
+
+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 "использовать расширенный формат git для diff'ов"
+
+msgid "qpush after importing"
+msgstr ""
+
+msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
+msgstr ""
+
msgid "import a patch"
msgstr ""
@@ -3767,6 +3832,12 @@
" "
msgstr ""
+msgid "create queue repository"
+msgstr ""
+
+msgid "hg qinit [-c]"
+msgstr ""
+
msgid "init a new queue repository (DEPRECATED)"
msgstr ""
@@ -3783,6 +3854,24 @@
" commands. With -c, use :hg:`init --mq` instead."
msgstr ""
+msgid "use pull protocol to copy metadata"
+msgstr "использовать протокол затягивания для копирования метаданных"
+
+msgid "do not update the new working directories"
+msgstr ""
+
+msgid "use uncompressed transfer (fast over LAN)"
+msgstr "не использовать сжатие при передачи (быстрее в локальной сети)"
+
+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 ""
@@ -3824,24 +3913,63 @@
msgid "updating destination repository\n"
msgstr ""
+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 ""
@@ -3878,6 +4006,24 @@
" "
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 "update the current patch"
msgstr ""
@@ -3910,6 +4056,9 @@
msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
msgstr ""
+msgid "hg qdiff [OPTION]... [FILE]..."
+msgstr ""
+
msgid "diff of the current patch and subsequent modifications"
msgstr ""
@@ -3927,6 +4076,15 @@
" qrefresh."
msgstr ""
+msgid "edit patch header"
+msgstr ""
+
+msgid "keep folded patch files"
+msgstr ""
+
+msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
+msgstr ""
+
msgid "fold the named patches into the current patch"
msgstr ""
@@ -3959,9 +4117,24 @@
msgid "error folding patch %s"
msgstr ""
+msgid "overwrite any local changes"
+msgstr ""
+
+msgid "hg qgoto [OPTION]... PATCH"
+msgstr ""
+
msgid "push or pop patches until named patch is at top of stack"
msgstr ""
+msgid "list all patches and guards"
+msgstr ""
+
+msgid "drop all guards"
+msgstr ""
+
+msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
+msgstr ""
+
msgid "set or print guards for a patch"
msgstr ""
@@ -4000,9 +4173,36 @@
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 ""
@@ -4018,6 +4218,18 @@
msgid "merging with queue at: %s\n"
msgstr ""
+msgid "pop all patches"
+msgstr ""
+
+msgid "queue name to pop (DEPRECATED)"
+msgstr ""
+
+msgid "forget any local changes to patched files"
+msgstr ""
+
+msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
+msgstr ""
+
msgid "pop the current patch off the stack"
msgstr ""
@@ -4031,6 +4243,9 @@
msgid "using patch queue: %s\n"
msgstr ""
+msgid "hg qrename PATCH1 [PATCH2]"
+msgstr ""
+
msgid "rename a patch"
msgstr ""
@@ -4047,12 +4262,36 @@
msgid "A patch named %s already exists in the series file"
msgstr ""
+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 :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)"
msgstr ""
@@ -4068,6 +4307,26 @@
msgid "copy %s to %s\n"
msgstr ""
+msgid "force removal of changesets, discard uncommitted changes (no backup)"
+msgstr ""
+
+msgid ""
+"bundle only changesets with local revision number greater than REV which are "
+"not descendants of REV (DEPRECATED)"
+msgstr ""
+
+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 ""
+
msgid "strip changesets and all their descendants from the repository"
msgstr ""
@@ -4102,6 +4361,21 @@
msgid "empty revision set"
msgstr ""
+msgid "disable all guards"
+msgstr ""
+
+msgid "list all guards in series file"
+msgstr ""
+
+msgid "pop to before first guarded applied patch"
+msgstr ""
+
+msgid "pop, then reapply patches"
+msgstr ""
+
+msgid "hg qselect [OPTION]... [GUARD]..."
+msgstr ""
+
msgid "set or print guarded patches to push"
msgstr ""
@@ -4178,6 +4452,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 ""
@@ -4203,6 +4483,24 @@
msgid "no revisions specified"
msgstr ""
+msgid "list all available queues"
+msgstr ""
+
+msgid "create new queue"
+msgstr ""
+
+msgid "rename active queue"
+msgstr ""
+
+msgid "delete reference to queue"
+msgstr ""
+
+msgid "delete queue, and remove patch dir"
+msgstr ""
+
+msgid "[OPTION] [QUEUE]"
+msgstr ""
+
msgid "manage multiple patch queues"
msgstr ""
@@ -4299,290 +4597,18 @@
msgid "mq: (empty queue)\n"
msgstr ""
+msgid ""
+"``mq()``\n"
+" Changesets managed by MQ."
+msgstr ""
+
+#, fuzzy
+msgid "mq takes no arguments"
+msgstr "несовместимые аргументы"
+
msgid "operate on patch repository"
msgstr "работать с репозиторием патчей mq"
-msgid "print first line of patch header"
-msgstr ""
-
-msgid "show only the last patch"
-msgstr ""
-
-msgid "hg qapplied [-1] [-s] [PATCH]"
-msgstr ""
-
-msgid "use pull protocol to copy metadata"
-msgstr "использовать протокол затягивания для копирования метаданных"
-
-msgid "do not update the new working directories"
-msgstr ""
-
-msgid "use uncompressed transfer (fast over LAN)"
-msgstr ""
-
-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 ""
-
-msgid "stop managing a revision (DEPRECATED)"
-msgstr ""
-
-msgid "hg qdelete [-k] [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"
-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 ""
-
-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] [-f] [PATCH | INDEX]"
-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 "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, discard uncommitted changes (no backup)"
-msgstr ""
-
-msgid ""
-"bundle only changesets with local revision number greater than REV which are "
-"not descendants of REV (DEPRECATED)"
-msgstr ""
-
-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 ""
-
-msgid "hg qtop [-s]"
-msgstr ""
-
-msgid "show only the first patch"
-msgstr ""
-
-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 ""
-
msgid "hooks for sending email notifications at commit/push time"
msgstr ""
@@ -4827,6 +4853,81 @@
msgid "Please enter a valid value.\n"
msgstr ""
+msgid "send patches as attachments"
+msgstr "отправить патчи как вложения"
+
+msgid "send patches as inline attachments"
+msgstr "отправить патчи как вложения в тексте"
+
+msgid "email addresses of blind carbon copy recipients"
+msgstr ""
+
+msgid "email addresses of copy recipients"
+msgstr ""
+
+msgid "ask for confirmation before sending"
+msgstr ""
+
+msgid "add diffstat output to messages"
+msgstr "добавить статистику различий к сообщениям"
+
+msgid "use the given date as the sending date"
+msgstr ""
+
+msgid "use the given file as the series description"
+msgstr ""
+
+msgid "email address of sender"
+msgstr ""
+
+msgid "print messages that would be sent"
+msgstr ""
+
+msgid "write messages to mbox file instead of sending them"
+msgstr ""
+
+msgid "email addresses replies should be sent to"
+msgstr ""
+
+msgid "subject of first message (intro or single patch)"
+msgstr ""
+
+msgid "message identifier to reply to"
+msgstr ""
+
+msgid "flags to add in subject prefixes"
+msgstr ""
+
+msgid "email addresses of recipients"
+msgstr ""
+
+msgid "omit hg patch header"
+msgstr ""
+
+msgid "send changes not found in the target repository"
+msgstr ""
+
+msgid "send changes not in target as a binary bundle"
+msgstr ""
+
+msgid "name of the bundle attachment file"
+msgstr ""
+
+msgid "a revision to send"
+msgstr ""
+
+msgid "run even when remote repository is unrelated (with -b/--bundle)"
+msgstr ""
+
+msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
+msgstr ""
+
+msgid "send an introduction email for a single patch"
+msgstr ""
+
+msgid "hg email [OPTION]... [DEST]..."
+msgstr ""
+
msgid "send changesets by email"
msgstr ""
@@ -4995,81 +5096,6 @@
msgid "sending"
msgstr ""
-msgid "send patches as attachments"
-msgstr "отправить патчи как вложения"
-
-msgid "send patches as inline attachments"
-msgstr "отправить патчи как вложения в тексте"
-
-msgid "email addresses of blind carbon copy recipients"
-msgstr ""
-
-msgid "email addresses of copy recipients"
-msgstr ""
-
-msgid "ask for confirmation before sending"
-msgstr ""
-
-msgid "add diffstat output to messages"
-msgstr "добавить статистику различий к сообщениям"
-
-msgid "use the given date as the sending date"
-msgstr ""
-
-msgid "use the given file as the series description"
-msgstr ""
-
-msgid "email address of sender"
-msgstr ""
-
-msgid "print messages that would be sent"
-msgstr ""
-
-msgid "write messages to mbox file instead of sending them"
-msgstr ""
-
-msgid "email addresses replies should be sent to"
-msgstr ""
-
-msgid "subject of first message (intro or single patch)"
-msgstr ""
-
-msgid "message identifier to reply to"
-msgstr ""
-
-msgid "flags to add in subject prefixes"
-msgstr ""
-
-msgid "email addresses of recipients"
-msgstr ""
-
-msgid "omit hg patch header"
-msgstr ""
-
-msgid "send changes not found in the target repository"
-msgstr ""
-
-msgid "send changes not in target as a binary bundle"
-msgstr ""
-
-msgid "name of the bundle attachment file"
-msgstr ""
-
-msgid "a revision to send"
-msgstr ""
-
-msgid "run even when remote repository is unrelated (with -b/--bundle)"
-msgstr ""
-
-msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
-msgstr ""
-
-msgid "send an introduction email for a single patch"
-msgstr ""
-
-msgid "hg email [OPTION]... [DEST]..."
-msgstr ""
-
msgid "show progress bars for some actions"
msgstr ""
@@ -5098,9 +5124,9 @@
msgid ""
"Valid entries for the format field are topic, bar, number, unit,\n"
-"estimate, and item. item defaults to the last 20 characters of the\n"
-"item, but this can be changed by adding either ``-<num>`` which would\n"
-"take the last num characters, or ``+<num>`` for the first num\n"
+"estimate, speed, and item. item defaults to the last 20 characters of\n"
+"the item, but this can be changed by adding either ``-<num>`` which\n"
+"would take the last num characters, or ``+<num>`` for the first num\n"
"characters.\n"
msgstr ""
@@ -5134,9 +5160,28 @@
msgid "%dy%02dw"
msgstr ""
+#, python-format
+msgid "%d %s/sec"
+msgstr ""
+
msgid "command to delete untracked files from the working directory"
msgstr ""
+msgid "abort if an error occurs"
+msgstr ""
+
+msgid "purge ignored files too"
+msgstr ""
+
+msgid "print filenames instead of deleting them"
+msgstr ""
+
+msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
+msgstr ""
+
+msgid "hg purge [OPTION]... [DIR]..."
+msgstr ""
+
msgid "removes files not tracked by Mercurial"
msgstr ""
@@ -5192,21 +5237,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 ""
@@ -5220,6 +5250,49 @@
"http://mercurial.selenic.com/wiki/RebaseExtension\n"
msgstr ""
+msgid "rebase from the specified changeset"
+msgstr ""
+
+msgid ""
+"rebase from the base of the specified changeset (up to greatest common "
+"ancestor of base and dest)"
+msgstr ""
+
+msgid "rebase onto the specified changeset"
+msgstr ""
+
+msgid "collapse the rebased changesets"
+msgstr ""
+
+msgid "use text as collapse commit message"
+msgstr ""
+
+msgid "read collapse commit message from file"
+msgstr ""
+
+msgid "keep original changesets"
+msgstr ""
+
+msgid "keep original branch names"
+msgstr ""
+
+msgid "force detaching of source from its original branch"
+msgstr ""
+
+msgid "specify merge tool"
+msgstr ""
+
+msgid "continue an interrupted rebase"
+msgstr ""
+
+msgid "abort an interrupted rebase"
+msgstr ""
+
+msgid ""
+"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
+"hg rebase {-a|-c}"
+msgstr ""
+
msgid "move changeset (and descendants) to a different branch"
msgstr ""
@@ -5369,49 +5442,6 @@
msgid "rebase working directory to branch head"
msgstr ""
-msgid "rebase from the specified changeset"
-msgstr ""
-
-msgid ""
-"rebase from the base of the specified changeset (up to greatest common "
-"ancestor of base and dest)"
-msgstr ""
-
-msgid "rebase onto the specified changeset"
-msgstr ""
-
-msgid "collapse the rebased changesets"
-msgstr ""
-
-msgid "use text as collapse commit message"
-msgstr ""
-
-msgid "read collapse commit message from file"
-msgstr ""
-
-msgid "keep original changesets"
-msgstr ""
-
-msgid "keep original branch names"
-msgstr ""
-
-msgid "force detaching of source from its original branch"
-msgstr ""
-
-msgid "specify merge tool"
-msgstr ""
-
-msgid "continue an interrupted rebase"
-msgstr ""
-
-msgid "abort an interrupted rebase"
-msgstr ""
-
-msgid ""
-"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
-"hg rebase {-a|-c}"
-msgstr ""
-
msgid "commands to interactively select changes for commit/qrefresh"
msgstr ""
@@ -5792,6 +5822,36 @@
msgid "no such option\n"
msgstr ""
+msgid "pull patches from REPO"
+msgstr ""
+
+msgid "BRANCH"
+msgstr "ВЕТВЬ"
+
+msgid "pull patches from branch BRANCH"
+msgstr ""
+
+msgid "pull all changesets up to BRANCH"
+msgstr ""
+
+msgid "skip over REV"
+msgstr ""
+
+msgid "merge at REV"
+msgstr ""
+
+msgid "append transplant info to log message"
+msgstr ""
+
+msgid "continue last transplant session after repair"
+msgstr ""
+
+msgid "filter changesets through command"
+msgstr ""
+
+msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
+msgstr ""
+
msgid "transplant changesets from another branch"
msgstr ""
@@ -5873,8 +5933,8 @@
msgstr ""
msgid ""
-"``transplanted(set)``\n"
-" Transplanted changesets in set."
+"``transplanted([set])``\n"
+" Transplanted changesets in set, or all transplanted changesets."
msgstr ""
msgid ""
@@ -5882,36 +5942,6 @@
" changeset if any."
msgstr ""
-msgid "pull patches from REPO"
-msgstr ""
-
-msgid "BRANCH"
-msgstr ""
-
-msgid "pull patches from branch BRANCH"
-msgstr ""
-
-msgid "pull all changesets up to BRANCH"
-msgstr ""
-
-msgid "skip over REV"
-msgstr ""
-
-msgid "merge at REV"
-msgstr ""
-
-msgid "append transplant info to log message"
-msgstr ""
-
-msgid "continue last transplant session after repair"
-msgstr ""
-
-msgid "filter changesets through command"
-msgstr ""
-
-msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
-msgstr ""
-
msgid "allow the use of MBCS paths with problematic encodings"
msgstr ""
@@ -6190,21 +6220,21 @@
msgid "invalid format spec '%%%s' in output filename"
msgstr ""
-#, python-format
-msgid "adding %s\n"
-msgstr ""
-
-#, python-format
-msgid "removing %s\n"
-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 "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 "репозиторий %s не найден"
#, python-format
msgid "%s: not copying - file is not managed\n"
@@ -6347,6 +6377,10 @@
msgstr ""
#, python-format
+msgid "adding %s\n"
+msgstr ""
+
+#, python-format
msgid "skipping missing subrepository: %s\n"
msgstr ""
@@ -6389,6 +6423,148 @@
msgid "empty commit message"
msgstr ""
+msgid "repository root directory or name of overlay bundle file"
+msgstr ""
+
+msgid "DIR"
+msgstr ""
+
+msgid "change working directory"
+msgstr ""
+
+msgid "do not prompt, assume 'yes' for any required answers"
+msgstr ""
+
+msgid "suppress output"
+msgstr "с подавлением вывода"
+
+msgid "enable additional output"
+msgstr "включить дополнительный вывод"
+
+msgid "set/override config option (use 'section.name=value')"
+msgstr ""
+
+msgid "CONFIG"
+msgstr ""
+
+msgid "enable debugging output"
+msgstr ""
+
+msgid "start debugger"
+msgstr "запустить отладчик"
+
+msgid "set the charset encoding"
+msgstr ""
+
+msgid "ENCODE"
+msgstr ""
+
+msgid "MODE"
+msgstr ""
+
+msgid "set the charset encoding mode"
+msgstr ""
+
+msgid "always print a traceback on exception"
+msgstr ""
+
+msgid "time how long the command takes"
+msgstr ""
+
+msgid "print command execution profile"
+msgstr "вывести профиль запуска команды"
+
+msgid "output version information and exit"
+msgstr "напечатать информацию о версии и выйти"
+
+msgid "display help and exit"
+msgstr "показать справку и выйти"
+
+msgid "do not perform actions, just print output"
+msgstr "ничего реально не делать, просто напечатать вывод"
+
+msgid "specify ssh command to use"
+msgstr "используемая команда для ssh"
+
+msgid "specify hg command to run on the remote side"
+msgstr "комадна Mercurial, которая будет запущена на удаленном компьютере"
+
+msgid "do not verify server certificate (ignoring web.cacerts config)"
+msgstr "не проверять сертификат сервера (игнорируя настройку web.cacerts)"
+
+msgid "PATTERN"
+msgstr "ШАБЛОН"
+
+msgid "include names matching the given patterns"
+msgstr "включить файлы, имена которых соответствуют данным шаблонам"
+
+msgid "exclude names matching the given patterns"
+msgstr "исключить файлы, имена которых соответствуют данным шаблонам"
+
+msgid "use text as commit message"
+msgstr "текст комментария к коммиту"
+
+msgid "read commit message from file"
+msgstr "читать журнальные сообщения из файла"
+
+msgid "record the specified date as commit date"
+msgstr "использовать эту дату в качестве даты коммита"
+
+msgid "record the specified user as committer"
+msgstr "использовать этого пользователя как автора коммита"
+
+msgid "STYLE"
+msgstr "СТИЛЬ"
+
+msgid "display using template map file"
+msgstr "отображать с использование файла-карты шаблонов"
+
+msgid "display with template"
+msgstr "отображать с помощью шаблона"
+
+msgid "do not show merges"
+msgstr "не показывать слияния"
+
+msgid "output diffstat-style summary of changes"
+msgstr "отображать сводку изменений в стиле diffstat"
+
+msgid "treat all files as text"
+msgstr "обрабатывать все файлы как текстовые"
+
+msgid "omit dates from diff headers"
+msgstr "опускать даты в заголовках diff'ов"
+
+msgid "show which function each change is in"
+msgstr "для каждого изменения показать, в какой оно сделано функции"
+
+msgid "produce a diff that undoes the changes"
+msgstr "сгенерировать патч, который отменяет изменения"
+
+msgid "ignore white space when comparing lines"
+msgstr "игнорировать пробельные символы при сравнении строк"
+
+msgid "ignore changes in the amount of white space"
+msgstr "игнорировать изменения в количестве пробельных символов"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "игнорировать пустые строки"
+
+msgid "number of lines of context to show"
+msgstr "показываемое количество строк контекста"
+
+msgid "SIMILARITY"
+msgstr "ПОХОЖЕСТЬ"
+
+msgid "guess renamed files by similarity (0<=s<=100)"
+msgstr ""
+"считать файлы переименованными исходя из степени их похожести (от 0 до 100)"
+
+msgid "recurse into subrepositories"
+msgstr "рекурсивно обрабатывать субрепозитории"
+
+msgid "[OPTION]... [FILE]..."
+msgstr "[ПАРАМЕТР]... [ФАЙЛ]..."
+
msgid "add the specified files on the next commit"
msgstr "добавить указанный файл при следующем коммите"
@@ -6490,6 +6666,36 @@
msgid "similarity must be between 0 and 100"
msgstr "параметр similarity должен быть от 0 до 100"
+msgid "annotate the specified revision"
+msgstr "аннотировать указанную ревизию"
+
+msgid "follow copies/renames and list the filename (DEPRECATED)"
+msgstr "отслеживать копирования/переименования и писать имя файла (УСТАРЕЛО)"
+
+msgid "don't follow copies and renames"
+msgstr "не отслеживать копирования и перемещения"
+
+msgid "list the author (long with -v)"
+msgstr "писать имя автора (длинный формат с -v)"
+
+msgid "list the filename"
+msgstr "писать имя файла"
+
+msgid "list the date (short with -q)"
+msgstr "писать дату (короткий формат с -q"
+
+msgid "list the revision number (default)"
+msgstr "писать номер ревизии (по умолчанию)"
+
+msgid "list the changeset"
+msgstr "писать набор изменений"
+
+msgid "show line number at the first appearance"
+msgstr "указывать номер строки при первом появлении"
+
+msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
+msgstr ""
+
msgid "show changeset information by line for each file"
msgstr "информация о наборе изменений построчно для каждого файла"
@@ -6528,6 +6734,25 @@
msgid "%s: binary file\n"
msgstr "%s: бинарный файл\n"
+msgid "do not pass files through decoders"
+msgstr "не обрабатывать файлы декодерами"
+
+msgid "directory prefix for files in archive"
+msgstr "префикс каталога для файлов в архиве"
+
+msgid "PREFIX"
+msgstr "ПРЕФИКС"
+
+msgid "revision to distribute"
+msgstr "ревизия для архивирования"
+
+msgid "type of distribution to create"
+msgstr "тип создаваемого архива"
+
+#, fuzzy
+msgid "[OPTION]... DEST"
+msgstr "[ПАРАМЕТР]... [-r] РЕВИЗИЯ"
+
msgid "create an unversioned archive of a repository revision"
msgstr "создать неверсированную архивную копию ревизии из репозитория"
@@ -6590,6 +6815,19 @@
msgid "cannot archive plain files to stdout"
msgstr "не могу архивировать обычный каталог в stdout"
+#, fuzzy
+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 "[ПАРАМЕТР]... [-r] РЕВИЗИЯ"
+
msgid "reverse effect of earlier changeset"
msgstr "отменить эффект более раннего набора изменений"
@@ -6664,6 +6902,30 @@
msgid "merging with changeset %s\n"
msgstr "слияние с ревизией %s\n"
+msgid "reset bisect state"
+msgstr "сбросить поиск"
+
+msgid "mark changeset good"
+msgstr "пометить ревизию как хорошую"
+
+msgid "mark changeset bad"
+msgstr "пометить ревизию как плохую"
+
+msgid "skip testing changeset"
+msgstr "пропустить тестирование набора изменений"
+
+msgid "extend the bisect range"
+msgstr "расширить диапазон поиска"
+
+msgid "use command to check changeset state"
+msgstr "использовать команду для проверки состояния набора изменений"
+
+msgid "do not update to target"
+msgstr "не обновляться до целевой ревизии"
+
+msgid "[-gbsr] [-U] [-c CMD] [REV]"
+msgstr "[-gbsr] [-U] [-c КОМАНДА] [РЕВИЗИЯ]"
+
msgid "subdivision search of changesets"
msgstr "поиск ревизии методом деления пополам"
@@ -6765,6 +7027,21 @@
msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
msgstr "Тестирование ревизии %d:%s (%d ревизий осталось, ~%d тестов)\n"
+msgid "force"
+msgstr "принудительно"
+
+msgid "delete a given bookmark"
+msgstr "удалить указанную закладку"
+
+msgid "rename a given bookmark"
+msgstr "переимновать указанную закладку"
+
+msgid "do not mark a new bookmark active"
+msgstr "не помечать новую закладку как активную"
+
+msgid "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]"
+msgstr "hg bookmarks [-f] [-d] [-i] [-m ИМЯ] [-r РЕВИЗИЯ] [ИМЯ]"
+
msgid "track a line of development with movable markers"
msgstr "отслеживать ветвь разработки с помощью передвигаемых меток"
@@ -6802,8 +7079,7 @@
" Закладки могут передаваться между репозиториями с помощью команд\n"
" push и pull (см. :hg:`help push` и :hg:`help pull). Для этого\n"
" необходимо, чтобы удаленный и локальный репозиторий поддерживали\n"
-" закладки. Для Mercurial версий меньше 1.8 это означает, "
-"что\n"
+" закладки. Для Mercurial версий меньше 1.8 это означает, что\n"
" должно быть включено расширение bookmarks.\n"
" "
@@ -6833,6 +7109,15 @@
msgid "no bookmarks set\n"
msgstr "нет ни одной закладки\n"
+msgid "set branch name even if it shadows an existing branch"
+msgstr "использовать имя ветви, даже если оно скрывает уже существующую ветвь"
+
+msgid "reset branch name to parent branch name"
+msgstr "сбросить имя ветви в имя ветви родителя"
+
+msgid "[-fC] [NAME]"
+msgstr "[-fC] [ИМЯ]"
+
msgid "set or show the current branch name"
msgstr "задать или показать имя текущей ветви"
@@ -6876,6 +7161,7 @@
msgid "a branch of the same name already exists"
msgstr "ветвь с таким именем уже существует"
+#. i18n: "it" refers to an existing branch
msgid "use 'hg update' to switch to it"
msgstr "используйте 'hg update' чтобы переключиться на нее"
@@ -6883,41 +7169,83 @@
msgid "marked working directory as branch %s\n"
msgstr "рабочий каталог помечен как ветвь %s\n"
+msgid "show only branches that have unmerged heads"
+msgstr "показывать только ветви, на которых есть неслитые головы"
+
+msgid "show normal and closed branches"
+msgstr "показывать обычные и закрытые ветви"
+
+msgid "[-ac]"
+msgstr "[-ac]"
+
msgid "list repository named branches"
-msgstr ""
+msgstr "перечислить именованные ветки в репозитории"
msgid ""
" List the repository's named branches, indicating which ones are\n"
" inactive. If -c/--closed is specified, also list branches which have\n"
" been marked closed (see :hg:`commit --close-branch`)."
msgstr ""
+" Перечисляет именованные ветви в репозитории, выделяя активные.\n"
+" Если указан -c/--close, печатает также ветви, помеченные как\n"
+" закрытые (см. :hg:`commit --close-branch`)."
msgid ""
" If -a/--active is specified, only show active branches. A branch\n"
" is considered active if it contains repository heads."
msgstr ""
+" Если укзан -a/--active, показывает только активные ветви. Ветвь\n"
+" считается активной, если она содержит головные ревизии."
msgid " Use the command :hg:`update` to switch to an existing branch."
msgstr ""
+" Используйте :hg:`update` чтобы переключиться на существующую ветвь."
msgid ""
" Returns 0.\n"
" "
msgstr ""
+" Возвращает 0.\n"
+" "
msgid " (closed)"
-msgstr ""
+msgstr " (закрыта)"
msgid " (inactive)"
-msgstr ""
+msgstr " (неактивна)"
+
+msgid "run even when the destination is unrelated"
+msgstr "работать даже если репозиторий не связан с репозиторием назначения"
+
+msgid "a changeset intended to be added to the destination"
+msgstr "набор изменений для добавления в репозиторий назначения"
+
+msgid "a specific branch you would like to bundle"
+msgstr "ветвь для упаковки"
+
+msgid "a base changeset assumed to be available at the destination"
+msgstr ""
+"базовый набор изменений, который предполагается доступным в репозитории "
+"назначения"
+
+msgid "bundle all changesets in the repository"
+msgstr "упаковать все ревизии в репозитории"
+
+msgid "bundle compression type to use"
+msgstr "тип сжатия"
+
+msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
+msgstr "[-f] [-t ТИП] [-a] [-r РЕВИЗИЯ]... [--base РЕВИЗИЯ]... ФАЙЛ [НАЗН]"
msgid "create a changegroup file"
-msgstr ""
+msgstr "создать файл с группой наборов изменений"
msgid ""
" Generate a compressed changegroup file collecting changesets not\n"
" known to be in another repository."
msgstr ""
+" Создает сжатый файл, содержащий группу наборов изменений, которые\n"
+" отсутсвуют в другом репозитории."
msgid ""
" If you omit the destination repository, then hg assumes the\n"
@@ -6925,12 +7253,19 @@
" parameters. To create a bundle containing all changesets, use\n"
" -a/--all (or --base null)."
msgstr ""
+" Если репозиторий назначения опущен, то Mercurial предполагает,\n"
+" что там имеются все ревизии, до указанной в --base. Чтобы создать\n"
+" файл, содержащий все наборы изменений, используйте -a/--all\n"
+" (или --base null)."
msgid ""
" You can change compression method with the -t/--type option.\n"
" The available compression methods are: none, bzip2, and\n"
" gzip (by default, bundles are compressed using bzip2)."
msgstr ""
+" Способ сжатия можно задать с помощью параметра -t/--type.\n"
+" Доступные методы сжатия: без сжатия (none), bzip2, gzip\n"
+" (по умолчанию используется bzip2)."
msgid ""
" The bundle file can then be transferred using conventional means\n"
@@ -6938,68 +7273,121 @@
" command. This is useful when direct push and pull are not\n"
" available or when exporting an entire repository is undesirable."
msgstr ""
+" Файл с группой изменений (bundle) может быть передан обычными\n"
+" средствами, или применен в другом репозитории с помощью команд\n"
+" unbundle или pull. Это полезно когда команды push и pull напрямую\n"
+" недоступны или когда пулбликация всего репозитория нежелательна."
msgid ""
" Applying bundles preserves all changeset contents including\n"
" permissions, copy/rename information, and revision history."
msgstr ""
+" Применение групп изменений сохраняет все аттрибуты наборов\n"
+" изменений, включая права доступа, информацию о копировании/\n"
+" переименовании и историю ревизий."
msgid ""
" Returns 0 on success, 1 if no changes found.\n"
" "
msgstr ""
+" Возвращает 0 в случае успеха, 1 если изменения не найдены\n"
+" "
msgid "--base is incompatible with specifying a destination"
-msgstr ""
+msgstr "нельзя одновременно указывать --base и репозиторий назначения"
msgid "unknown bundle type specified with --type"
-msgstr ""
+msgstr "неизвестный способ задан в --type"
+
+msgid "print output to file with formatted name"
+msgstr "печатать в файл с именем согласно ФОРМАТУ"
+
+msgid "print the given revision"
+msgstr "напечатать заданную ревизию"
+
+msgid "apply any matching decode filter"
+msgstr "декодировать любым подходящим фильтром"
+
+msgid "[OPTION]... FILE..."
+msgstr "[ПАРАМЕТР]... ФАЙЛ..."
msgid "output the current or given revision of files"
-msgstr ""
+msgstr "напечатать текущую или заданную ревизию файлов"
msgid ""
" Print the specified files as they were at the given revision. If\n"
" no revision is given, the parent of the working directory is used,\n"
" or tip if no revision is checked out."
msgstr ""
+" Печатает содержимое указанных файлов, каким оно бало на момент\n"
+" указанной ревизии. Если невизия не указана, используется\n"
+" родительская ревизия рабочего каталога или вершина (tip), если\n"
+" работий каталог пуст."
msgid ""
" Output may be to a file, in which case the name of the file is\n"
" given using a format string. The formatting rules are the same as\n"
" for the export command, with the following additions:"
msgstr ""
+" Можно печатать в файл, в этом случае его имя задается в виде\n"
+" форматирущей строки. Формат строки такой же, как в команде export,\n"
+" со следующими дополнениями:"
msgid ""
" :``%s``: basename of file being printed\n"
" :``%d``: dirname of file being printed, or '.' if in repository root\n"
" :``%p``: root-relative path name of file being printed"
msgstr ""
+" :``%s``: базовое имя печатаемого файла\n"
+" :``%d``: имя каталога печатаемого файла или '.', если файл в корне\n"
+" :``%p``: путь к печатаемому файлу относительно корня репозитория"
+
+msgid "the clone will include an empty working copy (only a repository)"
+msgstr "клон будет включать пустой рабочий каталог (только репозиторий)"
+
+msgid "revision, tag or branch to check out"
+msgstr "ревизия, метка или ветвь на которую обновиться"
+
+msgid "include the specified changeset"
+msgstr "включить указанный набор изменений"
+
+msgid "clone only the specified branch"
+msgstr "клонировать только указанную ветвь"
+
+msgid "[OPTION]... SOURCE [DEST]"
+msgstr "[ПАРАМЕТР]... ИСТОЧНИК [НАЗН]"
msgid "make a copy of an existing repository"
-msgstr ""
+msgstr "создать копию существующего репозитория"
msgid " Create a copy of an existing repository in a new directory."
-msgstr ""
+msgstr " Создает копию существующего репозитория в новом каталоге."
msgid ""
" If no destination directory name is specified, it defaults to the\n"
" basename of the source."
msgstr ""
+" Если директорий назначения не задан, используется имя базового\n"
+" каталога источника."
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."
msgstr ""
+" Адрес источника добавляется в файл ``.hg/hgrc`` нового репозитория,\n"
+" и используется по умолчанию для последующих pull'ов и push'ей."
msgid " See :hg:`help urls` for valid source format details."
-msgstr ""
+msgstr " См. :hg:`help urls` о форматах адреса источника."
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"
" Please see :hg:`help urls` for important details about ``ssh://`` URLs."
msgstr ""
+" Можно указать ``ssh://...`` в качестве адреса назначения, но файл\n"
+" ``.hg/hgrc`` и рабочая копия не будут созданы на удаленном компьютере.\n"
+" См. :hg:`help urls` для важной информации об адресах вида ``ssh://...``."
msgid ""
" A set of changesets (tags, or branch names) to pull may be specified\n"
@@ -7011,11 +7399,18 @@
" No subsequent changesets (including subsequent tags) will be present\n"
" in the destination."
msgstr ""
+" Копируемые наборы изменений (changesets) (как метки или имена ветвей)\n"
+" могут быть заданы указанием каждого набора изменений (метки или имени\n"
+" ветви) с помощью -r/--rev. При использовании -r/--rev, клонированный\n"
+" репозиторий будет содержать только подмножество наборов изменений\n"
+" источника."
msgid ""
" Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n"
" local source repositories."
msgstr ""
+" Использование -r/--rev (или 'clone источник#ревизия назн')\n"
+" предполагает --pull, даже если источник локален."
msgid ""
" For efficiency, hardlinks are used for cloning whenever the source\n"
@@ -7025,14 +7420,22 @@
" do not report errors. In these cases, use the --pull option to\n"
" avoid hardlinking."
msgstr ""
+" Для эффективности, при клонировании источника на одной файловой\n"
+" системе с целевым репозиторием, используются жесткие ссылки (это\n"
+" относится только к данным репозитория, не рабочему каталогу).\n"
+" Некоторые файловые системы, например, AFS, некорректно реализуют\n"
+" жесткие ссылки, но не сообщают об ошибках. В этом случае используйте\n"
+" --pull чтобы избежать жестких ссылок."
msgid ""
" In some cases, you can clone repositories and the working directory\n"
" using full hardlinks with ::"
msgstr ""
+" В некоторых случаях можно клонировать репозитории и рабочие\n"
+" каталоги целиком жесткими ссылками ::"
msgid " $ cp -al REPO REPOCLONE"
-msgstr ""
+msgstr " $ cp -al РЕПОЗИТОРИЙ КЛОН"
msgid ""
" This is the fastest way to clone, but it is not always safe. The\n"
@@ -7042,11 +7445,20 @@
" this is not compatible with certain extensions that place their\n"
" metadata under the .hg directory, such as mq."
msgstr ""
+" Это самый быстрый способ клонирования, но он не всегда безопасен.\n"
+" Эта операция не атомарна (вам надо следить за тем, что РЕПОЗИТОРИЙ\n"
+" не изменяется в процессе копирования), и вам надо убедиться, что\n"
+" ваш редактор умеет разрывать жесткие ссылки (Emacs и большинство\n"
+" инструментов разработчика ядра Linux умеют). Этот способ также\n"
+" не совместим с некоторыми расширениями, которые хранят свои\n"
+" метаданные в каталоге .hg, как mq."
msgid ""
" Mercurial will update the working directory to the first applicable\n"
" revision from this list:"
msgstr ""
+" Mercurial обновит рабочий каталог до первой подходящей ревизии по\n"
+" списку:"
msgid ""
" a) null if -U or the source repository has no changesets\n"
@@ -7060,28 +7472,53 @@
" g) the tipmost head of the default branch\n"
" h) tip"
msgstr ""
+" а) пустой каталог, если в источнике нет наборов изменений или указан -U\n"
+" б) если указан -u . и источник локален, до первого родителя рабочей "
+"копии\n"
+" источника\n"
+" в) ревизия, указанная в -u (если это имя ветви, то до головной ревизии\n"
+" этой ветви)\n"
+" г) до ревизии, укзанной с помощью -r\n"
+" д) до последней ревизии указанной в -b\n"
+" е) до последней ревизии указанной как url#ветвь\n"
+" ж) до последней ревизии ветви default\n"
+" з) до последней ревизии"
msgid "cannot specify both --noupdate and --updaterev"
-msgstr ""
+msgstr "нельзя указывать --noupdate и --updaterev одновременно"
+
+msgid "mark new/missing files as added/removed before committing"
+msgstr ""
+"пометить новые/недостающие файлы как добавленные/удаленные перед коммитом"
+
+msgid "mark a branch as closed, hiding it from the branch list"
+msgstr "пометить ветвь как закрытую, скрыть ее из списка ветвей"
msgid "commit the specified files or all outstanding changes"
-msgstr ""
+msgstr "зафиксировать указанные файлы или все изменения в репозитории"
msgid ""
" Commit changes to the given files into the repository. Unlike a\n"
" centralized SCM, this operation is a local operation. See\n"
" :hg:`push` for a way to actively distribute your changes."
msgstr ""
+" Зафиксировать (закоммитить) указанные файлы в репозитории. В\n"
+" отличие от централизованных SCM, это локальная операция. См.\n"
+" :hg:`push` чтобы узнать, как опубликовать свои изменения."
msgid ""
" If a list of files is omitted, all changes reported by :hg:`status`\n"
" will be committed."
msgstr ""
+" Если список файлов опущен, будут закоммичены все изменения, которые\n"
+" показывает :hg:`status`."
msgid ""
" If you are committing the result of a merge, do not provide any\n"
" filenames or -I/-X filters."
msgstr ""
+" Если вы коммитите результат слияния, не указывайте никаких\n"
+" файлов или фильтров в -I/-X."
msgid ""
" If no commit message is specified, Mercurial starts your\n"
@@ -7089,65 +7526,110 @@
" commit fails, you will find a backup of your message in\n"
" ``.hg/last-message.txt``."
msgstr ""
+" Если не указан комментарий к коммиту, Mercurial запустит ваш\n"
+" настроенный редактор, где можно ввести комментарий. Если при\n"
+" коммите случается сбой, копию сообщения можно найти в \n"
+" ``.hg/last-message.txt``."
msgid ""
" Returns 0 on success, 1 if nothing changed.\n"
" "
msgstr ""
+" Возвращает 0 при успехе, 1 если изменения не зафиксированы.\n"
+" "
msgid "can only close branch heads"
-msgstr ""
+msgstr "можно закрыть только головную ревизию ветви"
#, python-format
msgid "nothing changed (%d missing files, see 'hg status')\n"
-msgstr ""
+msgstr "нет изменений (%d файлов отсутсвует, см. 'hg status')\n"
msgid "nothing changed\n"
-msgstr ""
+msgstr "нет изменений\n"
msgid "created new head\n"
-msgstr ""
+msgstr "создана новая голова\n"
#, python-format
msgid "reopening closed branch head %d\n"
-msgstr ""
+msgstr "повторно открываю головную ревизию %d закрытой ветви\n"
#, python-format
msgid "committed changeset %d:%s\n"
-msgstr ""
+msgstr "зафиксирован набор изменений %d:%s\n"
+
+msgid "record a copy that has already occurred"
+msgstr "записать копирование, которое было проведено ранее"
+
+msgid "forcibly copy over an existing managed file"
+msgstr "перезаписывать существующие контролируемые файлы"
+
+msgid "[OPTION]... [SOURCE]... DEST"
+msgstr "[ПАРАМЕТР]... [ИСТОЧНИК]... НАЗН"
msgid "mark files as copied for the next commit"
-msgstr ""
+msgstr "пометить файл как скопированный при следующем коммите"
msgid ""
" Mark dest as having copies of source files. If dest is a\n"
" directory, copies are put in that directory. If dest is a file,\n"
" the source must be a single file."
msgstr ""
+" Помечает НАЗН как копию источника. Если НАЗН - директория,\n"
+" копии помещаются туда. Если НАЗН - файл, источник должен\n"
+" быть одним файлом."
msgid ""
" By default, this command copies the contents of files as they\n"
" exist in the working directory. If invoked with -A/--after, the\n"
" operation is recorded, but no copying is performed."
msgstr ""
+" По умолчанию эта команда копирует содержимое файлов в том виде,\n"
+" как они существуют в рабочем каталоге. Если указан -A/--after,\n"
+" операция регистрируется, но копирования не производится."
msgid ""
" This command takes effect with the next commit. To undo a copy\n"
" before that, see :hg:`revert`."
msgstr ""
+" Эффект этой команды фиксируется при следующем коммите. Чтобы\n"
+" отменить копирование, см. :hg:`revert`."
msgid ""
" Returns 0 on success, 1 if errors are encountered.\n"
" "
msgstr ""
+" Возвращает 0 при успехе, 1 при ошибке.\n"
+" "
+
+msgid "[INDEX] REV1 REV2"
+msgstr "[СПИСОК] РЕВИЗИЯ1 РЕВИЗИЯ2"
msgid "find the ancestor revision of two revisions in a given index"
-msgstr ""
+msgstr "найти родительскую ревизию двух ревизий в указанном списке"
msgid "either two or three arguments required"
-msgstr ""
-
-msgid "builds a repo with a given dag from scratch in the current empty repo"
+msgstr "требуются два или три аргумента"
+
+msgid "add single file mergeable changes"
+msgstr ""
+
+msgid "add single file all revs overwrite"
+msgstr ""
+
+msgid "add new file at each rev"
+msgstr ""
+
+msgid "[OPTION]... [TEXT]"
+msgstr "[ПАРАМЕТР]... [ТЕКСТ]..."
+
+msgid "builds a repo with a given DAG from scratch in the current empty repo"
+msgstr ""
+
+msgid ""
+" The description of the DAG is read from stdin if not given on the\n"
+" command line."
msgstr ""
msgid " Elements:"
@@ -7189,19 +7671,19 @@
" "
msgstr ""
+msgid "reading DAG from stdin\n"
+msgstr ""
+
msgid "repository is not empty"
msgstr ""
-msgid "list all available commands and options"
-msgstr ""
-
-msgid "returns the completion list associated with the given command"
-msgstr ""
-
-msgid "show information detected about current filesystem"
-msgstr ""
-
-msgid "rebuild the dirstate as it would look like for the given revision"
+msgid "building"
+msgstr ""
+
+msgid "show all details"
+msgstr ""
+
+msgid "lists the contents of a bundle"
msgstr ""
msgid "validate the correctness of the current dirstate"
@@ -7226,85 +7708,34 @@
msgid ".hg/dirstate inconsistent with current parent's manifest"
msgstr ""
-msgid "show combined config settings from all hgrc files"
-msgstr ""
-
-msgid " With no arguments, print names and values of all config items."
-msgstr ""
-
-msgid ""
-" With one argument of the form section.name, print just the value\n"
-" of that config item."
-msgstr ""
-
-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 "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 "lists the contents of a bundle"
-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 "access the pushkey key/value protocol"
-msgstr ""
-
-msgid " With two args, list the keys in the given namespace."
-msgstr ""
-
-msgid ""
-" With five args, set a key to new if it currently is set to old.\n"
-" Reports success or failure.\n"
-" "
-msgstr ""
-
-msgid "parse and apply a revision specification"
-msgstr ""
-
-msgid "manually set the parents of the current working directory"
-msgstr ""
-
-msgid ""
-" This is useful for writing repository conversion tools, but should\n"
-" be used with care."
-msgstr ""
-
-msgid "show the contents of the current dirstate"
-msgstr ""
-
-#, python-format
-msgid "copy: %s -> %s\n"
+msgid "[COMMAND]"
+msgstr ""
+
+msgid "list all available commands and options"
+msgstr ""
+
+msgid "show the command options"
+msgstr "показать параметры команды"
+
+msgid "[-o] CMD"
+msgstr "[-o] КОМАНДА"
+
+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 ""
msgid "format the changelog or an index DAG as a concise textual description"
@@ -7323,6 +7754,16 @@
msgid "need repo for changelog dag"
msgstr ""
+#, fuzzy
+msgid "open changelog"
+msgstr "открыть журнал изменений"
+
+msgid "open manifest"
+msgstr ""
+
+msgid "-c|-m|FILE REV"
+msgstr ""
+
msgid "dump the contents of a data file revision"
msgstr ""
@@ -7330,16 +7771,62 @@
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 "[PATH]"
+msgstr ""
+
+msgid "show information detected about current filesystem"
+msgstr ""
+
+msgid "id of head node"
+msgstr ""
+
+msgid "id of common node"
+msgstr ""
+
+msgid "REPO FILE [-H|-C ID]..."
+msgstr ""
+
+msgid "retrieves a bundle from a repo"
+msgstr ""
+
+msgid ""
+" Every ID must be a full-length hex node id string. Saves the bundle to "
+"the\n"
+" given file.\n"
+" "
+msgstr ""
+
msgid "display the combined ignore pattern"
msgstr ""
msgid "no ignore patterns found"
msgstr ""
-msgid "runs the changeset discovery protocol in isolation"
+msgid "revlog format"
+msgstr ""
+
+msgid "[-f FORMAT] -c|-m|FILE"
msgstr ""
msgid "dump the contents of an index file"
@@ -7404,6 +7891,49 @@
msgid "%s problems detected, please check your install!\n"
msgstr ""
+msgid "REPO ID..."
+msgstr ""
+
+msgid "test whether node ids are known to a repo"
+msgstr ""
+
+msgid ""
+" Every ID must be a full-length hex node id string. Returns a list of 0s "
+"and 1s\n"
+" indicating unknown/known.\n"
+" "
+msgstr ""
+
+msgid "REPO NAMESPACE [KEY OLD NEW]"
+msgstr ""
+
+msgid "access the pushkey key/value protocol"
+msgstr ""
+
+msgid " With two args, list the keys in the given namespace."
+msgstr ""
+
+msgid ""
+" With five args, set a key to new if it currently is set to old.\n"
+" Reports success or failure.\n"
+" "
+msgstr ""
+
+msgid "revision to rebuild to"
+msgstr ""
+
+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 ""
@@ -7415,17 +7945,65 @@
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 ""
+
+msgid "show the contents of the current dirstate"
+msgstr ""
+
+#, python-format
+msgid "copy: %s -> %s\n"
+msgstr ""
+
+msgid "revision to check"
+msgstr ""
+
msgid "show how files match on given patterns"
msgstr ""
+msgid "REPO [OPTIONS]... [ONE [TWO]]"
+msgstr ""
+
+msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
+msgstr "[ПАРАМЕТР]... ([-c РЕВИЗИЯ] | [-r РЕВИЗИЯ1 [-r РЕВИЗИЯ2]]) [ФАЙЛ]..."
+
msgid "diff repository (or selected files)"
-msgstr ""
+msgstr "показать изменения в репозитории (или выбранных файлах)"
msgid " Show differences between revisions for the specified files."
-msgstr ""
+msgstr " Показывает отличия между ревизиями указанных файлов."
msgid " Differences between files are shown using the unified diff format."
-msgstr ""
+msgstr " Различия показываются в унифицировнном формате diff."
msgid ""
" .. note::\n"
@@ -7433,34 +8011,60 @@
" default to comparing against the working directory's first\n"
" parent changeset if no revisions are specified."
msgstr ""
+" .. note::\n"
+" diff может генерировать неожиданные результаты для слияний,\n"
+" поскольку по умолчанию сравнивнение производится с первым\n"
+" родителем рабочего каталога, если не указаны другие ревизии."
msgid ""
" Alternatively you can specify -c/--change with a revision to see\n"
" the changes in that changeset relative to its first parent."
msgstr ""
+" Можно также указать -c/--change чтобы посмотреть изменения\n"
+" в этой ревизии относительно ее первой родительской ревизии."
msgid ""
" Without the -a/--text option, diff will avoid generating diffs of\n"
" files it detects as binary. With -a, diff will generate a diff\n"
" anyway, probably with undesirable results."
msgstr ""
+" Без -a/--text, diff не будет генерировать отличия для файлов,\n"
+" которые посчитает бинарными. С -а, будет генерировать для всех\n"
+" файлов, возможно с нежелательными результатами."
msgid ""
" Use the -g/--git option to generate diffs in the git extended diff\n"
" format. For more information, read :hg:`help diffs`."
msgstr ""
-
+" Исполльзуйте -g/--git чтобы генерировать отличися в расширенном\n"
+" формате git. Подробнее см. :hg:`help diffs`."
+
+msgid "diff against the second parent"
+msgstr "отличия от второй родительской ревизии"
+
+msgid "revisions to export"
+msgstr "ревизии для экспортирования"
+
+msgid "[OPTION]... [-o OUTFILESPEC] REV..."
+msgstr "[ПАРАМЕТР]... [-o OUTFILESPEC] РЕВИЗИЯ..."
+
+#, fuzzy
msgid "dump the header and diffs for one or more changesets"
-msgstr ""
+msgstr "сохранить заголовки и отличия для одного или более набора изменений"
msgid " Print the changeset header and diffs for one or more revisions."
msgstr ""
+" Печатает заголовок набора изменений и отличия для одной или\n"
+" более ревизии."
msgid ""
" The information shown in the changeset header is: author, date,\n"
" branch name (if non-default), changeset hash, parent(s) and commit\n"
" comment."
msgstr ""
+" В заголовке набора изменений содержится следующая информация:\n"
+" автор, дата, имя ветви (если не default), хэш набора изменений,\n"
+" родитель (родители) и комментарий к коммиту."
msgid ""
" .. note::\n"
@@ -7468,11 +8072,17 @@
" changesets, as it will compare the merge changeset against its\n"
" first parent only."
msgstr ""
+" .. note::\n"
+" export может генерировать неожиданный вывод diff для ревизий\n"
+" слияния, потому что сравнение такой ревизии проводится только\n"
+" с ее первой родительской ревизией."
msgid ""
" Output may be to a file, in which case the name of the file is\n"
" given using a format string. The formatting rules are as follows:"
msgstr ""
+" Можно осуществлять вывод в файл, при этом имя файла задается\n"
+" в виде форматирующей строки. Правила форматирования:"
msgid ""
" :``%%``: literal \"%\" character\n"
@@ -7484,61 +8094,112 @@
" :``%n``: zero-padded sequence number, starting at 1\n"
" :``%r``: zero-padded changeset revision number"
msgstr ""
+" :``%%``: символ \"%\"\n"
+" :``%H``: хэш набора изменений (40 шестнадцатеричных цифр)\n"
+" :``%N``: количество сгенерированных патчей\n"
+" :``%R``: номер ревизии набора изменений\n"
+" :``%b``: базовое имя экспортируемого репозитория\n"
+" :``%h``: короткий хэш набора изменений (12 шестнадцатеричных цифр)\n"
+" :``%n``: выровненный нулями последовательный номер, начиная с 1\n"
+" :``%r``: выровненный нулями номер ревизии"
msgid ""
" Without the -a/--text option, export will avoid generating diffs\n"
" of files it detects as binary. With -a, export will generate a\n"
" diff anyway, probably with undesirable results."
msgstr ""
+" Без -a/--text, export не будет генерировать diff'ы для файлов,\n"
+" которые он считает бинарными. С -а diff'ы будут сгенерированы\n"
+" для всех файлов, часто с нежелательными результатами."
msgid ""
" Use the -g/--git option to generate diffs in the git extended diff\n"
" format. See :hg:`help diffs` for more information."
msgstr ""
+" Используйте -g/--git чтобы сгенерировать diff'ы в расширенном\n"
+" формате git. Подробнее см. :hg:`help diffs`."
msgid ""
" With the --switch-parent option, the diff will be against the\n"
" second parent. It can be useful to review a merge."
msgstr ""
+" Если указан --switch-parent, будут генерироваться отличия от\n"
+" второго родителя. Это может быть полезно при анализе слияния."
msgid "export requires at least one changeset"
-msgstr ""
+msgstr "для экспорта требуется хотя бы один набор изменений"
msgid "exporting patches:\n"
-msgstr ""
+msgstr "экспортируемые патчи:\n"
msgid "exporting patch:\n"
-msgstr ""
+msgstr "экспортируемый патч:\n"
msgid "forget the specified files on the next commit"
-msgstr ""
+msgstr "забыть указанные файлы при следующем коммите"
msgid ""
" Mark the specified files so they will no longer be tracked\n"
" after the next commit."
msgstr ""
+" Помечает указанные файлы, чтобы перестать их отслеживать\n"
+" при следующем коммите."
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 ""
+" Это удаляет файлы только из текущей ветви, а не из всего\n"
+" репозитория, и не удаляет их из рабочего каталога."
msgid " To undo a forget before the next commit, see :hg:`add`."
msgstr ""
+" Чтобы отменить действие forget до следующего коммита\n"
+" см. :hg:`add`."
msgid "no files specified"
-msgstr ""
+msgstr "не задано ни одного файла"
#, python-format
msgid "not removing %s: file is already untracked\n"
-msgstr ""
+msgstr "%s не удален, он и так не отслеживается\n"
+
+#, python-format
+msgid "removing %s\n"
+msgstr "удаляю %s\n"
+
+msgid "end fields with NUL"
+msgstr "заканчивать поля символом NUL"
+
+msgid "print all revisions that match"
+msgstr "печатать все подходящие ревизии"
+
+msgid "follow changeset history, or file history across copies and renames"
+msgstr ""
+"следовать истории набора изменений или истории файла при копированиях/"
+"переименованиях"
+
+msgid "ignore case when matching"
+msgstr "игнорировать регистр букв"
+
+msgid "print only filenames and revisions that match"
+msgstr "печатать только имена совпадающих файлов и ревизий"
+
+msgid "print matching line numbers"
+msgstr "печатать номера строк"
+
+msgid "only search files changed within revision range"
+msgstr "искать только файлы, измененные в указанном диапазоне ревизий"
+
+msgid "[OPTION]... PATTERN [FILE]..."
+msgstr "[ПАРАМЕТР]... ШАБЛОН [ФАЙЛ]..."
msgid "search for a pattern in specified files and revisions"
-msgstr ""
+msgstr "искать шаблон в указанных файлах и ревизиях"
msgid " Search revisions of files for a regular expression."
-msgstr ""
+msgstr " Ищет регулярное выражение в указанных ревизиях файлов."
msgid ""
" This command behaves differently than Unix grep. It only accepts\n"
@@ -7546,6 +8207,10 @@
" working directory. It always prints the revision number in which a\n"
" match appears."
msgstr ""
+" Команда ведет себя не так, как grep в Unix. Она принимает\n"
+" регулярные выражения Python/Perl. Ищет в истории репозитория,\n"
+" а не в рабочем каталоге. Она всегда печатает номер ревизии,\n"
+" в ктором находит совпадение."
msgid ""
" By default, grep only prints output for the first revision of a\n"
@@ -7554,21 +8219,46 @@
" becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
" use the --all flag."
msgstr ""
+" По умолчанию печатается только вывод для первой ревизии файла,\n"
+" в которой найдено совпадение. Чтобы напечатать все ревизии, в которых\n"
+" меняется статус совпадения (\"-\", если совпадение перестало\n"
+" быть совпадением, или \"+\", если совпадение возникло там, где раньше\n"
+" его не было), используйте флаг --all."
msgid ""
" Returns 0 if a match is found, 1 otherwise.\n"
" "
msgstr ""
+" Возвращает 0, если совпадение найдено, 1 в противном случае.\n"
+" "
#, python-format
msgid "grep: invalid match pattern: %s\n"
-msgstr ""
+msgstr "grep: наверный шаблон: %s\n"
+
+msgid "STARTREV"
+msgstr "НАЧРЕВИЗИЯ"
+
+msgid "show only heads which are descendants of STARTREV"
+msgstr "показать только головные ревизии-потомки НАЧРЕВИЗИИ"
+
+msgid "show topological heads only"
+msgstr "показать только топологические головные ревизии"
+
+msgid "show active branchheads only (DEPRECATED)"
+msgstr "показать только активные головы ветвей (УСТАРЕЛО)"
+
+msgid "show normal and closed branch heads"
+msgstr "показать обычные и закрытые головы ветвей"
+
+msgid "[-ac] [-r STARTREV] [REV]..."
+msgstr "[-ac] [-r НАЧРЕВИЗИЯ] [РЕВИЗИЯ]..."
msgid "show current repository heads or show branch heads"
-msgstr ""
+msgstr "показать головы текущего репозитория или головы ветвей"
msgid " With no arguments, show all repository branch heads."
-msgstr ""
+msgstr " Без аргуметов показывает все головы ветвей репозитория."
msgid ""
" Repository \"heads\" are changesets with no child changesets. They are\n"
@@ -7576,74 +8266,106 @@
" for update and merge operations. Branch heads are changesets that have\n"
" no child changeset on the same branch."
msgstr ""
+" \"Головы\" репозитория - это наборы изменений, у которых нет дочерних\n"
+" наборов. Именно в них происходит разработка и они как правило являются\n"
+" объектами для операций update или merge. Головы ветвей - это наборы\n"
+" изменений, у которых нет дочерних наборов на той же ветви."
msgid ""
" If one or more REVs are given, only branch heads on the branches\n"
" associated with the specified changesets are shown."
msgstr ""
+" Если указана одна или более РЕВИЗИЯ, показываются только головы\n"
+" на ветвях, ассоциированных с указанными ревизиями."
msgid ""
" If -c/--closed is specified, also show branch heads marked closed\n"
" (see :hg:`commit --close-branch`)."
msgstr ""
+" Если указан -c/--closed, показываются также головы на закрытых\n"
+" ветвях (см. :hg:`commit --close-branch`)"
msgid ""
" If STARTREV is specified, only those heads that are descendants of\n"
" STARTREV will be displayed."
msgstr ""
+" Если задана НАЧАЛЬНАЯРЕВИЗИЯ, показываются только головы,\n"
+" являющиеся ее потомками."
msgid ""
" If -t/--topo is specified, named branch mechanics will be ignored and "
"only\n"
" changesets without children will be shown."
msgstr ""
+" Если указан -t/--topo, механизм именованных ветвей игнорируется, и "
+"будут\n"
+" показаны только наборы изменений без дочерних наборов."
msgid ""
" Returns 0 if matching heads are found, 1 if not.\n"
" "
msgstr ""
+" Возвращает 0, если головы найдены, 1 в противном случае.\n"
+" "
#, python-format
msgid "no open branch heads found on branches %s"
-msgstr ""
+msgstr "не найдено голов открытых ветвей на ветвях %s"
#, python-format
msgid " (started at %s)"
-msgstr ""
+msgstr " (начиная с %s)"
+
+msgid "show only help for extensions"
+msgstr "показать только справку по расширениям"
+
+msgid "show only help for commands"
+msgstr "показать справку для команд"
+
+msgid "[-ec] [TOPIC]"
+msgstr "[-ec] [ТЕМА]"
msgid "show help for a given topic or a help overview"
-msgstr ""
+msgstr "показать справку по выбранной теме или обзор справочной информации"
msgid ""
" With no arguments, print a list of commands with short help messages."
-msgstr ""
+msgstr " Без аргументов печатает списко команд с кратким описанием."
msgid ""
" Given a topic, extension, or command name, print help for that\n"
" topic."
msgstr ""
+" Если указана тема, расширение или имя команды, показывает справку\n"
+" по этой теме."
msgid ""
" Returns 0 if successful.\n"
" "
msgstr ""
+" Возвращает 0 при успешном выполнении.\n"
+" "
msgid "global options:"
msgstr "глобальные параметры:"
msgid "use \"hg help\" for the full list of commands"
-msgstr ""
+msgstr "используйте \"hg help\" чтобы посмотреть полный список команд"
msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
msgstr ""
+"используйте \"hg help\" чтобы посмотреть полный список команд,\"hg -v\" для "
+"подробной информации"
#, python-format
msgid "use \"hg help %s\" to show the full help text"
-msgstr ""
+msgstr "используйте \"hg help %s\" чтобы получить полную справку"
#, python-format
msgid "use \"hg -v help%s\" to show builtin aliases and global options"
msgstr ""
+"используйте \"hg -v help%s\" чтобы посмотреть встроенные псевдонимы и "
+"глобальные параметры"
#, python-format
msgid "use \"hg -v help %s\" to show global options"
@@ -7690,9 +8412,21 @@
msgid "options:\n"
msgstr "параметры:\n"
+#, python-format
+msgid "use \"hg help -e %s\" to show help for the %s extension"
+msgstr "используйте \"hg help -e %s\" для просмотра справки по расширению %s"
+
msgid "no commands defined\n"
msgstr "команды не определены\n"
+#, python-format
+msgid ""
+"\n"
+"use \"hg help -c %s\" to see help for the %s command\n"
+msgstr ""
+"\n"
+"используйте \"hg help -c %s\" для справки по команде %s\n"
+
msgid "no help text available"
msgstr "справка недоступна"
@@ -7736,6 +8470,27 @@
"\n"
"дополнительные разделы справки:"
+msgid "identify the specified revision"
+msgstr ""
+
+msgid "show local revision number"
+msgstr "показать локальный номер ревизии"
+
+msgid "show global revision id"
+msgstr "показать глобальный идентификатор ревизии"
+
+msgid "show branch"
+msgstr "показать ветку"
+
+msgid "show tags"
+msgstr "показать метки"
+
+msgid "show bookmarks"
+msgstr "показать закладка"
+
+msgid "[-nibtB] [-r REV] [SOURCE]"
+msgstr "[-nibtB] [-r РЕВИЗИЯ] [ИСТОЧНИК]"
+
msgid "identify the working copy or specified revision"
msgstr "описать рабочую копию или указанную ревизию"
@@ -7768,6 +8523,34 @@
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 ""
+"настройка strip для директории при применении патча. Значит то же,что и в "
+"команде patch"
+
+msgid "PATH"
+msgstr "ПУТЬ"
+
+msgid "base path"
+msgstr "базовый путь"
+
+msgid "skip check for outstanding uncommitted changes"
+msgstr "не проверять "
+
+msgid "don't commit, just update the working directory"
+msgstr "не коммитить, просто обновить рабочий каталог"
+
+msgid "apply patch to the nodes from which it was generated"
+msgstr "применить патч к узлам, для которых он был сгенерирован"
+
+msgid "use any branch information in patch (implied by --exact)"
+msgstr "использовать любую информацию о ветвях из патча (включается --exact)"
+
+msgid "[ПАРАМЕТР]... ПАТЧ..."
+msgstr ""
+
msgid "import an ordered set of patches"
msgstr "импортировать упорядоченный набор патчей"
@@ -7782,6 +8565,8 @@
" If there are outstanding changes in the working directory, import\n"
" will abort unless given the -f/--force flag."
msgstr ""
+" Если в рабочем каталоге есть незакоммиченные изменения, импорт\n"
+" отменяется, если не указан флаг -f/--force."
msgid ""
" You can import a patch straight from a mail message. Even patches\n"
@@ -7791,6 +8576,13 @@
" text/plain body parts before first diff are added to commit\n"
" message."
msgstr ""
+" Можно импортировать патчи прямо из емейла. Работает даже для\n"
+" патчей в приложениях (чтобы использовать патч из тела письма,\n"
+" оно должно иметь тип text/plain или text/x-patch).Заголовки\n"
+" электронного письма From и Subject используются по умолчанию\n"
+" в качестве автора коммита и комментария к коммиту. Все части\n"
+" тела письма типа text/plain до первого diff'а добавляются\n"
+" к комментарию к коммиту."
msgid ""
" If the imported patch was generated by :hg:`export`, user and\n"
@@ -7798,6 +8590,10 @@
" body. Values given on command line with -m/--message and -u/--user\n"
" override these."
msgstr ""
+" Если импортируемый патч был сгенерирован с помощью :hg:`export`,\n"
+" пользователь и описание из патча используются вместо заголовков\n"
+" и тела электронного письма. С помощью параметров -m/--message и\n"
+" -u/--user можно задать эти значения явно."
msgid ""
" If --exact is specified, import will set the working directory to\n"
@@ -7806,35 +8602,66 @@
" the patch. This may happen due to character set problems or other\n"
" deficiencies in the text patch format."
msgstr ""
+" Если указан --exact, рабочий каталог будет обновляться до родителя\n"
+" каждого патча перед его применением, и импорт будет отменен, если\n"
+" получившийся набор изменений будет иметь другой хэш, чем записанный\n"
+" в патче. Это может случиться, например, из-за проблем с кодировкой\n"
+" или других дефектах в формате патча."
msgid ""
" With -s/--similarity, hg will attempt to discover renames and\n"
" copies in the patch in the same way as 'addremove'."
msgstr ""
+" Если указан -s/--similatity, Mercurial попытается обнаружить\n"
+" копирования и переименования в патче так же, как в 'addremove'."
msgid ""
" To read a patch from standard input, use \"-\" as the patch name. If\n"
" a URL is specified, the patch will be downloaded from it.\n"
" See :hg:`help dates` for a list of formats valid for -d/--date."
msgstr ""
+" Используйте \"-\" вместо имени патча, чтобы прочитать патч со\n"
+" стандартного ввода. Если указан URL, патч будет загружен оттуда.\n"
+" См. :hg:`help dates` о допустимых форматах дат для -d/--date."
msgid "to working directory"
-msgstr ""
+msgstr "в рабочий каталог"
msgid "not a Mercurial patch"
-msgstr ""
+msgstr "не патч Mercurial"
msgid "patch is damaged or loses information"
-msgstr ""
+msgstr "патч поврежден или в нем недостает данных"
msgid "applying patch from stdin\n"
-msgstr ""
+msgstr "применяю патч со стандартного вводар\n"
#, python-format
msgid "applied %s\n"
-msgstr ""
+msgstr "применен %s\n"
msgid "no diffs found"
+msgstr "отличий не найдено"
+
+msgid "run even if remote repository is unrelated"
+msgstr ""
+
+msgid "show newest record first"
+msgstr ""
+
+msgid "file to store the bundles into"
+msgstr ""
+
+msgid "a remote changeset intended to be added"
+msgstr ""
+
+msgid "compare bookmarks"
+msgstr ""
+
+msgid "a specific branch you would like to pull"
+msgstr ""
+
+msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
msgstr ""
msgid "show new changesets found in source"
@@ -7863,7 +8690,10 @@
msgstr ""
msgid "remote doesn't support bookmarks\n"
-msgstr ""
+msgstr "удаленный репозиторий не поддерживает закладки\n"
+
+msgid "[-e CMD] [--remotecmd CMD] [DEST]"
+msgstr "[-e КОМАНДА] [--remotecmd КОМАНДА] [НАЗН]"
msgid "create a new repository in the given directory"
msgstr ""
@@ -7881,6 +8711,18 @@
" See :hg:`help urls` for more information."
msgstr ""
+msgid "search the repository as it is in REV"
+msgstr ""
+
+msgid "end filenames with NUL, for use with xargs"
+msgstr ""
+
+msgid "print complete paths from the filesystem root"
+msgstr ""
+
+msgid "[OPTION]... [PATTERN]..."
+msgstr ""
+
msgid "locate files matching specific patterns"
msgstr ""
@@ -7907,6 +8749,39 @@
" contain whitespace as multiple filenames."
msgstr ""
+msgid "only follow the first parent of merge changesets"
+msgstr ""
+
+msgid "show revisions matching date spec"
+msgstr ""
+
+msgid "show copied files"
+msgstr ""
+
+msgid "do case-insensitive search for a given text"
+msgstr ""
+
+msgid "include revisions where files were removed"
+msgstr ""
+
+msgid "show only merges"
+msgstr ""
+
+msgid "revisions committed by user"
+msgstr ""
+
+msgid "show only changesets within the given named branch (DEPRECATED)"
+msgstr ""
+
+msgid "show changesets within the given named branch"
+msgstr ""
+
+msgid "do not display revision or any of its ancestors"
+msgstr ""
+
+msgid "[OPTION]... [FILE]"
+msgstr ""
+
msgid "show revision history of entire repository or files"
msgstr ""
@@ -7945,6 +8820,12 @@
" will appear in files:."
msgstr ""
+msgid "revision to display"
+msgstr ""
+
+msgid "[-r REV]"
+msgstr ""
+
msgid "output the current or given revision of the project manifest"
msgstr ""
@@ -7959,6 +8840,18 @@
" With --debug, print file revision hashes."
msgstr ""
+msgid "force a merge with outstanding changes"
+msgstr ""
+
+msgid "revision to merge"
+msgstr ""
+
+msgid "review revisions to merge (no merge is performed)"
+msgstr ""
+
+msgid "[-P] [-f] [[-r] REV]"
+msgstr ""
+
msgid "merge working directory with another revision"
msgstr ""
@@ -8028,6 +8921,15 @@
msgid "use 'hg update' or merge with an explicit revision"
msgstr ""
+msgid "a changeset intended to be included in the destination"
+msgstr ""
+
+msgid "a specific branch you would like to push"
+msgstr ""
+
+msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
+msgstr ""
+
msgid "show changesets not found in the destination"
msgstr ""
@@ -8045,6 +8947,12 @@
" "
msgstr ""
+msgid "show parents of the specified revision"
+msgstr ""
+
+msgid "[-r REV] [FILE]"
+msgstr ""
+
msgid "show the parents of the working directory or revision"
msgstr ""
@@ -8063,6 +8971,9 @@
msgid "'%s' not found in manifest!"
msgstr ""
+msgid "[NAME]"
+msgstr ""
+
msgid "show aliases for remote repositories"
msgstr ""
@@ -8072,6 +8983,11 @@
msgstr ""
msgid ""
+" 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."
@@ -8111,6 +9027,21 @@
msgid "(run 'hg update' to get a working copy)\n"
msgstr ""
+msgid "update to new branch head if changesets were pulled"
+msgstr ""
+
+msgid "run even when remote repository is unrelated"
+msgstr ""
+
+msgid "BOOKMARK"
+msgstr ""
+
+msgid "bookmark to pull"
+msgstr ""
+
+msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
+msgstr ""
+
msgid "pull changes from the specified source"
msgstr ""
@@ -8154,6 +9085,18 @@
msgid "importing bookmark %s\n"
msgstr ""
+msgid "force push"
+msgstr ""
+
+msgid "bookmark to push"
+msgstr ""
+
+msgid "allow pushing a new branch"
+msgstr ""
+
+msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
+msgstr ""
+
msgid "push changes to the specified destination"
msgstr ""
@@ -8237,6 +9180,12 @@
" "
msgstr ""
+msgid "record delete for missing files"
+msgstr ""
+
+msgid "remove (and delete) file even if added or modified"
+msgstr ""
+
msgid "remove the specified files on the next commit"
msgstr ""
@@ -8294,6 +9243,12 @@
"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 ""
+
+msgid "[OPTION]... SOURCE... DEST"
+msgstr ""
+
msgid "rename files; equivalent of copy + remove"
msgstr ""
@@ -8308,6 +9263,21 @@
" before that, see :hg:`revert`."
msgstr ""
+msgid "select all unresolved files"
+msgstr ""
+
+msgid "list state of files needing merge"
+msgstr ""
+
+msgid "mark files as resolved"
+msgstr ""
+
+msgid "mark files as unresolved"
+msgstr ""
+
+msgid "hide status prefix"
+msgstr ""
+
msgid "redo merges or set/view the merge status of files"
msgstr ""
@@ -8369,6 +9339,21 @@
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 ""
+
+msgid "revert to the specified revision"
+msgstr ""
+
+msgid "do not save backup copies of files"
+msgstr ""
+
+msgid "[OPTION]... [-r REV] [NAME]..."
+msgstr ""
+
msgid "restore individual files or directories to an earlier state"
msgstr ""
@@ -8501,6 +9486,52 @@
msgid " Print the root directory of the current repository."
msgstr ""
+msgid "name of access log file to write to"
+msgstr "имя файла для записи журнала доступа"
+
+msgid "name of error log file to write to"
+msgstr "имя файла для записи журнала ошибок"
+
+msgid "PORT"
+msgstr ""
+
+msgid "port to listen on (default: 8000)"
+msgstr ""
+
+msgid "address to listen on (default: all interfaces)"
+msgstr ""
+
+msgid "ADDR"
+msgstr ""
+
+msgid "prefix path to serve from (default: server root)"
+msgstr ""
+"префикс пути для предоставления доступа (по умолчанию: в корне сервера)"
+
+msgid "name to show in web pages (default: working directory)"
+msgstr ""
+
+msgid "name of the hgweb config file (see \"hg help hgweb\")"
+msgstr ""
+
+msgid "name of the hgweb config file (DEPRECATED)"
+msgstr "имя конфигурационного файла hgweb (УСТАРЕЛО)"
+
+msgid "for remote clients"
+msgstr "для удалённых клиентов"
+
+msgid "web templates to use"
+msgstr "используемые веб-шаблоны"
+
+msgid "template style to use"
+msgstr "используемый стиль шаблона"
+
+msgid "use IPv6 in addition to IPv4"
+msgstr "использовать IPv6 вместе с IPv4"
+
+msgid "SSL certificate file"
+msgstr "Файл сертификата SSL"
+
msgid "start stand-alone webserver"
msgstr ""
@@ -8538,6 +9569,73 @@
msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
msgstr ""
+msgid "show untrusted configuration options"
+msgstr ""
+
+msgid "[-u] [NAME]..."
+msgstr ""
+
+msgid "show combined config settings from all hgrc files"
+msgstr ""
+
+msgid " With no arguments, print names and values of all config items."
+msgstr ""
+
+msgid ""
+" With one argument of the form section.name, print just the value\n"
+" of that config item."
+msgstr ""
+
+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 ""
+
+msgid "show only modified files"
+msgstr ""
+
+msgid "show only added files"
+msgstr ""
+
+msgid "show only removed files"
+msgstr ""
+
+msgid "show only deleted (but tracked) files"
+msgstr ""
+
+msgid "show only files without changes"
+msgstr ""
+
+msgid "show only unknown (not tracked) files"
+msgstr ""
+
+msgid "show only ignored files"
+msgstr ""
+
+msgid "show source of copied files"
+msgstr ""
+
+msgid "show difference from revision"
+msgstr ""
+
+msgid "list the changed files of a revision"
+msgstr ""
+
msgid "show changed files in the working directory"
msgstr ""
@@ -8584,6 +9682,9 @@
" = origin of the previous file listed as A (added)"
msgstr ""
+msgid "check for push and pull"
+msgstr ""
+
msgid "summarize working directory state"
msgstr ""
@@ -8703,6 +9804,24 @@
msgid "remote: (synced)\n"
msgstr ""
+msgid "force tag"
+msgstr ""
+
+msgid "make the tag local"
+msgstr ""
+
+msgid "revision to tag"
+msgstr ""
+
+msgid "remove a tag"
+msgstr ""
+
+msgid "use <text> as commit message"
+msgstr ""
+
+msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
+msgstr ""
+
msgid "add one or more tags for the current or given revision"
msgstr ""
@@ -8781,6 +9900,9 @@
" switch is used, a third column \"local\" is printed for local tags."
msgstr ""
+msgid "[-p] [-g]"
+msgstr ""
+
msgid "show the tip revision"
msgstr ""
@@ -8797,6 +9919,12 @@
" and cannot be renamed or assigned to a different changeset."
msgstr ""
+msgid "update to new branch head if changesets were unbundled"
+msgstr ""
+
+msgid "[-u] FILE..."
+msgstr ""
+
msgid "apply one or more changegroup files"
msgstr ""
@@ -8810,6 +9938,15 @@
" "
msgstr ""
+msgid "discard uncommitted changes (no backup)"
+msgstr ""
+
+msgid "update across branches if no uncommitted changes"
+msgstr ""
+
+msgid "[-c] [-C] [-d DATE] [[-r] REV]"
+msgstr ""
+
msgid "update working directory (or switch revisions)"
msgstr ""
@@ -8898,842 +10035,6 @@
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-msgid "repository root directory or name of overlay bundle file"
-msgstr ""
-
-msgid "DIR"
-msgstr ""
-
-msgid "change working directory"
-msgstr ""
-
-msgid "do not prompt, assume 'yes' for any required answers"
-msgstr ""
-
-msgid "suppress output"
-msgstr "с подавлением вывода"
-
-msgid "enable additional output"
-msgstr "включить дополнительный вывод"
-
-msgid "set/override config option (use 'section.name=value')"
-msgstr ""
-
-msgid "CONFIG"
-msgstr ""
-
-msgid "enable debugging output"
-msgstr ""
-
-msgid "start debugger"
-msgstr "запустить отладчик"
-
-msgid "set the charset encoding"
-msgstr ""
-
-msgid "ENCODE"
-msgstr ""
-
-msgid "MODE"
-msgstr ""
-
-msgid "set the charset encoding mode"
-msgstr ""
-
-msgid "always print a traceback on exception"
-msgstr ""
-
-msgid "time how long the command takes"
-msgstr ""
-
-msgid "print command execution profile"
-msgstr "вывести профиль запуска команды"
-
-msgid "output version information and exit"
-msgstr ""
-
-msgid "display help and exit"
-msgstr "показать справку и выйти"
-
-msgid "do not perform actions, just print output"
-msgstr "ничего реально не делать, просто напечатать вывод"
-
-msgid "specify ssh command to use"
-msgstr ""
-
-msgid "specify hg command to run on the remote side"
-msgstr ""
-
-msgid "do not verify server certificate (ignoring web.cacerts config)"
-msgstr ""
-
-msgid "PATTERN"
-msgstr "ШАБЛОН"
-
-msgid "include names matching the given patterns"
-msgstr "включить имена, соответствующие данным шаблонам"
-
-msgid "exclude names matching the given patterns"
-msgstr "исключить имена, соответствующие данным шаблонам"
-
-msgid "use text as commit message"
-msgstr "текст комментария к коммиту"
-
-msgid "read commit message from file"
-msgstr "читать журнальные сообщения из файла"
-
-msgid "record the specified date as commit date"
-msgstr "использовать эту дату в качестве даты коммита"
-
-msgid "record the specified user as committer"
-msgstr "использовать этого пользователя как автора коммита"
-
-msgid "STYLE"
-msgstr "СТИЛЬ"
-
-msgid "display using template map file"
-msgstr ""
-
-msgid "display with template"
-msgstr ""
-
-msgid "do not show merges"
-msgstr ""
-
-msgid "output diffstat-style summary of changes"
-msgstr ""
-
-msgid "treat all files as text"
-msgstr ""
-
-msgid "omit dates from diff headers"
-msgstr ""
-
-msgid "show which function each change is in"
-msgstr ""
-
-msgid "produce a diff that undoes the changes"
-msgstr ""
-
-msgid "ignore white space when comparing lines"
-msgstr ""
-
-msgid "ignore changes in the amount of white space"
-msgstr ""
-
-msgid "ignore changes whose lines are all blank"
-msgstr ""
-
-msgid "number of lines of context to show"
-msgstr ""
-
-msgid "SIMILARITY"
-msgstr "ПОХОЖЕСТЬ"
-
-msgid "guess renamed files by similarity (0<=s<=100)"
-msgstr ""
-"считать файлы переименованными исходя из степени их похожести (от 0 до 100)"
-
-msgid "recurse into subrepositories"
-msgstr "рекурсивно обрабатывать субрепозитории"
-
-msgid "[OPTION]... [FILE]..."
-msgstr "[ПАРАМЕТР]... [ФАЙЛ]..."
-
-msgid "annotate the specified revision"
-msgstr "аннотировать указанную ревизию"
-
-msgid "follow copies/renames and list the filename (DEPRECATED)"
-msgstr "отслеживать копирования/переименования и писать имя файла (УСТАРЕЛО)"
-
-msgid "don't follow copies and renames"
-msgstr "не отслеживать копирования и перемещения"
-
-msgid "list the author (long with -v)"
-msgstr "писать имя автора (длинный формат с -v)"
-
-msgid "list the filename"
-msgstr "писать имя файла"
-
-msgid "list the date (short with -q)"
-msgstr "писать дату (короткий формат с -q"
-
-msgid "list the revision number (default)"
-msgstr "писать номер ревизии (по умолчанию)"
-
-msgid "list the changeset"
-msgstr "писать набор изменений"
-
-msgid "show line number at the first appearance"
-msgstr "указывать номер строки при первом появлении"
-
-msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
-msgstr ""
-
-msgid "do not pass files through decoders"
-msgstr "не обрабатывать файлы декодерами"
-
-msgid "PREFIX"
-msgstr "ПРЕФИКС"
-
-msgid "directory prefix for files in archive"
-msgstr "префикс каталога для файлов в архиве"
-
-msgid "revision to distribute"
-msgstr "ревизия для архивирования"
-
-msgid "type of distribution to create"
-msgstr "тип создаваемого архива"
-
-msgid "[ПАРАМЕТР]... ВЫХОД"
-msgstr ""
-
-#, fuzzy
-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 "[ПАРАМЕТР]... [-r] РЕВИЗИЯ"
-
-msgid "reset bisect state"
-msgstr "сбросить поиск"
-
-msgid "mark changeset good"
-msgstr "пометить ревизию как хорошую"
-
-msgid "mark changeset bad"
-msgstr "пометить ревизию как плохую"
-
-msgid "skip testing changeset"
-msgstr "пропустить тестирование набора изменений"
-
-msgid "extend the bisect range"
-msgstr "расширить диапазон поиска"
-
-msgid "use command to check changeset state"
-msgstr "использовать команду для проверки состояния набора изменений"
-
-msgid "do not update to target"
-msgstr "не обновляться до целевой ревизии"
-
-msgid "[-gbsr] [-U] [-c CMD] [REV]"
-msgstr "[-gbsr] [-U] [-c КОМАНДА] [РЕВИЗИЯ]"
-
-msgid "force"
-msgstr "принудительно"
-
-msgid "delete a given bookmark"
-msgstr "удалить указанную закладку"
-
-msgid "rename a given bookmark"
-msgstr "переимновать указанную закладку"
-
-msgid "do not mark a new bookmark active"
-msgstr "не помечать новую закладку как активную"
-
-msgid "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]"
-msgstr "hg bookmarks [-f] [-d] [-i] [-m ИМЯ] [-r РЕВИЗИЯ] [ИМЯ]"
-
-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] [ИМЯ]"
-
-msgid "show only branches that have unmerged heads"
-msgstr ""
-
-msgid "show normal and closed branches"
-msgstr ""
-
-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 ""
-
-msgid "the clone will include an empty working copy (only a repository)"
-msgstr ""
-
-msgid "revision, tag or branch to check out"
-msgstr ""
-
-msgid "include the specified changeset"
-msgstr ""
-
-msgid "clone only the specified branch"
-msgstr ""
-
-msgid "[OPTION]... SOURCE [DEST]"
-msgstr ""
-
-msgid "mark new/missing files as added/removed before committing"
-msgstr ""
-
-msgid "mark a branch as closed, hiding it from the branch list"
-msgstr ""
-
-msgid "record a copy that has already occurred"
-msgstr ""
-
-msgid "forcibly copy over an existing managed file"
-msgstr ""
-
-msgid "[OPTION]... [SOURCE]... DEST"
-msgstr ""
-
-msgid "[INDEX] REV1 REV2"
-msgstr ""
-
-msgid "add single file mergeable changes"
-msgstr ""
-
-msgid "add single file all revs overwrite"
-msgstr ""
-
-msgid "add new file at each rev"
-msgstr ""
-
-msgid "[OPTION]... TEXT"
-msgstr ""
-
-msgid "show all details"
-msgstr ""
-
-msgid "[COMMAND]"
-msgstr ""
-
-msgid "show the command options"
-msgstr "показать параметры команды"
-
-msgid "[-o] CMD"
-msgstr "[-o] КОМАНДА"
-
-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 ""
-
-msgid "try extended date formats"
-msgstr ""
-
-msgid "[-e] DATE [RANGE]"
-msgstr ""
-
-msgid "FILE REV"
-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 "[PATH]"
-msgstr ""
-
-msgid "id of head node"
-msgstr ""
-
-msgid "id of common node"
-msgstr ""
-
-msgid "REPO FILE [-H|-C ID]..."
-msgstr ""
-
-msgid "revlog format"
-msgstr ""
-
-msgid "REPO ID..."
-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 "sort by saved mtime"
-msgstr ""
-
-msgid "[OPTION]..."
-msgstr ""
-
-msgid "revision to check"
-msgstr ""
-
-msgid "REPO [OPTIONS]... [ONE [TWO]]"
-msgstr ""
-
-msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
-msgstr ""
-
-msgid "diff against the second parent"
-msgstr ""
-
-msgid "revisions to export"
-msgstr ""
-
-msgid "[OPTION]... [-o OUTFILESPEC] REV..."
-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 ""
-
-msgid "ignore case when matching"
-msgstr ""
-
-msgid "print only filenames and revisions that match"
-msgstr ""
-
-msgid "print matching line numbers"
-msgstr ""
-
-msgid "only search files changed within revision range"
-msgstr ""
-
-msgid "[OPTION]... PATTERN [FILE]..."
-msgstr ""
-
-msgid "show only heads which are descendants of STARTREV"
-msgstr ""
-
-msgid "STARTREV"
-msgstr ""
-
-msgid "show topological heads only"
-msgstr ""
-
-msgid "show active branchheads only (DEPRECATED)"
-msgstr ""
-
-msgid "show normal and closed branch heads"
-msgstr ""
-
-msgid "[-ac] [-r STARTREV] [REV]..."
-msgstr ""
-
-msgid "[TOPIC]"
-msgstr ""
-
-msgid "identify the specified revision"
-msgstr ""
-
-msgid "show local revision number"
-msgstr ""
-
-msgid "show global revision id"
-msgstr ""
-
-msgid "show branch"
-msgstr ""
-
-msgid "show tags"
-msgstr ""
-
-msgid "show bookmarks"
-msgstr ""
-
-msgid "[-nibtB] [-r REV] [SOURCE]"
-msgstr ""
-
-msgid ""
-"directory strip option for patch. This has the same meaning as the "
-"corresponding patch option"
-msgstr ""
-
-msgid "PATH"
-msgstr ""
-
-msgid "base path"
-msgstr ""
-
-msgid "skip check for outstanding uncommitted changes"
-msgstr ""
-
-msgid "don't commit, just update the working directory"
-msgstr ""
-
-msgid "apply patch to the nodes from which it was generated"
-msgstr ""
-
-msgid "use any branch information in patch (implied by --exact)"
-msgstr ""
-
-msgid "[OPTION]... PATCH..."
-msgstr ""
-
-msgid "run even if remote repository is unrelated"
-msgstr ""
-
-msgid "show newest record first"
-msgstr ""
-
-msgid "file to store the bundles into"
-msgstr ""
-
-msgid "a remote changeset intended to be added"
-msgstr ""
-
-msgid "compare bookmarks"
-msgstr ""
-
-msgid "a specific branch you would like to pull"
-msgstr ""
-
-msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
-msgstr ""
-
-msgid "[-e CMD] [--remotecmd CMD] [DEST]"
-msgstr ""
-
-msgid "search the repository as it is in REV"
-msgstr ""
-
-msgid "end filenames with NUL, for use with xargs"
-msgstr ""
-
-msgid "print complete paths from the filesystem root"
-msgstr ""
-
-msgid "[OPTION]... [PATTERN]..."
-msgstr ""
-
-msgid "only follow the first parent of merge changesets"
-msgstr ""
-
-msgid "show revisions matching date spec"
-msgstr ""
-
-msgid "show copied files"
-msgstr ""
-
-msgid "do case-insensitive search for a given text"
-msgstr ""
-
-msgid "include revisions where files were removed"
-msgstr ""
-
-msgid "show only merges"
-msgstr ""
-
-msgid "revisions committed by user"
-msgstr ""
-
-msgid "show only changesets within the given named branch (DEPRECATED)"
-msgstr ""
-
-msgid "show changesets within the given named branch"
-msgstr ""
-
-msgid "do not display revision or any of its ancestors"
-msgstr ""
-
-msgid "[OPTION]... [FILE]"
-msgstr ""
-
-msgid "revision to display"
-msgstr ""
-
-msgid "[-r REV]"
-msgstr ""
-
-msgid "force a merge with outstanding changes"
-msgstr ""
-
-msgid "revision to merge"
-msgstr ""
-
-msgid "review revisions to merge (no merge is performed)"
-msgstr ""
-
-msgid "[-P] [-f] [[-r] REV]"
-msgstr ""
-
-msgid "a changeset intended to be included in the destination"
-msgstr ""
-
-msgid "a specific branch you would like to push"
-msgstr ""
-
-msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
-msgstr ""
-
-msgid "show parents of the specified revision"
-msgstr ""
-
-msgid "[-r REV] [FILE]"
-msgstr ""
-
-msgid "[NAME]"
-msgstr ""
-
-msgid "update to new branch head if changesets were pulled"
-msgstr ""
-
-msgid "run even when remote repository is unrelated"
-msgstr ""
-
-msgid "BOOKMARK"
-msgstr ""
-
-msgid "bookmark to pull"
-msgstr ""
-
-msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
-msgstr ""
-
-msgid "force push"
-msgstr ""
-
-msgid "bookmark to push"
-msgstr ""
-
-msgid "allow pushing a new branch"
-msgstr ""
-
-msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
-msgstr ""
-
-msgid "record delete for missing files"
-msgstr ""
-
-msgid "remove (and delete) file even if added or modified"
-msgstr ""
-
-msgid "record a rename that has already occurred"
-msgstr ""
-
-msgid "[OPTION]... SOURCE... DEST"
-msgstr ""
-
-msgid "select all unresolved files"
-msgstr ""
-
-msgid "list state of files needing merge"
-msgstr ""
-
-msgid "mark files as resolved"
-msgstr ""
-
-msgid "mark files as unresolved"
-msgstr ""
-
-msgid "hide status prefix"
-msgstr ""
-
-msgid "revert all changes when no arguments given"
-msgstr ""
-
-msgid "tipmost revision matching date"
-msgstr ""
-
-msgid "revert to the specified revision"
-msgstr ""
-
-msgid "do not save backup copies of files"
-msgstr ""
-
-msgid "[OPTION]... [-r REV] [NAME]..."
-msgstr ""
-
-msgid "name of access log file to write to"
-msgstr "имя файла для записи журнала доступа"
-
-msgid "name of error log file to write to"
-msgstr "имя файла для записи журнала ошибок"
-
-msgid "PORT"
-msgstr ""
-
-msgid "port to listen on (default: 8000)"
-msgstr ""
-
-msgid "ADDR"
-msgstr ""
-
-msgid "address to listen on (default: all interfaces)"
-msgstr ""
-
-msgid "prefix path to serve from (default: server root)"
-msgstr ""
-"префикс пути для предоставления доступа (по умолчанию: в корне сервера)"
-
-msgid "name to show in web pages (default: working directory)"
-msgstr ""
-
-msgid "name of the hgweb config file (see \"hg help hgweb\")"
-msgstr ""
-
-msgid "name of the hgweb config file (DEPRECATED)"
-msgstr "имя конфигурационного файла hgweb (УСТАРЕЛО)"
-
-msgid "for remote clients"
-msgstr "для удалённых клиентов"
-
-msgid "web templates to use"
-msgstr "используемые веб-шаблоны"
-
-msgid "template style to use"
-msgstr "используемый стиль шаблона"
-
-msgid "use IPv6 in addition to IPv4"
-msgstr "использовать IPv6 вместе с IPv4"
-
-msgid "SSL certificate file"
-msgstr "Файл сертификата SSL"
-
-msgid "show untrusted configuration options"
-msgstr ""
-
-msgid "[-u] [NAME]..."
-msgstr ""
-
-msgid "check for push and pull"
-msgstr ""
-
-msgid "show status of all files"
-msgstr ""
-
-msgid "show only modified files"
-msgstr ""
-
-msgid "show only added files"
-msgstr ""
-
-msgid "show only removed files"
-msgstr ""
-
-msgid "show only deleted (but tracked) files"
-msgstr ""
-
-msgid "show only files without changes"
-msgstr ""
-
-msgid "show only unknown (not tracked) files"
-msgstr ""
-
-msgid "show only ignored files"
-msgstr ""
-
-msgid "show source of copied files"
-msgstr ""
-
-msgid "show difference from revision"
-msgstr ""
-
-msgid "list the changed files of a revision"
-msgstr ""
-
-msgid "force tag"
-msgstr ""
-
-msgid "make the tag local"
-msgstr ""
-
-msgid "revision to tag"
-msgstr ""
-
-msgid "remove a tag"
-msgstr ""
-
-msgid "use <text> as commit message"
-msgstr ""
-
-msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
-msgstr ""
-
-msgid "[-p] [-g]"
-msgstr ""
-
-msgid "update to new branch head if changesets were unbundled"
-msgstr ""
-
-msgid "[-u] FILE..."
-msgstr ""
-
-msgid "discard uncommitted changes (no backup)"
-msgstr ""
-
-msgid "update across branches if no uncommitted changes"
-msgstr ""
-
-msgid "[-c] [-C] [-d DATE] [[-r] REV]"
-msgstr ""
-
#, python-format
msgid "cannot include %s (%s)"
msgstr ""
@@ -10039,9 +10340,6 @@
msgid "warning: --repository ignored\n"
msgstr ""
-msgid "invalid arguments"
-msgstr "неверные параметры"
-
#, python-format
msgid "unrecognized profiling format '%s' - Ignored\n"
msgstr "неопознаный формат профилирования '%s' - Игнорирован\n"
@@ -12250,6 +12548,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 ""
@@ -12675,7 +12980,7 @@
msgstr ""
msgid "Note:"
-msgstr ""
+msgstr "Примечание:"
msgid "Tip:"
msgstr ""
@@ -12684,6 +12989,10 @@
msgstr ""
#, python-format
+msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
+msgstr ""
+
+#, python-format
msgid "cannot create %s: destination already exists"
msgstr ""
@@ -12700,10 +13009,6 @@
msgstr "применяется патч к файлу %s\n"
#, 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 "плохая полоса #%d %s (%d %d %d %d)"
@@ -12944,7 +13249,8 @@
msgid ""
"``contains(pattern)``\n"
-" Revision contains pattern."
+" Revision contains a file matching pattern. See :hg:`help patterns`\n"
+" for information about file patterns."
msgstr ""
#. i18n: "contains" is a keyword
@@ -12966,8 +13272,22 @@
msgstr ""
msgid ""
-"``follow()``\n"
-" An alias for ``::.`` (ancestors of the working copy's first parent)."
+"``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
@@ -12986,7 +13306,8 @@
msgid ""
"``grep(regex)``\n"
" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n"
-" to ensure special escape characters are handled correctly."
+" to ensure special escape characters are handled correctly. Unlike\n"
+" ``keyword(string)``, the match is case-sensitive."
msgstr ""
#. i18n: "grep" is a keyword
@@ -13023,7 +13344,7 @@
msgid ""
"``keyword(string)``\n"
" Search commit message, user name, and names of changed files for\n"
-" string."
+" string. The match is case-insensitive."
msgstr ""
#. i18n: "keyword" is a keyword
@@ -13205,7 +13526,7 @@
msgstr ""
msgid ""
-"``tag(name)``\n"
+"``tag([name])``\n"
" The specified tag by name, or all tagged revisions if no name is given."
msgstr ""
@@ -13219,7 +13540,7 @@
msgid ""
"``user(string)``\n"
-" User name is string."
+" User name contains string. The match is case-insensitive."
msgstr ""
msgid "can't negate that"
@@ -13259,6 +13580,14 @@
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 "searching for changes\n"
msgstr ""
@@ -13439,6 +13768,10 @@
msgstr ""
#, python-format
+msgid "cloning subrepo %s from %s\n"
+msgstr ""
+
+#, python-format
msgid "pulling subrepo %s from %s\n"
msgstr ""
@@ -13457,10 +13790,6 @@
msgstr ""
#, python-format
-msgid "cloning subrepo %s from %s\n"
-msgstr ""
-
-#, python-format
msgid "revision %s does not exist in subrepo %s\n"
msgstr ""
@@ -13605,10 +13934,6 @@
msgid "edit failed"
msgstr "неудача при редактировании"
-#, python-format
-msgid "ignoring invalid [auth] key '%s'\n"
-msgstr ""
-
msgid "http authorization required"
msgstr ""
@@ -13630,9 +13955,6 @@
msgid "http auth: user %s, password %s\n"
msgstr ""
-msgid "kb"
-msgstr ""
-
#, python-format
msgid "command '%s' failed: %s"
msgstr ""