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, 21 insertions, 28 deletions

diff --git a/po/fa.po.in b/po/fa.po.in
index 084b22e56..dd1838f3b 100644
--- a/po/fa.po.in
+++ b/po/fa.po.in
@@ -2,14 +2,15 @@
 # Copyright (C) 2006-2015 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # the_cephalex https://launchpad.net/~ali-rashidi
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-06-28 21:57+0000\n"
-"Last-Translator: the_cephalex <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,14 +70,6 @@ msgid "sixth exit"
 msgstr "ششمین راه"
 
 #, c-format
-msgid "%d m"
-msgstr "%d دقیقه"
-
-#, c-format
-msgid "in %d m"
-msgstr ""
-
-#, c-format
 msgid "%d feet"
 msgstr ""
 
@@ -85,14 +78,6 @@ msgid "in %d feet"
 msgstr "%d فوت"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d متر"
-
-#, c-format
-msgid "in %d meters"
-msgstr ""
-
-#, c-format
 msgid "%d.%d miles"
 msgstr ""
 
@@ -101,14 +86,6 @@ msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr ""
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr ""
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -121,6 +98,22 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
+msgid "%d meters"
+msgstr "%d متر"
+
+#, c-format
+msgid "in %d meters"
+msgstr ""
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
@@ -159,7 +152,7 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "به سوی شیب"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
@@ -374,7 +367,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "بیرون"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"