Mercurial > hg-stable
changeset 17313:3eae346a30c4 stable
i18n-ru: synchronized with 85188487b9b4
| author | Alexander Sauta <demosito@gmail.com> |
|---|---|
| date | Wed, 01 Aug 2012 18:56:39 +0400 |
| parents | 2e4478cf8fed |
| children | d5bbb29a80ae |
| files | i18n/ru.po |
| diffstat | 1 files changed, 21 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/ru.po Fri Jul 20 12:18:31 2012 +0400 +++ b/i18n/ru.po Wed Aug 01 18:56:39 2012 +0400 @@ -173,7 +173,7 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2012-07-30 14:28+0400\n" +"POT-Creation-Date: 2012-08-01 18:47+0400\n" "PO-Revision-Date: 2011-05-12 23:48+0400\n" "Last-Translator: Alexander Sauta <demosito@gmail.com>\n" "Language-Team: Russian\n" @@ -4046,8 +4046,7 @@ " # f, fold = use commit, but fold into previous commit\n" " # d, drop = remove commit from history\n" " # m, mess = edit message without changing commit content\n" -" #\n" -" 0 files updated, 0 files merged, 0 files removed, 0 files unresolved" +" #" msgstr "" " # Edit history between 633536316234 and 7c2fd3b9020c\n" " #\n" @@ -4057,8 +4056,7 @@ " # f, fold = use commit, but fold into previous commit\n" " # d, drop = remove commit from history\n" " # m, mess = edit message without changing commit content\n" -" #\n" -" 0 files updated, 0 files merged, 0 files removed, 0 files unresolved" +" #" msgid "" "In this file, lines beginning with ``#`` are ignored. You must specify a " @@ -7500,10 +7498,10 @@ msgid "" " [pager]\n" -" pager = less -FRSX" +" pager = less -FRX" msgstr "" " [pager]\n" -" pager = less -FRSX" +" pager = less -FRX" msgid "" "If no pager is set, the pager extensions uses the environment variable\n" @@ -20742,7 +20740,7 @@ "================" msgstr "" "Что такое фазы?\n" -"==============" +"===============" msgid "" "Phases are a system for tracking which changesets have been or should\n" @@ -22140,8 +22138,8 @@ msgid "updating %s to public failed!\n" msgstr "обновление %s до публичной фазы завершилась неудачей!\n" -msgid "failed to push obsolete markers!\n" -msgstr "не удалось протолкнуть маркеры устаревших ревизий!\n" +msgid "failed to push some obsolete markers!\n" +msgstr "не удалось протолкнуть некоторые маркеры устаревших ревизий!\n" #, python-format msgid "%d changesets found\n" @@ -22888,10 +22886,10 @@ msgid "" "``extinct()``\n" -" obsolete changeset with obsolete descendant only." +" Obsolete changesets with obsolete descendants only." msgstr "" "``extinct()``\n" -" устаревший набор изменений, имеющий только устаревших потомков." +" Устаревший набор изменений, имеющий только устаревших потомков." #. i18n: "extinct" is a keyword msgid "extinct takes no arguments" @@ -23478,16 +23476,15 @@ msgstr "аргумент для tag должен быть строкой" #, python-format -msgid "no tags exist that match '%s" +msgid "no tags exist that match '%s'" msgstr "нет меток, совпадающих с '%s'" msgid "" "``unstable()``\n" -" Unstable changesets are non-obsolete with obsolete descendants." +" Non-obsolete changesets with obsolete ancestors." msgstr "" "``unstable()``\n" -" Нестабильные наборы изменений - не устаревшие наборы изменений\n" -" с устаревшими потомками." +" Неустаревшие наборы изменений с устаревшими предками." #. i18n: "unstable" is a keyword msgid "unstable takes no arguments" @@ -24649,6 +24646,14 @@ msgstr "ошибка при проталкивании:" #~ msgid "" +#~ "``unstable()``\n" +#~ " Unstable changesets are non-obsolete with obsolete descendants." +#~ msgstr "" +#~ "``unstable()``\n" +#~ " Нестабильные наборы изменений - не устаревшие наборы изменений\n" +#~ " с устаревшими потомками." + +#~ msgid "" #~ "Branch-based Access Control\n" #~ "..........................." #~ msgstr ""