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, 34 insertions, 41 deletions

diff --git a/po/eo.po.in b/po/eo.po.in
index 1118e6398..c31ea5c2c 100644
--- a/po/eo.po.in
+++ b/po/eo.po.in
@@ -5,14 +5,15 @@
 # KaZeR https://launchpad.net/~kazer
 # Lucas Larson https://launchpad.net/~lucaslarson
 # Michael Moroni https://launchpad.net/~airon90
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # OlivierWeb https://launchpad.net/~olivierweb
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-27 21:43+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,14 +74,6 @@ msgid "sixth exit"
 msgstr "sesa eliro"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "en %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -89,14 +82,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metroj"
-
-#, c-format
-msgid "in %d meters"
-msgstr "en %d metrojn"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -105,14 +90,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilometrojn"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "en %d.%d kilometrojn"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -125,6 +102,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metroj"
+
+#, c-format
+msgid "in %d meters"
+msgstr "en %d metrojn"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometrojn"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "en %d.%d kilometrojn"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "unu kilometro"
@@ -163,27 +156,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "al la ramplon"
 
 #. 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 "%sal la %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 "%sal la %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 "%sal la %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 "%sal la %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -213,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 "do lasu la trafikcirklon ĉe la %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 "Lasu la trafikcirklon ĉe la %1$s %2$s"
 
 msgid "soon"
 msgstr "baldaŭ"
@@ -227,7 +220,7 @@ msgid "now"
 msgstr "nun"
 
 msgid "then"
-msgstr ""
+msgstr "do"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -330,25 +323,25 @@ msgstr "post %i stratoj"
 #. 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 "Turnu %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 "do ĉirkaŭturnu"
 
 #. 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 "Ĉirkaŭturnu %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "do ĉirkaŭturnu"
 
 #. 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 "Ĉirkaŭturnu %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -363,7 +356,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "sekvu"
 
 msgid "then you have reached your destination."
 msgstr "do vi atingis la celon"
@@ -378,7 +371,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Eliro"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"