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

diff --git a/po/jv.po.in b/po/jv.po.in
index 3d5f3144c..3df25ba35 100644
--- a/po/jv.po.in
+++ b/po/jv.po.in
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Leonardus Priyo Handono https://launchpad.net/~leonardus-ymail
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-09-28 01:43+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:59+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Javanese <jv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,35 +74,39 @@ msgid "sixth exit"
 msgstr "metu kaenem"
 
 #, c-format
-msgid "%d m"
+msgid "%d feet"
 msgstr ""
 
 #, c-format
-msgid "in %d m"
+msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d feet"
+msgid "%d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "in %d feet"
+msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr ""
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "in %d meters"
-msgstr ""
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "%d.%d miles"
+msgid "%d meters"
 msgstr ""
 
 #, c-format
-msgid "in %d.%d miles"
+msgid "in %d meters"
 msgstr ""
 
 #, c-format
@@ -113,18 +118,6 @@ msgid "in %d.%d kilometers"
 msgstr ""
 
 #, c-format
-msgid "one mile"
-msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
@@ -168,27 +161,27 @@ 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 ing dalan %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 ing dalan %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 ing dalan %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 ing dalan %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 ing dalan %s"
+msgstr "%sing dalan %s"
 
 msgid "When possible, please turn around"
 msgstr "Yen biso, mutero"
@@ -200,7 +193,7 @@ msgstr ""
 
 #, c-format
 msgid "Follow the road for the next %s"
-msgstr "tetep ing dalan iki nganti %s"
+msgstr "Tetep ing dalan iki nganti %s"
 
 msgid "Enter the roundabout soon"
 msgstr ""
@@ -213,18 +206,18 @@ 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 "terus metu soko puteran ing cawang kaping %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 "Metu soko puteran ing cawang kaping %1$s %2$s"
 
 msgid "soon"
 msgstr "sedhelo maneh"
 
 msgid "then"
-msgstr ""
+msgstr "terus"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -375,7 +368,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Metu"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"