1 files changed, 116 insertions, 47 deletions
diff --git a/po/fa.po.in b/po/fa.po.in
index 0a396e551..7cfb1f3d3 100644
--- a/po/fa.po.in
+++ b/po/fa.po.in
@@ -133,8 +133,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "exit"
-msgstr "بیرون"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "به سوی شیب"
@@ -164,32 +166,17 @@ msgstr ""
 msgid "%sinto the %s"
 msgstr ""
 
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "راست"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "چپ"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "به آسانی "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "به سختی "
+msgid "When possible, please turn around"
+msgstr "هنگامیکه توانستید برگردید."
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
 msgstr ""
 
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "گمنام "
-
-msgid "When possible, please turn around"
-msgstr "هنگامیکه توانستید برگردید."
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr ""
 
 msgid "Enter the roundabout soon"
 msgstr "به زودی به فلکه بروید"
@@ -199,57 +186,134 @@ msgstr "به زودی به فلکه بروید"
 msgid "Enter the roundabout %s"
 msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "then leave the roundabout at the %1$s %2$s"
 msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Leave the roundabout at the %1$s %2$s"
 msgstr ""
 
+msgid "soon"
+msgstr "به زودی"
+
+msgid "now"
+msgstr "اکنون"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
 #, c-format
-msgid "Follow the road for the next %s"
+msgid "%1$s merge left %2$s"
 msgstr ""
 
-msgid "soon"
-msgstr "به زودی"
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "Take the %1$s road to the %2$s"
+msgid "%1$s left exit %2$s %3$s"
 msgstr ""
 
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
 #, c-format
-msgid "after %i roads"
+msgid "%1$s right exit %2$s %3$s"
 msgstr ""
 
-msgid "now"
-msgstr "اکنون"
+msgid " at the exit "
+msgstr ""
 
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
 #, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "%1$s continue straight%2$s"
 msgstr ""
 
-msgid "error"
-msgstr "نادرست"
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
 
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "%1$s keep left%2$s"
 msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "%1$s continue straight"
 msgstr ""
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "You have reached your destination %s"
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+msgid "right"
+msgstr "راست"
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. 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 ""
+
+msgid "easily "
+msgstr "به آسانی "
+
+msgid "strongly "
+msgstr "به سختی "
+
+msgid "left"
+msgstr "چپ"
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s left turnaround"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s right turnaround"
 msgstr ""
 
 msgid "then you have reached your destination."
 msgstr "سپس شما به خواستگاه خود رسیده اید."
 
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+msgid "exit"
+msgstr "بیرون"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
+
 #. Android resource: @strings/position_popup_title
 msgid "Position"
 msgstr "جایگاه"
@@ -1308,11 +1372,13 @@ msgstr ""
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1676,6 +1742,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr ""