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, 32 insertions, 40 deletions

diff --git a/po/et.po.in b/po/et.po.in
index 55f5fd8f8..d802ab548 100644
--- a/po/et.po.in
+++ b/po/et.po.in
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-04-13 06:57+0000\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
 "Last-Translator: Manuel Hohmann <mhohmann@physnet.uni-hamburg.de>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -74,14 +74,6 @@ msgid "sixth exit"
 msgstr "kuuendast mahasõidust"
 
 #, c-format
-msgid "%d m"
-msgstr "%d m"
-
-#, c-format
-msgid "in %d m"
-msgstr "%d m pärast"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d jalga"
 
@@ -90,14 +82,6 @@ msgid "in %d feet"
 msgstr "%d jala pärast"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d meetrit"
-
-#, c-format
-msgid "in %d meters"
-msgstr "%d meetri pärast"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d miili"
 
@@ -106,14 +90,6 @@ msgid "in %d.%d miles"
 msgstr "%d.%d miili pärast"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d kilomeetrit"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "%d.%d kilomeetri pärast"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "üks miil"
@@ -126,6 +102,22 @@ msgstr[0] "ühe miili pärast"
 msgstr[1] "%d miili pärast"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d meetrit"
+
+#, c-format
+msgid "in %d meters"
+msgstr "%d meetri pärast"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilomeetrit"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "%d.%d kilomeetri pärast"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "üks kilomeeter"
@@ -164,27 +156,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "kaldteele"
 
 #. 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 %s%s%s tänavale"
 
 #. 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 %s%s%s tänavale"
 
 #. 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 %s%s%s tänavale"
 
 #. 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 %s%s%s tänavale"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -214,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 "siis lahku ringteelt %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 "Lahku ringteelt %1$s %2$s"
 
 msgid "soon"
 msgstr "varsti"
@@ -228,7 +220,7 @@ msgid "now"
 msgstr "nüüd"
 
 msgid "then"
-msgstr ""
+msgstr "siis"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -251,10 +243,10 @@ msgid "Merge %1$s%2$s|left"
 msgstr ""
 
 msgid "on your left"
-msgstr ""
+msgstr "vasakul pool"
 
 msgid "on your right"
-msgstr ""
+msgstr "paremal pool"
 
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
@@ -335,21 +327,21 @@ msgstr "Pööra %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 "siis pööra ümber"
 
 #. 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 "Pööra ümber %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "siis pööra ümber"
 
 #. 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 "Pööra ümber %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -379,7 +371,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Mahasõit"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"