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

diff --git a/po/ast.po.in b/po/ast.po.in
index 0b2ff08b..edf0efbc 100644
--- a/po/ast.po.in
+++ b/po/ast.po.in
@@ -8,7 +8,7 @@ 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"
+"PO-Revision-Date: 2015-07-19 03:57+0000\n"
 "Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
 "Language-Team: Asturian <ast@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -70,14 +70,6 @@ msgid "sixth exit"
 msgstr "sesta salida"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "en %d m"
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -86,14 +78,6 @@ msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metros"
-
-#, c-format
-msgid "in %d meters"
-msgstr "en %d metros"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -102,14 +86,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d,%d quilómetros"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "en %d,%d quilómetros"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -122,6 +98,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metros"
+
+#, c-format
+msgid "in %d meters"
+msgstr "en %d metros"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d,%d quilómetros"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "en %d,%d quilómetros"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un quilómetru"
@@ -160,27 +152,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "pal enllaz"
 
 #. 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 pa la cai %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 pal %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 pa 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 "%s pal %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -210,12 +202,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 "llueu dexe la rotonda pola %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 "Dexe la rotonda pola %1$s %2$s"
 
 msgid "soon"
 msgstr "aína"
@@ -224,7 +216,7 @@ msgid "now"
 msgstr "agora"
 
 msgid "then"
-msgstr ""
+msgstr "llueu"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -260,7 +252,7 @@ msgstr ""
 #. 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 "Tome la salida %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
@@ -327,25 +319,25 @@ msgstr "tres %i carreteres"
 #. 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 "Xire %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 "llueu de la vuelta"
 
 #. 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 "De la vuelta %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "llueu de la vuelta"
 
 #. 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 "De la vuelta %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -360,7 +352,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "siga"
 
 msgid "then you have reached your destination."
 msgstr "entós llegará al destín."
@@ -375,7 +367,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Salida"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"