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, 35 insertions, 42 deletions

diff --git a/po/af.po.in b/po/af.po.in
index 28d1b2bf..8736cb98 100644
--- a/po/af.po.in
+++ b/po/af.po.in
@@ -5,6 +5,7 @@
 # Andre Hugo https://launchpad.net/~cortexhugo
 # KaZeR https://launchpad.net/~kazer
 # Kobus https://launchpad.net/~kobuswolf
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Stephan Wessels https://launchpad.net/~slwessels
 # Wimpie Hall https://launchpad.net/~gotek
 # mdhull https://launchpad.net/~mark-emsafrica
@@ -13,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:39+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,14 +76,6 @@ msgid "sixth exit"
 msgstr "sesde uitgang"
 
 #, c-format
-msgid "%d m"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d m"
-msgstr "na %d meter"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -91,14 +84,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d meter"
-
-#, c-format
-msgid "in %d meters"
-msgstr "na %d meter"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -107,14 +92,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d, %d kilometer"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "na %d.%d kilometer"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -127,6 +104,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d meter"
+
+#, c-format
+msgid "in %d meters"
+msgstr "na %d meter"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d, %d kilometer"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "na %d.%d kilometer"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "een kilometer"
@@ -170,22 +163,22 @@ 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 "%sin die %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 "%sin die %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 "%sin die %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 "%sin die %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -215,12 +208,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 "verlaat dan die sirkel by die %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 "Verlaat die sirkel by die %1$s %2$s"
 
 msgid "soon"
 msgstr "kortliks"
@@ -229,7 +222,7 @@ msgid "now"
 msgstr "nou"
 
 msgid "then"
-msgstr ""
+msgstr "dan"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -260,19 +253,19 @@ msgstr ""
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
 msgid "Take exit %1$s %2$s %3$s"
-msgstr ""
+msgstr "Neem die afrit %1$s %2$s %3$s"
 
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "Neem die afrit %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
 msgstr ""
 
 msgid "at exit"
-msgstr ""
+msgstr "by die afrit"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
@@ -332,25 +325,25 @@ msgstr "na %i paaie"
 #. 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 "Draai %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"
-msgstr ""
+msgstr "draai dan om"
 
 #. 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 "Draai om %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "draai dan om"
 
 #. 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 "Draai om %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -380,7 +373,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Afrit"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"