From 260a98a2981dd5065337bbd1812488ee14313ea0 Mon Sep 17 00:00:00 2001 From: kazer_ Date: Mon, 27 Jul 2015 17:34:32 +0000 Subject: Update:Translations:Massive translation update from launchpad. Mostly fixing high five merge updates git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6129 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- po/ru.po.in | 60 ++++++++++++++++++++++++++---------------------------------- 1 file changed, 26 insertions(+), 34 deletions(-) (limited to 'po/ru.po.in') diff --git a/po/ru.po.in b/po/ru.po.in index b6838a15b..b0181c93d 100644 --- a/po/ru.po.in +++ b/po/ru.po.in @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2015-05-17 20:19+0000\n" +"PO-Revision-Date: 2015-07-19 04:01+0000\n" "Last-Translator: tryagain \n" "Language-Team: Rustam T. Usmanov\n" "MIME-Version: 1.0\n" @@ -91,14 +91,6 @@ msgstr "пятый съезд" msgid "sixth exit" msgstr "шестой съезд" -#, c-format -msgid "%d m" -msgstr "%d м" - -#, c-format -msgid "in %d m" -msgstr "через %d м" - #, c-format msgid "%d feet" msgstr "%d футов" @@ -107,14 +99,6 @@ msgstr "%d футов" msgid "in %d feet" msgstr "через %d футов" -#, c-format -msgid "%d meters" -msgstr "%d метров" - -#, c-format -msgid "in %d meters" -msgstr "через %d метров" - #, c-format msgid "%d.%d miles" msgstr "%d,%d миль" @@ -123,14 +107,6 @@ msgstr "%d,%d миль" msgid "in %d.%d miles" msgstr "через %d,%d миль" -#, c-format -msgid "%d.%d kilometers" -msgstr "%d,%d километров" - -#, c-format -msgid "in %d.%d kilometers" -msgstr "через %d,%d километров" - #, c-format msgid "one mile" msgid_plural "%d miles" @@ -145,6 +121,22 @@ msgstr[0] "через %d милю" msgstr[1] "через %d мили" msgstr[2] "через %d миль" +#, c-format +msgid "%d meters" +msgstr "%d метров" + +#, c-format +msgid "in %d meters" +msgstr "через %d метров" + +#, c-format +msgid "%d.%d kilometers" +msgstr "%d,%d километров" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "через %d,%d километров" + #, c-format msgid "one kilometer" msgid_plural "%d kilometers" @@ -231,7 +223,7 @@ msgstr "Скоро круговое движение" #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" -msgstr "" +msgstr "%s круговое движение" #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format @@ -255,22 +247,22 @@ msgstr "после чего" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format msgid "then merge%1$s|right" -msgstr "" +msgstr "затем выезд вправо %1$s" #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format msgid "Merge %1$s%2$s|right" -msgstr "" +msgstr "%1$s выезд вправо %2$s" #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format msgid "then merge%1$s|left" -msgstr "" +msgstr "затем выезжайте влево %1$s" #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format msgid "Merge %1$s%2$s|left" -msgstr "" +msgstr "%1$s выезд влево %2$s" msgid "on your left" msgstr "влево" @@ -357,21 +349,21 @@ msgstr "%3$s сверните %1$s%2$s %4$s" #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|left" -msgstr "" +msgstr "затем развернитесь влево" #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|left" -msgstr "" +msgstr "%1$s разворот налево" #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. msgid "then make a U-turn|right" -msgstr "" +msgstr "затем развернитесь вправо" #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format msgid "Make a U-turn %1$s|right" -msgstr "" +msgstr "%1$s разворот направо" #. An empty placeholder that we can use in the future for #. * some motorway commands that are now suppressed but we -- cgit v1.2.1