--- a/i18n/ru.po Fri Dec 30 23:18:19 2011 +0300
+++ b/i18n/ru.po Sat Dec 31 21:54:14 2011 +0300
@@ -134,6 +134,7 @@
# progress bar индикатор выполнения
# map (file) ??? да и вообще все с map плохо
# abort отмена или останов (в статусах)
+# checkin (в конфиге для encode/decode) сейчас фиксация ???
#
#
# === TODO ===
@@ -158,6 +159,8 @@
# - bisect - можно во многих местах употреблять термин "бисекция" вместо
# неуклюжего "метод деления пополам". Это устоявшийся термин.
# - в строке дожно быть не более 75 символов!
+# - переводить ли примеры конфигов? я оставил как есть, чтобы пользователь
+# привыкал к англ, т.к. все настройки Mercurial на англ
#
#
msgid ""
@@ -14034,6 +14037,11 @@
"| (Windows) ``%HOME%\\.hgrc``\n"
"| (Windows) ``%HOME%\\Mercurial.ini``"
msgstr ""
+"| (Unix) ``$HOME/.hgrc``\n"
+"| (Windows) ``%USERPROFILE%\\.hgrc``\n"
+"| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n"
+"| (Windows) ``%HOME%\\.hgrc``\n"
+"| (Windows) ``%HOME%\\Mercurial.ini``"
msgid ""
" Per-user configuration file(s), for the user running Mercurial. On\n"
@@ -14054,6 +14062,8 @@
"| (Unix) ``/etc/mercurial/hgrc``\n"
"| (Unix) ``/etc/mercurial/hgrc.d/*.rc``"
msgstr ""
+"| (Unix) ``/etc/mercurial/hgrc``\n"
+"| (Unix) ``/etc/mercurial/hgrc.d/*.rc``"
msgid ""
" Per-system configuration files, for the system on which Mercurial\n"
@@ -14141,6 +14151,10 @@
" green=\n"
" eggs"
msgstr ""
+" [spam]\n"
+" eggs=ham\n"
+" green=\n"
+" eggs"
msgid ""
"Each line contains one entry. If the lines that follow are indented,\n"
@@ -14167,6 +14181,10 @@
" ham=serrano\n"
" eggs=small"
msgstr ""
+" [spam]\n"
+" eggs=large\n"
+" ham=serrano\n"
+" eggs=small"
msgid "This would set the configuration key named ``eggs`` to ``small``."
msgstr "Это установит ключ с именем ``eggs`` в значение ``small``."
@@ -14185,6 +14203,10 @@
" ham=serrano\n"
" eggs=small"
msgstr ""
+" [foo]\n"
+" eggs=large\n"
+" ham=serrano\n"
+" eggs=small"
msgid ""
" [bar]\n"
@@ -14192,6 +14214,10 @@
" green=\n"
" eggs"
msgstr ""
+" [bar]\n"
+" eggs=ham\n"
+" green=\n"
+" eggs"
msgid ""
" [foo]\n"
@@ -14199,6 +14225,10 @@
" eggs=medium\n"
" bread=toasted"
msgstr ""
+" [foo]\n"
+" ham=prosciutto\n"
+" eggs=medium\n"
+" bread=toasted"
msgid ""
"This would set the ``eggs``, ``ham``, and ``bread`` configuration keys\n"
@@ -14271,7 +14301,7 @@
"исключением случаев, когда значения заключаются в двойные кавычки::"
msgid " allow_read = \"John Doe, PhD\", brian, betty"
-msgstr ""
+msgstr " allow_read = \"John Doe, PhD\", brian, betty"
msgid ""
"Quotation marks can be escaped by prefixing them with a backslash. Only\n"
@@ -14402,18 +14432,28 @@
" processed before shell aliases and will thus not be passed to\n"
" aliases."
msgstr ""
+".. note:: Некоторые глобальные параметры, такие как ``-R``,\n"
+" обрабатываются перед псевдонимами оболочки, поэтому они не будут\n"
+" переданы в псевдонимы."
msgid ""
"\n"
"``annotate``\n"
"\"\"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``annotate``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
msgid ""
"Settings used when displaying file annotations. All values are\n"
"Booleans and default to False. See ``diff`` section for related\n"
"options for the diff command."
msgstr ""
+"Параметры, используемые при отображениии аннотаций файлов. Все\n"
+"значения являются логическими и по умолчанию установлены в False (Ложь).\n"
+"См. также секцию ``diff``, в которой имеются сходные параметры\n"
+"для команды diff."
msgid ""
"``ignorews``\n"
@@ -14441,6 +14481,9 @@
"``auth``\n"
"\"\"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``auth``\n"
+"\"\"\"\"\"\"\"\""
msgid ""
"Authentication credentials for HTTP authentication. This section\n"
@@ -14472,6 +14515,10 @@
" foo.password = bar\n"
" foo.schemes = http https"
msgstr ""
+" foo.prefix = hg.intevation.org/mercurial\n"
+" foo.username = foo\n"
+" foo.password = bar\n"
+" foo.schemes = http https"
msgid ""
" bar.prefix = secure.example.org\n"
@@ -14479,6 +14526,10 @@
" bar.cert = path/to/file.cert\n"
" bar.schemes = https"
msgstr ""
+" bar.prefix = secure.example.org\n"
+" bar.key = path/to/file.key\n"
+" bar.cert = path/to/file.cert\n"
+" bar.schemes = https"
msgid "Supported arguments:"
msgstr "Поддерживаемые аргументы:"
@@ -14573,6 +14624,9 @@
"``decode/encode``\n"
"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``decode/encode``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgid ""
"Filters for transforming files on checkout/checkin. This would\n"
@@ -14674,6 +14728,9 @@
"``defaults``\n"
"\"\"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``defaults``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
msgid "(defaults are deprecated. Don't use them. Use aliases instead)"
msgstr "(устарело. Не используйте эту секцию. Используйте псевдонимы.)"
@@ -14698,6 +14755,9 @@
" log = -v\n"
" status = -m"
msgstr ""
+" [defaults]\n"
+" log = -v\n"
+" status = -m"
msgid ""
"The actual commands, instead of their aliases, must be used when\n"
@@ -14713,6 +14773,9 @@
"``diff``\n"
"\"\"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``diff``\n"
+"\"\"\"\"\"\"\"\""
msgid ""
"Settings used when displaying diffs. Everything except for ``unified``\n"
@@ -14756,9 +14819,11 @@
"``email``\n"
"\"\"\"\"\"\"\"\"\""
msgstr ""
+"``email``\n"
+"\"\"\"\"\"\"\"\"\""
msgid "Settings for extensions that send email messages."
-msgstr "Настройки для расширений, использующих email для отправки сообщений"
+msgstr "Настройки для расширений, отправляющих сообщения по email"
msgid ""
"``from``\n"
@@ -14868,14 +14933,17 @@
"``extensions``\n"
"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``extensions``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgid ""
"Mercurial has an extension mechanism for adding new features. To\n"
"enable an extension, create an entry for it in this section."
msgstr ""
-"Mercurial поддерживает механизм расширений для добавления новых\n"
-"функций. Чтобы включить расширение, создайте для него запись в этой\n"
-"секции."
+"Mercurial использует механизм расширений для добавления новых\n"
+"возможностей. Чтобы включить расширение, создайте для него запись\n"
+"в этой секции."
msgid ""
"If you know that the extension is already in Python's search path,\n"
@@ -14925,6 +14993,9 @@
"``hostfingerprints``\n"
"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``hostfingerprints``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgid ""
"Fingerprints of the certificates of known HTTPS servers.\n"
@@ -14934,7 +15005,7 @@
"The fingerprint is the SHA-1 hash value of the DER encoded certificate.\n"
"The CA chain and web.cacerts is not used for servers with a fingerprint."
msgstr ""
-"Слепки сертификатов известных HTTPS-серверов. При заданном слепке,\n"
+"Слепки сертификатов известных HTTPS-серверов. При заданном слепке\n"
"HTTPS-соединение успешно установится только если слепок сертификата\n"
"сервера совпадает с заданным. Это похоже на работу с известными хостами\n"
"по ssh. Слепок - это хэш SHA-1 от сертификата, зашифрованного DER.\n"
@@ -14942,13 +15013,16 @@
"слепками."
msgid "For example::"
-msgstr "Приме::"
+msgstr "Пример::"
msgid ""
" [hostfingerprints]\n"
" hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:"
"d6:4b:ee:cc"
msgstr ""
+" [hostfingerprints]\n"
+" hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:"
+"d6:4b:ee:cc"
msgid "This feature is only supported when using Python 2.6 or later."
msgstr "Поддерживается только если используется Python 2.6 или выше."
@@ -14958,6 +15032,9 @@
"``format``\n"
"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``format``\n"
+"\"\"\"\"\"\"\"\"\"\""
msgid ""
"``usestore``\n"
@@ -15017,6 +15094,8 @@
"``merge-patterns``\n"
"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"``merge-patterns``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgid ""
"This section specifies merge tools to associate with particular file\n"
@@ -15034,11 +15113,16 @@
" **.c = kdiff3\n"
" **.jpg = myimgmerge"
msgstr ""
+" [merge-patterns]\n"
+" **.c = kdiff3\n"
+" **.jpg = myimgmerge"
msgid ""
"``merge-tools``\n"
"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"``merge-tools``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgid ""
"This section configures external merge tools to use for file-level\n"
@@ -15256,6 +15340,9 @@
"``hooks``\n"
"\"\"\"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``hooks``\n"
+"\"\"\"\"\"\"\"\"\""
msgid ""
"Commands or Python functions that get automatically executed by\n"
@@ -15636,6 +15723,9 @@
"``http_proxy``\n"
"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``http_proxy``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgid ""
"Used to access web-based Mercurial repositories through a HTTP\n"
@@ -15689,6 +15779,8 @@
"``smtp``\n"
"\"\"\"\"\"\"\"\""
msgstr ""
+"``smtp``\n"
+"\"\"\"\"\"\"\"\""
msgid "Configuration for extensions that need to send email messages."
msgstr "Настройки для расширений, которые рассылают email-сообщения."
@@ -15750,6 +15842,9 @@
"``patch``\n"
"\"\"\"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``patch``\n"
+"\"\"\"\"\"\"\"\"\""
msgid ""
"Settings used when applying patches, for instance through the 'import'\n"
@@ -15787,6 +15882,9 @@
"``paths``\n"
"\"\"\"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``paths``\n"
+"\"\"\"\"\"\"\"\"\""
msgid ""
"Assigns symbolic names to repositories. The left side is the\n"
@@ -15823,6 +15921,9 @@
"``profiling``\n"
"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``profiling``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgid ""
"Specifies profiling format and file output. In this section\n"
@@ -15878,14 +15979,20 @@
"``revsetalias``\n"
"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"``revsetalias``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
msgid "Alias definitions for revsets. See :hg:`help revsets` for details."
msgstr ""
+"Определения псеводнимов для множеств ревизий (revsets).\n"
+"Детали см. в :hg:`help revsets`."
msgid ""
"``server``\n"
"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"``server``\n"
+"\"\"\"\"\"\"\"\"\"\""
msgid "Controls generic server settings."
msgstr "Общие настройки сервера."
@@ -15931,6 +16038,8 @@
"``subpaths``\n"
"\"\"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"``subpaths``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
msgid "Defines subrepositories source locations rewriting rules of the form::"
msgstr "Определяет правила переопределения адресов источников в форме::"
@@ -15962,6 +16071,8 @@
"``trusted``\n"
"\"\"\"\"\"\"\"\"\"\"\""
msgstr ""
+"``trusted``\n"
+"\"\"\"\"\"\"\"\"\"\"\""
msgid ""
"Mercurial will not use the settings in the\n"
@@ -16012,9 +16123,12 @@
"``ui``\n"
"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``ui``\n"
+"\"\"\"\"\"\""
msgid "User interface controls."
-msgstr "Настройки пользовательского интерфейса."
+msgstr "Настройки интерфейса пользователя."
msgid ""
"``archivemeta``\n"
@@ -16273,6 +16387,9 @@
"``web``\n"
"\"\"\"\"\"\"\""
msgstr ""
+"\n"
+"``web``\n"
+"\"\"\"\"\"\"\""
msgid ""
"Web interface configuration. The settings in this section apply to\n"
@@ -16310,7 +16427,7 @@
"командную строку::"
msgid " $ hg --config web.allow_push=* --config web.push_ssl=False serve"
-msgstr ""
+msgstr " $ hg --config web.allow_push=* --config web.push_ssl=False serve"
msgid ""
"Note that this will allow anybody to push anything to the server and\n"
@@ -16399,6 +16516,12 @@
" allow cross-site scripting attacks when serving untrusted\n"
" repositories. Default is False."
msgstr ""
+"``guessmime``\n"
+" Контролирует MIME-типы при скачивании сырого содержимого файла.\n"
+" Установите в True чтобы разрешить hgweb угадывать тип содержимого\n"
+" по расширению файла. При этом HTML файлы будут отдаваться как\n"
+" ``text/html``, и это может сделать возможными атаки межсайтового\n"
+" скриптинга при обслуживании недоверенных хранилищ. По умолчанию False."
msgid ""
"``allow_read``\n"
@@ -16628,6 +16751,12 @@
" the logo image is \"staticurl/logoimg\".\n"
" If unset, ``hglogo.png`` will be used."
msgstr ""
+"``logoimg``\n"
+" Имя файла с картинкой-логотипом, которая показывается в некоторых\n"
+" шаблонах на каждой странице. Имя файла задается относительно "
+"``staticurl``.\n"
+" Т.е. полный путь к логотипу - \"staticurl/logoimg\".\n"
+" Если не задан, будет использован ``hglogo.png``."
msgid ""
"``logourl``\n"
@@ -17116,6 +17245,8 @@
" [extensions]\n"
" foo ="
msgstr ""
+" [extensions]\n"
+" foo ="
msgid "You may also specify the full path to an extension::"
msgstr "Можно также указать полный путь к расширению::"
@@ -17124,6 +17255,8 @@
" [extensions]\n"
" myfeature = ~/.hgext/myfeature.py"
msgstr ""
+" [extensions]\n"
+" myfeature = ~/.hgext/myfeature.py"
msgid ""
"To explicitly disable an extension enabled in a configuration file of\n"
@@ -17224,7 +17357,7 @@
msgstr "Поддерживаются следующие предикаты:"
msgid ".. predicatesmarker"
-msgstr ""
+msgstr ".. predicatesmarker"
msgid "Some sample queries:"
msgstr "Примеры запросов:"
@@ -17234,37 +17367,37 @@
msgstr "- Показать статус файлов, считающихся бинарными, в рабочем каталоге::"
msgid " hg status -A \"set:binary()\""
-msgstr ""
+msgstr " hg status -A \"set:binary()\""
msgid "- Forget files that are in .hgignore but are already tracked::"
msgstr "- Забыть файлы, которые записаны в .hgignore, но уже контролируются::"
msgid " hg forget \"set:hgignore() and not ignored()\""
-msgstr ""
+msgstr " hg forget \"set:hgignore() and not ignored()\""
msgid "- Find text files that contain a string::"
msgstr "- Найти текстовые файлы, содержащие строку::"
msgid " hg locate \"set:grep(magic) and not binary()\""
-msgstr ""
+msgstr " hg locate \"set:grep(magic) and not binary()\""
msgid "- Find C files in a non-standard encoding::"
msgstr "- Найти файлы С с нестандартной кодировкой::"
msgid " hg locate \"set:**.c and not encoding(ascii)\""
-msgstr ""
+msgstr " hg locate \"set:**.c and not encoding(ascii)\""
msgid "- Revert copies of large binary files::"
msgstr "- Вернуть (revert) копии больших бинарных файлов::"
msgid " hg revert \"set:copied() and binary() and size('>1M')\""
-msgstr ""
+msgstr " hg revert \"set:copied() and binary() and size('>1M')\""
msgid "- Remove files listed in foo.lst that contain the letter a or b::"
msgstr "- Удалить файлы, перечисленные в foo.lst и содержащие букву a или b::"
msgid " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""
-msgstr ""
+msgstr " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""
msgid "See also :hg:`help patterns`.\n"
msgstr "См. также :hg:`help patterns`.\n"
@@ -18278,6 +18411,9 @@
" *.pyc\n"
" *~"
msgstr ""
+" *.elc\n"
+" *.pyc\n"
+" *~"
msgid ""
" # switch to regexp syntax.\n"
@@ -18311,6 +18447,9 @@
" - paths\n"
" - collections"
msgstr ""
+" - web\n"
+" - paths\n"
+" - collections"
msgid ""
"The ``web`` section can specify all the settings described in the web\n"
@@ -18335,6 +18474,12 @@
" / = /real/root2/*\n"
" virtual/root2 = /real/root2/**"
msgstr ""
+" [paths]\n"
+" projects/a = /foo/bar\n"
+" projects/b = /baz/quux\n"
+" web/root = /real/root/*\n"
+" / = /real/root2/*\n"
+" virtual/root2 = /real/root2/**"
msgid ""
"- The first two entries make two repositories in different directories\n"
@@ -18376,6 +18521,8 @@
" [collections]\n"
" /foo = /foo"
msgstr ""
+" [collections]\n"
+" /foo = /foo"
msgid ""
"Here, the left side will be stripped off all repositories found in the\n"
@@ -19009,6 +19156,10 @@
" d($1) = sort($1, date)\n"
" rs($1, $2) = reverse(sort($1, $2))"
msgstr ""
+" [revsetalias]\n"
+" h = heads()\n"
+" d($1) = sort($1, date)\n"
+" rs($1, $2) = reverse(sort($1, $2))"
msgid ""
"defines three aliases, ``h``, ``d``, and ``rs``. ``rs(0:tip, author)`` is\n"
@@ -19030,26 +19181,34 @@
" -P x -> !::x\n"
" -l x -> limit(expr, x)"
msgstr ""
+" -f -> ::.\n"
+" -d x -> date(x)\n"
+" -k x -> keyword(x)\n"
+" -m -> merge()\n"
+" -u x -> user(x)\n"
+" -b x -> branch(x)\n"
+" -P x -> !::x\n"
+" -l x -> limit(expr, x)"
msgid "- Changesets on the default branch::"
msgstr "- Ревизии на ветке default::"
msgid " hg log -r \"branch(default)\""
-msgstr ""
+msgstr " hg log -r \"branch(default)\""
msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::"
msgstr ""
-"- Ревизии на ветке default, начиная с ветки 1.5, не включая ревизии\n"
+"- Ревизии на ветке default, начиная с метки 1.5, не включая ревизии\n"
" слияния::"
msgid " hg log -r \"branch(default) and 1.5:: and not merge()\""
-msgstr ""
+msgstr " hg log -r \"branch(default) and 1.5:: and not merge()\""
msgid "- Open branch heads::"
-msgstr "- Головы открытых веток"
+msgstr "- Головы открытых веток::"
msgid " hg log -r \"head() and not closed()\""
-msgstr ""
+msgstr " hg log -r \"head() and not closed()\""
msgid ""
"- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n"
@@ -19059,24 +19218,28 @@
" в которых были изменены файлы ``hgext/*``::"
msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
-msgstr ""
+msgstr " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
msgid "- Changesets committed in May 2008, sorted by user::"
msgstr ""
"- Ревизии, зафиксированные в мае 2008, отсортированные по пользователю::"
msgid " hg log -r \"sort(date('May 2008'), user)\""
-msgstr ""
+msgstr " hg log -r \"sort(date('May 2008'), user)\""
msgid ""
"- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n"
" release::"
-msgstr "- Не помеченные ревизии, содержащие слова \"bug\" или \"issue\"::"
+msgstr ""
+"- Наборы изменений, содержащие в описании слова \"bug\" или \"issue\",\n"
+" и не входящие в помеченный релиз::"
msgid ""
" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged"
"())\"\n"
msgstr ""
+" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged"
+"())\"\n"
msgid ""
"Subrepositories let you nest external repositories or projects into a\n"
@@ -19114,15 +19277,17 @@
" Подхранилища имеют такие пути:"
msgid " path/to/nested = https://example.com/nested/repo/path"
-msgstr ""
+msgstr " path/to/nested = https://example.com/nested/repo/path"
msgid " Git and Subversion subrepos are also supported:"
-msgstr ""
+msgstr " Поддерживаются также подхранилища Git и Subversion:"
msgid ""
" path/to/nested = [git]git://example.com/nested/repo/path\n"
" path/to/nested = [svn]https://example.com/nested/trunk/path"
msgstr ""
+" path/to/nested = [git]git://example.com/nested/repo/path\n"
+" path/to/nested = [svn]https://example.com/nested/trunk/path"
msgid ""
" where ``path/to/nested`` is the checkout location relatively to the\n"
@@ -19409,11 +19574,11 @@
"Usage::"
msgstr ""
"С Mercurial поставляются четыре стиля: стиль по умолчанию (используется,\n"
-"когда другой стиль явно указан), compact, changelog и xml.\n"
+"когда другой стиль явно не указан), compact, changelog и xml.\n"
"Использование::"
msgid " $ hg log -r1 --style changelog"
-msgstr ""
+msgstr " $ hg log -r1 --style changelog"
msgid ""
"A template is a piece of text, with markup to invoke variable\n"
@@ -19426,6 +19591,8 @@
" $ hg log -r1 --template \"{node}\\n\"\n"
" b56ce7b07c52de7d5fd79fb89701ea538af65746"
msgstr ""
+" $ hg log -r1 --template \"{node}\\n\"\n"
+" b56ce7b07c52de7d5fd79fb89701ea538af65746"
msgid ""
"Strings in curly braces are called keywords. The availability of\n"
@@ -19438,7 +19605,7 @@
"команд, похожих на log:"
msgid ".. keywordsmarker"
-msgstr ""
+msgstr ".. keywordsmarker"
msgid ""
"The \"date\" keyword does not produce human-readable output. If you\n"
@@ -19461,12 +19628,14 @@
" $ hg tip --template \"{date|isodate}\\n\"\n"
" 2008-08-21 18:22 +0000"
msgstr ""
+" $ hg tip --template \"{date|isodate}\\n\"\n"
+" 2008-08-21 18:22 +0000"
msgid "List of filters:"
msgstr "Список фильтров (вход, описание):"
msgid ".. filtersmarker\n"
-msgstr ""
+msgstr ".. filtersmarker\n"
msgid "Valid URLs are of the form::"
msgstr "Возможные следующие формы URL::"
@@ -19478,6 +19647,11 @@
" https://[user[:pass]@]host[:port]/[path][#revision]\n"
" ssh://[user@]host[:port]/[path][#revision]"
msgstr ""
+" путь/к/локальному/файлу[#ревизия]\n"
+" file://путь/к/локальному/файлу[#ревизия]\n"
+" http://[пользователь[:пароль]@]хост[:порт]/[путь][#ревизия]\n"
+" https://[пользователь[:пароль]@]хост[:порт]/[путь][#ревизия]\n"
+" ssh://[пользователь@]хост[:порт]/[путь][#ревизия]"
msgid ""
"Paths in the local filesystem can either point to Mercurial\n"
@@ -19485,8 +19659,8 @@
"incoming --bundle`). See also :hg:`help paths`."
msgstr ""
"Пути в локальной файловой системе могут указывать на хранилища\n"
-"Mercurial или на файлы бандлов (созданных с помощью :hg:`bundle` или\n"
-":hg:`incoming --bundle`). См. также :hg:`help paths`."
+"Mercurial или на файлы комплектов (bundle) (созданных с помощью\n"
+":hg:`bundle` или :hg:`incoming --bundle`). См. также :hg:`help paths`."
msgid ""
"An optional identifier after # indicates a particular branch, tag, or\n"
@@ -19530,7 +19704,7 @@
" задать абсолютный путь::"
msgid " ssh://example.com//tmp/repository"
-msgstr ""
+msgstr " ssh://example.com//tmp/repository"
msgid ""
"- Mercurial doesn't use its own compression via SSH; the right thing\n"
@@ -19545,6 +19719,10 @@
" Host *\n"
" Compression yes"
msgstr ""
+" Host *.mylocalnetwork.example.com\n"
+" Compression no\n"
+" Host *\n"
+" Compression yes"
msgid ""
" Alternatively specify \"ssh -C\" as your ssh command in your\n"