Update:Translations:Massive translation update from launchpad. Mostly fixing high five merge updatesv0.5.0-beta.1

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6129 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 30 insertions, 38 deletions

diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in
index c10e6d392..4c3d2efaf 100644
--- a/po/zh_CN.po.in
+++ b/po/zh_CN.po.in
@@ -14,14 +14,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:46+0000\n"
+"PO-Revision-Date: 2015-07-19 04:01+0000\n"
 "Last-Translator: Kyle WANG <waxaca@163.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"Language: \n"
+"Language: zh_CN\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -76,14 +76,6 @@ 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 ""
 
@@ -92,14 +84,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d米"
-
-#, c-format
-msgid "in %d meters"
-msgstr "距离%d米"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -108,14 +92,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, 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"
 msgstr[0] ""
@@ -128,6 +104,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, 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"
 msgstr[0] "%d千米"
@@ -164,32 +156,32 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "进入坡道"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%s到达 %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr ""
+msgstr "%s到达 %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr ""
+msgstr "%s到达 %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%s到达 %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s 到达 %s"
+msgstr "%s到达 %s"
 
 msgid "When possible, please turn around"
 msgstr "当遇到路口的时候，请转弯"
@@ -214,12 +206,12 @@ msgstr ""
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "then leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "然后在%1$s %2$s处驶出环形区"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr ""
+msgstr "还有%1$s %2$s就将驶离环形区"
 
 msgid "soon"
 msgstr "不久"
@@ -228,7 +220,7 @@ msgid "now"
 msgstr "现在"
 
 msgid "then"
-msgstr ""
+msgstr "然后"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -331,7 +323,7 @@ msgstr "之后有 %i 条道路"
 #. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgstr "转向 %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
@@ -376,10 +368,10 @@ msgstr "您已经抵达您的目的地 %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "交流道"
 
 msgid "Exit"
-msgstr ""
+msgstr "退出"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"