##// END OF EJS Templates
merge with stable
Matt Mackall -
r17341:b131e24e merge default
parent child Browse files
Show More
@@ -163,6 +163,7 b' command = cmdutil.command(cmdtable)'
163
163
164 testedwith = 'internal'
164 testedwith = 'internal'
165
165
166 # i18n: command names and abbreviations must remain untranslated
166 editcomment = _("""# Edit history between %s and %s
167 editcomment = _("""# Edit history between %s and %s
167 #
168 #
168 # Commands:
169 # Commands:
@@ -3890,14 +3890,14 b' msgid ""'
3890 " # m, mess = edit message without changing commit content\n"
3890 " # m, mess = edit message without changing commit content\n"
3891 " #"
3891 " #"
3892 msgstr ""
3892 msgstr ""
3893 " # Edit history between 633536316234 and 7c2fd3b9020c\n"
3893 " # Editar o histórico entre 633536316234 e 7c2fd3b9020c\n"
3894 " #\n"
3894 " #\n"
3895 " # Commands:\n"
3895 " # Comandos:\n"
3896 " # p, pick = use commit\n"
3896 " # p, pick = use a revisão\n"
3897 " # e, edit = use commit, but stop for amending\n"
3897 " # e, edit = use a revisão, mas pare para emendar\n"
3898 " # f, fold = use commit, but fold into previous commit\n"
3898 " # f, fold = use a revisão, mas combine com a anterior\n"
3899 " # d, drop = remove commit from history\n"
3899 " # d, drop = remova a revisão do histórico\n"
3900 " # m, mess = edit message without changing commit content\n"
3900 " # m, mess = edite a mensagem sem mudar o conteúdo da revisão\n"
3901 " #"
3901 " #"
3902
3902
3903 msgid ""
3903 msgid ""
@@ -4097,6 +4097,29 b' msgstr ""'
4097 "um repositório que o Mercurial detectar como não relacionado ao de\n"
4097 "um repositório que o Mercurial detectar como não relacionado ao de\n"
4098 "origem, você pode adicionar uma opção ``--force``.\n"
4098 "origem, você pode adicionar uma opção ``--force``.\n"
4099
4099
4100 #. i18n: command names and abbreviations must remain untranslated
4101 #, python-format
4102 msgid ""
4103 "# Edit history between %s and %s\n"
4104 "#\n"
4105 "# Commands:\n"
4106 "# p, pick = use commit\n"
4107 "# e, edit = use commit, but stop for amending\n"
4108 "# f, fold = use commit, but fold into previous commit (combines N and N-1)\n"
4109 "# d, drop = remove commit from history\n"
4110 "# m, mess = edit message without changing commit content\n"
4111 "#\n"
4112 msgstr ""
4113 "# Editar o histórico entre %s e %s\n"
4114 "#\n"
4115 "# Comandos:\n"
4116 "# p, pick = use a revisão\n"
4117 "# e, edit = use a revisão, mas pare para emendar\n"
4118 "# f, fold = use a revisão, mas combine com a anterior (combina N e N-1)\n"
4119 "# d, drop = remova a revisão do histórico\n"
4120 "# m, mess = edite a mensagem sem mudar o conteúdo da revisão\n"
4121 "# #\n"
4122
4100 msgid "cannot edit history that would orphan nodes"
4123 msgid "cannot edit history that would orphan nodes"
4101 msgstr "não é possível editar histórico de forma a produzir nós órfãos"
4124 msgstr "não é possível editar histórico de forma a produzir nós órfãos"
4102
4125
@@ -8039,12 +8062,8 b' msgstr "continua um rebaseamento interro'
8039 msgid "abort an interrupted rebase"
8062 msgid "abort an interrupted rebase"
8040 msgstr "aborta um rebaseamento interrompido"
8063 msgstr "aborta um rebaseamento interrompido"
8041
8064
8042 msgid ""
8065 msgid "[-s REV | -b REV] [-d REV] [OPTION]"
8043 "hg rebase [-s REV | -b REV] [-d REV] [options]\n"
8066 msgstr "[-s REV | -b REV] [-d REV] [OPÇÃO]"
8044 "hg rebase {-a|-c}"
8045 msgstr ""
8046 "hg rebase [-s REV | -b REV] [-d REV] [opções]\n"
8047 "hg rebase {-a|-c}"
8048
8067
8049 msgid "move changeset (and descendants) to a different branch"
8068 msgid "move changeset (and descendants) to a different branch"
8050 msgstr "move a revisão (e descendentes) para um ramo diferente"
8069 msgstr "move a revisão (e descendentes) para um ramo diferente"
@@ -8755,6 +8774,10 b' msgid "fix up the merge and run hg trans'
8755 msgstr "conserte a mesclagem e execute hg transplant --continue"
8774 msgstr "conserte a mesclagem e execute hg transplant --continue"
8756
8775
8757 #, python-format
8776 #, python-format
8777 msgid "skipping emptied changeset %s\n"
8778 msgstr "omitindo revisão resultante vazia %s\n"
8779
8780 #, python-format
8758 msgid "%s transplanted as %s\n"
8781 msgid "%s transplanted as %s\n"
8759 msgstr "%s transplantado em %s\n"
8782 msgstr "%s transplantado em %s\n"
8760
8783
@@ -18117,22 +18140,6 b' msgstr ""'
18117 " allow_push é examinado após a lista deny_push."
18140 " allow_push é examinado após a lista deny_push."
18118
18141
18119 msgid ""
18142 msgid ""
18120 "``guessmime``\n"
18121 " Control MIME types for raw download of file content.\n"
18122 " Set to True to let hgweb guess the content type from the file\n"
18123 " extension. This will serve HTML files as ``text/html`` and might\n"
18124 " allow cross-site scripting attacks when serving untrusted\n"
18125 " repositories. Default is False."
18126 msgstr ""
18127 "``guessmime``\n"
18128 " Controla tipos MIME para download inalterado do conteúdo de\n"
18129 " arquivos. Use True para permitir que o hgweb determine o tipo de\n"
18130 " conteúdo a partir da extensão do arquivo. Isto servirá arquivos\n"
18131 " HTML como ``text/html``, e portanto pode permitir ataques de\n"
18132 " cross-site scripting (XSS) ao servir repositórios não confiáveis.\n"
18133 " O padrão é False."
18134
18135 msgid ""
18136 "``allow_read``\n"
18143 "``allow_read``\n"
18137 " If the user has not already been denied repository access due to\n"
18144 " If the user has not already been denied repository access due to\n"
18138 " the contents of deny_read, this list determines whether to grant\n"
18145 " the contents of deny_read, this list determines whether to grant\n"
@@ -18266,6 +18273,20 b' msgstr ""'
18266 " subdiretório. O padrão é False."
18273 " subdiretório. O padrão é False."
18267
18274
18268 msgid ""
18275 msgid ""
18276 "``comparisoncontext``\n"
18277 " Number of lines of context to show in side-by-side file comparison. If\n"
18278 " negative or the value ``full``, whole files are shown. Default is 5.\n"
18279 " This setting can be overridden by a ``context`` request parameter to the\n"
18280 " ``comparison`` command, taking the same values."
18281 msgstr ""
18282 "``comparisoncontext``\n"
18283 " Número de linhas de contexto a serem exibidas em comparações lado a\n"
18284 " lado. Se negativo, ou com o valor ``full``, serão exibidos arquivos\n"
18285 " completos. O padrão é 5.\n"
18286 " Esta configuração pode ser redefinida por um parâmetro ``context`` do\n"
18287 " pedido para o comando ``comparison``, recebendo os mesmos valores."
18288
18289 msgid ""
18269 "``contact``\n"
18290 "``contact``\n"
18270 " Name or email address of the person in charge of the repository.\n"
18291 " Name or email address of the person in charge of the repository.\n"
18271 " Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty."
18292 " Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty."
@@ -18364,18 +18385,20 b' msgstr ""'
18364 " Onde escrever o log de erros. O padrão é a saída de erros (stderr)."
18385 " Onde escrever o log de erros. O padrão é a saída de erros (stderr)."
18365
18386
18366 msgid ""
18387 msgid ""
18367 "``comparisoncontext``\n"
18388 "``guessmime``\n"
18368 " Number of lines of context to show in side-by-side file comparison. If\n"
18389 " Control MIME types for raw download of file content.\n"
18369 " negative or the value ``full``, whole files are shown. Default is 5.\n"
18390 " Set to True to let hgweb guess the content type from the file\n"
18370 " This setting can be overridden by a ``context`` request parameter to the\n"
18391 " extension. This will serve HTML files as ``text/html`` and might\n"
18371 " ``comparison`` command, taking the same values."
18392 " allow cross-site scripting attacks when serving untrusted\n"
18372 msgstr ""
18393 " repositories. Default is False."
18373 "``comparisoncontext``\n"
18394 msgstr ""
18374 " Número de linhas de contexto a serem exibidas em comparações lado a\n"
18395 "``guessmime``\n"
18375 " lado. Se negativo, ou com o valor ``full``, serão exibidos arquivos\n"
18396 " Controla tipos MIME para download inalterado do conteúdo de\n"
18376 " completos. O padrão é 5.\n"
18397 " arquivos. Use True para permitir que o hgweb determine o tipo de\n"
18377 " Esta configuração pode ser redefinida por um parâmetro ``context`` do\n"
18398 " conteúdo a partir da extensão do arquivo. Isto servirá arquivos\n"
18378 " pedido para o comando ``comparison``, recebendo os mesmos valores."
18399 " HTML como ``text/html``, e portanto pode permitir ataques de\n"
18400 " cross-site scripting (XSS) ao servir repositórios não confiáveis.\n"
18401 " O padrão é False."
18379
18402
18380 msgid ""
18403 msgid ""
18381 "``hidden``\n"
18404 "``hidden``\n"
@@ -18417,15 +18440,6 b' msgstr ""'
18417 " ``http://mercurial.selenic.com/`` será usada."
18440 " ``http://mercurial.selenic.com/`` será usada."
18418
18441
18419 msgid ""
18442 msgid ""
18420 "``name``\n"
18421 " Repository name to use in the web interface. Default is current\n"
18422 " working directory."
18423 msgstr ""
18424 "``name``\n"
18425 " Nome do repositório a ser usado na interface web. Por padrão é\n"
18426 " o nome do diretório de trabalho."
18427
18428 msgid ""
18429 "``maxchanges``\n"
18443 "``maxchanges``\n"
18430 " Maximum number of changes to list on the changelog. Default is 10."
18444 " Maximum number of changes to list on the changelog. Default is 10."
18431 msgstr ""
18445 msgstr ""
@@ -18440,6 +18454,24 b' msgstr ""'
18440 " Numero máximo de arquivos listados por revisão. O padrão é 10."
18454 " Numero máximo de arquivos listados por revisão. O padrão é 10."
18441
18455
18442 msgid ""
18456 msgid ""
18457 "``maxshortchanges``\n"
18458 " Maximum number of changes to list on the shortlog, graph or filelog\n"
18459 " pages. Default is 60."
18460 msgstr ""
18461 "``maxshortchanges``\n"
18462 " Número máximo de mudanças listadas nas páginas shortlog, graph ou\n"
18463 " filelog. O padrão é 60."
18464
18465 msgid ""
18466 "``name``\n"
18467 " Repository name to use in the web interface. Default is current\n"
18468 " working directory."
18469 msgstr ""
18470 "``name``\n"
18471 " Nome do repositório a ser usado na interface web. Por padrão é\n"
18472 " o nome do diretório de trabalho."
18473
18474 msgid ""
18443 "``port``\n"
18475 "``port``\n"
18444 " Port to listen on. Default is 8000."
18476 " Port to listen on. Default is 8000."
18445 msgstr ""
18477 msgstr ""
@@ -173,7 +173,7 b' msgid ""'
173 msgstr ""
173 msgstr ""
174 "Project-Id-Version: Mercurial\n"
174 "Project-Id-Version: Mercurial\n"
175 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
175 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
176 "POT-Creation-Date: 2012-08-01 18:47+0400\n"
176 "POT-Creation-Date: 2012-08-03 17:58+0400\n"
177 "PO-Revision-Date: 2011-05-12 23:48+0400\n"
177 "PO-Revision-Date: 2011-05-12 23:48+0400\n"
178 "Last-Translator: Alexander Sauta <demosito@gmail.com>\n"
178 "Last-Translator: Alexander Sauta <demosito@gmail.com>\n"
179 "Language-Team: Russian\n"
179 "Language-Team: Russian\n"
@@ -4036,7 +4036,6 b' msgstr ""'
4036 " pick 030b686bedc4 Add gamma\n"
4036 " pick 030b686bedc4 Add gamma\n"
4037 " pick 7c2fd3b9020c Add delta"
4037 " pick 7c2fd3b9020c Add delta"
4038
4038
4039 # this output is not localized yet
4040 msgid ""
4039 msgid ""
4041 " # Edit history between 633536316234 and 7c2fd3b9020c\n"
4040 " # Edit history between 633536316234 and 7c2fd3b9020c\n"
4042 " #\n"
4041 " #\n"
@@ -4048,14 +4047,16 b' msgid ""'
4048 " # m, mess = edit message without changing commit content\n"
4047 " # m, mess = edit message without changing commit content\n"
4049 " #"
4048 " #"
4050 msgstr ""
4049 msgstr ""
4051 " # Edit history between 633536316234 and 7c2fd3b9020c\n"
4050 " # Редактирование истории между 633536316234 и 7c2fd3b9020c\n"
4052 " #\n"
4051 " #\n"
4053 " # Commands:\n"
4052 " # Команды:\n"
4054 " # p, pick = use commit\n"
4053 " # p, pick = использовать ревизию\n"
4055 " # e, edit = use commit, but stop for amending\n"
4054 " # e, edit = использовать ревизию, но остановиться для внесения изменений\n"
4056 " # f, fold = use commit, but fold into previous commit\n"
4055 " # f, fold = использовать ревизию, но совместить с предыдущим набором "
4057 " # d, drop = remove commit from history\n"
4056 "изменений\n"
4058 " # m, mess = edit message without changing commit content\n"
4057 " # d, drop = удалить ревизию из истории\n"
4058 " # m, mess = редактировать сообщение фиксации, не изменяя содержимого "
4059 "ревизии\n"
4059 " #"
4060 " #"
4060
4061
4061 msgid ""
4062 msgid ""
@@ -4263,6 +4264,32 b' msgstr ""'
4263 "хранилище, которое Mercurial не опознает как связанное с источником,\n"
4264 "хранилище, которое Mercurial не опознает как связанное с источником,\n"
4264 "можно использовать параметр ``--force``.\n"
4265 "можно использовать параметр ``--force``.\n"
4265
4266
4267 # NOT-SURE commit - ревизия?
4268 #. i18n: command names and abbreviations must remain untranslated
4269 #, python-format
4270 msgid ""
4271 "# Edit history between %s and %s\n"
4272 "#\n"
4273 "# Commands:\n"
4274 "# p, pick = use commit\n"
4275 "# e, edit = use commit, but stop for amending\n"
4276 "# f, fold = use commit, but fold into previous commit (combines N and N-1)\n"
4277 "# d, drop = remove commit from history\n"
4278 "# m, mess = edit message without changing commit content\n"
4279 "#\n"
4280 msgstr ""
4281 "# Редактирование истории между %s и %s\n"
4282 "#\n"
4283 "# Команды:\n"
4284 "# p, pick = использовать ревизию\n"
4285 "# e, edit = использовать ревизию, но остановиться для внесения изменений\n"
4286 "# f, fold = использовать ревизию, но совместить с предыдущим набором "
4287 "изменений (склеивает N и N-1)\n"
4288 "# d, drop = удалить ревизию из истории\n"
4289 "# m, mess = редактировать сообщение фиксации, не изменяя содержимого "
4290 "ревизии\n"
4291 "#\n"
4292
4266 msgid "cannot edit history that would orphan nodes"
4293 msgid "cannot edit history that would orphan nodes"
4267 msgstr "нельзя редактировать историю, если это оставляет висячие узлы"
4294 msgstr "нельзя редактировать историю, если это оставляет висячие узлы"
4268
4295
@@ -8238,13 +8265,8 b' msgstr "\xd0\xbf\xd1\x80\xd0\xbe\xd0\xb4\xd0\xbe\xd0\xbb\xd0\xb6\xd0\xb8\xd1\x82\xd1\x8c \xd0\xbf\xd1\x80\xd0\xb5\xd1\x80\xd0\xb2\xd0\xb0\xd0\xbd\xd0\xbd\xd0\xbe\xd0\xb5 \xd0\xbf\xd0\xb5\xd1\x80\xd0\xb5\xd0\xb1\xd0\xb0\xd0\xb7\xd0\xb8\xd1\x80\xd0\xbe\xd0\xb2\xd0\xb0\xd0\xbd\xd0\xb8\xd0\xb5"'
8238 msgid "abort an interrupted rebase"
8265 msgid "abort an interrupted rebase"
8239 msgstr "отменить прерванное перебазирование"
8266 msgstr "отменить прерванное перебазирование"
8240
8267
8241 # BUG one line?
8268 msgid "[-s REV | -b REV] [-d REV] [OPTION]"
8242 msgid ""
8269 msgstr "[-s РЕВ | -b РЕВ] [-d РЕВ] [ПАРАМЕТР]"
8243 "hg rebase [-s REV | -b REV] [-d REV] [options]\n"
8244 "hg rebase {-a|-c}"
8245 msgstr ""
8246 "hg rebase [-s РЕВ | -b РЕВ] [-d РЕВ] [параметры]\n"
8247 "hg rebase {-a|-c}"
8248
8270
8249 msgid "move changeset (and descendants) to a different branch"
8271 msgid "move changeset (and descendants) to a different branch"
8250 msgstr "переместить наборы изменений (с потомками) на другую ветку"
8272 msgstr "переместить наборы изменений (с потомками) на другую ветку"
@@ -8968,6 +8990,10 b' msgid "fix up the merge and run hg trans'
8968 msgstr "разрешите конфликты и запустите hg transplant --continue"
8990 msgstr "разрешите конфликты и запустите hg transplant --continue"
8969
8991
8970 #, python-format
8992 #, python-format
8993 msgid "skipping emptied changeset %s\n"
8994 msgstr "пропускается ставшая пустой ревизия %s\n"
8995
8996 #, python-format
8971 msgid "%s transplanted as %s\n"
8997 msgid "%s transplanted as %s\n"
8972 msgstr "%s пересажен как %s\n"
8998 msgstr "%s пересажен как %s\n"
8973
8999
@@ -18251,21 +18277,6 b' msgstr ""'
18251 " Этот список проверяется после списка deny_push."
18277 " Этот список проверяется после списка deny_push."
18252
18278
18253 msgid ""
18279 msgid ""
18254 "``guessmime``\n"
18255 " Control MIME types for raw download of file content.\n"
18256 " Set to True to let hgweb guess the content type from the file\n"
18257 " extension. This will serve HTML files as ``text/html`` and might\n"
18258 " allow cross-site scripting attacks when serving untrusted\n"
18259 " repositories. Default is False."
18260 msgstr ""
18261 "``guessmime``\n"
18262 " Контролирует MIME-типы при скачивании сырого содержимого файла.\n"
18263 " Установите в True чтобы разрешить hgweb угадывать тип содержимого\n"
18264 " по расширению файла. При этом HTML файлы будут отдаваться как\n"
18265 " ``text/html``, и это может сделать возможными атаки межсайтового\n"
18266 " скриптинга при обслуживании недоверенных хранилищ. По умолчанию False."
18267
18268 msgid ""
18269 "``allow_read``\n"
18280 "``allow_read``\n"
18270 " If the user has not already been denied repository access due to\n"
18281 " If the user has not already been denied repository access due to\n"
18271 " the contents of deny_read, this list determines whether to grant\n"
18282 " the contents of deny_read, this list determines whether to grant\n"
@@ -18396,6 +18407,23 b' msgstr ""'
18396 "(выкл.)."
18407 "(выкл.)."
18397
18408
18398 msgid ""
18409 msgid ""
18410 "``comparisoncontext``\n"
18411 " Number of lines of context to show in side-by-side file comparison. If\n"
18412 " negative or the value ``full``, whole files are shown. Default is 5.\n"
18413 " This setting can be overridden by a ``context`` request parameter to "
18414 "the\n"
18415 " ``comparison`` command, taking the same values."
18416 msgstr ""
18417 "``comparisoncontext``\n"
18418 " Количество строк контекста, показываемого при построчном сравнении "
18419 "файлов.\n"
18420 " Если отрицательно или ``full``, файлы показыаются целиком. По умолчанию "
18421 "5.\n"
18422 " Это значение может быть переопределено параметром запроса ``context`` "
18423 "команды\n"
18424 " ``comparison``, принимающей такие же значения."
18425
18426 msgid ""
18399 "``contact``\n"
18427 "``contact``\n"
18400 " Name or email address of the person in charge of the repository.\n"
18428 " Name or email address of the person in charge of the repository.\n"
18401 " Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty."
18429 " Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty."
@@ -18490,21 +18518,19 b' msgstr ""'
18490 " Куда писать журнал ошибок. По умолчанию stderr."
18518 " Куда писать журнал ошибок. По умолчанию stderr."
18491
18519
18492 msgid ""
18520 msgid ""
18493 "``comparisoncontext``\n"
18521 "``guessmime``\n"
18494 " Number of lines of context to show in side-by-side file comparison. If\n"
18522 " Control MIME types for raw download of file content.\n"
18495 " negative or the value ``full``, whole files are shown. Default is 5.\n"
18523 " Set to True to let hgweb guess the content type from the file\n"
18496 " This setting can be overridden by a ``context`` request parameter to "
18524 " extension. This will serve HTML files as ``text/html`` and might\n"
18497 "the\n"
18525 " allow cross-site scripting attacks when serving untrusted\n"
18498 " ``comparison`` command, taking the same values."
18526 " repositories. Default is False."
18499 msgstr ""
18527 msgstr ""
18500 "``comparisoncontext``\n"
18528 "``guessmime``\n"
18501 " Количество строк контекста, показываемого при построчном сравнении "
18529 " Контролирует MIME-типы при скачивании сырого содержимого файла.\n"
18502 "файлов.\n"
18530 " Установите в True чтобы разрешить hgweb угадывать тип содержимого\n"
18503 " Если отрицательно или ``full``, файлы показыаются целиком. По умолчанию "
18531 " по расширению файла. При этом HTML файлы будут отдаваться как\n"
18504 "5.\n"
18532 " ``text/html``, и это может сделать возможными атаки межсайтового\n"
18505 " Это значение может быть переопределено параметром запроса ``context`` "
18533 " скриптинга при обслуживании недоверенных хранилищ. По умолчанию False."
18506 "команды\n"
18507 " ``comparison``, принимающей такие же значения."
18508
18534
18509 msgid ""
18535 msgid ""
18510 "``hidden``\n"
18536 "``hidden``\n"
@@ -18546,15 +18572,6 b' msgstr ""'
18546 " ``http://mercurial.selenic.com/``."
18572 " ``http://mercurial.selenic.com/``."
18547
18573
18548 msgid ""
18574 msgid ""
18549 "``name``\n"
18550 " Repository name to use in the web interface. Default is current\n"
18551 " working directory."
18552 msgstr ""
18553 "``name``\n"
18554 " Имя хранилища, используемое в веб-интерфейсе. По умолчанию\n"
18555 " текущий рабочий каталог."
18556
18557 msgid ""
18558 "``maxchanges``\n"
18575 "``maxchanges``\n"
18559 " Maximum number of changes to list on the changelog. Default is 10."
18576 " Maximum number of changes to list on the changelog. Default is 10."
18560 msgstr ""
18577 msgstr ""
@@ -18570,6 +18587,25 b' msgstr ""'
18570 " По умолчанию 10."
18587 " По умолчанию 10."
18571
18588
18572 msgid ""
18589 msgid ""
18590 "``maxshortchanges``\n"
18591 " Maximum number of changes to list on the shortlog, graph or filelog\n"
18592 " pages. Default is 60."
18593 msgstr ""
18594 "``maxshortchanges``\n"
18595 " Максимальное количество изменений, показываемых в короткой истории,\n"
18596 " графе или истории файла (shortlog, graph, filelog pages). По умолчанию "
18597 "60."
18598
18599 msgid ""
18600 "``name``\n"
18601 " Repository name to use in the web interface. Default is current\n"
18602 " working directory."
18603 msgstr ""
18604 "``name``\n"
18605 " Имя хранилища, используемое в веб-интерфейсе. По умолчанию\n"
18606 " текущий рабочий каталог."
18607
18608 msgid ""
18573 "``port``\n"
18609 "``port``\n"
18574 " Port to listen on. Default is 8000."
18610 " Port to listen on. Default is 8000."
18575 msgstr ""
18611 msgstr ""
@@ -24645,6 +24681,14 b' msgstr "\xd0\xbf\xd0\xbe\xd0\xb8\xd1\x81\xd0\xba \xd0\xbe\xd1\x82\xd0\xb4\xd0\xb0\xd0\xbb\xd0\xb5\xd0\xbd\xd0\xbd\xd1\x8b\xd1\x85 \xd0\xb8\xd0\xb7\xd0\xbc\xd0\xb5\xd0\xbd\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb9"'
24645 msgid "push failed:"
24681 msgid "push failed:"
24646 msgstr "ошибка при проталкивании:"
24682 msgstr "ошибка при проталкивании:"
24647
24683
24684 # BUG one line?
24685 #~ msgid ""
24686 #~ "hg rebase [-s REV | -b REV] [-d REV] [options]\n"
24687 #~ "hg rebase {-a|-c}"
24688 #~ msgstr ""
24689 #~ "hg rebase [-s РЕВ | -b РЕВ] [-d РЕВ] [параметры]\n"
24690 #~ "hg rebase {-a|-c}"
24691
24648 #~ msgid ""
24692 #~ msgid ""
24649 #~ "``unstable()``\n"
24693 #~ "``unstable()``\n"
24650 #~ " Unstable changesets are non-obsolete with obsolete descendants."
24694 #~ " Unstable changesets are non-obsolete with obsolete descendants."
General Comments 0
You need to be logged in to leave comments. Login now