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, 71 insertions, 78 deletions

diff --git a/po/es.po.in b/po/es.po.in
index 798cec4c8..1c2082c61 100644
--- a/po/es.po.in
+++ b/po/es.po.in
@@ -11,6 +11,7 @@
 # Jonay https://launchpad.net/~jonay-santana
 # KaZeR https://launchpad.net/~kazer
 # Luis Alejandro Rangel Sánchez https://launchpad.net/~xlarsx
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Paco Molinero https://launchpad.net/~franciscomol
 # Ricardo Jurado https://launchpad.net/~ricky131313
 # agerio https://launchpad.net/~agerio
@@ -24,14 +25,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-12-18 16:54+0000\n"
-"Last-Translator: iceman75 <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Chris Eubank <cteubank@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: \n"
+"Language: es\n"
 
 msgid "Running from source directory\n"
 msgstr "Ejecutando desde el directorio fuente\n"
@@ -85,14 +86,6 @@ msgid "sixth exit"
 msgstr "sexta salida"
 
 #, c-format
-msgid "%d m"
-msgstr "%d metros"
-
-#, c-format
-msgid "in %d m"
-msgstr "en %d metros"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d pies"
 
@@ -101,14 +94,6 @@ msgid "in %d feet"
 msgstr "en %d pies"
 
 #, 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 "%d,%d millas"
 
@@ -117,14 +102,6 @@ msgid "in %d.%d miles"
 msgstr "en %d,%d millas"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d,%d kilómetros"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "en %d,%d kilómetros"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "una milla"
@@ -137,6 +114,22 @@ msgstr[0] "en una milla"
 msgstr[1] "en %d millas"
 
 #, 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 kilómetros"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "en %d,%d kilómetros"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un kilómetro"
@@ -151,56 +144,56 @@ msgstr[1] "en %d kilómetros"
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
 #, c-format
 msgid "%1$sonto the %2$s%3$s%4$s"
-msgstr ""
+msgstr "%1$sen la %2$s%3$s%4$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
 #, c-format
 msgid "%1$sonto %2$s"
-msgstr ""
+msgstr "%1$sen la carretera %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|masculine form"
-msgstr ""
+msgstr "%1$sen el %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|feminine form"
-msgstr ""
+msgstr "%1$sen la %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$sen la carretera %2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "en el carril de entrada"
 
 #. 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 "%sen la calle %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 "%sen el %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 "%sen 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 "%sen la calle %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 en la %s"
+msgstr "%sen la %s"
 
 msgid "When possible, please turn around"
 msgstr "Dé la vuelta cuando sea posible"
@@ -208,7 +201,7 @@ msgstr "Dé la vuelta cuando sea posible"
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "hacia %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -225,12 +218,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 "después salga de la rotonda por 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 "Salga de la rotonda por la %1$s %2$s"
 
 msgid "soon"
 msgstr "próximamente"
@@ -239,80 +232,80 @@ msgid "now"
 msgstr "ahora"
 
 msgid "then"
-msgstr ""
+msgstr "luego"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|right"
-msgstr ""
+msgstr "luego entre%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|right"
-msgstr ""
+msgstr "Entre%2$s %1$s"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|left"
-msgstr ""
+msgstr "luego entre%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|left"
-msgstr ""
+msgstr "Entre%2$s %1$s"
 
 msgid "on your left"
-msgstr ""
+msgstr "a la izquierda"
 
 msgid "on your right"
-msgstr ""
+msgstr "a la derecha"
 
 #. 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 "Tome la salida %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 "Tome la salida %1$s %2$s%3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
-msgstr ""
+msgstr "al enlace"
 
 msgid "at exit"
-msgstr ""
+msgstr "a la salida"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then continue straight%1$s"
-msgstr ""
+msgstr "luego continúe todo recto%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Continue straight %1$s%2$s%3$s"
-msgstr ""
+msgstr "Continúe todo recto %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep right%1$s"
-msgstr ""
+msgstr "luego manténgase por la derecha%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep right %1$s%2$s%3$s"
-msgstr ""
+msgstr "Manténgase por la derecha %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep left%1$s"
-msgstr ""
+msgstr "luego manténgase por la izquierda%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep left %1$s%2$s%3$s"
-msgstr ""
+msgstr "Manténgase por la izquierda %1$s%2$s%3$s"
 
 #. TRANSLATORS: "right" as in "turn right"
 msgid "right"
@@ -342,25 +335,25 @@ msgstr "después de %i carreteras"
 #. 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 "Gire %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 "luego dé 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 "Dé 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 "luego dé 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 "Dé la vuelta %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -375,7 +368,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "continúe"
 
 msgid "then you have reached your destination."
 msgstr "entonces ha llegado a su destino."
@@ -387,10 +380,10 @@ msgstr "Ha llegado a su destino %s"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "Enlace"
 
 msgid "Exit"
-msgstr ""
+msgstr "Salida"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1645,19 +1638,19 @@ msgid "Data"
 msgstr "Datos"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Farmacia"
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Restaurante"
 
 msgid "Restaurant. Fast food"
 msgstr ""
 
 msgid "Hotel"
-msgstr ""
+msgstr "Hotel"
 
 msgid "Car parking"
-msgstr ""
+msgstr "Estacionamiento"
 
 msgid "Fuel station"
 msgstr ""
@@ -1669,19 +1662,19 @@ msgid "Hospital"
 msgstr ""
 
 msgid "Cinema"
-msgstr ""
+msgstr "Cine"
 
 msgid "Train station"
 msgstr ""
 
 msgid "School"
-msgstr ""
+msgstr "Escuela"
 
 msgid "Police"
-msgstr ""
+msgstr "Policía"
 
 msgid "Justice"
-msgstr ""
+msgstr "Juzgado"
 
 msgid "Taxi"
 msgstr ""
@@ -2025,7 +2018,7 @@ msgstr "Vuelva a la ruta"
 
 #. warning told
 msgid "Look out! Camera!"
-msgstr "!Atención! Radar"
+msgstr "¡Atención! Radar"
 
 #. warning told
 msgid "Please decrease your speed"
@@ -2189,16 +2182,16 @@ msgid "Baden-Wuerttemberg"
 msgstr "Baden-Wuerttemberg"
 
 msgid "Bayern"
-msgstr "Bayern"
+msgstr "Baviera"
 
 msgid "Mittelfranken"
 msgstr "Franconia Media"
 
 msgid "Niederbayern"
-msgstr "Bajo Bayern"
+msgstr "Baja Baviera"
 
 msgid "Oberbayern"
-msgstr "Alto Bayern"
+msgstr "Alta Baviera"
 
 msgid "Oberfranken"
 msgstr "Alta Franconia"