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

1 files changed, 29 insertions, 36 deletions

diff --git a/po/zh_HK.po.in b/po/zh_HK.po.in
index f7f7b896..d1d6eba1 100644
--- a/po/zh_HK.po.in
+++ b/po/zh_HK.po.in
@@ -4,14 +4,15 @@
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
 # Kyle https://launchpad.net/~kylelover
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Walter Cheuk https://launchpad.net/~wwycheuk
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:45+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 04:01+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,14 +73,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 ""
 
@@ -88,14 +81,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 ""
 
@@ -104,14 +89,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] ""
@@ -124,6 +101,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 千米"
@@ -160,27 +153,27 @@ 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
@@ -210,12 +203,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 "即將"
@@ -224,7 +217,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
@@ -327,7 +320,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"
@@ -375,7 +368,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "退出"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"