Mercurial > hg
changeset 17352:c6f88e7f95b7
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 11 Aug 2012 12:45:53 -0500 |
| parents | 2da47de36b6f (current diff) 9d9d15928521 (diff) |
| children | c87ba0a6fb79 635d4807e9c6 099c778ceb33 |
| files | |
| diffstat | 2 files changed, 20 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/pt_BR.po Wed Aug 08 18:10:37 2012 +0200 +++ b/i18n/pt_BR.po Sat Aug 11 12:45:53 2012 -0500 @@ -3885,7 +3885,7 @@ " # Commands:\n" " # p, pick = use commit\n" " # e, edit = use commit, but stop for amending\n" -" # f, fold = use commit, but fold into previous commit\n" +" # f, fold = use commit, but fold into previous commit (combines N and N-1)\n" " # d, drop = remove commit from history\n" " # m, mess = edit message without changing commit content\n" " #" @@ -3895,7 +3895,7 @@ " # Comandos:\n" " # p, pick = use a revisão\n" " # e, edit = use a revisão, mas pare para emendar\n" -" # f, fold = use a revisão, mas combine com a anterior\n" +" # f, fold = use a revisão, mas combine com a anterior (combina N e N-1)\n" " # d, drop = remova a revisão do histórico\n" " # m, mess = edite a mensagem sem mudar o conteúdo da revisão\n" " #" @@ -20340,7 +20340,7 @@ " como ``http://server/user/bob/quux/testsubrepo/``" msgid "" -"The ``collections`` section is deprecated and has been superseeded by\n" +"The ``collections`` section is deprecated and has been superseded by\n" "``paths``.\n" msgstr "" "A seção ``collections`` é obsoleta e foi completamente substituída\n" @@ -24244,6 +24244,10 @@ msgstr "estilo não encontrado: %s" #, python-format +msgid "%s: missing value" +msgstr "%s: valor faltando" + +#, python-format msgid "\"%s\" not in template map" msgstr "\"%s\" não está no mapa de modelo"
--- a/i18n/ru.po Wed Aug 08 18:10:37 2012 +0200 +++ b/i18n/ru.po Sat Aug 11 12:45:53 2012 -0500 @@ -173,7 +173,7 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2012-08-03 17:58+0400\n" +"POT-Creation-Date: 2012-08-09 13:23+0400\n" "PO-Revision-Date: 2011-05-12 23:48+0400\n" "Last-Translator: Alexander Sauta <demosito@gmail.com>\n" "Language-Team: Russian\n" @@ -4042,7 +4042,8 @@ " # Commands:\n" " # p, pick = use commit\n" " # e, edit = use commit, but stop for amending\n" -" # f, fold = use commit, but fold into previous commit\n" +" # f, fold = use commit, but fold into previous commit (combines N and " +"N-1)\n" " # d, drop = remove commit from history\n" " # m, mess = edit message without changing commit content\n" " #" @@ -4053,7 +4054,7 @@ " # p, pick = использовать ревизию\n" " # e, edit = использовать ревизию, но остановиться для внесения изменений\n" " # f, fold = использовать ревизию, но совместить с предыдущим набором " -"изменений\n" +"изменений (объединить N и N-1)\n" " # d, drop = удалить ревизию из истории\n" " # m, mess = редактировать сообщение фиксации, не изменяя содержимого " "ревизии\n" @@ -4338,7 +4339,9 @@ msgid "" "interactively edit changeset history\n" " " -msgstr "интерактивно редактировать историю ревизий " +msgstr "" +"интерактивно редактировать историю ревизий\n" +" " msgid "source has mq patches applied" msgstr "источник имеет наложенные патчи mq" @@ -20404,7 +20407,7 @@ " и ``http://server/user/bob/quux/testsubrepo/``" msgid "" -"The ``collections`` section is deprecated and has been superseeded by\n" +"The ``collections`` section is deprecated and has been superseded by\n" "``paths``.\n" msgstr "Секция ``collections`` устарела и заменена секцией ``paths``.\n" @@ -24304,10 +24307,14 @@ msgid "style not found: %s" msgstr "стиль не найден: %s" +#, python-format +msgid "%s: missing value" +msgstr "%s: значение отсутствует" + # NOT-SURE так? #, python-format msgid "\"%s\" not in template map" -msgstr "\"%s\" отсутсвует в сопоставлении шаблона" +msgstr "\"%s\" отсутствует в сопоставлении шаблона" #, python-format msgid "template file %s: %s"