summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/af.po.in251
-rw-r--r--po/ar.po.in239
-rw-r--r--po/ast.po.in249
-rw-r--r--po/be.po.in231
-rw-r--r--po/bg.po.in245
-rw-r--r--po/bs.po.in219
-rw-r--r--po/ca.po.in257
-rw-r--r--po/ckb.po.in213
-rw-r--r--po/cs.po.in247
-rw-r--r--po/cy.po.in223
-rw-r--r--po/da.po.in251
-rw-r--r--po/de.po.in258
-rw-r--r--po/de_CH.po.in213
-rw-r--r--po/el.po.in245
-rw-r--r--po/en.po.in2736
-rw-r--r--po/en_AU.po.in249
-rw-r--r--po/en_CA.po.in249
-rw-r--r--po/en_GB.po.in251
-rw-r--r--po/eo.po.in243
-rw-r--r--po/es.po.in285
-rw-r--r--po/et.po.in249
-rw-r--r--po/eu.po.in233
-rw-r--r--po/fa.po.in231
-rw-r--r--po/fi.po.in244
-rw-r--r--po/fil.po.in231
-rw-r--r--po/fo.po.in245
-rw-r--r--po/fr.po.in267
-rw-r--r--po/fr_CH.po.in258
-rw-r--r--po/fy.po.in213
-rw-r--r--po/gl.po.in241
-rw-r--r--po/he.po.in243
-rw-r--r--po/hi.po.in241
-rw-r--r--po/hr.po.in249
-rw-r--r--po/hu.po.in243
-rw-r--r--po/id.po.in245
-rw-r--r--po/it.po.in275
-rw-r--r--po/ja.po.in221
-rw-r--r--po/jv.po.in235
-rw-r--r--po/kk.po.in213
-rw-r--r--po/kn.po.in213
-rw-r--r--po/ko.po.in216
-rw-r--r--po/ku.po.in219
-rw-r--r--po/lb.po.in227
-rw-r--r--po/lt.po.in368
-rw-r--r--po/lv.po.in247
-rw-r--r--po/mk.po.in246
-rw-r--r--po/ml.po.in257
-rw-r--r--po/mn.po.in216
-rw-r--r--po/mr.po.in213
-rw-r--r--po/nb.po.in243
-rw-r--r--po/nds.po.in245
-rw-r--r--po/nl.po.in257
-rw-r--r--po/nn.po.in227
-rw-r--r--po/pl.po.in251
-rw-r--r--po/pms.po.in215
-rw-r--r--po/pt.po.in247
-rw-r--r--po/pt_BR.po.in243
-rw-r--r--po/ro.po.in251
-rw-r--r--po/ru.po.in265
-rw-r--r--po/sc.po.in251
-rw-r--r--po/si.po.in241
-rw-r--r--po/sk.po.in251
-rw-r--r--po/sl.po.in245
-rw-r--r--po/sr.po.in288
-rw-r--r--po/sv.po.in245
-rw-r--r--po/sw.po.in239
-rw-r--r--po/ta.po.in221
-rw-r--r--po/te.po.in223
-rw-r--r--po/th.po.in237
-rw-r--r--po/tr.po.in243
-rw-r--r--po/uk.po.in255
-rw-r--r--po/ur.po.in331
-rw-r--r--po/vi.po.in243
-rw-r--r--po/zh_CN.po.in245
-rw-r--r--po/zh_HK.po.in235
75 files changed, 16481 insertions, 4309 deletions
diff --git a/po/af.po.in b/po/af.po.in
index fcba87bf..bfb95e1e 100644
--- a/po/af.po.in
+++ b/po/af.po.in
@@ -8,19 +8,19 @@
# Stephan Wessels https://launchpad.net/~slwessels
# Wimpie Hall https://launchpad.net/~gotek
# mdhull https://launchpad.net/~mark-emsafrica
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:39+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Afrikaans <af@li.org>\n"
+"Language: af\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: af\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -138,88 +138,188 @@ msgid_plural "in %d kilometers"
msgstr[0] "na een kilometer"
msgstr[1] "na %d kilometer"
-msgid "exit"
-msgstr "afrit"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
-msgstr "na die afrit"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%sin die straat %s%s%s in"
+msgid "%sinto %s%s%s"
+msgstr "%sin die %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%sin die %s%s%s|"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sin die %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%sin die %s%s%s|"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sin die %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%sin die %s%s%s|"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sin die %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
#, c-format
msgid "%sinto the %s"
msgstr "%sin die %s in"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "regs"
+msgid "When possible, please turn around"
+msgstr "Draai asseblief om wanneer moontlik"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "links"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "maklik "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Volg die pad vir die volgende %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "skerp "
+msgid "Enter the roundabout soon"
+msgstr "Gaan kortliks in die sirkel in"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "verlaat dan die sirkel by die %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 "Verlaat die sirkel by die %1$s %2$s"
+
+msgid "soon"
+msgstr "kortliks"
+
+msgid "now"
+msgstr "nou"
+
+msgid "then"
+msgstr "dan"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Draai asseblief om wanneer moontlik"
+#. 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 ""
-msgid "Enter the roundabout soon"
-msgstr "Gaan kortliks in die sirkel in"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
+#. 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 "Neem die afrit %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 "then leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr "Neem die afrit %1$s %2$s%3$s"
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr "by die afrit"
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then continue straight%1$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Volg die pad vir die volgende %s"
+msgid "Continue straight %1$s%2$s%3$s"
+msgstr ""
-msgid "soon"
-msgstr "kortliks"
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "regs"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "links"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "maklik "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "skerp "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Neem die %1$s pad na %2$s"
@@ -228,32 +328,59 @@ msgstr "Neem die %1$s pad na %2$s"
msgid "after %i roads"
msgstr "na %i paaie"
-msgid "now"
-msgstr "nou"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Draai %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "draai dan om"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Draai om %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "draai dan om"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Draai om %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "dan het jy jou bestemming bereik."
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Jy het jou bestemming bereik %s"
-msgid "then you have reached your destination."
-msgstr "dan het jy jou bestemming bereik."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Afrit"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1808,10 +1935,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/ar.po.in b/po/ar.po.in
index 137319f6..ab724aae 100644
--- a/po/ar.po.in
+++ b/po/ar.po.in
@@ -6,20 +6,20 @@
# Magd Addin M. Almuntaser https://launchpad.net/~ttmtt-team
# drsaudi https://launchpad.net/~mon7b6
# metehyi https://launchpad.net/~metehyi
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-11-10 01:24+0000\n"
"Last-Translator: metehyi <Unknown>\n"
"Language-Team: Arabic <ar@li.org>\n"
+"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"Language: ar\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -153,30 +153,53 @@ msgstr[3] "بعد %d كلم"
msgstr[4] "بعد %d كلم"
msgstr[5] "بعد %d كلم"
-msgid "exit"
-msgstr "خروج"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
-msgstr "إلى داخل الطريق المنحدر"
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%s إلى داخل الشارع %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%sإلى داخل %s%s%s|صفة الذكر"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sإلى داخل %s%s%s|صفة الأنثى"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sإلى داخل %s%s%s|غير محدد الجنس"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -184,32 +207,17 @@ msgstr "%sإلى داخل %s%s%s|غير محدد الجنس"
msgid "%sinto the %s"
msgstr "%s إلى داخل %s"
-#. 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 "بكل شدة "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "حيث ممكن الرجاء اللف"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "حيث ممكن الرجاء اللف"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "تابع الطريق لل- %s التالية"
msgid "Enter the roundabout soon"
msgstr "قريباً الدخول إلى المستديرة"
@@ -219,22 +227,114 @@ msgstr "قريباً الدخول إلى المستديرة"
msgid "Enter the roundabout %s"
msgstr "أدخل المسافة %s إلى المستديرة"
+#. 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 "ثم أخرج من المستديرة عند الــ%1$s %2$s"
+
+#. 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 "Leave the roundabout at the %1$s %2$s"
+msgstr "أخرج من المستديرة عند الــ %1$s %2$s"
+
+msgid "soon"
+msgstr "قريبا"
+
+msgid "now"
+msgstr "الآن"
+
+msgid "then"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "Follow the road for the next %s"
-msgstr "تابع الطريق لل- %s التالية"
+msgid "Merge %1$s%2$s|right"
+msgstr ""
-msgid "soon"
-msgstr "قريبا"
+#. 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 ""
+
+#. 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 ""
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "إلى اليمين"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "إلى اليسار"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "بسهولة "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "بكل شدة "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "خذ الطريق %1$s إلى ال%2$s"
@@ -243,32 +343,59 @@ msgstr "خذ الطريق %1$s إلى ال%2$s"
msgid "after %i roads"
msgstr "بعد %i طرقات"
-msgid "now"
-msgstr "الآن"
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "حوّل %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 ""
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
-msgid "error"
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
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 arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "و بعدها تكون قد وصلت إلى هدفك"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "لقد وصلت إلى هدفك %s"
-msgid "then you have reached your destination."
-msgstr "و بعدها تكون قد وصلت إلى هدفك"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "خروج"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1823,10 +1950,10 @@ msgstr "نقاط المراحل"
msgid "Enter Coordinates"
msgstr "أدخل الإحداثيات"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/ast.po.in b/po/ast.po.in
index 4d72f19f..5a446a25 100644
--- a/po/ast.po.in
+++ b/po/ast.po.in
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# Xuacu Saturio https://launchpad.net/~xuacusk8
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:39+0000\n"
"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
"Language-Team: Asturian <ast@li.org>\n"
+"Language: ast\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: ast\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -133,63 +133,71 @@ msgid_plural "in %d kilometers"
msgstr[0] "nun quilómetru"
msgstr[1] "en %d quilómetros"
-msgid "exit"
-msgstr "salida"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
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 the street %s%s%s"
+msgid "%sinto %s%s%s"
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. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s pal %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
+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. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%s pa la %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
+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. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%s pal %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%s pal %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 pa la %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "drecha"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "izquierda"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "selemente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "enforma "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "Cuando seya posible, de la vuelta"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Cuando seya posible, de la vuelta"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Siga pela carretera los siguientes %s"
msgid "Enter the roundabout soon"
msgstr "Entre ceo na rotonda"
@@ -199,57 +207,176 @@ msgstr "Entre ceo na rotonda"
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 %1$s %2$s"
+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 "Dexe la rotonda pola %1$s %2$s"
+
+msgid "soon"
+msgstr "aína"
+
+msgid "now"
+msgstr "agora"
+
+msgid "then"
+msgstr "llueu"
+
+#. 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 ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
-msgstr "Siga pela carretera los siguientes %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
-msgid "soon"
-msgstr "aína"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
-msgstr "Tome la carretera %1$s dica %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "tres %i carreteres"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr "Tome la salida %1$s %2$s%3$s"
-msgid "now"
-msgstr "agora"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Llegó al destín %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "drecha"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "izquierda"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "selemente "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "enforma "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Tome la carretera %1$s dica %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "tres %i carreteres"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "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 "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 "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 "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 "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
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "siga"
msgid "then you have reached your destination."
msgstr "entós llegará al destín."
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Llegó al destín %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Salida"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posición"
@@ -1803,10 +1930,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/be.po.in b/po/be.po.in
index 58137de7..b3041903 100644
--- a/po/be.po.in
+++ b/po/be.po.in
@@ -4,20 +4,20 @@
# Many thanks to the contributors of this translation:
# Anatoli Putseyeu https://launchpad.net/~st-shadow-by
# KaZeR https://launchpad.net/~kazer
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2014-11-15 22:06+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Belarusian <be@li.org>\n"
+"Language: be\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"Language: be\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
msgid "Running from source directory\n"
msgstr ""
@@ -135,30 +135,53 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
-msgstr "выхад"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -166,92 +189,196 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "направа"
+msgid "When possible, please turn around"
+msgstr "Развярніцеся, калі будзе магчымасць"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "налева"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "мацней "
+msgid "Enter the roundabout soon"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Развярніцеся, калі будзе магчымасць"
+#. 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 ""
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "скора"
+
+msgid "now"
+msgstr "зараз"
+
+msgid "then"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
-msgstr "скора"
+msgid "on your left"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
-msgstr "зараз"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "направа"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "налева"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "мацней "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr "Развярніцеся %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
msgstr ""
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Развярніцеся %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr ""
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Выхад"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Размяшчэнне"
@@ -1805,10 +1932,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/bg.po.in b/po/bg.po.in
index 46d5b779..2b5b019c 100644
--- a/po/bg.po.in
+++ b/po/bg.po.in
@@ -7,19 +7,19 @@
# Anton Todorov https://launchpad.net/~antod
# Lyudmil Bonev https://launchpad.net/~bonev-j
# MalamiR https://launchpad.net/~mamut-killer
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:39+0000\n"
"Last-Translator: Alex Stanev <alex@stanev.org>\n"
"Language-Team: Bulgarian <bg@li.org>\n"
+"Language: bg\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: bg\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -137,123 +137,250 @@ msgid_plural "in %d kilometers"
msgstr[0] "след един километър"
msgstr[1] "след %d километра"
-msgid "exit"
-msgstr "изход"
-
-msgid "into the ramp"
-msgstr "на рампата"
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%sпо улица %s%s%s"
+msgid "%1$sonto the %2$s%3$s%4$s"
+msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
#, c-format
-msgid "%sinto the %s%s%s|male form"
+msgid "%1$sonto %2$s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|female form"
+msgid "%1$sonto %2$s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|neutral form"
+msgid "%1$sonto %2$s|feminine form"
msgstr ""
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s"
+msgid "%1$sonto %2$s|neuter form"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "надясно"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr "на рампата"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "наляво"
+#. 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 "%sпо улица %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "леко "
+#. 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 "%sпо улица %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "силно "
+#. 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 "%sпо улица %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+#. 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 "%sпо улица %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#, c-format
+msgid "%sinto the %s"
msgstr ""
msgid "When possible, please turn around"
msgstr "Когато е възможно обърнете"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Следвайте пътя през следващите %s"
+
msgid "Enter the roundabout soon"
msgstr "Скоро навлизате в кръгово"
#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
msgid "Enter the roundabout %s"
+msgstr "Навлизате в кръгово %s"
+
+#. 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 "след това излезте от кръговото на %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 "Излезте от кръговото на %1$s %2$s"
+
+msgid "soon"
+msgstr "скоро"
+
+msgid "now"
+msgstr "сега"
+
+msgid "then"
+msgstr "след това"
+
+#. 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 ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
-msgstr "Следвайте пътя през следващите %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
-msgid "soon"
-msgstr "скоро"
+msgid "on your left"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
-msgstr "Тръгнете по %1$s път към %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "след %i пресечки"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "now"
-msgstr "сега"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Достигнахте до целта %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "надясно"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "наляво"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "леко "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "силно "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Тръгнете по %1$s път към %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "след %i пресечки"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Завийте %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 "след това обърнете"
+
+#. 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 "Обърнете %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "след това обърнете"
+
+#. 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 "Обърнете %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
msgid "then you have reached your destination."
msgstr "след това пристигате на местоназначението"
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Достигнахте до целта %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Изход"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Позиция"
@@ -1807,10 +1934,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/bs.po.in b/po/bs.po.in
index e6445c0f..c9270fce 100644
--- a/po/bs.po.in
+++ b/po/bs.po.in
@@ -4,20 +4,20 @@
# Many thanks to the contributors of this translation:
# KaZeR https://launchpad.net/~kazer
# Kenan https://launchpad.net/~kahrickenan
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2014-08-08 23:15+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Bosnian <bs@li.org>\n"
+"Language: bs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
msgid "Running from source directory\n"
msgstr ""
@@ -136,30 +136,53 @@ msgstr[0] "u %d kilometru"
msgstr[1] "u %d kilometara"
msgstr[2] "u %d kilometara"
-msgid "exit"
-msgstr "izlaz"
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "u rampu"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -167,92 +190,196 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+#. 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 ""
-msgid "Enter the roundabout soon"
+msgid "soon"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
+msgid "on your left"
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr ""
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
msgstr ""
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Take the %1$s road to the %2$s"
msgstr ""
-msgid "error"
+#, c-format
+msgid "after %i roads"
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'
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr ""
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Izlaz"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1806,10 +1933,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/ca.po.in b/po/ca.po.in
index a36140c6..228ce565 100644
--- a/po/ca.po.in
+++ b/po/ca.po.in
@@ -13,19 +13,19 @@
# juliwoodbcn https://launchpad.net/~julianlozano
# kualsevol https://launchpad.net/~ojuanv
# peremayol@gmail.com https://launchpad.net/~peremayol
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2014-07-09 18:11+0000\n"
"Last-Translator: Sergi Gomis <paloky3@gmail.com>\n"
"Language-Team: Catalan <ca@li.org>\n"
+"Language: ca\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: ca\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -143,123 +143,250 @@ msgid_plural "in %d kilometers"
msgstr[0] "d'aquí a un quilòmetre"
msgstr[1] "d'aquí a %d quilòmetres"
-msgid "exit"
-msgstr "surt"
-
-msgid "into the ramp"
-msgstr "a la sortida"
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s al carrer %s %s %s"
+msgid "%1$sonto the %2$s%3$s%4$s"
+msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
#, c-format
-msgid "%sinto the %s%s%s|male form"
-msgstr "%s al %s %s %s"
+msgid "%1$sonto %2$s"
+msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|female form"
-msgstr "%s a la %s %s %s"
+msgid "%1$sonto %2$s|masculine form"
+msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|neutral form"
-msgstr "%s a %s %s %s"
+msgid "%1$sonto %2$s|feminine form"
+msgstr ""
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s"
-msgstr "%s cap a la %s"
+msgid "%1$sonto %2$s|neuter form"
+msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "dreta"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "esquerra"
+#. 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 "%sal carrer %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "fàcilment "
+#. 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 "%sal %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "fortament "
+#. 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 "%sa la %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+#. 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 "%sa %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr ""
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#, c-format
+msgid "%sinto the %s"
+msgstr "%scap a la %s"
msgid "When possible, please turn around"
msgstr "Quan sigui possible, doneu mitja volta"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr "cap a %s"
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Seguiu per la carretera durant els propers %s"
+
msgid "Enter the roundabout soon"
msgstr "Entreu a la rotonda vinent"
#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
msgid "Enter the roundabout %s"
+msgstr "Entreu a la rotonda %s"
+
+#. 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 "aleshores deixeu la rotonda a 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 "Deixeu la rotonda a la %1$s %2$s"
+
+msgid "soon"
+msgstr "aviat"
+
+msgid "now"
+msgstr "ara"
+
+msgid "then"
+msgstr "aleshores"
+
+#. 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 ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
-msgstr "Seguiu per la carretera durant els propers %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
-msgid "soon"
-msgstr "aviat"
+msgid "on your left"
+msgstr "a l'esquerra"
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr "a la dreta"
+
+#. 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 the %1$s road to the %2$s"
-msgstr "Preneu el %1$s carrer a la %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr "Preneu la sortida %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 "after %i roads"
-msgstr "després de %i carrers"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr "Preneu la sortida %1$s %2$s%3$s"
-msgid "now"
-msgstr "ara"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr "a l'intersecció"
+
+msgid "at exit"
+msgstr "a la sortida"
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Heu arribat a la destinació %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "dreta"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "esquerra"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "fàcilment "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "fortament "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Preneu el %1$s carrer a la %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "després de %i carrers"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Gireu %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 "després, doneu mitja volta"
+
+#. 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 "Doneu mitja volta %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "després, doneu mitja volta"
+
+#. 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 "Doneu mitja volta %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "seguiu"
msgid "then you have reached your destination."
msgstr "aleshores heu arribat a destí"
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Heu arribat a la destinació %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Intersecció"
+
+msgid "Exit"
+msgstr "Sortida"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posició"
@@ -1546,7 +1673,7 @@ msgid "Police"
msgstr ""
msgid "Justice"
-msgstr ""
+msgstr "Jutjats"
msgid "Taxi"
msgstr ""
@@ -1813,10 +1940,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/ckb.po.in b/po/ckb.po.in
index 98908ac0..b3f95202 100644
--- a/po/ckb.po.in
+++ b/po/ckb.po.in
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# kosar https://launchpad.net/~kosar-belana
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-06-22 23:00+0000\n"
"Last-Translator: kosar <kosar.belana@gmail.com>\n"
"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"
+"Language: ckb\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"
msgid "Running from source directory\n"
msgstr ""
@@ -132,30 +132,53 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -163,92 +186,196 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. 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 ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+msgid "soon"
msgstr ""
-msgid "Enter the roundabout soon"
+msgid "now"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr ""
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr ""
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
msgstr ""
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr ""
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1802,10 +1929,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/cs.po.in b/po/cs.po.in
index efc46492..9c78adfe 100644
--- a/po/cs.po.in
+++ b/po/cs.po.in
@@ -15,19 +15,19 @@
# Vojtěch Látal https://launchpad.net/~vojtik
# stritek https://launchpad.net/~stritek
# talmik https://launchpad.net/~mikatom
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-03-15 14:56+0000\n"
"Last-Translator: Jakuje <jakuje@gmail.com>\n"
"Language-Team: Čeština\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"Language: \n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -149,30 +149,53 @@ msgstr[0] "za %d kilometr"
msgstr[1] "za %d kilometry"
msgstr[2] "za %d kilometrů"
-msgid "exit"
-msgstr "ukončit"
+#. 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 "%1$sna %2$s%3$s%4$s"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr "%1$sna %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 "%1$sna %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 "%1$sna %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 "%1$sna %2$s"
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "na přivadeč"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%sdo ulice %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%sdo %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s do %s%s%s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sdo %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sdo %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sdo %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -180,32 +203,17 @@ msgstr "%sdo %s%s%s"
msgid "%sinto the %s"
msgstr "%sna %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "vpravo"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "vlevo"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "mírně "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "silně "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "Až to bude možné, otočte se"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Až to bude možné, otočte se"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Pokračujte po cestě dalších %s"
msgid "Enter the roundabout soon"
msgstr "Brzy najeďte na kruhový objezd"
@@ -215,57 +223,176 @@ msgstr "Brzy najeďte na kruhový objezd"
msgid "Enter the roundabout %s"
msgstr "Najeďte na kruhový objezd %s"
+#. 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 "pak sjeďte na %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 "Sjeďte na %1$s %2$s"
+
+msgid "soon"
+msgstr "brzy"
+
+msgid "now"
+msgstr "nyní"
+
+msgid "then"
+msgstr "pak"
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "then leave the roundabout at the %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "Leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Pokračujte po cestě dalších %s"
+msgid "then merge%1$s|left"
+msgstr ""
-msgid "soon"
-msgstr "brzy"
+#. 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 ""
+
+msgid "on your left"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
-msgstr "Jeďte na %1$s silnici %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "za %i silnice"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "now"
-msgstr "nyní"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "%s dorazíte do cíle"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "vpravo"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "vlevo"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "mírně "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "silně "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Jeďte na %1$s silnici %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "za %i silnice"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Zabočte %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 "pak otočte se"
+
+#. 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 "Otočte se %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "pak otočte se"
+
+#. 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 "Otočte se %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
msgid "then you have reached your destination."
msgstr "pak budete v cíli."
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "%s dorazíte do cíle"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Ukončit"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Poloha"
@@ -1821,10 +1948,10 @@ msgstr "Body trasy"
msgid "Enter Coordinates"
msgstr "Zadejte souřadnice"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/cy.po.in b/po/cy.po.in
index ff8e87d0..f417c084 100644
--- a/po/cy.po.in
+++ b/po/cy.po.in
@@ -4,20 +4,20 @@
# Many thanks to the contributors of this translation:
# Padi Phillips https://launchpad.net/~padi
# Simon Hewison https://launchpad.net/~simon-hewison-6
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-01-18 20:41+0000\n"
"Last-Translator: Padi Phillips <Unknown>\n"
"Language-Team: Welsh <cy@li.org>\n"
+"Language: cy\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
"2 : 3;\n"
-"Language: cy\n"
msgid "Running from source directory\n"
msgstr ""
@@ -136,30 +136,53 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
-msgstr "allanfa"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -167,92 +190,196 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Dilynwch yr heol am y %s nesaf"
+
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "yn cryf "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. 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 ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+msgid "soon"
+msgstr "yn fuan"
+
+msgid "now"
+msgstr "nawr"
+
+msgid "then"
msgstr ""
-msgid "Enter the roundabout soon"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "then leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 "Follow the road for the next %s"
-msgstr "Dilynwch yr heol am y %s nesaf"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
-msgid "soon"
-msgstr "yn fuan"
+#. 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 ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Continue straight %1$s%2$s%3$s"
msgstr ""
-msgid "now"
-msgstr "nawr"
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr ""
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "yn cryf "
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Take the %1$s road to the %2$s"
msgstr ""
-msgid "error"
+#, c-format
+msgid "after %i roads"
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'
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr ""
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
msgstr ""
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr ""
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Allanfa"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1806,10 +1933,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/da.po.in b/po/da.po.in
index 9c1baf9b..18d631f7 100644
--- a/po/da.po.in
+++ b/po/da.po.in
@@ -11,19 +11,19 @@
# Ole Carlsen https://launchpad.net/~ole-carlsen-web
# Tomas Groth https://launchpad.net/~tomasgroth
# Uffe Kjems https://launchpad.net/~uffekjems
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:40+0000\n"
"Last-Translator: Lasse Luttermann <luttermann@silenzio.dk>\n"
"Language-Team: Glenn Sommer <glemsom@gmail.com>\n"
+"Language: da\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"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -141,63 +141,71 @@ msgid_plural "in %d kilometers"
msgstr[0] "om én kilometer"
msgstr[1] "om %d kilometer"
-msgid "exit"
-msgstr "afkørsel"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "op på rampen"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s ind i gaden %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%sind i %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s ind i %s%s%s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sind i %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%s ind i %s%s%s"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sind i %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%s ind i %s%s%s"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sind i %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
#, c-format
msgid "%sinto the %s"
msgstr "%sind i %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "højre"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "venstre"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "blødt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "skarpt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "Når muligt, vend venligst om"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Når muligt, vend venligst om"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Følg vejen de næste %s"
msgid "Enter the roundabout soon"
msgstr "Kør snart ind i rundkørslen"
@@ -205,59 +213,178 @@ msgstr "Kør snart ind i rundkørslen"
#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
msgid "Enter the roundabout %s"
+msgstr "Kør ind i rundkørslen %s"
+
+#. 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 "forlad så rundkørslen ved den %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 "Forlad rundkørslen ved den %1$s %2$s"
+
+msgid "soon"
+msgstr "snart"
+
+msgid "now"
+msgstr "nu"
+
+msgid "then"
+msgstr "så"
+
+#. 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 ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
-msgstr "Følg vejen de næste %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
-msgid "soon"
-msgstr "snart"
+msgid "on your left"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
-msgstr "Tag den %1$s vej til %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr "Tag den afkørslen %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 "after %i roads"
-msgstr "efter %i veje"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr "Tag den afkørslen %1$s %2$s%3$s"
-msgid "now"
-msgstr "nu"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Du er fremme ved destinationen %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "højre"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "venstre"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "blødt "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "skarpt "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Tag den %1$s vej til %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "efter %i veje"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Drej %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 "vend så om"
+
+#. 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 "Vend om %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "vend så om"
+
+#. 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 "Vend om %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "følg"
msgid "then you have reached your destination."
msgstr "og så ankommer du til din destination"
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Du er fremme ved destinationen %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Motorvejskryds"
+
+msgid "Exit"
+msgstr "Afkørsel"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Position"
@@ -1811,10 +1938,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/de.po.in b/po/de.po.in
index 5f79a20c..d220b0e9 100644
--- a/po/de.po.in
+++ b/po/de.po.in
@@ -34,19 +34,19 @@
# singesang https://launchpad.net/~singesang
# spaetz https://launchpad.net/~spaetz
# vsandre https://launchpad.net/~riedel-andre
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-04-22 22:10+0000\n"
"Last-Translator: Mathias Klein <ma_klein@gmx.de>\n"
"Language-Team: Martin Schaller <martin-s@sourceforge.net>\n"
+"Language: de\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"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -126,11 +126,11 @@ msgstr "In %d Metern"
#, c-format
msgid "%d.%d miles"
-msgstr "%d.%d Meilen"
+msgstr "%d,%d Meilen"
#, c-format
msgid "in %d.%d miles"
-msgstr "in %d.%d Meilen"
+msgstr "in %d,%d Meilen"
#, c-format
msgid "%d.%d kilometers"
@@ -164,30 +164,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "In einem Kilometer"
msgstr[1] "In %d Kilometern"
-msgid "exit"
-msgstr "Ausfahrt"
+#. 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 "%1$sauf die %2$s%3$s%4$s"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr "%1$sauf die Straße %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 "%1$sauf den %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 "%1$sauf die %2$s"
-msgid "into the ramp"
+#. 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 "%1$sauf das %2$s"
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "auf die Auffahrt"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%sauf die Straße %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%sauf den %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sauf die %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sauf das %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -195,34 +218,19 @@ msgstr "%sauf das %s%s%s"
msgid "%sinto the %s"
msgstr "%sauf die %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "rechts"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "links"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "leicht "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "scharf "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "sehr stark "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "unbekannt "
-
#
msgid "When possible, please turn around"
msgstr "Wenn möglich, bitte wenden"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr "in Richtung %s"
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Dem Straßenverlauf %s folgen"
+
msgid "Enter the roundabout soon"
msgstr "Demnächst in den Kreisverkehr einfahren"
@@ -231,22 +239,117 @@ msgstr "Demnächst in den Kreisverkehr einfahren"
msgid "Enter the roundabout %s"
msgstr "%s in den Kreisverkehr einfahren"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "anschliessend verlassen Sie den Kreisverkehr an der %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Verlassen Sie den Kreisverkehr an der %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr "anschließend verlassen Sie den Kreisverkehr an der %1$s %2$s"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Dem Straßenverlauf %s folgen"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr "Verlassen Sie den Kreisverkehr an der %1$s %2$s"
msgid "soon"
msgstr "Demnächst"
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "Jetzt"
+
+msgid "then"
+msgstr "dann"
+
+#. 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 "dann auf die%1$s auffahren"
+
+#. 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 "Fahren Sie %1$s%2$s auf"
+
+#. 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 "dann auf die%1$s auffahren"
+
+#. 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 "Fahren Sie %1$s%2$s auf"
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 "Nehmen Sie die Ausfahrt %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 "Nehmen Sie die Ausfahrt %1$s %2$s%3$s"
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr "am Autobahnknoten"
+
+msgid "at exit"
+msgstr "an der Ausfahrt"
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr "dann geradeaus fahren%1$s"
+
+# c-format
+#. 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 "Geradeaus fahren %1$s%2$s%3$s"
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr "dann rechts halten%1$s"
+
+# c-format
+# todo unify left/right string
+#. 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 "Rechts halten %1$s%2$s%3$s"
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr "dann links halten%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 "Links halten %1$s%2$s%3$s"
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "rechts"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "links"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "leicht "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "scharf "
+
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Die %1$s Straße %2$s abbiegen"
@@ -255,32 +358,59 @@ msgstr "Die %1$s Straße %2$s abbiegen"
msgid "after %i roads"
msgstr "nach %i Straßen"
-msgid "now"
-msgstr "Jetzt"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "dann die %1$s Straße %2$s abbiegen"
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Biegen Sie %1$s%2$s ab %3$s%4$s"
-msgid "error"
-msgstr "Fehler"
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "dann wenden"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "%3$s %1$s%2$s abbiegen%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr "Wenden Sie %1$s"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "dann wenden"
+
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "dann %3$s %1$s%2$s abbiegen%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Wenden Sie %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "folgen"
+msgid "then you have reached your destination."
+msgstr "dann haben Sie Ihr Ziel erreicht."
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Sie haben Ihr Ziel %s erreicht"
-msgid "then you have reached your destination."
-msgstr "dann haben Sie Ihr Ziel erreicht."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Autobahnknoten"
+
+msgid "Exit"
+msgstr "Ausfahrt"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1841,10 +1971,10 @@ msgstr "Wegpunkte"
msgid "Enter Coordinates"
msgstr "Koordinaten eingeben"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/de_CH.po.in b/po/de_CH.po.in
index a039fdc8..b5086c86 100644
--- a/po/de_CH.po.in
+++ b/po/de_CH.po.in
@@ -2,19 +2,19 @@
# Copyright (C) 2006-2014 The Navit Team
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2010-05-18 08:49+0000\n"
"Last-Translator: \n"
"Language-Team: German (Switzerland) <de_CH@li.org>\n"
+"Language: de_CH\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"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -132,30 +132,53 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -163,92 +186,196 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. 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 ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+msgid "soon"
msgstr ""
-msgid "Enter the roundabout soon"
+msgid "now"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr ""
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr ""
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
msgstr ""
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr ""
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1802,10 +1929,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/el.po.in b/po/el.po.in
index 130cd2da..56cd0897 100644
--- a/po/el.po.in
+++ b/po/el.po.in
@@ -8,19 +8,19 @@
# alichani https://launchpad.net/~alichani
# okiroi https://launchpad.net/~g-theodoroy
# vassilis https://launchpad.net/~kagemarou
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2014-12-07 10:54+0000\n"
"Last-Translator: aitolos <Unknown>\n"
"Language-Team: Greek <el@li.org>\n"
+"Language: el\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: el\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -138,88 +138,188 @@ msgid_plural "in %d kilometers"
msgstr[0] "σε ένα χιλιόμετρο"
msgstr[1] "σε %d χιλιόμετρα"
-msgid "exit"
-msgstr "έξοδος"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "στη ράμπα"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s στην οδό %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%sστην οδό %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%sστον %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sστην %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sστο %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 στην %s"
+msgstr "%sστην %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "δεξιά"
+msgid "When possible, please turn around"
+msgstr "Όταν είναι δυνατόν, κάνε αναστροφή"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "αριστερά"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "ελαφρά "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Ακολουθήστε το δρόμο για τα επόμενα %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "Κλειστά "
+msgid "Enter the roundabout soon"
+msgstr "Μπές στη κυκλική πορεία άμεσα"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "και βγείτε απο την κυκλική πορεία στην %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 "Εξοδος απο την κυκλική πορεία στην %1$s %2$s"
+
+msgid "soon"
+msgstr "σύντομα"
+
+msgid "now"
+msgstr "τώρα"
+
+msgid "then"
+msgstr "και"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Όταν είναι δυνατόν, κάνε αναστροφή"
+#. 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 ""
-msgid "Enter the roundabout soon"
-msgstr "Μπές στη κυκλική πορεία άμεσα"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
msgstr ""
+msgid "on your right"
+msgstr ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Ακολουθήστε το δρόμο για τα επόμενα %s"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "σύντομα"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "δεξιά"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "αριστερά"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "ελαφρά "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "κλειστά "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Πάρτε τον %1$s δρόμο για το %2$s"
@@ -228,32 +328,59 @@ msgstr "Πάρτε τον %1$s δρόμο για το %2$s"
msgid "after %i roads"
msgstr "μετά από %i δρόμους"
-msgid "now"
-msgstr "τώρα"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Στρίψτε %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Κάνε αναστροφή %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "και κάνε αναστροφή"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Κάνε αναστροφή %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "τότε έχετε φτάσει στον προορισμό σας."
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Φτάσατε στον προορισμό σας %s"
-msgid "then you have reached your destination."
-msgstr "τότε έχετε φτάσει στον προορισμό σας."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Εξοδος"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1808,10 +1935,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/en.po.in b/po/en.po.in
new file mode 100644
index 00000000..ca337896
--- /dev/null
+++ b/po/en.po.in
@@ -0,0 +1,2736 @@
+# English translations for navit
+# Copyright (C) 2006-2015 The Navit Team
+# This file is distributed under the same license as the navit package.
+msgid ""
+msgstr ""
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
+"PO-Revision-Date: 2015-05-14 13:03+0200\n"
+"Last-Translator: Michael von Glasow <michael@vonglasow.com>\n"
+"Language-Team: English <en@li.org>\n"
+"Language: en\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"
+"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
+
+msgid "Running from source directory\n"
+msgstr "Running from source directory\n"
+
+#, c-format
+msgid "setting '%s' to '%s'\n"
+msgstr "setting '%s' to '%s'\n"
+
+#. TRANSLATORS: the following counts refer to streets
+msgid "zeroth"
+msgstr "zeroth"
+
+msgid "first"
+msgstr "first"
+
+msgid "second"
+msgstr "second"
+
+msgid "third"
+msgstr "third"
+
+msgid "fourth"
+msgstr "fourth"
+
+msgid "fifth"
+msgstr "fifth"
+
+msgid "sixth"
+msgstr "sixth"
+
+#. TRANSLATORS: the following counts refer to roundabout exits
+msgid "zeroth exit"
+msgstr "zeroth exit"
+
+msgid "first exit"
+msgstr "first exit"
+
+msgid "second exit"
+msgstr "second exit"
+
+msgid "third exit"
+msgstr "third exit"
+
+msgid "fourth exit"
+msgstr "fourth exit"
+
+msgid "fifth exit"
+msgstr "fifth exit"
+
+msgid "sixth exit"
+msgstr "sixth exit"
+
+#, c-format
+msgid "%d m"
+msgstr "%d m"
+
+#, c-format
+msgid "in %d m"
+msgstr "in %d m"
+
+#, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
+msgid "%d meters"
+msgstr "%d meters"
+
+#, c-format
+msgid "in %d meters"
+msgstr "in %d meters"
+
+#, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d kilometers"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "in %d.%d kilometers"
+
+#, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "one kilometer"
+msgid_plural "%d kilometers"
+msgstr[0] "one kilometer"
+msgstr[1] "%d kilometers"
+
+#, c-format
+msgid "in one kilometer"
+msgid_plural "in %d kilometers"
+msgstr[0] "in one kilometer"
+msgstr[1] "in %d kilometers"
+
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 "%1$sonto %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 "%1$sonto %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 "%1$sonto %2$s"
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr "onto the motorway ramp"
+
+#. 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 ""
+
+#. 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 "%sinto %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 "%sinto %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 "%sinto %s%s%s"
+
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#, c-format
+msgid "%sinto the %s"
+msgstr "%sinto the %s"
+
+msgid "When possible, please turn around"
+msgstr "When possible, please turn around"
+
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Follow the road for the next %s"
+
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+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 %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 %1$s %2$s"
+msgstr ""
+
+msgid "soon"
+msgstr "soon"
+
+msgid "now"
+msgstr "now"
+
+msgid "then"
+msgstr ""
+
+#. 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 "then merge%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 "Merge %1$s%2$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 "then merge%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 "Merge %1$s%2$s"
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "right"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "left"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "easily "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "strongly "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Take the %1$s road to the %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "after %i roads"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Turn %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 "then make a U-turn"
+
+#. 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 "Make a U-turn %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "then make a U-turn"
+
+#. 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 "Make a U-turn %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "then you have reached your destination."
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "You have reached your destination %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Interchange"
+
+msgid "Exit"
+msgstr "Exit"
+
+#. Android resource: @strings/position_popup_title
+msgid "Position"
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Length"
+msgstr ""
+
+msgid "km"
+msgstr ""
+
+msgid "m"
+msgstr ""
+
+msgid "Time"
+msgstr ""
+
+msgid "Destination Length"
+msgstr ""
+
+msgid "Destination Time"
+msgstr ""
+
+msgid "Roadbook"
+msgstr ""
+
+#, c-format
+msgid "Waypoint %d"
+msgstr ""
+
+msgid "Visit before..."
+msgstr ""
+
+msgid "Set as position"
+msgstr ""
+
+msgid "Set as destination"
+msgstr ""
+
+msgid "Add as bookmark"
+msgstr ""
+
+#, c-format
+msgid "Point 0x%x 0x%x"
+msgstr ""
+
+#, c-format
+msgid "Screen coord : %d %d"
+msgstr ""
+
+#. 020
+msgid "Andorra"
+msgstr ""
+
+#. 784
+msgid "United Arab Emirates"
+msgstr ""
+
+#. 004
+msgid "Afghanistan"
+msgstr ""
+
+#. 028
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#. 660
+msgid "Anguilla"
+msgstr ""
+
+#. 008
+msgid "Albania"
+msgstr ""
+
+#. 051
+msgid "Armenia"
+msgstr ""
+
+#. 530
+msgid "Netherlands Antilles"
+msgstr ""
+
+#. 024
+msgid "Angola"
+msgstr ""
+
+#. 010
+msgid "Antarctica"
+msgstr ""
+
+#. 032
+msgid "Argentina"
+msgstr ""
+
+#. 016
+msgid "American Samoa"
+msgstr ""
+
+#. 040
+msgid "Austria"
+msgstr ""
+
+#. 036
+msgid "Australia"
+msgstr ""
+
+#. 533
+msgid "Aruba"
+msgstr ""
+
+#. 248
+msgid "Aland Islands"
+msgstr ""
+
+#. 031
+msgid "Azerbaijan"
+msgstr ""
+
+#. 070
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#. 052
+msgid "Barbados"
+msgstr ""
+
+#. 050
+msgid "Bangladesh"
+msgstr ""
+
+#. 056
+msgid "Belgium"
+msgstr ""
+
+#. 854
+msgid "Burkina Faso"
+msgstr ""
+
+#. 100
+msgid "Bulgaria"
+msgstr ""
+
+#. 048
+msgid "Bahrain"
+msgstr ""
+
+#. 108
+msgid "Burundi"
+msgstr ""
+
+#. 204
+msgid "Benin"
+msgstr ""
+
+#. 652
+msgid "Saint Barthelemy"
+msgstr ""
+
+#. 060
+msgid "Bermuda"
+msgstr ""
+
+#. 096
+msgid "Brunei Darussalam"
+msgstr ""
+
+#. 068
+msgid "Bolivia"
+msgstr ""
+
+#. 535
+msgid "Bonaire, Sint Eustatius and Saba"
+msgstr ""
+
+#. 076
+msgid "Brazil"
+msgstr ""
+
+#. 044
+msgid "Bahamas"
+msgstr ""
+
+#. 064
+msgid "Bhutan"
+msgstr ""
+
+#. 074
+msgid "Bouvet Island"
+msgstr ""
+
+#. 072
+msgid "Botswana"
+msgstr ""
+
+#. 112
+msgid "Belarus"
+msgstr ""
+
+#. 084
+msgid "Belize"
+msgstr ""
+
+#. 124
+msgid "Canada"
+msgstr ""
+
+#. 166
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#. 180
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
+#. 140
+msgid "Central African Republic"
+msgstr ""
+
+#. 178
+msgid "Congo"
+msgstr ""
+
+#. 756
+msgid "Switzerland"
+msgstr ""
+
+#. 384
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#. 184
+msgid "Cook Islands"
+msgstr ""
+
+#. 152
+msgid "Chile"
+msgstr ""
+
+#. 120
+msgid "Cameroon"
+msgstr ""
+
+#. 156
+msgid "China"
+msgstr ""
+
+#. 170
+msgid "Colombia"
+msgstr ""
+
+#. 188
+msgid "Costa Rica"
+msgstr ""
+
+#. 192
+msgid "Cuba"
+msgstr ""
+
+#. 132
+msgid "Cape Verde"
+msgstr ""
+
+#. 531
+msgid "Curacao"
+msgstr ""
+
+#. 162
+msgid "Christmas Island"
+msgstr ""
+
+#. 196
+msgid "Cyprus"
+msgstr ""
+
+#. 203
+msgid "Czech Republic"
+msgstr ""
+
+#. 276
+msgid "Germany"
+msgstr ""
+
+#. 262
+msgid "Djibouti"
+msgstr ""
+
+#. 208
+msgid "Denmark"
+msgstr ""
+
+#. 212
+msgid "Dominica"
+msgstr ""
+
+#. 214
+msgid "Dominican Republic"
+msgstr ""
+
+#. 012
+msgid "Algeria"
+msgstr ""
+
+#. 218
+msgid "Ecuador"
+msgstr ""
+
+#. 233
+msgid "Estonia"
+msgstr ""
+
+#. 818
+msgid "Egypt"
+msgstr ""
+
+#. 732
+msgid "Western Sahara"
+msgstr ""
+
+#. 232
+msgid "Eritrea"
+msgstr ""
+
+#. 724
+msgid "Spain"
+msgstr ""
+
+#. 231
+msgid "Ethiopia"
+msgstr ""
+
+#. 246
+msgid "Finland"
+msgstr ""
+
+#. 242
+msgid "Fiji"
+msgstr ""
+
+#. 238
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#. 583
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#. 234
+msgid "Faroe Islands"
+msgstr ""
+
+#. 250
+msgid "France"
+msgstr ""
+
+#. 266
+msgid "Gabon"
+msgstr ""
+
+#. 826
+msgid "United Kingdom"
+msgstr ""
+
+#. 308
+msgid "Grenada"
+msgstr ""
+
+#. 268
+msgid "Georgia"
+msgstr ""
+
+#. 254
+msgid "French Guiana"
+msgstr ""
+
+#. 831
+msgid "Guernsey"
+msgstr ""
+
+#. 288
+msgid "Ghana"
+msgstr ""
+
+#. 292
+msgid "Gibraltar"
+msgstr ""
+
+#. 304
+msgid "Greenland"
+msgstr ""
+
+#. 270
+msgid "Gambia"
+msgstr ""
+
+#. 324
+msgid "Guinea"
+msgstr ""
+
+#. 312
+msgid "Guadeloupe"
+msgstr ""
+
+#. 226
+msgid "Equatorial Guinea"
+msgstr ""
+
+#. 300
+msgid "Greece"
+msgstr ""
+
+#. 239
+msgid "South Georgia and the South Sandwich Islands"
+msgstr ""
+
+#. 320
+msgid "Guatemala"
+msgstr ""
+
+#. 316
+msgid "Guam"
+msgstr ""
+
+#. 624
+msgid "Guinea-Bissau"
+msgstr ""
+
+#. 328
+msgid "Guyana"
+msgstr ""
+
+#. 344
+msgid "Hong Kong"
+msgstr ""
+
+#. 334
+msgid "Heard Island and McDonald Islands"
+msgstr ""
+
+#. 340
+msgid "Honduras"
+msgstr ""
+
+#. 191
+msgid "Croatia"
+msgstr ""
+
+#. 332
+msgid "Haiti"
+msgstr ""
+
+#. 348
+msgid "Hungary"
+msgstr ""
+
+#. 360
+msgid "Indonesia"
+msgstr ""
+
+#. 372
+msgid "Ireland"
+msgstr ""
+
+#. 376
+msgid "Israel"
+msgstr ""
+
+#. 833
+msgid "Isle of Man"
+msgstr ""
+
+#. 356
+msgid "India"
+msgstr ""
+
+#. 086
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#. 368
+msgid "Iraq"
+msgstr ""
+
+#. 364
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#. 352
+msgid "Iceland"
+msgstr ""
+
+#. 380
+msgid "Italy"
+msgstr ""
+
+#. 832
+msgid "Jersey"
+msgstr ""
+
+#. 388
+msgid "Jamaica"
+msgstr ""
+
+#. 400
+msgid "Jordan"
+msgstr ""
+
+#. 392
+msgid "Japan"
+msgstr ""
+
+#. 404
+msgid "Kenya"
+msgstr ""
+
+#. 417
+msgid "Kyrgyzstan"
+msgstr ""
+
+#. 116
+msgid "Cambodia"
+msgstr ""
+
+#. 296
+msgid "Kiribati"
+msgstr ""
+
+#. 174
+msgid "Comoros"
+msgstr ""
+
+#. 659
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#. 408
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#. 410
+msgid "Korea, Republic of"
+msgstr ""
+
+#. 414
+msgid "Kuwait"
+msgstr ""
+
+#. 136
+msgid "Cayman Islands"
+msgstr ""
+
+#. 398
+msgid "Kazakhstan"
+msgstr ""
+
+#. 418
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#. 422
+msgid "Lebanon"
+msgstr ""
+
+#. 662
+msgid "Saint Lucia"
+msgstr ""
+
+#. 438
+msgid "Liechtenstein"
+msgstr ""
+
+#. 144
+msgid "Sri Lanka"
+msgstr ""
+
+#. 430
+msgid "Liberia"
+msgstr ""
+
+#. 426
+msgid "Lesotho"
+msgstr ""
+
+#. 440
+msgid "Lithuania"
+msgstr ""
+
+#. 442
+msgid "Luxembourg"
+msgstr ""
+
+#. 428
+msgid "Latvia"
+msgstr ""
+
+#. 434
+msgid "Libya"
+msgstr ""
+
+#. 504
+msgid "Morocco"
+msgstr ""
+
+#. 492
+msgid "Monaco"
+msgstr ""
+
+#. 498
+msgid "Moldova, Republic of"
+msgstr ""
+
+#. 499
+msgid "Montenegro"
+msgstr ""
+
+#. 663
+msgid "Saint Martin (French part)"
+msgstr ""
+
+#. 450
+msgid "Madagascar"
+msgstr ""
+
+#. 584
+msgid "Marshall Islands"
+msgstr ""
+
+#. 807
+msgid "Macedonia, the former Yugoslav Republic of"
+msgstr ""
+
+#. 466
+msgid "Mali"
+msgstr ""
+
+#. 104
+msgid "Myanmar"
+msgstr ""
+
+#. 496
+msgid "Mongolia"
+msgstr ""
+
+#. 446
+msgid "Macao"
+msgstr ""
+
+#. 580
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#. 474
+msgid "Martinique"
+msgstr ""
+
+#. 478
+msgid "Mauritania"
+msgstr ""
+
+#. 500
+msgid "Montserrat"
+msgstr ""
+
+#. 470
+msgid "Malta"
+msgstr ""
+
+#. 480
+msgid "Mauritius"
+msgstr ""
+
+#. 462
+msgid "Maldives"
+msgstr ""
+
+#. 454
+msgid "Malawi"
+msgstr ""
+
+#. 484
+msgid "Mexico"
+msgstr ""
+
+#. 458
+msgid "Malaysia"
+msgstr ""
+
+#. 508
+msgid "Mozambique"
+msgstr ""
+
+#. 516
+msgid "Namibia"
+msgstr ""
+
+#. 540
+msgid "New Caledonia"
+msgstr ""
+
+#. 562
+msgid "Niger"
+msgstr ""
+
+#. 574
+msgid "Norfolk Island"
+msgstr ""
+
+#. 566
+msgid "Nigeria"
+msgstr ""
+
+#. 558
+msgid "Nicaragua"
+msgstr ""
+
+#. 528
+msgid "Netherlands"
+msgstr ""
+
+#. 578
+msgid "Norway"
+msgstr ""
+
+#. 524
+msgid "Nepal"
+msgstr ""
+
+#. 520
+msgid "Nauru"
+msgstr ""
+
+#. 570
+msgid "Niue"
+msgstr ""
+
+#. 554
+msgid "New Zealand"
+msgstr ""
+
+#. 512
+msgid "Oman"
+msgstr ""
+
+#. 591
+msgid "Panama"
+msgstr ""
+
+#. 604
+msgid "Peru"
+msgstr ""
+
+#. 258
+msgid "French Polynesia"
+msgstr ""
+
+#. 598
+msgid "Papua New Guinea"
+msgstr ""
+
+#. 608
+msgid "Philippines"
+msgstr ""
+
+#. 586
+msgid "Pakistan"
+msgstr ""
+
+#. 616
+msgid "Poland"
+msgstr ""
+
+#. 666
+msgid "Saint Pierre and Miquelon"
+msgstr ""
+
+#. 612
+msgid "Pitcairn"
+msgstr ""
+
+#. 630
+msgid "Puerto Rico"
+msgstr ""
+
+#. 275
+msgid "Palestinian Territory, Occupied"
+msgstr ""
+
+#. 620
+msgid "Portugal"
+msgstr ""
+
+#. 585
+msgid "Palau"
+msgstr ""
+
+#. 600
+msgid "Paraguay"
+msgstr ""
+
+#. 634
+msgid "Qatar"
+msgstr ""
+
+#. 638
+msgid "Reunion"
+msgstr ""
+
+#. 642
+msgid "Romania"
+msgstr ""
+
+#. 688
+msgid "Serbia"
+msgstr ""
+
+#. 643
+msgid "Russian Federation"
+msgstr ""
+
+#. 646
+msgid "Rwanda"
+msgstr ""
+
+#. 682
+msgid "Saudi Arabia"
+msgstr ""
+
+#. 090
+msgid "Solomon Islands"
+msgstr ""
+
+#. 690
+msgid "Seychelles"
+msgstr ""
+
+#. 736
+msgid "Sudan"
+msgstr ""
+
+#. 752
+msgid "Sweden"
+msgstr ""
+
+#. 702
+msgid "Singapore"
+msgstr ""
+
+#. 654
+msgid "Saint Helena"
+msgstr ""
+
+#. 705
+msgid "Slovenia"
+msgstr ""
+
+#. 744
+msgid "Svalbard and Jan Mayen"
+msgstr ""
+
+#. 703
+msgid "Slovakia"
+msgstr ""
+
+#. 694
+msgid "Sierra Leone"
+msgstr ""
+
+#. 674
+msgid "San Marino"
+msgstr ""
+
+#. 686
+msgid "Senegal"
+msgstr ""
+
+#. 706
+msgid "Somalia"
+msgstr ""
+
+#. 740
+msgid "Suriname"
+msgstr ""
+
+#. 728
+msgid "South Sudan"
+msgstr ""
+
+#. 678
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#. 222
+msgid "El Salvador"
+msgstr ""
+
+#. 534
+msgid "Sint Maarten (Dutch part)"
+msgstr ""
+
+#. 760
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#. 748
+msgid "Swaziland"
+msgstr ""
+
+#. 796
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#. 148
+msgid "Chad"
+msgstr ""
+
+#. 260
+msgid "French Southern Territories"
+msgstr ""
+
+#. 768
+msgid "Togo"
+msgstr ""
+
+#. 764
+msgid "Thailand"
+msgstr ""
+
+#. 762
+msgid "Tajikistan"
+msgstr ""
+
+#. 772
+msgid "Tokelau"
+msgstr ""
+
+#. 626
+msgid "Timor-Leste"
+msgstr ""
+
+#. 795
+msgid "Turkmenistan"
+msgstr ""
+
+#. 788
+msgid "Tunisia"
+msgstr ""
+
+#. 776
+msgid "Tonga"
+msgstr ""
+
+#. 792
+msgid "Turkey"
+msgstr ""
+
+#. 780
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#. 798
+msgid "Tuvalu"
+msgstr ""
+
+#. 158
+msgid "Taiwan, Province of China"
+msgstr ""
+
+#. 834
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#. 804
+msgid "Ukraine"
+msgstr ""
+
+#. 800
+msgid "Uganda"
+msgstr ""
+
+#. 581
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#. 840
+msgid "United States"
+msgstr ""
+
+#. 858
+msgid "Uruguay"
+msgstr ""
+
+#. 860
+msgid "Uzbekistan"
+msgstr ""
+
+#. 336
+msgid "Holy See (Vatican City State)"
+msgstr ""
+
+#. 670
+msgid "Saint Vincent and the Grenadines"
+msgstr ""
+
+#. 862
+msgid "Venezuela"
+msgstr ""
+
+#. 092
+msgid "Virgin Islands, British"
+msgstr ""
+
+#. 850
+msgid "Virgin Islands, U.S."
+msgstr ""
+
+#. 704
+msgid "Viet Nam"
+msgstr ""
+
+#. 548
+msgid "Vanuatu"
+msgstr ""
+
+#. 876
+msgid "Wallis and Futuna"
+msgstr ""
+
+#. 882
+msgid "Samoa"
+msgstr ""
+
+#. 887
+msgid "Yemen"
+msgstr ""
+
+#. 175
+msgid "Mayotte"
+msgstr ""
+
+#. 710
+msgid "South Africa"
+msgstr ""
+
+#. 894
+msgid "Zambia"
+msgstr ""
+
+#. 716
+msgid "Zimbabwe"
+msgstr ""
+
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
+msgid ""
+"navit usage:\n"
+"navit [options] [configfile]\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"
+msgstr ""
+
+#. We have not found an existing config file from all possibilities
+msgid "No config file navit.xml, navit.xml.local found\n"
+msgstr ""
+
+#, c-format
+msgid "Error parsing config file '%s': %s\n"
+msgstr ""
+
+#, c-format
+msgid "Using config file '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "Error: No configuration found in config file '%s'\n"
+msgstr ""
+
+msgid ""
+"Internal initialization failed, exiting. Check previous error messages.\n"
+msgstr ""
+
+msgid "unknown street"
+msgstr ""
+
+#. Safe cast: attr_generic_set_attr does not modify its parameter.
+msgid "Unnamed vehicle"
+msgstr ""
+
+msgid "Failed to write bookmarks file"
+msgstr ""
+
+#. Strings from navit_shipped.xml
+msgid "Map Point"
+msgstr ""
+
+msgid "Car"
+msgstr ""
+
+msgid "Iso2"
+msgstr ""
+
+msgid "Iso3"
+msgstr ""
+
+msgid "Country"
+msgstr ""
+
+msgid "Postal"
+msgstr ""
+
+msgid "Town"
+msgstr ""
+
+msgid "District"
+msgstr ""
+
+msgid "Street"
+msgstr ""
+
+msgid "Number"
+msgstr ""
+
+msgid "Enter Destination"
+msgstr ""
+
+msgid "Zip Code"
+msgstr ""
+
+msgid "City"
+msgstr ""
+
+msgid "District/Township"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Bookmark"
+msgstr ""
+
+msgid "Destination"
+msgstr ""
+
+#. TRANSLATORS: These texts are for menu items in GTK GUI. The _ indicates the mnemonic key (=underlined character) for this menu item. Please place the _ before a suitable character in the translation (or omit it if no mnemonic key is desired).
+msgid "_Display"
+msgstr ""
+
+msgid "_Route"
+msgstr ""
+
+msgid "_Former Destinations"
+msgstr ""
+
+msgid "_Bookmarks"
+msgstr ""
+
+msgid "_Map"
+msgstr ""
+
+msgid "_Layout"
+msgstr ""
+
+msgid "_Projection"
+msgstr ""
+
+msgid "_Vehicle"
+msgstr ""
+
+msgid "Zoom_Out"
+msgstr ""
+
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
+msgstr ""
+
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
+msgstr ""
+
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
+msgstr ""
+
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
+msgstr ""
+
+msgid "Test"
+msgstr ""
+
+msgid "_Quit"
+msgstr ""
+
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
+
+msgid "_Lock on Road"
+msgstr ""
+
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr ""
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
+msgstr ""
+
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
+msgid "N"
+msgstr ""
+
+msgid "NE"
+msgstr ""
+
+msgid "E"
+msgstr ""
+
+msgid "SE"
+msgstr ""
+
+msgid "S"
+msgstr ""
+
+msgid "SW"
+msgstr ""
+
+msgid "W"
+msgstr ""
+
+msgid "NW"
+msgstr ""
+
+#. Android resource: @strings/no
+msgid "No"
+msgstr ""
+
+msgid "2D"
+msgstr ""
+
+msgid "3D"
+msgstr ""
+
+msgid "OT"
+msgstr ""
+
+#, c-format
+msgid "Route %4.0fkm %02d:%02d ETA"
+msgstr ""
+
+msgid "Route 0000km 0+00:00 ETA"
+msgstr ""
+
+msgid "Help"
+msgstr ""
+
+#, c-format
+msgid "Waypoint %s"
+msgstr ""
+
+msgid "Select waypoint to insert the new one before"
+msgstr ""
+
+msgid "View in Browser"
+msgstr ""
+
+msgid "Item type"
+msgstr ""
+
+#. Android resource: @strings/address_search_streets
+msgid "Streets"
+msgstr ""
+
+msgid "House numbers"
+msgstr ""
+
+msgid "View Attributes"
+msgstr ""
+
+msgid "Set as position (and deactivate vehicle)"
+msgstr ""
+
+msgid "POIs"
+msgstr ""
+
+msgid "View on map"
+msgstr ""
+
+msgid "Remove search results from the map"
+msgstr ""
+
+msgid "Show results on the map"
+msgstr ""
+
+msgid "Cut Bookmark"
+msgstr ""
+
+msgid "Copy Bookmark"
+msgstr ""
+
+msgid "Rename Bookmark"
+msgstr ""
+
+msgid "Paste Bookmark"
+msgstr ""
+
+msgid "Delete Bookmark"
+msgstr ""
+
+msgid "Delete waypoint"
+msgstr ""
+
+msgid "Bookmarks"
+msgstr ""
+
+msgid "Bookmarks as waypoints"
+msgstr ""
+
+msgid "Save waypoints"
+msgstr ""
+
+msgid "Replace with waypoints"
+msgstr ""
+
+msgid "Delete Folder"
+msgstr ""
+
+#. Adds the Bookmark folders
+msgid "Add Bookmark folder"
+msgstr ""
+
+#. Pastes the Bookmark
+msgid "Paste bookmark"
+msgstr ""
+
+#, c-format
+msgid "Bookmark %s"
+msgstr ""
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
+msgid "Show Satellite Status"
+msgstr ""
+
+msgid " Elevation "
+msgstr ""
+
+msgid " Azimuth "
+msgstr ""
+
+msgid "Show NMEA Data"
+msgstr ""
+
+msgid "car"
+msgstr ""
+
+msgid "bike"
+msgstr ""
+
+msgid "pedestrian"
+msgstr ""
+
+#, c-format
+msgid "Current profile: %s"
+msgstr ""
+
+#, c-format
+msgid "Change profile to: %s"
+msgstr ""
+
+msgid "Set as active"
+msgstr ""
+
+msgid "Show Satellite status"
+msgstr ""
+
+msgid "Show NMEA data"
+msgstr ""
+
+msgid "Add Bookmark"
+msgstr ""
+
+msgid "Rename"
+msgstr ""
+
+msgid "About Navit"
+msgstr ""
+
+#. Authors
+msgid "By"
+msgstr ""
+
+#. Contributors
+msgid "And all the Navit Team"
+msgstr ""
+
+msgid "members and contributors."
+msgstr ""
+
+msgid "Waypoints"
+msgstr ""
+
+msgid "Enter Coordinates"
+msgstr ""
+
+#.
+#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill);
+#. gui_internal_widget_append(wb, w);
+#.
+#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill);
+#. gui_internal_widget_append(w, we);
+msgid "Latitude Longitude"
+msgstr ""
+
+msgid "Enter coordinates, for example:"
+msgstr ""
+
+msgid "Vehicle"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Lock on road"
+msgstr ""
+
+msgid "Northing"
+msgstr ""
+
+msgid "Map follows Vehicle"
+msgstr ""
+
+msgid "Plan with Waypoints"
+msgstr ""
+
+msgid "Maps"
+msgstr ""
+
+msgid "Layout"
+msgstr ""
+
+msgid "Height Profile"
+msgstr ""
+
+msgid "Route Description"
+msgstr ""
+
+msgid "Show Locale"
+msgstr ""
+
+msgid "Former Destinations"
+msgstr ""
+
+msgid "- No former destinations available -"
+msgstr ""
+
+msgid "Message"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Back to map"
+msgstr ""
+
+msgid "Main Menu"
+msgstr ""
+
+msgid "House number"
+msgstr ""
+
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "partial match"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+msgid "Map data (c) OpenStreetMap contributors, ODBL"
+msgstr ""
+
+msgid ""
+"Current map location %s is not available\n"
+"Please restart Navit after you attach an SD card or select a different map "
+"location."
+msgstr ""
+
+msgid "Downloaded maps"
+msgstr ""
+
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "filenamePath"
+msgstr ""
+
+msgid ""
+"New location set to %s\n"
+"Restart Navit to apply the changes."
+msgstr ""
+
+msgid "Whole Planet"
+msgstr ""
+
+msgid "Africa"
+msgstr ""
+
+msgid "Canary Islands"
+msgstr ""
+
+msgid "Asia"
+msgstr ""
+
+msgid "Korea"
+msgstr ""
+
+msgid "Taiwan"
+msgstr ""
+
+msgid "UAE+Other"
+msgstr ""
+
+msgid "Oceania"
+msgstr ""
+
+msgid "Tasmania"
+msgstr ""
+
+msgid "Victoria"
+msgstr ""
+
+msgid "New South Wales"
+msgstr ""
+
+msgid "Europe"
+msgstr ""
+
+msgid "Western Europe"
+msgstr ""
+
+msgid "Azores"
+msgstr ""
+
+msgid "BeNeLux"
+msgstr ""
+
+msgid "Alsace"
+msgstr ""
+
+msgid "Aquitaine"
+msgstr ""
+
+msgid "Auvergne"
+msgstr ""
+
+msgid "Basse-Normandie"
+msgstr ""
+
+msgid "Bourgogne"
+msgstr ""
+
+msgid "Bretagne"
+msgstr ""
+
+msgid "Centre"
+msgstr ""
+
+msgid "Champagne-Ardenne"
+msgstr ""
+
+msgid "Corse"
+msgstr ""
+
+msgid "Franche-Comte"
+msgstr ""
+
+msgid "Haute-Normandie"
+msgstr ""
+
+msgid "Ile-de-France"
+msgstr ""
+
+msgid "Languedoc-Roussillon"
+msgstr ""
+
+msgid "Limousin"
+msgstr ""
+
+msgid "Lorraine"
+msgstr ""
+
+msgid "Midi-Pyrenees"
+msgstr ""
+
+msgid "Nord-pas-de-Calais"
+msgstr ""
+
+msgid "Pays-de-la-Loire"
+msgstr ""
+
+msgid "Picardie"
+msgstr ""
+
+msgid "Poitou-Charentes"
+msgstr ""
+
+msgid "Provence-Alpes-Cote-d-Azur"
+msgstr ""
+
+msgid "Rhone-Alpes"
+msgstr ""
+
+msgid "Baden-Wuerttemberg"
+msgstr ""
+
+msgid "Bayern"
+msgstr ""
+
+msgid "Mittelfranken"
+msgstr ""
+
+msgid "Niederbayern"
+msgstr ""
+
+msgid "Oberbayern"
+msgstr ""
+
+msgid "Oberfranken"
+msgstr ""
+
+msgid "Oberpfalz"
+msgstr ""
+
+msgid "Schwaben"
+msgstr ""
+
+msgid "Unterfranken"
+msgstr ""
+
+msgid "Berlin"
+msgstr ""
+
+msgid "Brandenburg"
+msgstr ""
+
+msgid "Bremen"
+msgstr ""
+
+msgid "Hamburg"
+msgstr ""
+
+msgid "Hessen"
+msgstr ""
+
+msgid "Mecklenburg-Vorpommern"
+msgstr ""
+
+msgid "Niedersachsen"
+msgstr ""
+
+msgid "Nordrhein-westfalen"
+msgstr ""
+
+msgid "Rheinland-Pfalz"
+msgstr ""
+
+msgid "Saarland"
+msgstr ""
+
+msgid "Sachsen-Anhalt"
+msgstr ""
+
+msgid "Sachsen"
+msgstr ""
+
+msgid "Schleswig-Holstein"
+msgstr ""
+
+msgid "Thueringen"
+msgstr ""
+
+msgid "Mallorca"
+msgstr ""
+
+msgid "Galicia"
+msgstr ""
+
+msgid "Scandinavia"
+msgstr ""
+
+msgid "England"
+msgstr ""
+
+msgid "Buckinghamshire"
+msgstr ""
+
+msgid "Cambridgeshire"
+msgstr ""
+
+msgid "Cumbria"
+msgstr ""
+
+msgid "East yorkshire with hull"
+msgstr ""
+
+msgid "Essex"
+msgstr ""
+
+msgid "Herefordshire"
+msgstr ""
+
+msgid "Kent"
+msgstr ""
+
+msgid "Lancashire"
+msgstr ""
+
+msgid "Leicestershire"
+msgstr ""
+
+msgid "Norfolk"
+msgstr ""
+
+msgid "Nottinghamshire"
+msgstr ""
+
+msgid "Oxfordshire"
+msgstr ""
+
+msgid "Shropshire"
+msgstr ""
+
+msgid "Somerset"
+msgstr ""
+
+msgid "South yorkshire"
+msgstr ""
+
+msgid "Suffolk"
+msgstr ""
+
+msgid "Surrey"
+msgstr ""
+
+msgid "Wiltshire"
+msgstr ""
+
+msgid "Scotland"
+msgstr ""
+
+msgid "Wales"
+msgstr ""
+
+msgid "Crete"
+msgstr ""
+
+msgid "North America"
+msgstr ""
+
+msgid "Alaska"
+msgstr ""
+
+msgid "Hawaii"
+msgstr ""
+
+msgid "USA"
+msgstr ""
+
+msgid " (except Alaska and Hawaii)"
+msgstr ""
+
+msgid "Midwest"
+msgstr ""
+
+msgid "Michigan"
+msgstr ""
+
+msgid "Ohio"
+msgstr ""
+
+msgid "Northeast"
+msgstr ""
+
+msgid "Massachusetts"
+msgstr ""
+
+msgid "Vermont"
+msgstr ""
+
+msgid "Pacific"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "Arkansas"
+msgstr ""
+
+msgid "District of Columbia"
+msgstr ""
+
+msgid "Florida"
+msgstr ""
+
+msgid "Louisiana"
+msgstr ""
+
+msgid "Maryland"
+msgstr ""
+
+msgid "Mississippi"
+msgstr ""
+
+msgid "Oklahoma"
+msgstr ""
+
+msgid "Texas"
+msgstr ""
+
+msgid "Virginia"
+msgstr ""
+
+msgid "West Virginia"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "Arizona"
+msgstr ""
+
+msgid "California"
+msgstr ""
+
+msgid "Colorado"
+msgstr ""
+
+msgid "Idaho"
+msgstr ""
+
+msgid "Montana"
+msgstr ""
+
+msgid "New Mexico"
+msgstr ""
+
+msgid "Nevada"
+msgstr ""
+
+msgid "Oregon"
+msgstr ""
+
+msgid "Utah"
+msgstr ""
+
+msgid "Washington State"
+msgstr ""
+
+msgid "South+Middle America"
+msgstr ""
+
+msgid "Guyane Francaise"
+msgstr ""
+
+msgid "downloading"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+msgid "Media selected for map storage is not available"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+msgid "Error downloading map!"
+msgstr ""
+
+msgid "Error writing map!"
+msgstr ""
+
+msgid "Map download aborted!"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
+msgid "Main menu"
+msgstr ""
+
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Tools"
+msgstr ""
+
+msgid "Route"
+msgstr ""
+
+msgid "About"
+msgstr ""
+
+msgid "Quit"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Fullscreen"
+msgstr ""
+
+msgid "Window Mode"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid ""
+"Drop last \n"
+"Waypoint"
+msgstr ""
+
+msgid ""
+"Drop next \n"
+"Waypoint"
+msgstr ""
+
+msgid "Satellite Status"
+msgstr ""
+
+msgid "NMEA Data"
+msgstr ""
+
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
+msgid "car_pedantic"
+msgstr ""
+
+msgid "horse"
+msgstr ""
+
+msgid "Truck"
+msgstr ""
+
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
+msgstr ""
+
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
+msgstr ""
+
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
+msgstr ""
+
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
+msgstr ""
+
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
+msgstr ""
+
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
+msgstr ""
+
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
+msgstr ""
+
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
+msgstr ""
+
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
+msgstr ""
+
+#. Android resource: @strings/address_search_title
+msgid "Address search"
+msgstr ""
+
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
+msgstr ""
+
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
+msgstr ""
+
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
+msgstr ""
+
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
+msgstr ""
+
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
+msgstr ""
+
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
+msgstr ""
+
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
+msgstr ""
+
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
+msgstr ""
+
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
+msgstr ""
+
+#. Android resource: @strings/restoring
+msgid "Restoring..."
+msgstr ""
+
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
+msgstr ""
+
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
+msgstr ""
+
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
+msgstr ""
+
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
+msgstr ""
+
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
+msgstr ""
+
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
+msgstr ""
+
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
+msgstr ""
+
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
+msgstr ""
+
+#. Android resource: @strings/select_backup
+msgid "Select backup"
+msgstr ""
+
+#. Android resource: @strings/backup
+msgid "Backup"
+msgstr ""
+
+#. Android resource: @strings/restore
+msgid "Restore"
+msgstr ""
+
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
+msgstr ""
+
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
+msgstr ""
diff --git a/po/en_AU.po.in b/po/en_AU.po.in
index 515b5f2f..e177a764 100644
--- a/po/en_AU.po.in
+++ b/po/en_AU.po.in
@@ -4,19 +4,19 @@
# Many thanks to the contributors of this translation:
# Athol Mullen https://launchpad.net/~athol-mullen
# KaZeR https://launchpad.net/~kazer
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:41+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: English (Australia) <en_AU@li.org>\n"
+"Language: en_AU\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"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -134,88 +134,188 @@ msgid_plural "in %d kilometers"
msgstr[0] "in one kilometre"
msgstr[1] "in %d kilometres"
-msgid "exit"
-msgstr "exit"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 "%1$sonto %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 "%1$sonto %2$s"
-msgid "into the ramp"
-msgstr "into the ramp"
+#. 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 "%1$sonto %2$s"
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr "onto the motorway ramp"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%sinto the %s%s%s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sinto %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%sinto the %s%s%s"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sinto %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%sinto the %s%s%s"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sinto %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
#, c-format
msgid "%sinto the %s"
msgstr "%sinto the %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "right"
+msgid "When possible, please turn around"
+msgstr "When possible, please turn around"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "easily "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Follow the road for the next %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "strongly "
+msgid "Enter the roundabout soon"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "When possible, please turn around"
+#. 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 ""
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "soon"
+
+msgid "now"
+msgstr "now"
+
+msgid "then"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
+msgstr "then merge%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 "Merge %1$s%2$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 "then merge%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 "Merge %1$s%2$s"
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Follow the road for the next %s"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "soon"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "right"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "left"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "easily "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "strongly "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Take the %1$s road to the %2$s"
@@ -224,32 +324,59 @@ msgstr "Take the %1$s road to the %2$s"
msgid "after %i roads"
msgstr "after %i roads"
-msgid "now"
-msgstr "now"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Turn %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "then make a U-turn"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Make a U-turn %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "then make a U-turn"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Make a U-turn %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "then you will have reached your destination"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "You have reached your destination %s"
-msgid "then you have reached your destination."
-msgstr "then you will have reached your destination"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Interchange"
+
+msgid "Exit"
+msgstr "Exit"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1804,10 +1931,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/en_CA.po.in b/po/en_CA.po.in
index 57578ddb..aac5067c 100644
--- a/po/en_CA.po.in
+++ b/po/en_CA.po.in
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# Frank Bax https://launchpad.net/~drw06g0w-qaens-52bk9e55
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2012-11-20 02:05+0000\n"
"Last-Translator: Frank Bax <frank@bax.on.ca>\n"
"Language-Team: English (Canada) <en_CA@li.org>\n"
+"Language: en_CA\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"
msgid "Running from source directory\n"
msgstr "Running from source directory\n"
@@ -132,88 +132,188 @@ msgid_plural "in %d kilometers"
msgstr[0] "in one kilometre"
msgstr[1] "in %d kilometres"
-msgid "exit"
-msgstr "exit"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 "%1$sonto %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 "%1$sonto %2$s"
-msgid "into the ramp"
-msgstr "into the ramp"
+#. 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 "%1$sonto %2$s"
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr "onto the motorway ramp"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%sinto the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sinto %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%sinto the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sinto %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%sinto the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sinto %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
#, c-format
msgid "%sinto the %s"
msgstr "%sinto the %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "right"
+msgid "When possible, please turn around"
+msgstr "When possible, please turn around"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "easily "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Follow the road for the next %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "strongly "
+msgid "Enter the roundabout soon"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "When possible, please turn around"
+#. 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 ""
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "soon"
+
+msgid "now"
+msgstr "now"
+
+msgid "then"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
+msgstr "then merge%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 "Merge %1$s%2$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 "then merge%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 "Merge %1$s%2$s"
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Follow the road for the next %s"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "soon"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "right"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "left"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "easily "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "strongly "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Take the %1$s road to the %2$s"
@@ -222,32 +322,59 @@ msgstr "Take the %1$s road to the %2$s"
msgid "after %i roads"
msgstr "after %i roads"
-msgid "now"
-msgstr "now"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Turn %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "then make a U-turn"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Make a U-turn %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "then make a U-turn"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Make a U-turn %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "then you have reached your destination."
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "You have reached your destination %s"
-msgid "then you have reached your destination."
-msgstr "then you have reached your destination."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Interchange"
+
+msgid "Exit"
+msgstr "Exit"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1802,10 +1929,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/en_GB.po.in b/po/en_GB.po.in
index e7e3b13d..973c689a 100644
--- a/po/en_GB.po.in
+++ b/po/en_GB.po.in
@@ -10,19 +10,19 @@
# Stephen Irons https://launchpad.net/~stephen-irons
# half_monkey https://launchpad.net/~d-r-williams-01
# lopho https://launchpad.net/~lopho
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2014-11-12 10:10+0000\n"
"Last-Translator: Andi Chandler <Unknown>\n"
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"Language: en_GB\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"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -140,63 +140,71 @@ msgid_plural "in %d kilometers"
msgstr[0] "in one kilometre"
msgstr[1] "in %d kilometres"
-msgid "exit"
-msgstr "exit"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 "%1$sonto %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 "%1$sonto %2$s"
-msgid "into the ramp"
+#. 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 "%1$sonto %2$s"
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "onto the slip road"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%sonto the street %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%sonto the %s%s%s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sinto %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%sonto the %s%s%s"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sinto %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%sonto the %s%s%s"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sinto %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
#, c-format
msgid "%sinto the %s"
msgstr "%sonto the %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "right"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "left"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "easily "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "strongly "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "When possible, please turn around"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "When possible, please turn around"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Follow the road for the next %s"
msgid "Enter the roundabout soon"
msgstr "Enter the roundabout soon"
@@ -206,57 +214,176 @@ msgstr "Enter the roundabout soon"
msgid "Enter the roundabout %s"
msgstr "Enter the roundabout %s"
+#. 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 ""
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Follow the road for the next %s"
-
msgid "soon"
msgstr "soon"
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "now"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Take the %1$s road to the %2$s"
-msgstr "Take the %1$s road to the %2$s"
+msgid "then merge%1$s|right"
+msgstr "then merge%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 "after %i roads"
-msgstr "after %i roads"
+msgid "Merge %1$s%2$s|right"
+msgstr "Merge %1$s%2$s"
-msgid "now"
-msgstr "now"
+#. 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 "then merge%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 "then take the %1$s road to the %2$s"
+msgid "Merge %1$s%2$s|left"
+msgstr "Merge %1$s%2$s"
+
+msgid "on your left"
msgstr ""
-msgid "error"
+msgid "on your right"
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 exit ref and/or name, the second is the direction of exit and the third is distance
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Take exit %1$s %2$s %3$s"
+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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "then continue straight%1$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "You have reached your destination %s"
-msgstr "You have reached your destination %s"
+msgid "Continue straight %1$s%2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "right"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "left"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "easily "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "strongly "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Take the %1$s road to the %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "after %i roads"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Turn %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 "then make a U-turn"
+
+#. 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 "Make a U-turn %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "then make a U-turn"
+
+#. 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 "Make a U-turn %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
msgid "then you have reached your destination."
msgstr "then you have reached your destination"
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "You have reached your destination %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Interchange"
+
+msgid "Exit"
+msgstr "Exit"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Position"
@@ -1811,10 +1938,10 @@ msgstr "Waypoints"
msgid "Enter Coordinates"
msgstr "Enter Coordinates"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/eo.po.in b/po/eo.po.in
index 67e485b0..4414815a 100644
--- a/po/eo.po.in
+++ b/po/eo.po.in
@@ -6,19 +6,19 @@
# Lucas Larson https://launchpad.net/~lucaslarson
# Michael Moroni https://launchpad.net/~airon90
# OlivierWeb https://launchpad.net/~olivierweb
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-27 21:43+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Esperanto <eo@li.org>\n"
+"Language: eo\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: eo\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -136,30 +136,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "en unu kilometron"
msgstr[1] "en %d kilometrojn"
-msgid "exit"
-msgstr "eliro"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "al la ramplon"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%sal la straton %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%sal la %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%sal la %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sal la %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sal la %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -167,57 +190,134 @@ msgstr "%sal la %s%s%s"
msgid "%sinto the %s"
msgstr "%sal la %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "dekstren"
+msgid "When possible, please turn around"
+msgstr "Kiam eble, bonvole ĉirkaŭturnu"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "maldekstren"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "facile "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Sekvu la straton ĝis la sekva %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "forte "
+msgid "Enter the roundabout soon"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "do lasu la trafikcirklon ĉe 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 "Lasu la trafikcirklon ĉe la %1$s %2$s"
+
+msgid "soon"
+msgstr "baldaŭ"
+
+msgid "now"
+msgstr "nun"
+
+msgid "then"
+msgstr "do"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Kiam eble, bonvole ĉirkaŭturnu"
+#. 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 ""
-msgid "Enter the roundabout soon"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Sekvu la straton ĝis la sekva %s"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "baldaŭ"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "dekstren"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "maldekstren"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "facile "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "forte "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Turnu %2$s ĉe la strato %1$s"
@@ -226,32 +326,59 @@ msgstr "Turnu %2$s ĉe la strato %1$s"
msgid "after %i roads"
msgstr "post %i stratoj"
-msgid "now"
-msgstr "nun"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Turnu %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "do ĉirkaŭturnu"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Ĉirkaŭturnu %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "do ĉirkaŭturnu"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|right"
+msgstr "Ĉirkaŭturnu %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "sekvu"
+msgid "then you have reached your destination."
+msgstr "do vi atingis la celon"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Vi atingis la celon %s"
-msgid "then you have reached your destination."
-msgstr "do vi atingis la celon"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Eliro"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1806,10 +1933,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/es.po.in b/po/es.po.in
index 24fccfb0..b57d5bad 100644
--- a/po/es.po.in
+++ b/po/es.po.in
@@ -19,19 +19,19 @@
# marZiano https://launchpad.net/~m3marte
# pataquets https://launchpad.net/~pataquets
# singesang https://launchpad.net/~singesang
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-12-18 16:54+0000\n"
"Last-Translator: iceman75 <Unknown>\n"
"Language-Team: Chris Eubank <cteubank@gmail.com>\n"
+"Language: es\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"
msgid "Running from source directory\n"
msgstr "Ejecutando desde el directorio fuente\n"
@@ -148,64 +148,72 @@ msgid_plural "in %d kilometers"
msgstr[0] "en un kilómetro"
msgstr[1] "en %d kilómetros"
-msgid "exit"
-msgstr "salir"
-
-msgid "into the ramp"
-msgstr "en la salida"
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s en la calle %s %s %s"
+msgid "%1$sonto the %2$s%3$s%4$s"
+msgstr "%1$sen la %2$s%3$s%4$s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
#, c-format
-msgid "%sinto the %s%s%s|male form"
-msgstr "%s en el %s%s%s"
+msgid "%1$sonto %2$s"
+msgstr "%1$sen la carretera %2$s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|female form"
-msgstr "%s en la %s%s%s"
+msgid "%1$sonto %2$s|masculine form"
+msgstr "%1$sen el %2$s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|neutral form"
-msgstr "%s en %s%s%s"
+msgid "%1$sonto %2$s|feminine form"
+msgstr "%1$sen la %2$s"
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s"
-msgstr "%s en la %s"
+msgid "%1$sonto %2$s|neuter form"
+msgstr "%1$sen la carretera %2$s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "a la derecha"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr "en el carril de entrada"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "a la izquierda"
+#. 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 "%sen la calle %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "ligeramente "
+#. 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 "%sen el %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "bruscamente "
+#. 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 "%sen la %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+#. 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 "%sen la calle %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr ""
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#, c-format
+msgid "%sinto the %s"
+msgstr "%sen la %s"
msgid "When possible, please turn around"
msgstr "Dé la vuelta cuando sea posible"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr "hacia %s"
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Continúe en esta carretera durante %s"
+
msgid "Enter the roundabout soon"
msgstr "Entre en la próxima rotonda"
@@ -214,22 +222,114 @@ msgstr "Entre en la próxima rotonda"
msgid "Enter the roundabout %s"
msgstr "Entre en la rotonda %s"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr ""
+msgid "then leave the roundabout at the %1$s %2$s"
+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 %s"
-msgstr ""
-
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Continúe en esta carretera durante %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr "Salga de la rotonda por la %1$s %2$s"
msgid "soon"
msgstr "próximamente"
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "ahora"
+
+msgid "then"
+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 "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 "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 "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 "Entre%2$s %1$s"
+
+msgid "on your left"
+msgstr "a la izquierda"
+
+msgid "on your right"
+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 "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 "Tome la salida %1$s %2$s%3$s"
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr "al enlace"
+
+msgid "at exit"
+msgstr "a la salida"
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+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 "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 "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 "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 "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 "Manténgase por la izquierda %1$s%2$s%3$s"
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "a la derecha"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "a la izquierda"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "ligeramente "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "bruscamente "
+
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Tome la %1$s carretera %2$s"
@@ -238,32 +338,59 @@ msgstr "Tome la %1$s carretera %2$s"
msgid "after %i roads"
msgstr "después de %i carreteras"
-msgid "now"
-msgstr "ahora"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Gire %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "luego dé la vuelta"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Dé la vuelta %1$s"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+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 "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|right"
+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
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "continúe"
+
+msgid "then you have reached your destination."
+msgstr "entonces ha llegado a su destino."
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Ha llegado a su destino %s"
-msgid "then you have reached your destination."
-msgstr "entonces ha llegado a su destino."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Enlace"
+
+msgid "Exit"
+msgstr "Salida"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1518,19 +1645,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 ""
@@ -1542,19 +1669,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 ""
@@ -1821,10 +1948,10 @@ msgstr "Puntos de paso"
msgid "Enter Coordinates"
msgstr "Introduzca coordenadas"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
@@ -1898,7 +2025,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"
@@ -2062,16 +2189,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"
diff --git a/po/et.po.in b/po/et.po.in
index 2f939960..2b738881 100644
--- a/po/et.po.in
+++ b/po/et.po.in
@@ -7,19 +7,19 @@
# Manuel Hohmann https://launchpad.net/~mhohmann
# lyyser https://launchpad.net/~lyyser
# thucar https://launchpad.net/~rait
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-04-13 06:57+0000\n"
"Last-Translator: Manuel Hohmann <mhohmann@physnet.uni-hamburg.de>\n"
"Language-Team: Estonian <et@li.org>\n"
+"Language: et\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: et\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -137,30 +137,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "ühe kilomeetri pärast"
msgstr[1] "%d kilomeetri pärast"
-msgid "exit"
-msgstr "mahasõit"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
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 the street %s%s%s"
+msgid "%sinto %s%s%s"
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. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
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. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
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. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%s %s%s%s tänavale"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -168,32 +191,17 @@ msgstr "%s %s%s%s tänavale"
msgid "%sinto the %s"
msgstr "%steele %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "paremale"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "vasakule"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "laugelt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "järsult "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "väga järsult "
+msgid "When possible, please turn around"
+msgstr "Kui võimalik, palun pööra ümber"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Kui võimalik, palun pööra ümber"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Mööda teed järgmised %s"
msgid "Enter the roundabout soon"
msgstr "Sõida varsti ringteele"
@@ -203,22 +211,114 @@ msgstr "Sõida varsti ringteele"
msgid "Enter the roundabout %s"
msgstr "Ringteeni %s"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "siis lahku ringteelt %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+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 %s"
-msgstr "Lahku ringteelt %s"
-
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Mööda teed järgmised %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr "Lahku ringteelt %1$s %2$s"
msgid "soon"
msgstr "varsti"
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "nüüd"
+
+msgid "then"
+msgstr "siis"
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "paremale"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "vasakule"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "laugelt "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "järsult "
+
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Vali %1$s tee, mis viib %2$s"
@@ -227,32 +327,59 @@ msgstr "Vali %1$s tee, mis viib %2$s"
msgid "after %i roads"
msgstr "pärast %i teed"
-msgid "now"
-msgstr "nüüd"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "siis vali %1$s mis viib %2$s"
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Pööra %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr "viga"
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "siis pööra ümber"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Pööra %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+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 "siis pööra ümber"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "siis pööra %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+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
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
+msgid "then you have reached your destination."
+msgstr "siis oled jõudnud sihtpunkti."
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Sa oled jõudnud sihtpunkti %s"
-msgid "then you have reached your destination."
-msgstr "siis oled jõudnud sihtpunkti."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Mahasõit"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1809,10 +1936,10 @@ msgstr "Teekonnapunktid"
msgid "Enter Coordinates"
msgstr "Sisesta koordinaadid"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/eu.po.in b/po/eu.po.in
index 58e516a4..2b4961d9 100644
--- a/po/eu.po.in
+++ b/po/eu.po.in
@@ -4,19 +4,19 @@
# Many thanks to the contributors of this translation:
# Inaki Saez https://launchpad.net/~inaki-saez
# mikel https://launchpad.net/~mikel85
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:42+0000\n"
"Last-Translator: Inaki Saez <Inaki.Saez@gmail.com>\n"
"Language-Team: Basque <eu@li.org>\n"
+"Language: eu\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: eu\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -134,30 +134,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "kilometro batean"
msgstr[1] "%d kilometrotan"
-msgid "exit"
-msgstr "irteera"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "maldan"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%s %s %s %s kalean"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%s %s%s%s-an"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%s %s%s%s-an"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%s %s%s%s-en"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -165,57 +188,134 @@ msgstr "%s %s%s%s-en"
msgid "%sinto the %s"
msgstr "%s %s-an"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "eskuina"
+msgid "When possible, please turn around"
+msgstr "Ahal duzunean eman itzulia, mesedez"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "ezkerra"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "pizka bat "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Jarraitu bidean urrengo %s-arte"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "gogorki "
+msgid "Enter the roundabout soon"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "gero, irten errotondatik %1$s-ean %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 "Irten errotondatik %1$s-ean %2$s"
+
+msgid "soon"
+msgstr "hurrengotan"
+
+msgid "now"
+msgstr "orain"
+
+msgid "then"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Ahal duzunean eman itzulia, mesedez"
+#. 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 ""
-msgid "Enter the roundabout soon"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|left"
+msgstr ""
+
+#. 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 ""
+
+msgid "on your left"
msgstr ""
+msgid "on your right"
+msgstr ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Jarraitu bidean urrengo %s-arte"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "hurrengotan"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "eskuina"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "ezkerra"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "pizka bat "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "gogorki "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Hartu %1$s bidea %2$s-ean"
@@ -224,32 +324,59 @@ msgstr "Hartu %1$s bidea %2$s-ean"
msgid "after %i roads"
msgstr "%i bideen ondoren"
-msgid "now"
-msgstr "orain"
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Biratu %1$s%2$s-ra %3$s%4$s-tan"
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
-msgid "error"
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
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 arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "dagoeneko helburura iritsi zara"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "%s helburura iritsi zara"
-msgid "then you have reached your destination."
-msgstr "dagoeneko helburura iritsi zara"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Irteera"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1804,10 +1931,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/fa.po.in b/po/fa.po.in
index d5d69708..ff9ce283 100644
--- a/po/fa.po.in
+++ b/po/fa.po.in
@@ -4,19 +4,19 @@
# Many thanks to the contributors of this translation:
# salix https://launchpad.net/~s-shahsa
# the_cephalex https://launchpad.net/~ali-rashidi
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2014-06-28 21:57+0000\n"
"Last-Translator: the_cephalex <Unknown>\n"
"Language-Team: Persian <fa@li.org>\n"
+"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Language: fa\n"
msgid "Running from source directory\n"
msgstr ""
@@ -133,64 +133,72 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
-msgstr "بیرون"
-
-msgid "into the ramp"
-msgstr "به سوی شیب"
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%1$sonto the %2$s%3$s%4$s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
#, c-format
-msgid "%sinto the %s%s%s|male form"
+msgid "%1$sonto %2$s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|female form"
+msgid "%1$sonto %2$s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|neutral form"
+msgid "%1$sonto %2$s|feminine form"
msgstr ""
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s"
+msgid "%1$sonto %2$s|neuter form"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "راست"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr "به سوی شیب"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "چپ"
+#. 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 ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "به آسانی "
+#. 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 ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "به سختی "
+#. 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 ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. 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 ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#, c-format
+msgid "%sinto the %s"
msgstr ""
msgid "When possible, please turn around"
msgstr "هنگامیکه توانستید برگردید."
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr ""
+
msgid "Enter the roundabout soon"
msgstr "به زودی به فلکه بروید"
@@ -199,57 +207,176 @@ 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 arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Follow the road for the next %s"
+msgid "then merge%1$s|right"
msgstr ""
-msgid "soon"
-msgstr "به زودی"
+#. 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 ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Take the %1$s road to the %2$s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "after %i roads"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "now"
-msgstr "اکنون"
+msgid "on your left"
+msgstr ""
+msgid "on your right"
+msgstr ""
+
+#. 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 "then take the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "راست"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "چپ"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "به آسانی "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "به سختی "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr ""
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
msgstr ""
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr "سپس شما به خواستگاه خود رسیده اید."
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "بیرون"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "جایگاه"
@@ -1803,10 +1930,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/fi.po.in b/po/fi.po.in
index df255eaf..af18088c 100644
--- a/po/fi.po.in
+++ b/po/fi.po.in
@@ -9,19 +9,19 @@
# Ossi Berg https://launchpad.net/~fso-polonez
# Roadrunner IN https://launchpad.net/~online
# Timo Jyrinki https://launchpad.net/~timo-jyrinki
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:42+0000\n"
"Last-Translator: Timo Jyrinki <timo.jyrinki@canonical.com>\n"
"Language-Team: Ossi Berg <o.berg@mail.com>\n"
+"Language: fi\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"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -139,30 +139,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "Yhden kilometrin päästä"
msgstr[1] "%d kilometrin päästä"
-msgid "exit"
-msgstr "poistumistie"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "rampille"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%skadulle %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%skadulle %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%skadulle %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%skadulle %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -170,92 +193,196 @@ msgstr "%skadulle %s%s%s"
msgid "%sinto the %s"
msgstr "%stielle %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "oikealle"
+msgid "When possible, please turn around"
+msgstr "Kun mahdollista, tee u-käännös"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "vasemmalle"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "loivasti "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Seuraa tätä tietä %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "jyrkästi "
+msgid "Enter the roundabout soon"
+msgstr "Liity liikenneympyrään pian"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Kun mahdollista, tee u-käännö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 ""
-msgid "Enter the roundabout soon"
-msgstr "Liity liikenneympyrään pian"
+msgid "soon"
+msgstr "pian"
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr "nyt"
+
+msgid "then"
+msgstr "sitten"
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
-msgstr "Seuraa tätä tietä %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
-msgid "soon"
-msgstr "pian"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
-msgstr "Valitse %1$s tie suuntaan %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "%i tien jälkeen"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "now"
-msgstr "nyt"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Olet saavuttanut kohteesi %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "oikealle"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "vasemmalle"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "loivasti "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "jyrkästi "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Valitse %1$s tie suuntaan %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "%i tien jälkeen"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Käänny %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 "tee sitten u-käännös"
+
+#. 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 "Tee u-käännös %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "tee sitten u-käännös"
+
+#. 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 "Tee u-käännös %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
msgid "then you have reached your destination."
msgstr "sitten olet perillä."
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Olet saavuttanut kohteesi %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Poistumistie"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Sijainti"
@@ -1501,8 +1628,7 @@ msgid "_Autozoom"
msgstr "Autom. suurennus"
msgid "Enable/disable automatic zoom level changing"
-msgstr ""
-"Ota automaattinen lähennystason muuttaminen käyttöön tai pois käytöstä"
+msgstr "Ota automaattinen lähennystason muuttaminen käyttöön tai pois käytöstä"
msgid "_Fullscreen"
msgstr "Koko ruutu"
@@ -1814,10 +1940,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/fil.po.in b/po/fil.po.in
index be3aaa3f..bfcb7c01 100644
--- a/po/fil.po.in
+++ b/po/fil.po.in
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# chito https://launchpad.net/~cnuarin
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2012-09-26 07:21+0000\n"
"Last-Translator: chito <cnuarin@gmail.com>\n"
"Language-Team: Filipino <fil@li.org>\n"
+"Language: fil\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: fil\n"
msgid "Running from source directory\n"
msgstr ""
@@ -132,123 +132,250 @@ msgid_plural "in %d kilometers"
msgstr[0] "sa loob ng isang kilometro"
msgstr[1] "sa loob ng %d kilometro"
-msgid "exit"
-msgstr "labasan"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%s sa kalyeng %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 "%s sa kalyeng %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 "%s sa kalyeng %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%s sa kalyeng %s%s%s"
+
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#, c-format
+msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+msgid "When possible, please turn around"
+msgstr "Kung maari ay bumalik"
+
+#. TRANSLATORS: the argument is the destination to follow
#, c-format
-msgid "%sinto the %s%s%s|female form"
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|neutral form"
+msgid "Follow the road for the next %s"
+msgstr "Sundan ang kalye sa susunod na %s"
+
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
-msgid "%sinto the %s"
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "kanan"
+#. 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 "pagkatapos ay lumabas sa rotonda sa may %1$s %2$s"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "Kaliwa"
+#. 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 "Lisanin ang rotonda sa may %1$s %2$s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "ng marahan "
+msgid "soon"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "now"
+msgstr "ngayon na"
+
+msgid "then"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. 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 ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "kung maari ay bumalik"
+#. 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 ""
-msgid "Enter the roundabout soon"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 "Enter the roundabout %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then continue straight%1$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Sundan ang kalye sa susunod na %s"
+msgid "Continue straight %1$s%2$s%3$s"
+msgstr ""
-msgid "soon"
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "Take the %1$s road to the %2$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "after %i roads"
+msgid "then keep left%1$s"
msgstr ""
-msgid "now"
-msgstr "ngayon na"
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "kanan"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "Kaliwa"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "ng marahan "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Take the %1$s road to the %2$s"
msgstr ""
-msgid "error"
+#, c-format
+msgid "after %i roads"
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'
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr ""
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
msgstr ""
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr ""
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Labasan"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1802,10 +1929,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/fo.po.in b/po/fo.po.in
index b5dd2a33..dc9f8eda 100644
--- a/po/fo.po.in
+++ b/po/fo.po.in
@@ -4,19 +4,19 @@
# Many thanks to the contributors of this translation:
# Cyberish https://launchpad.net/~cyberish
# Gunleif Joensen https://launchpad.net/~gunleif
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:42+0000\n"
"Last-Translator: Cyberish <kajsten@gmail.com>\n"
"Language-Team: Faroese <fo@li.org>\n"
+"Language: fo\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: fo\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -134,30 +134,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "um ein kilometur"
msgstr[1] "um %d kilometrar"
-msgid "exit"
-msgstr "avkoyring"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "uppá rampuna"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%sinná gøtuna %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%sinto the %s%s%sur"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sinná %s%s%sur"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%sinto the %s%s%sa"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sinná %s%s%sa"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sinná %s%s%si"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -165,57 +188,134 @@ msgstr "%sinná %s%s%si"
msgid "%sinto the %s"
msgstr "%sinná %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "Høgra"
+msgid "When possible, please turn around"
+msgstr "Vend um skótast tilber"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "Vinstra"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "lætt "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "fylg vegnum tær næstu %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "knapt "
+msgid "Enter the roundabout soon"
+msgstr "Um lítið bil verður koyrt inní rundkoyringina"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "far so út úr rundkoyring við %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 "Far so út úr rundkoyring við %1$s %2$s"
+
+msgid "soon"
+msgstr "skjótt"
+
+msgid "now"
+msgstr "nú"
+
+msgid "then"
+msgstr "so"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "vend um skótast tilber"
+#. 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 ""
-msgid "Enter the roundabout soon"
-msgstr "Um lítið bil verður koyrt inní rundkoyringina"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
msgstr ""
+msgid "on your right"
+msgstr ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "fylg vegnum tær næstu %s"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "skjótt"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "Høgra"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "Vinstra"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "lætt "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "knapt "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "tak tann %1$s vegin til %2$s"
@@ -224,32 +324,59 @@ msgstr "tak tann %1$s vegin til %2$s"
msgid "after %i roads"
msgstr "eftir %i vegir"
-msgid "now"
-msgstr "nú"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "dreya %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "vend so um"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Vend um %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "vend so um"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Vend um %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "tá hevur tú nátt tínum ferðamáli"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Tú hevur nátt tínum ferðamáli %s"
-msgid "then you have reached your destination."
-msgstr "tá hevur tú nátt tínum ferðamáli"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Avkoyring"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1804,10 +1931,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/fr.po.in b/po/fr.po.in
index a48e9ef1..fd7a50e2 100644
--- a/po/fr.po.in
+++ b/po/fr.po.in
@@ -23,19 +23,19 @@
# metehyi https://launchpad.net/~metehyi
# pierre https://launchpad.net/~pmghost4
# yannick56 https://launchpad.net/~yleny
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-04-21 18:51+0000\n"
"Last-Translator: Jean Marc <Unknown>\n"
"Language-Team: KaZeR <kazer@altern.org>\n"
+"Language: fr\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: fr\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -153,30 +153,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "dans un kilomètre"
msgstr[1] "dans %d kilomètres"
-msgid "exit"
-msgstr "sortie"
+#. 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 "%1$svers %2$s%3$s%4$s"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr "%1$svers %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 "%1$svers le %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 "%1$svers la %2$s"
-msgid "into the ramp"
-msgstr "vers la sortie"
+#. 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 "%1$svers l'%2$s"
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr "vers la bretelle"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%sdans %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%ssur %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%ssur le %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%ssur le %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%sdans la %s%s%s"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%ssur la %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%ssur l'%s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -184,36 +207,18 @@ msgstr "%ssur l'%s%s%s"
msgid "%sinto the %s"
msgstr "%svers la %s"
-# tournez à droite
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "à droite"
-
-# tournez à gauche
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "à gauche"
-
-# utilisé pour les changements de voie pour les sorties?
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "légèrement "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "fortement "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "inconnu "
-
msgid "When possible, please turn around"
msgstr "Dès que possible, faites demi-tour"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr "vers %s"
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Suivez la route sur %s"
+
msgid "Enter the roundabout soon"
msgstr "Préparez vous à vous engager dans le rond-point"
@@ -222,57 +227,179 @@ msgstr "Préparez vous à vous engager dans le rond-point"
msgid "Enter the roundabout %s"
msgstr "Entrer dans le rond-point %s"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "puis sortez du rond-point à la %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr "puis sortez du rond-point à 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 %s"
-msgstr "Sortez du rond-point à la %s"
-
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Suivez la route sur %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr "Sortez du rond-point à la %1$s %2$s"
msgid "soon"
msgstr "bientôt"
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "maintenant"
+
+msgid "then"
+msgstr "puis"
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Take the %1$s road to the %2$s"
-msgstr "Empreintez la %1$s rue en direction de %2$s"
+msgid "then merge%1$s|right"
+msgstr ""
+#. 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 "after %i roads"
-msgstr "après %i rues"
+msgid "Merge %1$s%2$s|right"
+msgstr ""
-msgid "now"
-msgstr "maintenant"
+#. 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 ""
+#. 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 "then take the %1$s road to the %2$s"
-msgstr "puis prenez la %1$s route à %2$s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
-msgid "error"
-msgstr "erreur"
+msgid "on your left"
+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'
+msgid "on your right"
+msgstr ""
+
+#. 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 "Prenez la sortie %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 "Prenez la sortie %1$s %2$s%3$s"
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr "à l'èchangeur"
+
+msgid "at exit"
+msgstr "à la sortie"
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+# tournez à droite
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "à droite"
+
+# tournez à gauche
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "à gauche"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "légèrement "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "fortement "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Empreintez la %1$s rue en direction de %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "après %i rues"
+
+# espace important après le 2
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "puis faites demi-tour"
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "puis tournez %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr "Faites demi-tour %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "puis faites demi-tour"
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Vous êtes arrivé à destination : %s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Faites demi-tour %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "suivez"
msgid "then you have reached your destination."
msgstr "puis vous arriverez à destination"
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Vous êtes arrivé à destination %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Echangeur"
+
+msgid "Exit"
+msgstr "Sortie"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Position"
@@ -1828,10 +1955,10 @@ msgstr "Étapes"
msgid "Enter Coordinates"
msgstr "Saisissez les coordonnées"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/fr_CH.po.in b/po/fr_CH.po.in
index 87e38f75..a0747f17 100644
--- a/po/fr_CH.po.in
+++ b/po/fr_CH.po.in
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# KaZeR https://launchpad.net/~kazer
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:42+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: KaZeR <kazer@altern.org>\n"
+"Language: fr_CH\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"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -133,126 +133,254 @@ msgid_plural "in %d kilometers"
msgstr[0] "dans un kilomètre"
msgstr[1] "dans %d kilomètres"
-msgid "exit"
-msgstr "sortie"
+#. 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 "%1$svers %2$s%3$s%4$s"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr "%1$svers %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 "%1$svers le %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 "%1$svers 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 "%1$svers l'%2$s"
-msgid "into the ramp"
-msgstr "vers la sortie"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr "vers la bretelle"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%ssur %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%ssur le %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%ssur le %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%ssur la %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%ssur la %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%ssur l'%s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%ssur l'%s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
#, c-format
msgid "%sinto the %s"
msgstr "%svers la %s"
-# tournez à droite
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "à droite"
+msgid "When possible, please turn around"
+msgstr "Dès que possible, faites demi-tour"
-# tournez à gauche
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "à gauche"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr "vers %s"
-# utilisé pour les changements de voie pour les sorties?
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "légèrement "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Suivez la route sur %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "fortement "
+msgid "Enter the roundabout soon"
+msgstr "Préparez vous à vous engager dans le rond-point"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-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 "puis sortez du rond-point à la %1$s %2$s"
-msgid "When possible, please turn around"
-msgstr "Dès que possible, faites demi-tour"
+#. 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 "Sortez du rond-point à la %1$s %2$s"
-msgid "Enter the roundabout soon"
-msgstr "Préparez vous à vous engager dans le rond-point"
+msgid "soon"
+msgstr "bientôt"
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr "maintenant"
+
+msgid "then"
+msgstr "puis"
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
-msgstr "Suivez la route sur %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
-msgid "soon"
-msgstr "bientôt"
+msgid "on your left"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
-msgstr "Prenez la %1$s route vers la %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr "Prenez la sortie %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 "after %i roads"
-msgstr "après %i rues"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr "Prenez la sortie %1$s %2$s%3$s"
-msgid "now"
-msgstr "maintenant"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr "à l'èchangeur"
+msgid "at exit"
+msgstr "à la sortie"
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Vous êtes arrivé à destination : %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+# tournez à droite
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "à droite"
+
+# tournez à gauche
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "à gauche"
+
+# utilisé pour les changements de voie pour les sorties?
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "légèrement "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "fortement "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Prenez la %1$s route vers la %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "après %i rues"
+
+# espace important après le 2
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
+
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "puis faites demi-tour"
+
+#. 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 "Faites demi-tour %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "puis faites demi-tour"
+
+#. 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 "Faites demi-tour %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "suivez"
msgid "then you have reached your destination."
msgstr "ensuite vous serez à destination"
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Vous êtes arrivé à destination %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Echangeur"
+
+msgid "Exit"
+msgstr "Sortie"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Position"
@@ -1806,10 +1934,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/fy.po.in b/po/fy.po.in
index 12da3858..ff727f4c 100644
--- a/po/fy.po.in
+++ b/po/fy.po.in
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# 205 https://launchpad.net/~205-z
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2011-08-12 12:18+0000\n"
"Last-Translator: 205 <Unknown>\n"
"Language-Team: Frisian <fy@li.org>\n"
+"Language: fy\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"
msgid "Running from source directory\n"
msgstr ""
@@ -132,30 +132,53 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -163,92 +186,196 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. 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 ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+msgid "soon"
msgstr ""
-msgid "Enter the roundabout soon"
+msgid "now"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr ""
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr ""
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
msgstr ""
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr ""
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1802,10 +1929,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/gl.po.in b/po/gl.po.in
index 1d36677d..376d1d0a 100644
--- a/po/gl.po.in
+++ b/po/gl.po.in
@@ -6,19 +6,19 @@
# Miguel Anxo Bouzada https://launchpad.net/~mbouzada
# Xosé https://launchpad.net/~ubuntu-galizaweb
# andreout https://launchpad.net/~andre-outeiro
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:42+0000\n"
"Last-Translator: andreout <andre@outeiro.com>\n"
"Language-Team: Galician <gl@li.org>\n"
+"Language: gl\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: gl\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -136,30 +136,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "nun quilómetro"
msgstr[1] "en %d quilómetros"
-msgid "exit"
-msgstr "saída"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "na rampa"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%s na rúa %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%s no %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%s na %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%s no %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -167,57 +190,134 @@ msgstr "%s no %s%s%s"
msgid "%sinto the %s"
msgstr "%s na %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "á dereita"
+msgid "When possible, please turn around"
+msgstr "Cando sexa posible, dea a volta"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "á esquerda"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "suavemente "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Siga a estrada durante os próximos %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "bruscamente "
+msgid "Enter the roundabout soon"
+msgstr "Métase pronto na rotonda"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "logo saia da 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 "Saia da rotonda pola %1$s %2$s"
+
+msgid "soon"
+msgstr "cedo"
+
+msgid "now"
+msgstr "agora"
+
+msgid "then"
+msgstr "logo"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Cando sexa posible, dea a volta"
+#. 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 ""
-msgid "Enter the roundabout soon"
-msgstr "Métase pronto na rotonda"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr "Tome a saida %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 "Tome a saida %1$s %2$s%3$s"
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then continue straight%1$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Siga a estrada durante os próximos %s"
+msgid "Continue straight %1$s%2$s%3$s"
+msgstr ""
-msgid "soon"
-msgstr "cedo"
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "á dereita"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "á esquerda"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "suavemente "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "bruscamente "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Tome a estrada %1$s cara o %2$s"
@@ -226,32 +326,59 @@ msgstr "Tome a estrada %1$s cara o %2$s"
msgid "after %i roads"
msgstr "despois de %i estradas"
-msgid "now"
-msgstr "agora"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Xire %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "logo dea a volta"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Dea a volta %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "logo dea a volta"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Dea a volta %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "despois xa chega ao seu destino"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Chegou ao seu destino %s"
-msgid "then you have reached your destination."
-msgstr "despois xa chega ao seu destino"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Saída"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1806,10 +1933,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/he.po.in b/po/he.po.in
index f0785bcb..b95ac602 100644
--- a/po/he.po.in
+++ b/po/he.po.in
@@ -8,19 +8,19 @@
# Nadav https://launchpad.net/~nadavz
# Yaron https://launchpad.net/~sh-yaron
# rintintin https://launchpad.net/~yonatanhak-gmail
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2014-05-26 10:31+0000\n"
"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
"Language-Team: Hebrew <he@li.org>\n"
+"Language: he\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: he\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -138,88 +138,188 @@ msgid_plural "in %d kilometers"
msgstr[0] "בעוד קילומטר אחד"
msgstr[1] "בעוד %d קילומטרים"
-msgid "exit"
-msgstr "יציאה"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "אל הרמפה"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s אל רחוב %s %s %s"
+msgid "%sinto %s%s%s"
+msgstr "%s אל רחוב %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s אל רחוב %s %s %s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%s אל רחוב %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%s אל רחוב %s %s %s"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%s אל רחוב %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%s אל רחוב %s %s %s"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%s אל רחוב %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אל תוך ה%s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "ימינה"
+msgid "When possible, please turn around"
+msgstr "כשיתאפשר לך, פנה חזרה"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "שמאלה"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "מעט "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "המשך בדרך זו למשך %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "בצורה חדה "
+msgid "Enter the roundabout soon"
+msgstr "הכנס לכיכר הקרובה"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "אחר כך צא מהכיכר ב%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 "צא מהכיכר ב%1$s %2$s"
+
+msgid "soon"
+msgstr "בקרוב"
+
+msgid "now"
+msgstr "כעת"
+
+msgid "then"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "כשיתאפשר לך, פנה חזרה"
+#. 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 ""
-msgid "Enter the roundabout soon"
-msgstr "הכנס לכיכר הקרובה"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 "Leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "המשך בדרך זו למשך %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "soon"
-msgstr "בקרוב"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "ימינה"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "שמאלה"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "מעט "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "בצורה חדה "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "קח את הכביש ה%1$s אל %2$s"
@@ -228,32 +328,59 @@ msgstr "קח את הכביש ה%1$s אל %2$s"
msgid "after %i roads"
msgstr "לאחר %i כבישים"
-msgid "now"
-msgstr "כעת"
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "פנה %1$s %2$s %4$s %3$s"
+
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
-msgid "error"
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
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 arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "ואז הגעת ליעד."
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "הגעת ליעדך %s"
-msgid "then you have reached your destination."
-msgstr "ואז הגעת ליעד."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "יציאה"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1808,10 +1935,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr "נא להזין נקודות ציון"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/hi.po.in b/po/hi.po.in
index f7f57bce..392ace61 100644
--- a/po/hi.po.in
+++ b/po/hi.po.in
@@ -4,19 +4,19 @@
# Many thanks to the contributors of this translation:
# KaZeR https://launchpad.net/~kazer
# desh deep https://launchpad.net/~singhdeepdesh
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2014-11-15 22:03+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Hindi <hi@li.org>\n"
+"Language: hi\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: hi\n"
msgid "Running from source directory\n"
msgstr ""
@@ -133,64 +133,72 @@ msgid_plural "in %d kilometers"
msgstr[0] "ek kilometer mein"
msgstr[1] "%d kilometero mein"
-msgid "exit"
-msgstr "nikas"
-
-msgid "into the ramp"
-msgstr "dhalan mein"
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s sheher mein%s%s%s"
+msgid "%1$sonto the %2$s%3$s%4$s"
+msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
#, c-format
-msgid "%sinto the %s%s%s|male form"
+msgid "%1$sonto %2$s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|female form"
+msgid "%1$sonto %2$s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|neutral form"
+msgid "%1$sonto %2$s|feminine form"
msgstr ""
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s"
+msgid "%1$sonto %2$s|neuter form"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "दायाँ"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr "dhalan mein"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "बांया"
+#. 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 "%ssheher mein %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "आसानी से "
+#. 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 "%ssheher mein %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "दृढ़ता से "
+#. 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 "%ssheher mein %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+#. 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 "%ssheher mein %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#, c-format
+msgid "%sinto the %s"
msgstr ""
msgid "When possible, please turn around"
msgstr "जब संभव हो, कृपया चारों ओर मोड़"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "अगले%s के लिए सड़क का पालन करें"
+
msgid "Enter the roundabout soon"
msgstr ""
@@ -199,57 +207,176 @@ 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 "तो %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 "%1$s %2$s के राउंडअबाउट छोड़ें"
+
+msgid "soon"
+msgstr "जल्दी"
+
+msgid "now"
+msgstr "अब"
+
+msgid "then"
+msgstr "तो"
+
+#. 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 ""
+#. 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 "Leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "अगले%s के लिए सड़क का पालन करें"
+msgid "then merge%1$s|left"
+msgstr ""
-msgid "soon"
-msgstr "जल्दी"
+#. 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 ""
+
+msgid "on your left"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
-msgstr "%1$s %2$s के लिए सड़क ले लो"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "%i के बाद सड़कों"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "now"
-msgstr "अब"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
-msgid "error"
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$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 maneuver, the third is destination
+#, c-format
+msgid "Keep left %1$s%2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "दायाँ"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "बांया"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "आसानी से "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "दृढ़ता से "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "%1$s %2$s के लिए सड़क ले लो"
+
+#, c-format
+msgid "after %i roads"
+msgstr "%i के बाद सड़कों"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "तो चारों ओर मोड़"
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr "चारों ओर मोड़ %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "तो चारों ओर मोड़"
+
+#. 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 "चारों ओर मोड़ %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+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 "then you have reached your destination."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
msgstr ""
+msgid "Exit"
+msgstr "Nikas"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1803,10 +1930,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/hr.po.in b/po/hr.po.in
index e3a2980b..d3e1bb43 100644
--- a/po/hr.po.in
+++ b/po/hr.po.in
@@ -6,20 +6,20 @@
# Marjan Vrban https://launchpad.net/~mvrban
# gogo https://launchpad.net/~trebelnik-stefina
# klajo https://launchpad.net/~klaudio
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-03-06 22:33+0000\n"
"Last-Translator: gogo <trebelnik2@gmail.com>\n"
"Language-Team: Croatian <hr@li.org>\n"
+"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -139,88 +139,188 @@ msgstr[0] "za %d kilometar"
msgstr[1] "za %d kilometara"
msgstr[2] "za %d kilometara"
-msgid "exit"
-msgstr "izlaz"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "na rampu"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%su ulicu %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%su %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%su %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%su %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%su %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%su %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%su %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
#, c-format
msgid "%sinto the %s"
msgstr "%su %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "desno"
+msgid "When possible, please turn around"
+msgstr "Ako je moguće okrenite se"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "lijevo"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "jednostavno "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Pratite cestu za idući %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "teško "
+msgid "Enter the roundabout soon"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "onda napustite kružni tok na %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 "Napustite kružni tok na %1$s %2$s"
+
+msgid "soon"
+msgstr "uskoro"
+
+msgid "now"
+msgstr "sada"
+
+msgid "then"
+msgstr "onda"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Ako je moguće okrenite se"
+#. 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 ""
-msgid "Enter the roundabout soon"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Pratite cestu za idući %s"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "uskoro"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "desno"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "lijevo"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "jednostavno "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "teško "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Vozite cestom %1$s do %2$s"
@@ -229,32 +329,59 @@ msgstr "Vozite cestom %1$s do %2$s"
msgid "after %i roads"
msgstr "nakon %i ceste"
-msgid "now"
-msgstr "sada"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Krenite %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "onda okrenite se"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Okrenite se %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "onda okrenite se"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Okrenite se %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "nakon toga ste stigli do cilja"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Stigli ste na cilj %s"
-msgid "then you have reached your destination."
-msgstr "nakon toga ste stigli do cilja"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Izlaz"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1809,10 +1936,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/hu.po.in b/po/hu.po.in
index 891ef5c2..ef830e6a 100644
--- a/po/hu.po.in
+++ b/po/hu.po.in
@@ -9,19 +9,19 @@
# WintermuteHun https://launchpad.net/~wintermute-valodi
# dandor https://launchpad.net/~dandorfs
# kalmarzs https://launchpad.net/~kalmarzs
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2014-05-12 16:58+0000\n"
"Last-Translator: György Balló <ballogyor@gmail.com>\n"
"Language-Team: Hungarian <hu@li.org>\n"
+"Language: hu\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: hu\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -139,30 +139,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "egy kilométer után"
msgstr[1] "%d kilométer után"
-msgid "exit"
-msgstr "kijárat"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "a felhajtóra"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%sa(z) %s%s%s utcába"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%sa(z) %s%s%s útra"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sa(z) %s%s%s útra"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sa(z) %s%s%s útra"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -170,32 +193,17 @@ msgstr "%sa(z) %s%s%s útra"
msgid "%sinto the %s"
msgstr "%shajtson rá a(z) %s útra"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "jobbra"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "balra"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "enyhén "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "élesen "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "Amint lehet, fordujon meg"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Amint lehet, fordujon meg"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Haladjon az úton a következő %sig"
msgid "Enter the roundabout soon"
msgstr "Hajtson be a körforgalomba hamarosan."
@@ -205,57 +213,176 @@ msgstr "Hajtson be a körforgalomba hamarosan."
msgid "Enter the roundabout %s"
msgstr "Hajtson be a körforgalomba %s"
+#. 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 "majd hagyja el a körforgalmat a(z) %1$s %2$s"
+
+#. 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 "Leave the roundabout at the %1$s %2$s"
+msgstr "Hagyja el a körforgalmat a(z) %1$s %2$s"
+
+msgid "soon"
+msgstr "hamarosan"
+
+msgid "now"
+msgstr "most"
+
+msgid "then"
+msgstr "aztán"
+
+#. 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 ""
+#. 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 "Leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Haladjon az úton a következő %sig"
+msgid "then merge%1$s|left"
+msgstr ""
-msgid "soon"
-msgstr "hamarosan"
+#. 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 ""
+
+msgid "on your left"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
-msgstr "A(z) %1$s útnál forduljon %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "%i út után"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "now"
-msgstr "most"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Elérte az úticélját: %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "jobbra"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "balra"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "enyhén "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "élesen "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "A(z) %1$s útnál forduljon %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "%i út után"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Forduljon %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 "aztán fordujon meg"
+
+#. 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 "Fordujon meg %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "aztán fordujon meg"
+
+#. 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 "Fordujon meg %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
msgid "then you have reached your destination."
msgstr "majd eléri az úticélját."
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Elérte az úticélját: %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Kijárat"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Pozíció"
@@ -1811,10 +1938,10 @@ msgstr "Útvonalpontok"
msgid "Enter Coordinates"
msgstr "Koordináták megadása"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/id.po.in b/po/id.po.in
index baa20378..ff4f490c 100644
--- a/po/id.po.in
+++ b/po/id.po.in
@@ -6,19 +6,19 @@
# KaZeR https://launchpad.net/~kazer
# M Bambang I https://launchpad.net/~mbi-lawang
# Steve Kartantya https://launchpad.net/~jack-haz
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:43+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Indonesian <id@li.org>\n"
+"Language: id\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Language: id\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -135,30 +135,53 @@ msgid "in one kilometer"
msgid_plural "in %d kilometers"
msgstr[0] "dalam %d kilometer"
-msgid "exit"
-msgstr "keluar"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "menuju jalur yang melandai"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s menuju jalan %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%smenuju ke %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%smenuju ke%s%s%s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%smenuju ke %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%smenuju ke %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%smenuju ke %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -166,57 +189,134 @@ msgstr "%smenuju ke %s%s%s"
msgid "%sinto the %s"
msgstr "%smenuju ke %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "kanan"
+msgid "When possible, please turn around"
+msgstr "Bila memungkinkan, balik arah"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "Kiri"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "dengan mudah "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "ikuti jalan untuk ke tujuan berikutnya %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "Sangat "
+msgid "Enter the roundabout soon"
+msgstr "segera memasuki bundaran"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "kemudian tinggalkan bundaran pada %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 "Tinggalkan bundaran pada %1$s %2$s"
+
+msgid "soon"
+msgstr "segera"
+
+msgid "now"
+msgstr "saat ini"
+
+msgid "then"
+msgstr "kemudian"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "bila memungkinkan, balik arah"
+#. 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 ""
-msgid "Enter the roundabout soon"
-msgstr "segera memasuki bundaran"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
msgstr ""
+msgid "on your right"
+msgstr ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "ikuti jalan untuk ke tujuan berikutnya %s"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "segera"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "kanan"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "Kiri"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "dengan mudah "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "Sangat "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Ambil %1$s jalan ke %2$s"
@@ -225,32 +325,59 @@ msgstr "Ambil %1$s jalan ke %2$s"
msgid "after %i roads"
msgstr "setelah %i jalan"
-msgid "now"
-msgstr "saat ini"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Beloklah %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "kemudian balik arah"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Balik arah %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "kemudian balik arah"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Balik arah %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "kini anda telah sampai pada tujuan"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "anda telah sampai pada tujuan %s"
-msgid "then you have reached your destination."
-msgstr "kini anda telah sampai pada tujuan"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Keluar"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1805,10 +1932,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/it.po.in b/po/it.po.in
index 0970b1e3..8fd8f618 100644
--- a/po/it.po.in
+++ b/po/it.po.in
@@ -18,19 +18,19 @@
# giardia https://launchpad.net/~fabriziosm
# jackyes https://launchpad.net/~jackthebest
# tomas https://launchpad.net/~tracks-tomyt
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2014-11-15 00:53+0000\n"
"Last-Translator: giardia <Unknown>\n"
"Language-Team: Italiano\n"
+"Language: it\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"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -148,30 +148,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "tra un chilometro"
msgstr[1] "tra %d chilometri"
-msgid "exit"
-msgstr "uscire"
+#. 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 "%1$ssulla %2$s%3$s%4$s"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr "%1$ssulla strada %2$s"
-msgid "into the ramp"
+#. 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 "%1$ssul %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 "%1$ssulla %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 "%1$ssulla strada %2$s"
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "nella rampa"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%sin %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%sin %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sin %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sin %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -179,33 +202,18 @@ msgstr "%sin %s%s%s"
msgid "%sinto the %s"
msgstr "%sin %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "destra"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "sinistra"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "leggermente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "decisamente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr ""
-
msgid "When possible, please turn around"
msgstr "Appena possibile, invertire il senso di marcia"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr "verso %s"
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Seguire la strada per i prossimi %s"
+
msgid "Enter the roundabout soon"
msgstr "Tra poco si entrerà in rotonda"
@@ -214,22 +222,114 @@ msgstr "Tra poco si entrerà in rotonda"
msgid "Enter the roundabout %s"
msgstr "Imboccare la rotonda %s"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr ""
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr ""
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr "e alla rotonda prendere la %1$s %2$s"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Seguire la strada per i prossimi %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr "Alla rotonda prendere la %1$s %2$s"
msgid "soon"
msgstr "tra poco"
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "adesso"
+
+msgid "then"
+msgstr "poi"
+
+#. 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 "poi entrare%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 "Entrare %1$s%2$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 "poi entrare%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 "Entrare %1$s%2$s"
+
+msgid "on your left"
+msgstr "a sinistra"
+
+msgid "on your right"
+msgstr "a destra"
+
+#. 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 "Prendere l'uscita %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 "Prendere l'uscita %1$s %2$s%3$s"
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr "all'intersezione"
+
+msgid "at exit"
+msgstr "all'uscita"
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr "poi procedere dritto%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 "Procedere dritto %1$s%2$s%3$s"
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr "poi tenere la destra%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 "Tenere la destra %1$s%2$s%3$s"
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr "poi tenere la sinistra%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 "Tenere la sinistra %1$s%2$s%3$s"
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "destra"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "sinistra"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "leggermente "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "decisamente "
+
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Prendere la %1$s strada a %2$s"
@@ -238,32 +338,59 @@ msgstr "Prendere la %1$s strada a %2$s"
msgid "after %i roads"
msgstr "tra %i strade"
-msgid "now"
-msgstr "adesso"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Svoltare %1$s %2$s %3$s %4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "poi invertire il senso di marcia"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Invertire il senso di marcia %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "poi invertire il senso di marcia"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|right"
+msgstr "Invertire il senso di marcia %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "seguire"
+msgid "then you have reached your destination."
+msgstr "poi sarete arrivati a destinazione"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Siete arrivati a destinazione %s"
-msgid "then you have reached your destination."
-msgstr "poi sarete arrivati a destinazione"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Intersezione"
+
+msgid "Exit"
+msgstr "Uscita"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1470,10 +1597,10 @@ msgid "Opens address search dialog"
msgstr "Apri la finestra di ricerca indirizzo"
msgid "_POI search"
-msgstr "_ricerca POI"
+msgstr "_Ricerca POI"
msgid "Opens POI search dialog"
-msgstr "Apre finestra di ricerca POI"
+msgstr "Apri la finestra di ricerca POI"
msgid "_Stop Navigation"
msgstr "Interrompi la navigazione"
@@ -1546,7 +1673,7 @@ msgid "Cinema"
msgstr "Cinema"
msgid "Train station"
-msgstr "Stazione del treno"
+msgstr "Stazione ferroviaria"
msgid "School"
msgstr "Scuola"
@@ -1583,16 +1710,16 @@ msgid "Set next visit to %ld, %ld \n"
msgstr "Imposta la prossima tappa a %ld, %ld \n"
msgid "POI search"
-msgstr "ricerca POI"
+msgstr "Ricerca POI"
msgid "Select a category"
-msgstr "Seleziona una categoria"
+msgstr "Selezionare una categoria"
msgid "Select a distance to look for (km)"
-msgstr "Seleziona la distanza in cui cercare (km)"
+msgstr "Selezionare la distanza in cui cercare (km)"
msgid "Select a POI"
-msgstr "Seleziona un POI"
+msgstr "Selezionare un POI"
msgid " "
msgstr " "
@@ -1604,7 +1731,7 @@ msgid "Direction"
msgstr "Direzione"
msgid "Distance(m)"
-msgstr "Distanza(m)"
+msgstr "Distanza (m)"
msgid "Name"
msgstr "Nome"
@@ -1822,10 +1949,10 @@ msgstr "Waypoints"
msgid "Enter Coordinates"
msgstr "Inserire Coordinate"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
@@ -1938,7 +2065,7 @@ msgid ""
msgstr ""
msgid "Cancel"
-msgstr "Cancella"
+msgstr "Annulla"
msgid "filenamePath"
msgstr ""
@@ -2377,8 +2504,8 @@ msgid ""
"Former\n"
"Destinations"
msgstr ""
-"Precedenti\n"
-"Destinazioni"
+"Destinazioni\n"
+"precedenti"
msgid "Coordinates"
msgstr "Coordinate"
@@ -2495,7 +2622,7 @@ msgstr "Scarica mappe"
#. Android resource: @strings/optionsmenu_toggle_poi
msgid "Toggle POIs"
-msgstr "Attiva/Disattiva Punti Di Interesse"
+msgstr "Mostra/nascondi POI"
#. Android resource: @strings/optionsmenu_exit_navit
msgid "Exit Navit"
diff --git a/po/ja.po.in b/po/ja.po.in
index 4055f7f4..f8af5015 100644
--- a/po/ja.po.in
+++ b/po/ja.po.in
@@ -4,19 +4,19 @@
# Many thanks to the contributors of this translation:
# KaZeR https://launchpad.net/~kazer
# MontBlanc https://launchpad.net/~osm-gatinho
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:43+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Language: ja\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -134,30 +134,53 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -165,90 +188,194 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "右"
+msgid "When possible, please turn around"
+msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "左"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+#. 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 ""
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "まもなく"
+
+msgid "now"
+msgstr "今"
+
+msgid "then"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
-msgstr "まもなく"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
-msgstr "今"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "右"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "左"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Take the %1$s road to the %2$s"
msgstr ""
-msgid "error"
+#, c-format
+msgid "after %i roads"
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'
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr ""
+
+#. 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 ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "目的地の%sにつきました"
-msgid "then you have reached your destination."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
msgstr ""
#. Android resource: @strings/position_popup_title
@@ -1804,10 +1931,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/jv.po.in b/po/jv.po.in
index 168abde6..e7edaa51 100644
--- a/po/jv.po.in
+++ b/po/jv.po.in
@@ -3,27 +3,21 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# Leonardus Priyo Handono https://launchpad.net/~leonardus-ymail
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:43+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Javanese <jv@li.org>\n"
+"Language: jv\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 != 0;\n"
-"Language: jv\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-msgid "exit"
-msgstr "metu"
-
-msgid "now"
-msgstr "saiki"
-
msgid "Running from source directory\n"
msgstr ""
@@ -139,85 +133,188 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] "ing %d kilometer"
-msgid "into the ramp"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%s ing dalan %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%s ing dalan %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%s ing dalan %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%s ing dalan %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 ing dalan %s"
+msgstr "%sing dalan %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "nengen"
+msgid "When possible, please turn around"
+msgstr "Yen biso, mutero"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "ngiwa"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "kanthi gampang "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Tetep ing dalan iki nganti %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "terus metu soko puteran ing cawang kaping %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 "Metu soko puteran ing cawang kaping %1$s %2$s"
+
+msgid "soon"
+msgstr "sedhelo maneh"
+
+msgid "now"
+msgstr "saiki"
+
+msgid "then"
+msgstr "terus"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Yen biso, mutero"
+#. 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 ""
-msgid "Enter the roundabout soon"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "tetep ing dalan iki nganti %s"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "sedhelo maneh"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "nengen"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "ngiwa"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "kanthi gampang "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Jupuk dalan kaping %1$s ing %2$s"
@@ -226,30 +323,60 @@ msgstr "Jupuk dalan kaping %1$s ing %2$s"
msgid "after %i roads"
msgstr "sakwise %i dalan"
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Turn %1$s%2$s %3$s%4$s"
msgstr ""
-msgid "error"
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
msgstr ""
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr "terus panjenengan tekan tujuan"
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Metu"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "dunung"
@@ -1803,10 +1930,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/kk.po.in b/po/kk.po.in
index c05ead99..4909a444 100644
--- a/po/kk.po.in
+++ b/po/kk.po.in
@@ -2,19 +2,19 @@
# Copyright (C) 2006-2014 The Navit Team
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2010-02-24 19:32+0000\n"
"Last-Translator: \n"
"Language-Team: Kazakh <kk@li.org>\n"
+"Language: kk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Language: kk\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -132,30 +132,53 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -163,90 +186,194 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+#. 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 ""
-msgid "Enter the roundabout soon"
+msgid "soon"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr ""
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
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'
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
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 "then you have reached your destination."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
msgstr ""
#. Android resource: @strings/position_popup_title
@@ -1802,10 +1929,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/kn.po.in b/po/kn.po.in
index 6dab7049..fc338b9b 100644
--- a/po/kn.po.in
+++ b/po/kn.po.in
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# Mahesh Venom https://launchpad.net/~mahesh-venom-73
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2014-06-21 16:42+0000\n"
"Last-Translator: Mahesh Venom <mahesh.venom.73@gmail.com>\n"
"Language-Team: Kannada <kn@li.org>\n"
+"Language: kn\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: kn\n"
msgid "Running from source directory\n"
msgstr ""
@@ -132,30 +132,53 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -163,90 +186,194 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+#. 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 ""
-msgid "Enter the roundabout soon"
+msgid "soon"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr ""
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
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'
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
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 "then you have reached your destination."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
msgstr ""
#. Android resource: @strings/position_popup_title
@@ -1802,10 +1929,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/ko.po.in b/po/ko.po.in
index f2daa350..97bb5cda 100644
--- a/po/ko.po.in
+++ b/po/ko.po.in
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# Seungjun, Lee https://launchpad.net/~cybercorean
-
msgid ""
msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-04-03 14:35+0000\n"
"Last-Translator: Seungjun, Lee <cybercorean@gmail.com>\n"
"Language-Team: Korean <ko@li.org>\n"
+"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -127,30 +128,53 @@ msgid "in one kilometer"
msgid_plural "in %d kilometers"
msgstr[0] "%d 킬로미터 후에"
-msgid "exit"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -158,92 +182,196 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. 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 ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+msgid "soon"
msgstr ""
-msgid "Enter the roundabout soon"
+msgid "now"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr ""
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr ""
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
msgstr ""
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr ""
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1797,10 +1925,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/ku.po.in b/po/ku.po.in
index e6b942a7..842f62b1 100644
--- a/po/ku.po.in
+++ b/po/ku.po.in
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# kosar https://launchpad.net/~kosar-belana
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-06-22 22:57+0000\n"
"Last-Translator: kosar <kosar.belana@gmail.com>\n"
"Language-Team: Kurdish <ku@li.org>\n"
+"Language: ku\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: ku\n"
msgid "Running from source directory\n"
msgstr ""
@@ -132,30 +132,53 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -163,92 +186,196 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "ڕاست"
+msgid "When possible, please turn around"
+msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "چەپ"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+#. 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 ""
-msgid "Enter the roundabout soon"
+msgid "soon"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr "ئێستا"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
+msgid "on your left"
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
-msgstr "ئێستا"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$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 maneuver, the third is destination
+#, c-format
+msgid "Keep left %1$s%2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "ڕاست"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "چەپ"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr ""
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1802,10 +1929,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/lb.po.in b/po/lb.po.in
index 38c40d50..00e4513e 100644
--- a/po/lb.po.in
+++ b/po/lb.po.in
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# Kevin G https://launchpad.net/~kev912002
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2011-09-29 17:56+0000\n"
"Last-Translator: Kevin G <Unknown>\n"
"Language-Team: Luxembourgish <lb@li.org>\n"
+"Language: lb\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"
msgid "Running from source directory\n"
msgstr "Aus dem Quellverzeechnis starten\n"
@@ -132,123 +132,250 @@ msgid_plural "in %d kilometers"
msgstr[0] "An engem Kilometer"
msgstr[1] "An %d Kilometer"
-msgid "exit"
-msgstr "Verlossen"
+#. 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 "%1$sop d' %2$s%3$s%4$s"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr "%1$sop d' Stross %2$s"
-msgid "into the ramp"
+#. 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 "%1$sop den %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 "%1$sop d' %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 "%1$sop d' %2$s"
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "op d' Opfahrt"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%sop d' Stross %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%sop den %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sop d' %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr ""
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sop d' %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
#, c-format
msgid "%sinto the %s"
msgstr "%sop d' %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "riets"
+msgid "When possible, please turn around"
+msgstr "Wann meiglech, wannechglift dreinen"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "lenks"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "liicht "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "schaarf "
+msgid "Enter the roundabout soon"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Wann meiglech, wannechglift dreinen"
+#. 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 ""
-msgid "Enter the roundabout soon"
+msgid "soon"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
-#. 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 arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "riets"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "lenks"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "liicht "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "schaarf "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr "Dreinen %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
msgstr ""
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Dreinen %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr ""
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Verdeeler"
+
+msgid "Exit"
+msgstr "Ausfaart"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1802,10 +1929,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/lt.po.in b/po/lt.po.in
index 36202844..7ea70958 100644
--- a/po/lt.po.in
+++ b/po/lt.po.in
@@ -7,20 +7,20 @@
# Mantas Kriaučiūnas https://launchpad.net/~mantas
# Rytis Ūsalis https://launchpad.net/~rytis-usalis
# laimonas https://launchpad.net/~laimonas-mockus
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-04-15 00:07+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Lithuanian <lt@li.org>\n"
+"Language: lt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -84,11 +84,11 @@ msgstr "už %d m"
#, c-format
msgid "%d feet"
-msgstr ""
+msgstr "%d pėdos"
#, c-format
msgid "in %d feet"
-msgstr ""
+msgstr "už %d pėdų"
#, c-format
msgid "%d meters"
@@ -100,11 +100,11 @@ msgstr "už %d metrų"
#, c-format
msgid "%d.%d miles"
-msgstr ""
+msgstr "%d.%d mylios"
#, c-format
msgid "in %d.%d miles"
-msgstr ""
+msgstr "už %d.%d mylių"
#, c-format
msgid "%d.%d kilometers"
@@ -124,8 +124,9 @@ msgstr[2] "%d mylių"
#, c-format
msgid "in one mile"
msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "už %d mylios"
+msgstr[1] "už %d mylių"
+msgstr[2] "už %d mylių"
#, c-format
msgid "one kilometer"
@@ -141,63 +142,71 @@ msgstr[0] "už %d kilometro"
msgstr[1] "už %d kilometrų"
msgstr[2] "už %d kilometrų"
-msgid "exit"
-msgstr "išvažiavimas"
+#. 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 "%1$sį %2$s%3$s%4$s"
-msgid "into the ramp"
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr "%1$sį %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 "%1$sį %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 "%1$sį %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 "%1$sį %2$s"
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "į rampą"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s į gatvę %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%sį %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s į %s%s%s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sį %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%s į %s%s%s"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sį %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%s į %s%s%s"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sį %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 į %s"
-
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "dešinėn"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "kairėn"
+msgstr "%sį %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "lengvai "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "stipriai "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "Kai įmanoma, apsisukite"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr ""
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr "link %s"
-msgid "When possible, please turn around"
-msgstr "kai įmanoma, apsisukite"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Laikykitės kelio sekančius %s"
msgid "Enter the roundabout soon"
msgstr "Netrukus įsukite į žiedą"
@@ -205,24 +214,116 @@ msgstr "Netrukus įsukite į žiedą"
#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "Įsukite į žiedą %s"
+
+#. 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 "tada išsukite iš žiedo %1$s išvažiavime %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 "Išsukite iš žiedo %1$s išvažiavime %2$s"
+
+msgid "soon"
+msgstr "netrukus"
+
+msgid "now"
+msgstr "dabar"
+
+msgid "then"
+msgstr "tada"
+
+#. 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 "tada užvažiuokite už%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 "Užvažiuokite už%1$s%2$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 "tada užvažiuokite už%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 "Užvažiuokite už%1$s%2$s"
+
+msgid "on your left"
+msgstr "kairėje"
+
+msgid "on your right"
+msgstr "dešinėje"
+
+#. 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 "Išvažiuokite per išvažiavimą %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 "then leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr "Išvažiuokite per išvažiavimą %1$s %2$s%3$s"
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr "sankryžoje"
+
+msgid "at exit"
+msgstr "išvažiavime"
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Continue straight %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Laikykitės kelio sekančius %s"
+msgid "then keep right%1$s"
+msgstr "tada laikykitės dešinės%1$s"
-msgid "soon"
-msgstr "netrukus"
+#. 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 "Laikykitės dešinės %1$s%2$s%3$s"
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr "tada laikykitės kairės%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 "Laikykitės kairės %1$s%2$s%3$s"
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "dešinėn"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "kairėn"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "lengvai "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "stipriai "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Važiuokite %1$s keliu į %2$s"
@@ -231,32 +332,59 @@ msgstr "Važiuokite %1$s keliu į %2$s"
msgid "after %i roads"
msgstr "už %i kelių"
-msgid "now"
-msgstr "dabar"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Pasukite %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "tada apsisukite"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Apsisukite %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "tada apsisukite"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|right"
+msgstr "Apsisukite %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "laikykitės kelio"
+
+msgid "then you have reached your destination."
+msgstr "tada jūs pasiekėte kelionės tikslą."
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Jūs pasiekėte tikslą %s"
-msgid "then you have reached your destination."
-msgstr "tada jūs pasiekėte kelionės tikslą."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Sankryža"
+
+msgid "Exit"
+msgstr "Išvažiavimas"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -291,16 +419,16 @@ msgid "Waypoint %d"
msgstr ""
msgid "Visit before..."
-msgstr ""
+msgstr "Lankyti prieš..."
msgid "Set as position"
-msgstr "Nustatykite poziciją"
+msgstr "Nustatyti poziciją"
msgid "Set as destination"
-msgstr "Nustatykite tikslą"
+msgstr "Nustatyti tikslą"
msgid "Add as bookmark"
-msgstr "Pridėkite žymę"
+msgstr "Pridėti žymę"
#, c-format
msgid "Point 0x%x 0x%x"
@@ -308,7 +436,7 @@ msgstr "Taškas 0x%x 0x%x"
#, c-format
msgid "Screen coord : %d %d"
-msgstr "Ekrano koordinatės : %d %d"
+msgstr "Ekrano koordinatės : %d %d"
#. 020
msgid "Andorra"
@@ -1350,7 +1478,7 @@ msgstr "nežinoma gatvė"
#. Safe cast: attr_generic_set_attr does not modify its parameter.
msgid "Unnamed vehicle"
-msgstr ""
+msgstr "Bevardė transporto priemonė"
msgid "Failed to write bookmarks file"
msgstr ""
@@ -1415,7 +1543,7 @@ msgid "_Route"
msgstr "Parinkti kelią"
msgid "_Former Destinations"
-msgstr "Ankstesnės vietos"
+msgstr "Ankstesni tikslai"
msgid "_Bookmarks"
msgstr "Adresynas"
@@ -1460,10 +1588,10 @@ msgid "Opens address search dialog"
msgstr "Atidaro adreso paieškos dialogą"
msgid "_POI search"
-msgstr ""
+msgstr "Lankytinų vietų paieška"
msgid "Opens POI search dialog"
-msgstr ""
+msgstr "Atidaro lankytinų vietų paieškos dialogą"
msgid "_Stop Navigation"
msgstr "Stabdyti navigaciją"
@@ -1508,7 +1636,7 @@ msgid "Data"
msgstr "Duomenys"
msgid "Pharmacy"
-msgstr ""
+msgstr "Vaistinė"
msgid "Restaurant"
msgstr "Restoranas"
@@ -1544,20 +1672,20 @@ msgid "Police"
msgstr "Policija"
msgid "Justice"
-msgstr ""
+msgstr "Teismas"
msgid "Taxi"
msgstr "Taksi"
msgid "Shopping"
-msgstr ""
+msgstr "Parduotuvė"
msgid "Distance from screen center (km)"
-msgstr ""
+msgstr "Atstumas nuo ekrano vidaus (km)"
#, c-format
msgid "POI %s. %s"
-msgstr ""
+msgstr "Lankytina vieta %s. %s"
#, c-format
msgid "Set destination to %ld, %ld \n"
@@ -1565,23 +1693,23 @@ msgstr "Nustatyti tikslą į %ld, %ld \n"
#, c-format
msgid "Set map to %ld, %ld \n"
-msgstr ""
+msgstr "Nustatyti žemėlapį į %ld, %ld \n"
#, c-format
msgid "Set next visit to %ld, %ld \n"
msgstr ""
msgid "POI search"
-msgstr ""
+msgstr "Lankytinų vietų paieška"
msgid "Select a category"
msgstr "Pasirinkite kategoriją"
msgid "Select a distance to look for (km)"
-msgstr ""
+msgstr "Išrinkite atstumą, kuriame ieškoti (km)"
msgid "Select a POI"
-msgstr ""
+msgstr "Išrinkite lankytiną vietą"
msgid " "
msgstr " "
@@ -1596,10 +1724,10 @@ msgid "Distance(m)"
msgstr "Atstumas (m)"
msgid "Name"
-msgstr ""
+msgstr "Vardas"
msgid "Visit Before"
-msgstr ""
+msgstr "Aplankyi prieš"
msgid "N"
msgstr "Š"
@@ -1672,7 +1800,7 @@ msgid "View Attributes"
msgstr "Rodyti savybes"
msgid "Set as position (and deactivate vehicle)"
-msgstr ""
+msgstr "Nustatyti poziciją (išjungdamas transporto priemonę)"
msgid "POIs"
msgstr "Lankytinos vietos"
@@ -1681,10 +1809,10 @@ msgid "View on map"
msgstr "Rodyti žemėlapyje"
msgid "Remove search results from the map"
-msgstr ""
+msgstr "Pašalinti paieškos rezultatas nuo žemėlapio"
msgid "Show results on the map"
-msgstr ""
+msgstr "Rodyti rezultatus žemelapyje"
msgid "Cut Bookmark"
msgstr "Iškirpti žymą"
@@ -1717,7 +1845,7 @@ msgid "Replace with waypoints"
msgstr ""
msgid "Delete Folder"
-msgstr "Trinti aplanką"
+msgstr "Pašalinti katalogą"
#. Adds the Bookmark folders
msgid "Add Bookmark folder"
@@ -1739,7 +1867,7 @@ msgid "Map Download"
msgstr ""
msgid "Active"
-msgstr ""
+msgstr "Aktyvus"
msgid "Download Enabled"
msgstr ""
@@ -1796,7 +1924,7 @@ msgstr "Apie Navit"
#. Authors
msgid "By"
-msgstr ""
+msgstr "Sukūrė"
#. Contributors
msgid "And all the Navit Team"
@@ -1809,19 +1937,19 @@ msgid "Waypoints"
msgstr ""
msgid "Enter Coordinates"
-msgstr ""
+msgstr "Įvėskite koordinates"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
-msgstr ""
+msgstr "Platuma Ilguma"
msgid "Enter coordinates, for example:"
-msgstr ""
+msgstr "Įvėskitė koordinates, pvz.:"
msgid "Vehicle"
msgstr "Transporto priemonė"
@@ -1857,10 +1985,10 @@ msgid "Show Locale"
msgstr ""
msgid "Former Destinations"
-msgstr "Ankstesnės vietos"
+msgstr "Ankstesni tikslai"
msgid "- No former destinations available -"
-msgstr ""
+msgstr "- Nėra ankstesnių tikslų -"
msgid "Message"
msgstr "Žinutė"
@@ -1869,7 +1997,7 @@ msgid "Back"
msgstr "Grįžti"
msgid "Back to map"
-msgstr "Grižti į žemėlapį"
+msgstr "Grįžti į žemėlapį"
msgid "Main Menu"
msgstr "Pagrindinis meniu"
@@ -1884,7 +2012,7 @@ msgid "Prev"
msgstr ""
msgid "Return to route!"
-msgstr ""
+msgstr "Grįžti į maršrutą!"
#. warning told
msgid "Look out! Camera!"
@@ -1892,22 +2020,22 @@ msgstr ""
#. warning told
msgid "Please decrease your speed"
-msgstr ""
+msgstr "Prašom sumažinti greitį"
msgid "partial match"
msgstr ""
#. Android resource: @strings/address_search_button
msgid "Search"
-msgstr ""
+msgstr "Paieška"
#. Android resource: @strings/address_search_towns
msgid "Towns"
-msgstr ""
+msgstr "Miestai"
#. Android resource: @strings/position_popup_drive_here
msgid "Route to here"
-msgstr ""
+msgstr "Maršrutas iki čia"
msgid "Map data (c) OpenStreetMap contributors, ODBL"
msgstr ""
@@ -1919,7 +2047,7 @@ msgid ""
msgstr ""
msgid "Downloaded maps"
-msgstr ""
+msgstr "Atsisiųsti žemėlapiai"
msgid ""
"Sorry, we currently do not support maps above 3.8G on Android, please select "
@@ -2052,7 +2180,7 @@ msgid "Baden-Wuerttemberg"
msgstr ""
msgid "Bayern"
-msgstr ""
+msgstr "Bavarija"
msgid "Mittelfranken"
msgstr ""
@@ -2366,6 +2494,8 @@ msgid ""
"Former\n"
"Destinations"
msgstr ""
+"Ankstesni\n"
+"tikslai"
msgid "Coordinates"
msgstr "Koordinatės"
@@ -2406,7 +2536,7 @@ msgid "NMEA Data"
msgstr ""
msgid "car_shortest"
-msgstr ""
+msgstr "Automobilis (trumpiausias maršrutas)"
msgid "car_avoid_tolls"
msgstr ""
@@ -2459,11 +2589,11 @@ msgstr "Daugiau informacijos"
#. Android resource: @strings/optionsmenu_zoom_in
msgid "Zoom in"
-msgstr "Artinti"
+msgstr "Padidinti"
#. Android resource: @strings/optionsmenu_zoom_out
msgid "Zoom out"
-msgstr "Tolinti"
+msgstr "Sumažinti"
#. Android resource: @strings/optionsmenu_download_maps
msgid "Download maps"
@@ -2471,7 +2601,7 @@ msgstr "Atsisiųsti žemėlapius"
#. Android resource: @strings/optionsmenu_toggle_poi
msgid "Toggle POIs"
-msgstr ""
+msgstr "Rodyti/slėpti lankytinas vietas"
#. Android resource: @strings/optionsmenu_exit_navit
msgid "Exit Navit"
@@ -2487,7 +2617,7 @@ msgstr ""
#. Android resource: @strings/map_delete
msgid "Delete this map?"
-msgstr "Ištrinti šį žemėlapį?"
+msgstr "Pašalinti šį žemėlapį?"
#. Android resource: @strings/map_download_downloading
msgid "Downloading:"
@@ -2511,7 +2641,7 @@ msgstr ""
#. Android resource: @strings/address_search_title
msgid "Address search"
-msgstr "Ieškoti adreso"
+msgstr "Adresų paieška"
#. Android resource: @strings/address_enter_destination
msgid "Enter destination"
diff --git a/po/lv.po.in b/po/lv.po.in
index 2c36124d..ce0d282a 100644
--- a/po/lv.po.in
+++ b/po/lv.po.in
@@ -6,19 +6,19 @@
# KaZeR https://launchpad.net/~kazer
# Stendec https://launchpad.net/~stendec
# sieks https://launchpad.net/~sieks
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-01-05 13:24+0000\n"
"Last-Translator: Stendec <Unknown>\n"
"Language-Team: Latvian <lv@li.org>\n"
+"Language: lv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"Language: lv\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -140,30 +140,53 @@ msgstr[0] "pēc %d kilometra"
msgstr[1] "pēc %d kilometriem"
msgstr[2] "pēc %d kilometriem"
-msgid "exit"
-msgstr "nobraukt nost"
+#. 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 ""
-msgid "into the ramp"
-msgstr "uz rampas"
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr "uz uzbrauktuves"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%suz ielu %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%suz %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%suz %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%suz %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%suz %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -171,32 +194,17 @@ msgstr "%suz %s%s%s"
msgid "%sinto the %s"
msgstr "Uz %spagriezties pa %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "pa labi"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "pa kreisi"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "nedaudz "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "strauji "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "Kad iespējams apgriezieties"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Kad iespējams apgriezieties"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Turpiniet pa šo ceļu %s"
msgid "Enter the roundabout soon"
msgstr "Drīzumā uzbraukt uz apļa"
@@ -206,57 +214,176 @@ msgstr "Drīzumā uzbraukt uz apļa"
msgid "Enter the roundabout %s"
msgstr "Uzbraukt uz apļa pēc %s"
+#. 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 "pēc tam izbraukt no apļa pa %1$s %2$s"
+
+#. 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 "Leave the roundabout at the %1$s %2$s"
+msgstr "Nobraukt no apļa pa %1$s %2$s"
+
+msgid "soon"
+msgstr "drīz"
+
+msgid "now"
+msgstr "tagad"
+
+msgid "then"
+msgstr "pēc tam"
+
+#. 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 ""
+#. 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 "Leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Turpiniet pa šo ceļu %s"
+msgid "then merge%1$s|left"
+msgstr ""
-msgid "soon"
-msgstr "drīz"
+#. 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 ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
-msgstr "Pagriežaties %1$s ceļā pa %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "pēc %i ceļiem"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "now"
-msgstr "tagad"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+msgid "at exit"
+msgstr "nobrauktuvē"
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Jūs esat sasniedzis galamērķi %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "pa labi"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "pa kreisi"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "nedaudz "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "strauji "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Pagriežaties %1$s ceļā pa %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "pēc %i ceļiem"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Pagriezties %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 "pēc tam apgriezieties"
+
+#. 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 "Apgriezieties %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "pēc tam apgriezieties"
+
+#. 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 "Apgriezieties %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "turpiniet"
msgid "then you have reached your destination."
msgstr "tad Jūs sasniegsiet glamērķi"
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Jūs esat sasniedzis galamērķi %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Nobrauktuve"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Pozīcija"
@@ -1812,10 +1939,10 @@ msgstr "Pieturpunkti"
msgid "Enter Coordinates"
msgstr "Ievadiet Koordinātes"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/mk.po.in b/po/mk.po.in
index d3d48a42..862017b4 100644
--- a/po/mk.po.in
+++ b/po/mk.po.in
@@ -6,19 +6,19 @@
# Naum Spaseski https://launchpad.net/~naum-spaseski-gmail
# Robert Mileski https://launchpad.net/~mileski
# goran.cvetkovski https://launchpad.net/~goran-cvetkovski
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-12-10 00:53+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Macedonian <mk@li.org>\n"
+"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"Language: mk\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -136,30 +136,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "после %d километри"
msgstr[1] "после %d километри"
-msgid "exit"
-msgstr "излез"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "на рампа"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%sна улица %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%sна %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%sна %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sна %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sна %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -167,57 +190,134 @@ msgstr "%sна %s%s%s"
msgid "%sinto the %s"
msgstr "%sна %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "на десно"
+msgid "When possible, please turn around"
+msgstr "Кога можете, свртете"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "на лево"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "лесно "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Следете го патот следните %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "силно "
+msgid "Enter the roundabout soon"
+msgstr "Наскоро влегувате во кружен тек"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "потоа излегувате од кружен тек на %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 "Излегувате од кружен тек на %1$s %2$s"
+
+msgid "soon"
+msgstr "наскоро"
+
+msgid "now"
+msgstr "сега"
+
+msgid "then"
+msgstr "тогаш"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Кога можете, свртете"
+#. 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 ""
-msgid "Enter the roundabout soon"
-msgstr "Наскоро влегувате во кружен тек"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
msgstr ""
+msgid "on your right"
+msgstr ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Следете го патот следните %s"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "наскоро"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "на десно"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "на лево"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "лесно "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "силно "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Продолжи по %1$s патот до %2$s"
@@ -226,32 +326,59 @@ msgstr "Продолжи по %1$s патот до %2$s"
msgid "after %i roads"
msgstr "после %i патишта"
-msgid "now"
-msgstr "сега"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Свртете %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Свртете %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "тогаш свртете"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Свртете %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "потоа пристигате на одредиштето."
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Стигнавте на целта %s"
-msgid "then you have reached your destination."
-msgstr "потоа пристигате на одредиштето."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Излез"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1322,8 +1449,7 @@ msgstr ""
#. We have not found an existing config file from all possibilities
msgid "No config file navit.xml, navit.xml.local found\n"
-msgstr ""
-"Не е пронајден документ за конфигурација navit.xml, navit.xml.local\n"
+msgstr "Не е пронајден документ за конфигурација navit.xml, navit.xml.local\n"
#, c-format
msgid "Error parsing config file '%s': %s\n"
@@ -1809,10 +1935,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/ml.po.in b/po/ml.po.in
index 6ddae3c9..615f0fb8 100644
--- a/po/ml.po.in
+++ b/po/ml.po.in
@@ -4,14 +4,15 @@
# Many thanks to the contributors of this translation:
# Faju https://launchpad.net/~gotoarunk
# Sunil K https://launchpad.net/~sunilk
-
msgid ""
msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-03-18 13:32+0000\n"
"Last-Translator: Sunil K <Unknown>\n"
"Language-Team: Malayalam <ml@li.org>\n"
+"Language: ml\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -132,63 +133,71 @@ msgid_plural "in %d kilometers"
msgstr[0] "ഒരു കിലോമീറ്ററില്‍"
msgstr[1] "%d കിലോമീറ്ററില്‍"
-msgid "exit"
-msgstr "പുറത്തേക്ക്"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
-msgstr "ചരുവിലേക്ക് പോവുക"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s തെരുവിലേക്ക് %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%sകഴിഞ്ഞു %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s കഴിഞ്ഞു %s %s %s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sകഴിഞ്ഞു %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%sകഴിഞ്ഞു %s %s %s"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sകഴിഞ്ഞു %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%sകഴിഞ്ഞു %s %s %s"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sകഴിഞ്ഞു %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-ല്‍ %s -ലേക്ക് തിരിയുക"
-#. 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 "നന്നായി "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "സാധിക്കുന്നിടത്ത് വച്ച്,തിരിച്ചു പോവുക"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "സാധിക്കുന്നിടത്ത് വച്ച്,തിരിച്ചു പോവുക"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "ഈ വഴിയിലുടെ അടുത്ത %s പോവുക"
msgid "Enter the roundabout soon"
msgstr "റൗണ്ടാനയിലേക്ക് ഉടനെ കയറുക"
@@ -198,22 +207,114 @@ msgstr "റൗണ്ടാനയിലേക്ക് ഉടനെ കയറു
msgid "Enter the roundabout %s"
msgstr "%s റൗണ്ടാനയിലേക്ക് കേറുക"
+#. 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 "%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 "%1$s-ലൂടെ റൗണ്ടാനയില്‍ നിന്നും പുറത്തു പോവുകാ %2$s"
+
+msgid "soon"
+msgstr "അല്പസമയത്തിനുള്ളില്‍"
+
+msgid "now"
+msgstr "ഇപ്പോള്‍"
+
+msgid "then"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "Follow the road for the next %s"
-msgstr "ഈ വഴിയിലുടെ അടുത്ത %s പോവുക"
+msgid "Merge %1$s%2$s|right"
+msgstr ""
-msgid "soon"
-msgstr "അല്പസമയത്തിനുള്ളില്‍"
+#. 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 ""
+
+#. 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 ""
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "വലത്തോട്ട്"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "ഇടത്തോട്ട്"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "ചെറുതായ് "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "നന്നായി "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "%2$s %1$s-മത്തെ പാത എടുക്കുക"
@@ -222,32 +323,59 @@ msgstr "%2$s %1$s-മത്തെ പാത എടുക്കുക"
msgid "after %i roads"
msgstr "%i വഴികൾക്കു ശേഷം"
-msgid "now"
-msgstr "ഇപ്പോള്‍"
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "%4$s ലേക്ക് %3$s %2$s %1$s തിരിയുക"
+
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
-msgid "error"
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
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 arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "അപ്പോള്‍ നിങ്ങള്‍ ലക്ഷ്യത്തിലെത്തും"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "നിങ്ങള്‍ %s ലക്ഷ്യത്തിലെത്തിയിരിക്കുന്നു"
-msgid "then you have reached your destination."
-msgstr "അപ്പോള്‍ നിങ്ങള്‍ ലക്ഷ്യത്തിലെത്തും"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "പുറത്തേക്ക്"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1334,8 +1462,7 @@ msgstr "'%s' കോണ്‍ഫിഗറേഷന്‍ ഫയലില്‍
msgid ""
"Internal initialization failed, exiting. Check previous error messages.\n"
-msgstr ""
-"പിഴവ് സംഭവിച്ചു. നിര്‍ത്തുന്നു. ദയവായ് മുന് സന്ദേശങ്ങള്‍ പരിശോധിക്കുക\n"
+msgstr "പിഴവ് സംഭവിച്ചു. നിര്‍ത്തുന്നു. ദയവായ് മുന് സന്ദേശങ്ങള്‍ പരിശോധിക്കുക\n"
msgid "unknown street"
msgstr "പേരില്ലാത്ത തെരുവ്"
@@ -1803,10 +1930,10 @@ msgstr "വഴിത്തിരിവുകള്‍"
msgid "Enter Coordinates"
msgstr "കോഓര്‍ഡിനേറ്റുകള്‍ ചേര്‍ക്കുക"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
@@ -2448,8 +2575,8 @@ msgid ""
msgstr ""
"നാവിറ്റ് ഉപയോഗിക്കുന്നതിനു നന്നീ\n"
"\n"
-"തുടങ്ങുവാന്‍ നാവിറ്റ് മെനുവില്‍ നിന്നും ഭൂപടം ഡൗണ്‍ലോഡ് ചെയ്യാനുള്ള ഓപ്ഷ്ന്‍ "
-"തെരഞ്ഞെടുക്കുക, (ഫയല്‍ വളരെ വലുതായതിനാല്‍ വൈഫൈ \n"
+"തുടങ്ങുവാന്‍ നാവിറ്റ് മെനുവില്‍ നിന്നും ഭൂപടം ഡൗണ്‍ലോഡ് ചെയ്യാനുള്ള ഓപ്ഷ്ന്‍ തെരഞ്ഞെടുക്കുക, (ഫയല്‍ വളരെ "
+"വലുതായതിനാല്‍ വൈഫൈ \n"
"\n"
"കണക്ഷന്‍ ഉപയോഗിക്കുന്നത് ഉചിതമായിരിക്കും)\n"
"\n"
diff --git a/po/mn.po.in b/po/mn.po.in
index 022e669b..ee5982e7 100644
--- a/po/mn.po.in
+++ b/po/mn.po.in
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# Enkhbold https://launchpad.net/~enkhbold-baatar
-
msgid ""
msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-03-11 06:11+0000\n"
"Last-Translator: Enkhbold <enkhbold_baatar@yahoo.com>\n"
"Language-Team: Mongolian <mn@li.org>\n"
+"Language: mn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -131,30 +132,53 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -162,92 +186,196 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. 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 ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+msgid "soon"
msgstr ""
-msgid "Enter the roundabout soon"
+msgid "now"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr ""
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr ""
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
msgstr ""
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr ""
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1801,10 +1929,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/mr.po.in b/po/mr.po.in
index 9af2aec7..6780e22b 100644
--- a/po/mr.po.in
+++ b/po/mr.po.in
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# nagesh https://launchpad.net/~nageshpachorkar
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-02-18 10:23+0000\n"
"Last-Translator: nagesh <nageshpachorkar@gmail.com>\n"
"Language-Team: Marathi <mr@li.org>\n"
+"Language: mr\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: mr\n"
msgid "Running from source directory\n"
msgstr ""
@@ -132,30 +132,53 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -163,90 +186,194 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+#. 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 ""
-msgid "Enter the roundabout soon"
+msgid "soon"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr ""
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
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'
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
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 "then you have reached your destination."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
msgstr ""
#. Android resource: @strings/position_popup_title
@@ -1802,10 +1929,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/nb.po.in b/po/nb.po.in
index ba45b76e..a8a13097 100644
--- a/po/nb.po.in
+++ b/po/nb.po.in
@@ -8,19 +8,19 @@
# Skippern https://launchpad.net/~gay-today
# Thor H. Johansen https://launchpad.net/~thorhajo
# burner https://launchpad.net/~bendik-xplore
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:44+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Bendik Brenne <bendik@xplore.nu>\n"
+"Language: nb\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"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -138,30 +138,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "om en kilometer"
msgstr[1] "om %d kilometer"
-msgid "exit"
-msgstr "avkjørsel"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "ut på akselerasjonsfeltet"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%sinn på gaten %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%sinn på %s%s%sen"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sinn på %s%s%sa"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sin på %s%s%set"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -169,32 +192,17 @@ msgstr "%sin på %s%s%set"
msgid "%sinto the %s"
msgstr "%sinn på %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "høyre"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "venstre"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "slakt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "skarpt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "Snu når det er mulig"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Snu når det er mulig"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Følg veien de neste %s"
msgid "Enter the roundabout soon"
msgstr "Kjør inn i rundkjøringen snart"
@@ -202,59 +210,178 @@ msgstr "Kjør inn i rundkjøringen snart"
#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
msgid "Enter the roundabout %s"
+msgstr "Kjør inn i rundkjøringen %s"
+
+#. 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 "forlat så rundkjøringen ut %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 "Forlat rundkjøringen ut %1$s %2$s"
+
+msgid "soon"
+msgstr "snart"
+
+msgid "now"
+msgstr "nå"
+
+msgid "then"
+msgstr "så"
+
+#. 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 ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
-msgstr "Følg veien de neste %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
-msgid "soon"
-msgstr "snart"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
-msgstr "Ta den %1$s veien mot %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "etter %i avkjøringer"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "now"
-msgstr "nå"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Du har nådd ditt reisemål %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "høyre"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "venstre"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "slakt "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "skarpt "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Ta den %1$s veien mot %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "etter %i avkjøringer"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Sving %1$s til %2$s om %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 "snu så"
+
+#. 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 "Snu %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "snu så"
+
+#. 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 "Snu %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "følg"
msgid "then you have reached your destination."
msgstr "så har du nådd ditt reisemål."
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Du har nådd ditt reisemål %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Avkjørsel"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posisjon"
@@ -1808,10 +1935,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/nds.po.in b/po/nds.po.in
index 88b3484b..6b4664ee 100644
--- a/po/nds.po.in
+++ b/po/nds.po.in
@@ -9,19 +9,19 @@
# Roschkor https://launchpad.net/~bound-one2000
# everyone https://launchpad.net/~anonymus1338
# fred husche https://launchpad.net/~paidmailacc
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:42+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: German, Low <nds@li.org>\n"
+"Language: nds\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"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -139,88 +139,188 @@ msgid_plural "in %d kilometers"
msgstr[0] "in einem Kilometer"
msgstr[1] "in %d Kilometern"
-msgid "exit"
-msgstr "Ausfahrt"
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "auf die Auffahrt"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s in die Straße %s %s %s"
+msgid "%sinto %s%s%s"
+msgstr "%sin die Straße %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s in den %s%s%s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sin den %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%s in die %s%s%s"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sin die %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%s in das %s%s%s"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sin das %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 in die %s"
+msgstr "%sin die %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "Rechts"
+msgid "When possible, please turn around"
+msgstr "Wenn möglich, bitte wenden"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "links"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "einfach "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Der Straße %s folgen"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "straf "
+msgid "Enter the roundabout soon"
+msgstr "In Kürze in den Kreisverkehr einfahren"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "dann den Kreisverkehr an der %1$s %2$s verlassen"
+
+#. 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 "Den Kreisverkehr an der %1$s %2$s verlassen"
+
+msgid "soon"
+msgstr "in Kürze"
+
+msgid "now"
+msgstr "jetzt"
+
+msgid "then"
+msgstr "dann"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Wenn möglich, bitte wenden"
+#. 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 ""
-msgid "Enter the roundabout soon"
-msgstr "In Kürze in den Kreisverkehr einfahren"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
msgstr ""
+msgid "on your right"
+msgstr ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Der Straße %s folgen"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "in Kürze"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "Rechts"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "links"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "einfach "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "straf "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Die %1$s Straße zur %2$s nehmen"
@@ -229,32 +329,59 @@ msgstr "Die %1$s Straße zur %2$s nehmen"
msgid "after %i roads"
msgstr "nach %i Straßen"
-msgid "now"
-msgstr "jetzt"
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "In %3$s %1$s%2$s %4$s abbiegen"
+
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
-msgid "error"
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
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 arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "Dann haben Sie Ihr Ziel erreicht"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Sie haben Ihr Ziel erreicht %s"
-msgid "then you have reached your destination."
-msgstr "Dann haben Sie Ihr Ziel erreicht"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Ausfahrt"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1809,10 +1936,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/nl.po.in b/po/nl.po.in
index 1f41b3fc..817fd491 100644
--- a/po/nl.po.in
+++ b/po/nl.po.in
@@ -20,24 +20,21 @@
# jan https://launchpad.net/~jandegr1
# rob https://launchpad.net/~rvdb
# worldcitizen https://launchpad.net/~joop-boonen
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-04-09 12:39+0000\n"
"Last-Translator: jan <jandegr1@hotmail.com>\n"
"Language-Team: afaber\n"
+"Language: nl\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"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-msgid "soon"
-msgstr "straks"
-
msgid "Running from source directory\n"
msgstr "Gestart vanuit de bronmap\n"
@@ -153,30 +150,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "na één kilometer"
msgstr[1] "na %d kilometer"
-msgid "exit"
-msgstr "afslag"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "naar de oprit"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%sde straat %s%s%s in"
+msgid "%sinto %s%s%s"
+msgstr "%sde %s%s%s in"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%sde %s%s%s in"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sde %s%s%s in"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sde %s%s%s in"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -184,32 +204,17 @@ msgstr "%sde %s%s%s in"
msgid "%sinto the %s"
msgstr "%snaar de %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "rechts"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "links"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "flauw "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "scherp "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "zeer scherp "
+msgid "When possible, please turn around"
+msgstr "Indien mogelijk omkeren"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Indien mogelijk omkeren"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Volg de weg gedurende %s"
msgid "Enter the roundabout soon"
msgstr "U rijdt zodadelijk de rotonde op"
@@ -219,19 +224,114 @@ msgstr "U rijdt zodadelijk de rotonde op"
msgid "Enter the roundabout %s"
msgstr "neem de rotonde %s"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "daarna de rotonde verlaten bij de %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr "daarna de rotonde verlaten bij de %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 %s"
-msgstr "Verlaat de rotonde bij de %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr "Verlaat de rotonde bij de %1$s %2$s"
+msgid "soon"
+msgstr "straks"
+
+msgid "now"
+msgstr "nu"
+
+msgid "then"
+msgstr "daarna"
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Volg de weg gedurende %s"
+msgid "then merge%1$s|right"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "rechts"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "links"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "flauw "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "scherp "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Neem de %1$s straat naar %2$s"
@@ -240,32 +340,59 @@ msgstr "Neem de %1$s straat naar %2$s"
msgid "after %i roads"
msgstr "na %i wegen"
-msgid "now"
-msgstr "nu"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "neem daarna de %1$s straat naar %2$s"
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Ga %3$s %1$s naar %2$s %4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "daarna omkeren"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Ga %3$s%1$s naar %2$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr "Omkeren %1$s"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "daarna omkeren"
+
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "daarna ga %3$s%1$s naar %2$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Omkeren %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "volg"
+
+msgid "then you have reached your destination."
+msgstr "daarna heeft u uw bestemming bereikt."
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Bestemming %s bereikt"
-msgid "then you have reached your destination."
-msgstr "daarna heeft u uw bestemming bereikt."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Knooppunt"
+
+msgid "Exit"
+msgstr "Afslag"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1825,10 +1952,10 @@ msgstr "route punten"
msgid "Enter Coordinates"
msgstr "voer coordinaten in"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
@@ -2660,5 +2787,5 @@ msgid ""
"Should we ask the system to show voice download dialog?"
msgstr ""
"Navit kan elke tekst naar spraak-engine geïnstalleerd op uw apparaat "
-"gebruiken . De momenteel geselecteerde engine meldt dat het niet in uw taal "
-"kan spreken . Wil U de spraak download dialoog van Uw toestel starten?"
+"gebruiken. De momenteel geselecteerde engine meldt dat het niet in uw taal "
+"kan spreken. Wil U de spraak download dialoog van Uw toestel starten?"
diff --git a/po/nn.po.in b/po/nn.po.in
index 3e58d6bc..6622d8bb 100644
--- a/po/nn.po.in
+++ b/po/nn.po.in
@@ -4,19 +4,19 @@
# Many thanks to the contributors of this translation:
# KaZeR https://launchpad.net/~kazer
# Skippern https://launchpad.net/~gay-today
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:44+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Norwegian Nynorsk <nn@li.org>\n"
+"Language: nn\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: nn\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -134,30 +134,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "om ein kilometer"
msgstr[1] "om %d kilometer"
-msgid "exit"
-msgstr "avkjøyring"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -165,57 +188,134 @@ msgstr ""
msgid "%sinto the %s"
msgstr "%sinn på %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "høgre"
+msgid "When possible, please turn around"
+msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "venstre"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "slakt "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "krapt "
+msgid "Enter the roundabout soon"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+#. 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 ""
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "snart"
+
+msgid "now"
+msgstr "no"
+
+msgid "then"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
-msgstr "snart"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "høgre"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "venstre"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "slakt "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "krapt "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Ta den %1$s vegen mot %2$s"
@@ -224,33 +324,60 @@ msgstr "Ta den %1$s vegen mot %2$s"
msgid "after %i roads"
msgstr ""
-msgid "now"
-msgstr "no"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Turn %1$s%2$s %3$s%4$s"
msgstr ""
-msgid "error"
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
msgstr ""
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+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 "then you have reached your destination."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
msgstr ""
+msgid "Exit"
+msgstr "Avkjøyring"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posisjon"
@@ -1804,10 +1931,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/pl.po.in b/po/pl.po.in
index 388786ab..015d7dbb 100644
--- a/po/pl.po.in
+++ b/po/pl.po.in
@@ -15,20 +15,20 @@
# linek10 https://launchpad.net/~zbyszekm
# skrzat https://launchpad.net/~skrzat
# Łukasz Semler https://launchpad.net/~lukasz-semler
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-11-04 21:48+0000\n"
"Last-Translator: DarkAlexis <Unknown>\n"
"Language-Team: Translators\n"
+"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"Language: \n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -150,63 +150,71 @@ msgstr[0] "za jeden kilometr"
msgstr[1] "za %d kilometry"
msgstr[2] "za %d kilometrów"
-msgid "exit"
-msgstr "zjazd"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "na wjazd"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s w ulicę %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%sw %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%sw %s%s%s|męski rodzaj"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sw %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%sw %s%s%s|żeński rodzaj"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sw %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%sw %s%s%s|neutralny rodzaj"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sw %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 do %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "w prawo"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "w lewo"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "lekko "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "silnie "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "Zawróc, gdy będzie to możliwe"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Zawróc, gdy będzie to możliwe"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Jedź tą drogą do następnego %s"
msgid "Enter the roundabout soon"
msgstr "Wjazd na rondo wkrótce"
@@ -216,57 +224,176 @@ msgstr "Wjazd na rondo wkrótce"
msgid "Enter the roundabout %s"
msgstr "Wjazd na rondo %s"
+#. 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 "następnie zjedź z ronda na %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 "Zjedź z ronda na %1$s %2$s"
+
+msgid "soon"
+msgstr "wkrótce"
+
+msgid "now"
+msgstr "teraz"
+
+msgid "then"
+msgstr "następnie"
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "then leave the roundabout at the %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "Leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Jedź tą drogą do następnego %s"
+msgid "then merge%1$s|left"
+msgstr ""
-msgid "soon"
-msgstr "wkrótce"
+#. 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 ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
-msgstr "Jedź drogą %1$s do %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "po drodze %i"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "now"
-msgstr "teraz"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Dotarłeś do celu %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "w prawo"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "w lewo"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "lekko "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "silnie "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Jedź drogą %1$s do %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "po drodze %i"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Skręć %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 "następnie zawróc"
+
+#. 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 "Zawróc %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "następnie zawróc"
+
+#. 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 "Zawróc %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
msgid "then you have reached your destination."
msgstr "następnie dojechałeś do celu."
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Dotarłeś do celu %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Węzeł"
+
+msgid "Exit"
+msgstr "Zjazd"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Położenie"
@@ -1822,10 +1949,10 @@ msgstr "Punkty trasy"
msgid "Enter Coordinates"
msgstr "Wprowadź współrzędne"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/pms.po.in b/po/pms.po.in
index dc8b2115..27d952ab 100644
--- a/po/pms.po.in
+++ b/po/pms.po.in
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# Simone Briatore https://launchpad.net/~simone-bri
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2012-09-14 10:28+0000\n"
"Last-Translator: Simone Briatore <simone.bri@alice.it>\n"
"Language-Team: Piemontese <pms@li.org>\n"
+"Language: pms\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"
msgid "Running from source directory\n"
msgstr ""
@@ -132,30 +132,53 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
-msgstr "surtia"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "in tla rampa"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -163,92 +186,196 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+#. 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 ""
-msgid "Enter the roundabout soon"
+msgid "soon"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr ""
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$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 maneuver, the third is destination
+#, c-format
+msgid "Keep left %1$s%2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr ""
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr ""
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Surtia"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1802,10 +1929,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/pt.po.in b/po/pt.po.in
index a9c9a606..40105804 100644
--- a/po/pt.po.in
+++ b/po/pt.po.in
@@ -14,19 +14,19 @@
# brukutu https://launchpad.net/~brukutu99
# eSkiSo https://launchpad.net/~wise-gdr
# lezurdis https://launchpad.net/~f-dos-santos
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-12-01 01:04+0000\n"
"Last-Translator: Sérgio Marques <Unknown>\n"
"Language-Team: Portuguese <pt@li.org>\n"
+"Language: pt\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: pt\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -144,63 +144,71 @@ msgid_plural "in %d kilometers"
msgstr[0] "a um quilómetro"
msgstr[1] "a %d quilómetros"
-msgid "exit"
-msgstr "sair"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "na subida"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s para a rua %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%spara a rua %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%s no %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%s na %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%s na %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 na %s"
-
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "direita"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "esquerda"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "facilmente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "veementemente "
+msgstr "%sna %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "Quando for possível, inverta o sentido de marcha"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Quando for possível, inverta o sentido de marcha"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Siga a estrada para a próxima %s"
msgid "Enter the roundabout soon"
msgstr "Entre na próxima rotunda"
@@ -210,57 +218,176 @@ msgstr "Entre na próxima rotunda"
msgid "Enter the roundabout %s"
msgstr "Entre na próxima rotunda a %s"
+#. 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 "e saia da rotunda na %1$s %2$s"
+
+#. 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 "Leave the roundabout at the %1$s %2$s"
+msgstr "Saia da rotunda na %1$s %2$s"
+
+msgid "soon"
+msgstr "logo"
+
+msgid "now"
+msgstr "agora"
+
+msgid "then"
+msgstr "depois"
+
+#. 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 ""
+#. 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 "Leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Siga a estrada para a próxima %s"
+msgid "then merge%1$s|left"
+msgstr ""
-msgid "soon"
-msgstr "logo"
+#. 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 ""
+
+msgid "on your left"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
-msgstr "Apanhe a %1$s estrada para a %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "depois de %i estradas"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "now"
-msgstr "agora"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Chega ao seu destino em %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "direita"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "esquerda"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "facilmente "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "veementemente "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Apanhe a %1$s estrada para a %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "depois de %i estradas"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Vire %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 "depois inverta o sentido de marcha"
+
+#. 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 "Inverta o sentido de marcha %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "depois inverta o sentido de marcha"
+
+#. 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 "Inverta o sentido de marcha %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
msgid "then you have reached your destination."
msgstr "depois chegou ao seu destino."
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Chega ao seu destino em %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Trevo"
+
+msgid "Exit"
+msgstr "Saída"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posição"
@@ -1814,10 +1941,10 @@ msgstr "Pontos"
msgid "Enter Coordinates"
msgstr "Introduzir coordenadas"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/pt_BR.po.in b/po/pt_BR.po.in
index 8030e758..5b9d5760 100644
--- a/po/pt_BR.po.in
+++ b/po/pt_BR.po.in
@@ -18,19 +18,19 @@
# hvera https://launchpad.net/~hamilton-listas
# paulohm https://launchpad.net/~paulohm
# pingflood https://launchpad.net/~pingflood
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-04-03 01:58+0000\n"
"Last-Translator: Jairo Roberto Duarte <Unknown>\n"
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"Language: pt_BR\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: pt_BR\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -148,30 +148,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "em um quilômetro"
msgstr[1] "em %d quilômetros"
-msgid "exit"
-msgstr "saída"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "na rampa"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%sna %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%sno %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sna %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sem %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -179,32 +202,17 @@ msgstr "%sem %s%s%s"
msgid "%sinto the %s"
msgstr "%sna %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "à direita"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "à esquerda"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "levemente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "fortemente "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "Quando possível, favor retornar"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Quando possível, favor retornar"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Continue na via por %s"
msgid "Enter the roundabout soon"
msgstr "Entre na rotatória em seguida"
@@ -214,57 +222,176 @@ msgstr "Entre na rotatória em seguida"
msgid "Enter the roundabout %s"
msgstr "Entre na rotatória %s"
+#. 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 "em seguida deixe a rotatória no %1$s %2$s"
+
+#. 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 "Leave the roundabout at the %1$s %2$s"
+msgstr "Deixe a rotatória na %1$s %2$s"
+
+msgid "soon"
+msgstr "em breve"
+
+msgid "now"
+msgstr "agora"
+
+msgid "then"
+msgstr "então"
+
+#. 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 ""
+#. 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 "Leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Continue na via por %s"
+msgid "then merge%1$s|left"
+msgstr ""
-msgid "soon"
-msgstr "em breve"
+#. 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 ""
+
+msgid "on your left"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
-msgstr "Pegue a %1$s via para a %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "após %i vias"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "now"
-msgstr "agora"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Você chegará ao destino %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "à direita"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "à esquerda"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "levemente "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "fortemente "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Pegue a %1$s via para a %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "após %i vias"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Vire %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 "então retornar"
+
+#. 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 "Retornar %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "então retornar"
+
+#. 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 "Retornar %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
msgid "then you have reached your destination."
msgstr "então você chegará ao destino."
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Você chegará ao destino %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Trevo"
+
+msgid "Exit"
+msgstr "Saída"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posição"
@@ -1831,10 +1958,10 @@ msgstr "Pontos da via"
msgid "Enter Coordinates"
msgstr "Digite as coordenadas"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/ro.po.in b/po/ro.po.in
index a4a986b1..b202d196 100644
--- a/po/ro.po.in
+++ b/po/ro.po.in
@@ -11,20 +11,20 @@
# dodobird https://launchpad.net/~dorinnirod
# fasiol https://launchpad.net/~fasiol2
# igorashu https://launchpad.net/~ionut-soare
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:44+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Romanian <ro@li.org>\n"
+"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
"== 0) && (n != 0))) ? 2: 1));\n"
-"Language: ro\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -144,88 +144,188 @@ msgstr[0] "într-un kilometru"
msgstr[1] "în %d kilometri"
msgstr[2] "în %d de kilometri"
-msgid "exit"
-msgstr "ieșire"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "pe rampă"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s pe strada %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%spe %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s pe %s%s%s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%spe %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%s pe %s%s%s"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%spe %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%s pe %s%s%s"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%spe %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 spre %s"
+msgstr "%sspre %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "la dreapta"
+msgid "When possible, please turn around"
+msgstr "Când este posibil, întoarceţi"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "la stânga"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "uşor "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Urmați drumul pentru încă %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "strâns "
+msgid "Enter the roundabout soon"
+msgstr "Intrați în curând în giratoriu"
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr "Intrați în giratoriu %s"
+
+#. 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 "apoi ieșiți din giratoriu 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 "Ieșiți din giratoriu la %1$s %2$s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+msgid "soon"
+msgstr "curând"
+
+msgid "now"
+msgstr "acum"
+
+msgid "then"
+msgstr "apoi"
+
+#. 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 ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Când este posibil, întoarceţi"
+#. 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 ""
-msgid "Enter the roundabout soon"
-msgstr "Intrați în curând în giratoriu"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 "Enter the roundabout %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then continue straight%1$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Urmați drumul pentru încă %s"
+msgid "Continue straight %1$s%2$s%3$s"
+msgstr ""
-msgid "soon"
-msgstr "curând"
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "la dreapta"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "la stânga"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "uşor "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "strâns "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Virați %2s pe %1s stradă"
@@ -234,32 +334,59 @@ msgstr "Virați %2s pe %1s stradă"
msgid "after %i roads"
msgstr "după %i străzi"
-msgid "now"
-msgstr "acum"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Virați %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "apoi întoarceţi"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Întoarceţi %1$s"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "apoi întoarceţi"
+
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Întoarceţi %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "apoi ajungeți la destinație."
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Ați ajuns la destinație %s"
-msgid "then you have reached your destination."
-msgstr "apoi ajungeți la destinație."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Nod"
+
+msgid "Exit"
+msgstr "Ieșire"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1814,10 +1941,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/ru.po.in b/po/ru.po.in
index 1cfa21cd..3d3308d9 100644
--- a/po/ru.po.in
+++ b/po/ru.po.in
@@ -25,20 +25,20 @@
# tryagain https://launchpad.net/~mdankov
# zcc https://launchpad.net/~zcc
# Павел https://launchpad.net/~pavel-sgn
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-04-20 20:06+0000\n"
"Last-Translator: tryagain <mdankov@yandex.ru>\n"
"Language-Team: Rustam T. Usmanov\n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -160,64 +160,72 @@ msgstr[0] "через %d километр"
msgstr[1] "%d километра"
msgstr[2] "%d километров"
-msgid "exit"
-msgstr "съезд"
-
-msgid "into the ramp"
-msgstr "съезд на"
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s на улицу %s%s%s"
+msgid "%1$sonto the %2$s%3$s%4$s"
+msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
#, c-format
-msgid "%sinto the %s%s%s|male form"
-msgstr "%s на %s%s%s"
+msgid "%1$sonto %2$s"
+msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|female form"
-msgstr "%s на %s%s%s"
+msgid "%1$sonto %2$s|masculine form"
+msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s%s%s|neutral form"
-msgstr "%s на %s%s%s"
+msgid "%1$sonto %2$s|feminine form"
+msgstr ""
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
#, c-format
-msgid "%sinto the %s"
-msgstr "%s на %s"
+msgid "%1$sonto %2$s|neuter form"
+msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "направо"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
+msgstr "съезд на"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "налево"
+#. 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 "%sна %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "немного "
+#. 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 "%sна %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "круто "
+#. 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 "%sна %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "очень круто "
+#. 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 "%sна %s%s%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "неизвестно "
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#, c-format
+msgid "%sinto the %s"
+msgstr "%sна %s"
msgid "When possible, please turn around"
msgstr "Развернитесь, пожалуйста, если это возможно"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Двигайтесь по дороге следующие %s"
+
msgid "Enter the roundabout soon"
msgstr "Скоро круговое движение"
@@ -226,22 +234,114 @@ msgstr "Скоро круговое движение"
msgid "Enter the roundabout %s"
msgstr "Через %s круговое движение"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "потом съезжайте с кругового движения на %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr "потом съезжайте с кругового движения на %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 %s"
-msgstr "Съезжайте с кругового движения на %s"
-
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Двигайтесь по дороге следующие %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr "Съезжайте с кругового движения на %1$s %2$s"
msgid "soon"
msgstr "скоро"
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "сейчас"
+
+msgid "then"
+msgstr "потом"
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "направо"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "налево"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "немного "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "круто "
+
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Выезжайте на %1$s дорогу в направлении %2$s"
@@ -250,32 +350,59 @@ msgstr "Выезжайте на %1$s дорогу в направлении %2$s
msgid "after %i roads"
msgstr "после %i дорог"
-msgid "now"
-msgstr "сейчас"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "затем выезжайте на дорогу %1$s в направлении %2$s"
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Сверните %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr "ошибка"
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Сверните %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr "Развернитесь %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "потом развернитесь"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "после чего поверните %1$s%2$s на %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "Развернитесь %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "после чего вы прибудете в пункт назначения"
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Вы прибыли в пункт назначения %s"
-msgid "then you have reached your destination."
-msgstr "после чего вы прибудете в пункт назначения"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Развязка"
+
+msgid "Exit"
+msgstr "Съезд"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1832,10 +1959,10 @@ msgstr "Маршрутные точки"
msgid "Enter Coordinates"
msgstr "Введите координаты"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/sc.po.in b/po/sc.po.in
index bfe58fcb..053fc9f3 100644
--- a/po/sc.po.in
+++ b/po/sc.po.in
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# Rex Sanna https://launchpad.net/~rex-sanna
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2011-02-05 18:46+0000\n"
"Last-Translator: Rex Sanna <Unknown>\n"
"Language-Team: Sardinian <sc@li.org>\n"
+"Language: sc\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: sc\n"
msgid "Running from source directory\n"
msgstr "Leghende dae sos sorgentese\n"
@@ -132,88 +132,188 @@ msgid_plural "in %d kilometers"
msgstr[0] "in unu chilometru"
msgstr[1] "in %d chilometroso"
-msgid "exit"
-msgstr "essi"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "in sa rampa"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s in s\\'istrada %s %s %s"
+msgid "%sinto %s%s%s"
+msgstr "%sin s\\'istrada %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s in su %s%s%s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sin su %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%s in sa %s%s%s"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sin sa %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%s in su %s%s%s"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sin su %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 in sa %s"
+msgstr "%sin sa %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "destra"
+msgid "When possible, please turn around"
+msgstr "Commente possibile torra in daesecusu"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "manca"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "fatzilmente "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Sichi s'istrada fintzasa a %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "fortemente "
+msgid "Enter the roundabout soon"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "tando lassa sa rotatoria a %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 "Lassa sa rotatoria a %1$s %2$s"
+
+msgid "soon"
+msgstr "prestu"
+
+msgid "now"
+msgstr "como"
+
+msgid "then"
+msgstr "tando"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Commente possibile torra in daesecusu"
+#. 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 ""
-msgid "Enter the roundabout soon"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Sichi s'istrada fintzasa a %s"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "prestu"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "destra"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "manca"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "fatzilmente "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "fortemente "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Pica sa %1$s istrada a %2$s"
@@ -222,32 +322,59 @@ msgstr "Pica sa %1$s istrada a %2$s"
msgid "after %i roads"
msgstr "dopu %i istradasa"
-msgid "now"
-msgstr "como"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Zira %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "tando torra in daesecusu"
-#. 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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Torra in daesecusu %1$s"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "tando torra in daesecusu"
+
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|right"
+msgstr "Torra in daesecusu %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "sichi"
+
+msgid "then you have reached your destination."
+msgstr "tando ses arribbau"
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Ses arribbau a %s"
-msgid "then you have reached your destination."
-msgstr "tando ses arribbau"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Essi"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1802,10 +1929,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/si.po.in b/po/si.po.in
index 9f75dcdd..b9c3c436 100644
--- a/po/si.po.in
+++ b/po/si.po.in
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# සපුමල් බණ්ඩාර https://launchpad.net/~sapumalbandaraucsc
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-06-02 06:14+0000\n"
"Last-Translator: සපුමල් බණ්ඩාර <sapumalbandaraucsc@gmail.com>\n"
"Language-Team: Sinhalese <si@li.org>\n"
+"Language: si\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"
msgid "Running from source directory\n"
msgstr "මූල ඩිරෙක්ටරියෙන් විචලනය වේ\n"
@@ -132,88 +132,188 @@ msgid_plural "in %d kilometers"
msgstr[0] "කිලෝ මීටරයකින්"
msgstr[1] "කිලෝ මීටර %d කින්"
-msgid "exit"
-msgstr "පිටවුම"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "රැම්පය තුළට"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s %s %s %s මාර්ගය තුළට"
+msgid "%sinto %s%s%s"
+msgstr "%s %s %s %s තුළට"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s %s %s %s තුළට | පුරුෂ ආකාරය"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%s %s %s %s තුළට"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%s %s %s %s තුළට | ස්ත්‍රී ආකාරය"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%s %s %s %s තුළට"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%s %s %s %s තුළට | උදාසීන ආකාරය"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%s %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 %s තුළට"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "දකුණ"
+msgid "When possible, please turn around"
+msgstr "හැකියාව ඇතිවිට දී, කරුණාකර හැරෙන්න."
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "වම"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "පහසුවෙන් "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "මීළඟ %s දක්වා මාර්ගය හඹායන්න."
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "ශක්තිමත් ලෙස "
+msgid "Enter the roundabout soon"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "එවිට %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 "%1$s %2$s හිදී වටරවුමෙන් ඉවත්වන්න."
+
+msgid "soon"
+msgstr "ලඟදීම"
+
+msgid "now"
+msgstr "දැන්"
+
+msgid "then"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "හැකියාව ඇතිවිට දී, කරුණාකර හැරෙන්න."
+#. 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 ""
-msgid "Enter the roundabout soon"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|left"
+msgstr ""
+
+#. 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 ""
+
+msgid "on your left"
msgstr ""
+msgid "on your right"
+msgstr ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "මීළඟ %s දක්වා මාර්ගය හඹායන්න."
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "ලඟදීම"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "දකුණ"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "වම"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "පහසුවෙන් "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "ශක්තිමත් ලෙස "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "ගන්න %1$s මාර්ගය %2$s ට"
@@ -222,32 +322,59 @@ msgstr "ගන්න %1$s මාර්ගය %2$s ට"
msgid "after %i roads"
msgstr "මාර්ග %i පසු"
-msgid "now"
-msgstr "දැන්"
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "%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 ""
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
-msgid "error"
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
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 arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "එවිට ඔබ ඔබේ ගමනාන්තයට ළඟා වී ඇත."
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "ඔබ ඔබේ ගමනාන්තය වන %s ට ළඟා වී ඇත."
-msgid "then you have reached your destination."
-msgstr "එවිට ඔබ ඔබේ ගමනාන්තයට ළඟා වී ඇත."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "පිටවුම"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1802,10 +1929,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/sk.po.in b/po/sk.po.in
index 18a9c8fc..3c19d800 100644
--- a/po/sk.po.in
+++ b/po/sk.po.in
@@ -10,19 +10,19 @@
# helix84 https://launchpad.net/~helix84
# kayle.sk https://launchpad.net/~kayle.sk
# laznik https://launchpad.net/~orders-strings
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2014-11-15 22:08+0000\n"
"Last-Translator: GizmoSK <gizmosk@gmail.com>\n"
"Language-Team: Slovenčina\n"
+"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"Language: sk\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -144,63 +144,71 @@ msgstr[0] "o %d kilometrov"
msgstr[1] "o jeden kilometer"
msgstr[2] "o %d kilometre"
-msgid "exit"
-msgstr "výjazd"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "na privádzač"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s do ulice %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%sdo %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s do %s%s%s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sdo %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%s do %s%s%s"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sdo %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%s do %s%s%s"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sdo %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 na %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "vpravo"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "vľavo"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "mierne "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "prudko "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "Ak to bude možné, prosím, otočte sa"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Ak to bude možné, prosím, otočte sa"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Pokračujte naďalej po ceste %s"
msgid "Enter the roundabout soon"
msgstr "Vstúpte do kruhového objazdu onedlho"
@@ -210,57 +218,176 @@ msgstr "Vstúpte do kruhového objazdu onedlho"
msgid "Enter the roundabout %s"
msgstr "Vojdite do kruhového objazdu %s"
+#. 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 "potom opustite kruhový objazd na %1$s %2$s"
+
+#. 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 "Leave the roundabout at the %1$s %2$s"
+msgstr "Opustite kruhový objazd na %1$s %2$s"
+
+msgid "soon"
+msgstr "onedlho"
+
+msgid "now"
+msgstr "teraz"
+
+msgid "then"
+msgstr "potom"
+
+#. 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 ""
+#. 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 "Leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Pokračujte naďalej po ceste %s"
+msgid "then merge%1$s|left"
+msgstr ""
-msgid "soon"
-msgstr "onedlho"
+#. 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 ""
+
+msgid "on your left"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
-msgstr "Choďte %1$s cestou na %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "po %i cestách"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "now"
-msgstr "teraz"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Dorazili ste do svojho cieľa %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "vpravo"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "vľavo"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "mierne "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "prudko "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Choďte %1$s cestou na %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "po %i cestách"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Odbočte %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 "potom otočte sa"
+
+#. 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 "Otočte sa %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "potom otočte sa"
+
+#. 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 "Otočte sa %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
msgid "then you have reached your destination."
msgstr "potom dosiahnete svoj cieľ cesty"
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Dorazili ste do svojho cieľa %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Križovatka"
+
+msgid "Exit"
+msgstr "Výjazd"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Pozícia"
@@ -1817,10 +1944,10 @@ msgstr "Body trasy"
msgid "Enter Coordinates"
msgstr "Vložte súradnice"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/sl.po.in b/po/sl.po.in
index 57c9d794..41e7cbc4 100644
--- a/po/sl.po.in
+++ b/po/sl.po.in
@@ -5,20 +5,20 @@
# Gregor Koporec https://launchpad.net/~gregork8
# KaZeR https://launchpad.net/~kazer
# Štefan Baebler https://launchpad.net/~stefanba
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:42+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Slovenian <sl@li.org>\n"
+"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
-"n%100==4 ? 3 : 0);\n"
-"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -140,30 +140,53 @@ msgstr[1] "Čez %d kilometer"
msgstr[2] "Čez %d kilometra"
msgstr[3] "Čez %d kilometre"
-msgid "exit"
-msgstr "odcep"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr "%sna %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%sna %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sna %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sna %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -171,92 +194,196 @@ msgstr "%sna %s%s%s"
msgid "%sinto the %s"
msgstr "%sna %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "desno"
+msgid "When possible, please turn around"
+msgstr "Obrnite čim bo to mogoče"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "levo"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "rahlo "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Ostanite na tej cesti naslednjih %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "ostro "
+msgid "Enter the roundabout soon"
+msgstr "Kmalu zapeljite v krožišče"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Obrnite čim bo to mogoče"
+#. 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 ""
-msgid "Enter the roundabout soon"
-msgstr "Kmalu zapeljite v krožišče"
+msgid "soon"
+msgstr "kmalu"
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "now"
+msgstr "sedaj"
+
+msgid "then"
+msgstr "nato"
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
-msgstr "Ostanite na tej cesti naslednjih %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
-msgid "soon"
-msgstr "kmalu"
+msgid "on your left"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
-msgstr "Zavijte na %2$s v %1$so cesto"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "čez %i cest"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "now"
-msgstr "sedaj"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "%s ste na cilju"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "desno"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "levo"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "rahlo "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "ostro "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Zavijte na %2$s v %1$so cesto"
+
+#, c-format
+msgid "after %i roads"
+msgstr "čez %i cest"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "%3$s zavijte %1$s%2$s %4$s"
+
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "nato obrnite čim"
+
+#. 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 "Obrnite čim %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "nato obrnite čim"
+
+#. 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 "Obrnite čim %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
msgid "then you have reached your destination."
msgstr "in ste na cilju."
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "%s ste na cilju"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Razcep"
+
+msgid "Exit"
+msgstr "Odcep"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Položaj"
@@ -1810,10 +1937,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/sr.po.in b/po/sr.po.in
index b2d186b2..96f35d98 100644
--- a/po/sr.po.in
+++ b/po/sr.po.in
@@ -8,20 +8,20 @@
# momcilo https://launchpad.net/~momcilo-majic
# Мирослав Николић https://launchpad.net/~lipek
# Саша Петровић https://launchpad.net/~salepetronije
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2015-02-08 21:50+0000\n"
"Last-Translator: Саша Петровић <salepetronije@gmail.com>\n"
"Language-Team: српски <xfce4@xfce4.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -143,30 +143,53 @@ msgstr[0] "за %d километара"
msgstr[1] "за %d километара"
msgstr[2] "за %d километара"
-msgid "exit"
-msgstr "излаз"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "на нагибу"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%sу улици %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%sу %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%sу %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sу %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sу %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -174,32 +197,17 @@ msgstr "%sу %s%s%s"
msgid "%sinto the %s"
msgstr "%sна %s"
-#. 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 "јако "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "Када буде могуће, променити смер"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Када буде могуће, променити смер"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Прати пут до следећег %s"
msgid "Enter the roundabout soon"
msgstr "Ускоро прелазак на обилазницу"
@@ -209,57 +217,176 @@ msgstr "Ускоро прелазак на обилазницу"
msgid "Enter the roundabout %s"
msgstr "Прелаз на обилазницу %s"
+#. 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 "потом напутстите обилазницу на %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 "Напуштање обилазнице за %1$s %2$s"
+
+msgid "soon"
+msgstr "ускоро"
+
+msgid "now"
+msgstr "сад"
+
+msgid "then"
+msgstr "потом"
+
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "then leave the roundabout at the %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "Leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Прати пут до следећег %s"
+msgid "then merge%1$s|left"
+msgstr ""
-msgid "soon"
-msgstr "ускоро"
+#. 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 ""
+
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
-msgstr "Прати %1$s пут до %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "после %i путева"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "now"
-msgstr "сад"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Стигли сте на одредиште %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "десно"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "лево"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "лако "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "јако "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Прати %1$s пут до %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "после %i путева"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Скрени %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 "потом променити смер"
+
+#. 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 "Променити смер %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "потом променити смер"
+
+#. 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 "Променити смер %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
msgid "then you have reached your destination."
msgstr "потом сте стигли на своје одредиште."
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Стигли сте на одредиште %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Излаз"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Положај"
@@ -1329,13 +1456,11 @@ msgstr ""
#. We have not found an existing config file from all possibilities
msgid "No config file navit.xml, navit.xml.local found\n"
-msgstr ""
-"Нема датотеке подешавања navit.xml, navit.xml.сопствени је пронађен\n"
+msgstr "Нема датотеке подешавања navit.xml, navit.xml.сопствени је пронађен\n"
#, c-format
msgid "Error parsing config file '%s': %s\n"
-msgstr ""
-"Десила се грешка приликом рашчлањивања датотеке подешавања „%s“: %s\n"
+msgstr "Десила се грешка приликом рашчлањивања датотеке подешавања „%s“: %s\n"
#, c-format
msgid "Using config file '%s'\n"
@@ -1817,10 +1942,10 @@ msgstr "Пролазне тачке"
msgid "Enter Coordinates"
msgstr "Унесите координате"
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
@@ -2643,3 +2768,36 @@ msgid ""
"currently selected engine reports it is unable to speak in your language. "
"Should we ask the system to show voice download dialog?"
msgstr ""
+
+#~ msgid "%sinto the street %s%s%s"
+#~ msgstr "%sу улици %s%s%s"
+
+#~ msgid "%sinto the %s%s%s|male form"
+#~ msgstr "%sу %s%s%s"
+
+#~ msgid "%sinto the %s%s%s|female form"
+#~ msgstr "%sу %s%s%s"
+
+#~ msgid "%sinto the %s%s%s|neutral form"
+#~ msgstr "%sу %s%s%s"
+
+#~ msgid "really strongly "
+#~ msgstr "веома јако "
+
+#~ msgid "unknown "
+#~ msgstr "непознат "
+
+#~ msgid "then leave the roundabout at the %s"
+#~ msgstr "потом напутстите обилазницу на %s"
+
+#~ msgid "Leave the roundabout at the %s"
+#~ msgstr "Напуштање обилазнице за %s"
+
+#~ msgid "then take the %1$s road to the %2$s"
+#~ msgstr "потом прати пут %1$s до %2$s"
+
+#~ msgid "error"
+#~ msgstr "грешка"
+
+#~ msgid "then turn %1$s%2$s %3$s%4$s"
+#~ msgstr "потом скрени %1$s%2$s %3$s%4$s"
diff --git a/po/sv.po.in b/po/sv.po.in
index e6f4428e..7897930c 100644
--- a/po/sv.po.in
+++ b/po/sv.po.in
@@ -9,19 +9,19 @@
# Squall Leonhart https://launchpad.net/~webmaster-square-one
# nairobie https://launchpad.net/~samuel-ostman
# pipatron https://launchpad.net/~pipatron
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:44+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\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: sv\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -139,30 +139,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "om en kilometer"
msgstr[1] "om %d kilometer"
-msgid "exit"
-msgstr "avfart"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "ut på påfarten"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%sin på gatan %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%sin på %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%sin på %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%sin på %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%sin på %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -170,32 +193,17 @@ msgstr "%sin på %s%s%s"
msgid "%sinto the %s"
msgstr "%sut på %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "höger"
-
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "vänster"
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "lätt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "tvärt "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr ""
+msgid "When possible, please turn around"
+msgstr "Vänd när det går"
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Vänd när det går"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Följ vägen i %s"
msgid "Enter the roundabout soon"
msgstr "Kör snart in i rondellen"
@@ -205,57 +213,176 @@ msgstr "Kör snart in i rondellen"
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 %1$s %2$s"
+msgstr "kör sedan ut ur rondellen mot %1$s %2$s"
+
+#. 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 "Leave the roundabout at the %1$s %2$s"
+msgstr "Kör ut ur rondellen mot %1$s %2$s"
+
+msgid "soon"
+msgstr "snart"
+
+msgid "now"
+msgstr "nu"
+
+msgid "then"
+msgstr "sedan"
+
+#. 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 ""
+#. 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 "Leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Följ vägen i %s"
+msgid "then merge%1$s|left"
+msgstr ""
-msgid "soon"
-msgstr "snart"
+#. 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 ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
-msgstr "Ta %1$s vägen mot %2$s"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
-msgstr "efter %i vägar"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-msgid "now"
-msgstr "nu"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "then continue straight%1$s"
msgstr ""
-msgid "error"
+#. 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 ""
-#. 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 arg. is where to do the maneuver
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "then keep right%1$s"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "You have reached your destination %s"
-msgstr "Du har nått din destination %s"
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "höger"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "vänster"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "lätt "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "tvärt "
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Ta %1$s vägen mot %2$s"
+
+#, c-format
+msgid "after %i roads"
+msgstr "efter %i vägar"
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Sväng %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 "vänd sedan"
+
+#. 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 "Vänd %1$s"
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "vänd sedan"
+
+#. 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 "Vänd %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr "följ"
msgid "then you have reached your destination."
msgstr "sedan har du nått din destination."
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Du har nått din destination %s"
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Korsning"
+
+msgid "Exit"
+msgstr "Avfart"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Position"
@@ -1809,10 +1936,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/sw.po.in b/po/sw.po.in
index 4701629a..de891ac2 100644
--- a/po/sw.po.in
+++ b/po/sw.po.in
@@ -4,19 +4,19 @@
# Many thanks to the contributors of this translation:
# HinzundKunz https://launchpad.net/~martin-tlustos
# KaZeR https://launchpad.net/~kazer
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2014-08-08 23:15+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Swahili <sw@li.org>\n"
+"Language: sw\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: sw\n"
msgid "Running from source directory\n"
msgstr ""
@@ -133,88 +133,188 @@ msgid_plural "in %d kilometers"
msgstr[0] "baada ya kilomita %d"
msgstr[1] "baada ya kilomita %d"
-msgid "exit"
-msgstr "ondoka"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s kufuata %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%skufuata %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s kufuata %s%s%s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%skufuata %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%s kufuata %s%s%s"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%skufuata %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%s kufuata %s%s%s"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%skufuata %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 kufuata %s"
+msgstr "%skufuata %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "kulia"
+msgid "When possible, please turn around"
+msgstr "Geuka na kurudi nyuma inapowezekana"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "kushoto"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Buata barabara kwa %s"
+
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. 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 "halafu toka kutoka kwenye kipilefti kwenye %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 "Toka kutoka kwenye kipilefti kwenye %1$s %2$s"
+
+msgid "soon"
+msgstr "karibuni"
+
+msgid "now"
+msgstr "sasa"
+
+msgid "then"
+msgstr "halafu"
+
+#. 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 ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "geuka na kurudi nyuma inapowezekana"
+#. 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 ""
-msgid "Enter the roundabout soon"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
+
+#. 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 "Enter the roundabout %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then continue straight%1$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "buata barabara kwa %s"
+msgid "Continue straight %1$s%2$s%3$s"
+msgstr ""
-msgid "soon"
-msgstr "karibuni"
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "kulia"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "kushoto"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "fuata %1$s hadi %2$s"
@@ -223,32 +323,59 @@ msgstr "fuata %1$s hadi %2$s"
msgid "after %i roads"
msgstr "baada ya barabara %i"
-msgid "now"
-msgstr "sasa"
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "piga kona %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 ""
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
-msgid "error"
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
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 arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "halafu utakuwa umefika"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "umelifikia lengo lako %s"
-msgid "then you have reached your destination."
-msgstr "halafu utakuwa umefika"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Ondoka"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1803,10 +1930,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/ta.po.in b/po/ta.po.in
index 20d45d1e..beab1fc9 100644
--- a/po/ta.po.in
+++ b/po/ta.po.in
@@ -4,19 +4,19 @@
# Many thanks to the contributors of this translation:
# Dinesh Ramalingam https://launchpad.net/~dinodinu+navit
# Rajiv Subrahmanyam https://launchpad.net/~rajiv-public
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-04 00:29+0000\n"
"Last-Translator: Dinesh Ramalingam <Unknown>\n"
"Language-Team: Tamil <ta@li.org>\n"
+"Language: ta\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: ta\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -134,30 +134,53 @@ msgid_plural "in %d kilometers"
msgstr[0] "ஒரு கிலோமீட்டருக்குள்"
msgstr[1] "%d கிலோமீட்டர்களுக்குள்"
-msgid "exit"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -165,92 +188,196 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
+msgid "When possible, please turn around"
msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "இயல்பாக "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "%s க்கு இதே தெருவில் செல்லவும்"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+#. 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 ""
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "சீக்கிரமாக"
+
+msgid "now"
+msgstr "இப்பொழுது"
+
+msgid "then"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
-msgstr "%s க்கு இதே தெருவில் செல்லவும்"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
-msgid "soon"
-msgstr "சீக்கிரமாக"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
-msgstr "இப்பொழுது"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr ""
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr ""
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "இயல்பாக "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Take the %1$s road to the %2$s"
msgstr ""
-msgid "error"
+#, c-format
+msgid "after %i roads"
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'
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "You have reached your destination %s"
+msgid "Make a U-turn %1$s|right"
+msgstr ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
msgid "then you have reached your destination."
msgstr ""
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr ""
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1804,10 +1931,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/te.po.in b/po/te.po.in
index 83701d4b..eb4b0427 100644
--- a/po/te.po.in
+++ b/po/te.po.in
@@ -4,19 +4,19 @@
# Many thanks to the contributors of this translation:
# KaZeR https://launchpad.net/~kazer
# వీవెన్ https://launchpad.net/~veeven
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-27 21:48+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Telugu <te@li.org>\n"
+"Language: te\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: te\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -134,30 +134,53 @@ msgid_plural "in %d kilometers"
msgstr[0] ""
msgstr[1] ""
-msgid "exit"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
+msgid "%sinto %s%s%s"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr ""
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr ""
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -165,90 +188,194 @@ msgstr ""
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "కుడి"
+msgid "When possible, please turn around"
+msgstr ""
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "ఎడమ"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "తేలికగా "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
+#. 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 ""
-msgid "Enter the roundabout soon"
+msgid "soon"
+msgstr "త్వరలో"
+
+msgid "now"
+msgstr "ఇప్పుడు"
+
+msgid "then"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
+msgid "Merge %1$s%2$s|left"
msgstr ""
-msgid "soon"
-msgstr "త్వరలో"
+msgid "on your left"
+msgstr ""
+
+msgid "on your right"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
-msgstr "ఇప్పుడు"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Continue straight %1$s%2$s%3$s"
msgstr ""
-msgid "error"
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$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 maneuver, the third is destination
+#, c-format
+msgid "Keep right %1$s%2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "కుడి"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "ఎడమ"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "తేలికగా "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr ""
+
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr ""
+
+#. 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 ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "మీరు మీ గమ్యస్థానం %s చేరారు"
-msgid "then you have reached your destination."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
msgstr ""
#. Android resource: @strings/position_popup_title
@@ -1804,10 +1931,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/th.po.in b/po/th.po.in
index ac4d01ac..c752bb08 100644
--- a/po/th.po.in
+++ b/po/th.po.in
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# mansv68 https://launchpad.net/~mansv68
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:46+0000\n"
"Last-Translator: mansv68 <mansv68@yahoo.co.th>\n"
"Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Language: th\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -131,123 +131,250 @@ msgid "in one kilometer"
msgid_plural "in %d kilometers"
msgstr[0] "อีก %d กิโลเมตร"
-msgid "exit"
-msgstr "ทางออก"
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr ""
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s เข้าสู่ถนน %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%sเข้าสู่ถนน %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s เข้าสู่ %s%s%s| จาก"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sเข้าสู่ %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%s เข้าสู %s%s%s| จาก"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sเข้าสู %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%s เข้าสู่ %s%s%s| จาก"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sเข้าสู่ %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
#, c-format
msgid "%sinto the %s"
msgstr ""
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "ขวา"
+msgid "When possible, please turn around"
+msgstr "ถ้าเป็นไปได้ ให้กลับรถ"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "ซ้าย"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "ตรงไปตามถนน แล้ว %s"
+
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "อย่างเคร่งคัด "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. 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 ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "ถ้าเป็นไปได้ ให้กลับรถ"
+msgid "soon"
+msgstr "ในไม่ช้า"
-msgid "Enter the roundabout soon"
+msgid "now"
+msgstr "เดี๋ยวนี้"
+
+msgid "then"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Enter the roundabout %s"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "then leave the roundabout at the %s"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "Follow the road for the next %s"
-msgstr "ตรงไปตามถนน แล้ว %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
-msgid "soon"
-msgstr "ในไม่ช้า"
+msgid "on your left"
+msgstr ""
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "on your right"
+msgstr ""
+
+#. 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 the %1$s road to the %2$s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "after %i roads"
+msgid "Take the exit %1$s %2$s%3$s"
msgstr ""
-msgid "now"
-msgstr "เดี๋ยวนี้"
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "ขวา"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "ซ้าย"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "อย่างเคร่งคัด "
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Take the %1$s road to the %2$s"
msgstr ""
-msgid "error"
+#, c-format
+msgid "after %i roads"
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'
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|left"
+msgstr ""
+
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr ""
+
+#. 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 ""
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
+msgstr ""
+
+msgid "then you have reached your destination."
msgstr ""
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "คุณได้ถึงที่หมายแล้ว %s"
-msgid "then you have reached your destination."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
msgstr ""
+msgid "Exit"
+msgstr "ทางออก"
+
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1801,10 +1928,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/tr.po.in b/po/tr.po.in
index f1b668b4..13ff71c5 100644
--- a/po/tr.po.in
+++ b/po/tr.po.in
@@ -13,19 +13,19 @@
# seqizz (gurkanGur) https://launchpad.net/~seqizz
# tinyos https://launchpad.net/~eygu-mindikoglu
# Şahin Alp Taşkaya https://launchpad.net/~sahin
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-12-10 00:54+0000\n"
"Last-Translator: seqizz (gurkanGur) <seqizz@gmail.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
+"Language: tr\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: tr\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -143,88 +143,188 @@ msgid_plural "in %d kilometers"
msgstr[0] "%d kilometrede"
msgstr[1] "%d kilometrede"
-msgid "exit"
-msgstr "çıkış"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "rampada"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%sCaddesi'ne %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%scaddesine %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%scaddesine %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%scaddesine %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%scaddesine %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%scaddesine %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%scaddesine %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%scaddesine %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%s yoluna"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "Sağa"
+msgid "When possible, please turn around"
+msgstr "Müsait olduğunda lütfen yönünü değiştir"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "Sola"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "kolayca "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Gelecek %s için yolu takip et"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "sertçe "
+msgid "Enter the roundabout soon"
+msgstr "Yakındaki kavşağa girin"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "ardından %1$s'de kavşaktan çıkın %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 "%1$s'de kavşaktan çıkın %2$s"
+
+msgid "soon"
+msgstr "yakında"
+
+msgid "now"
+msgstr "şimdi"
+
+msgid "then"
+msgstr "ardından"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Müsait olduğunda lütfen yönünü değiştir"
+#. 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 ""
-msgid "Enter the roundabout soon"
-msgstr "Yakındaki kavşağa girin"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
msgstr ""
+msgid "on your right"
+msgstr ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Gelecek %s için yolu takip et"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "yakında"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "Sağa"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "Sola"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "kolayca "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "sertçe "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "%1$s yolunda %2$s yönüne dönün"
@@ -233,32 +333,59 @@ msgstr "%1$s yolunda %2$s yönüne dönün"
msgid "after %i roads"
msgstr "%i yol sonra"
-msgid "now"
-msgstr "şimdi"
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Dönüş %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 ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
-msgid "error"
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
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 arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "ardından hedefinize ulaşacaksınız"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Hedefinize ulaştınız, %s"
-msgid "then you have reached your destination."
-msgstr "ardından hedefinize ulaşacaksınız"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Çıkış"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1813,10 +1940,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/uk.po.in b/po/uk.po.in
index 2df01bb0..ce5c9022 100644
--- a/po/uk.po.in
+++ b/po/uk.po.in
@@ -6,20 +6,20 @@
# Knedlyk https://launchpad.net/~yupadmin
# andygol https://launchpad.net/~andygol
# serg_stetsuk https://launchpad.net/~serg-stetsuk
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:44+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
+"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -139,88 +139,188 @@ msgstr[0] "за %d кілометр"
msgstr[1] "за %d кілометри"
msgstr[2] "за %d кілометрів"
-msgid "exit"
-msgstr "виїзд"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "з'їзд на"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s на вулицю %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%sна %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s на %s%s%s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sна %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%s на %s%s%s"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sна %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%s на %s%s%s"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sна %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 в %s"
+msgstr "%sв %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "праворуч"
+msgid "When possible, please turn around"
+msgstr "Якщо це можливо, то розверніться"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "ліворуч"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "легко "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Їдьте дорогою наступні %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "круто "
+msgid "Enter the roundabout soon"
+msgstr "Скоро виїзд на дорогу з кільцевим рухом"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "тоді виїдьте з кільця через %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 "Виїдьте з кільця через %1$s %2$s"
+
+msgid "soon"
+msgstr "скоро"
+
+msgid "now"
+msgstr "зараз"
+
+msgid "then"
+msgstr "тоді"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Якщо це можливо, то розверніться"
+#. 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 ""
-msgid "Enter the roundabout soon"
-msgstr "Скоро виїзд на дорогу з кільцевим рухом"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
msgstr ""
+msgid "on your right"
+msgstr ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Їдьте дорогою наступні %s"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "скоро"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "праворуч"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "ліворуч"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "легко "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "круто "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "З’їдьте на дорогу %1$s до %2$s"
@@ -229,32 +329,59 @@ msgstr "З’їдьте на дорогу %1$s до %2$s"
msgid "after %i roads"
msgstr "після %i дороги"
-msgid "now"
-msgstr "зараз"
-
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Поверніть на %1$s%2$s %3$s%4$s"
-msgid "error"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+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 arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "То розверніться %1$s"
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "тоді то розверніться"
+
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
+msgstr "То розверніться %1$s"
+
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "і тоді Ви прибудете в місце призначення."
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Ви досягли місця призначення %s"
-msgid "then you have reached your destination."
-msgstr "і тоді Ви прибудете в місце призначення."
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "Розв'язка"
+
+msgid "Exit"
+msgstr "Виїзд"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1809,10 +1936,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/ur.po.in b/po/ur.po.in
index e5d09bdd..2e998b03 100644
--- a/po/ur.po.in
+++ b/po/ur.po.in
@@ -4,24 +4,32 @@
# Many thanks to the contributors of this translation:
# KaZeR https://launchpad.net/~kazer
# asghar https://launchpad.net/~asghar144
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:44+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Urdu <ur@li.org>\n"
+"Language: ur\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: ur\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
msgstr "سورس ڈایرکٹری سے چلا ر ہے ہیں\n"
+#, c-format
+msgid "setting '%s' to '%s'\n"
+msgstr "ترتیب '%s' سے '%s'\n"
+
+#. TRANSLATORS: the following counts refer to streets
+msgid "zeroth"
+msgstr "صفر سے"
+
msgid "first"
msgstr "پہلا"
@@ -67,6 +75,18 @@ msgid "%d m"
msgstr "%d میٹر"
#, c-format
+msgid "in %d m"
+msgstr "%d میٹر میں"
+
+#, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
msgid "%d meters"
msgstr "%d میٹر"
@@ -75,6 +95,14 @@ msgid "in %d meters"
msgstr "%d میٹر میں"
#, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
msgid "%d.%d kilometers"
msgstr "%d.%d کلومیٹر"
@@ -82,159 +110,212 @@ msgstr "%d.%d کلومیٹر"
msgid "in %d.%d kilometers"
msgstr "%d.%d کلومیٹر میں"
-msgid "exit"
-msgstr "اخراج"
+#, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "one kilometer"
+msgid_plural "%d kilometers"
+msgstr[0] "ایک کلومیٹر"
+msgstr[1] "%d کلومیٹر"
+
+#, c-format
+msgid "in one kilometer"
+msgid_plural "in %d kilometers"
+msgstr[0] "ایک کلومیٹر میں"
+msgstr[1] "%d کلومیٹر میں"
+
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "ڈھلان میں"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s سڑک میں سے %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%sمیں سے %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s میں سے %s%s%s"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%sمیں سے %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%s میں سے %s%s%s"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%sمیں سے %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%s میں سے %s%s%s"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%sمیں سے %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پر %s"
-#. 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 "جب ممکن ہو گھومیں"
-msgid "Set as destination"
-msgstr "بطور منزل انتخاب"
-
-msgid "Enter Destination"
-msgstr "منزل داخل کریں"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-msgid "Enable/disable automatic zoom level changing"
-msgstr "فعال/غیر فعال کریں زوم کی خود کار تبدیلی"
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "%s تک سڑک کے مطابق جایئں"
-msgid " Elevation "
-msgstr " ارتفاع "
+msgid "Enter the roundabout soon"
+msgstr ""
+#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
-msgid "Current profile: %s"
-msgstr "موجودہ پروفائل: %s"
+msgid "Enter the roundabout %s"
+msgstr ""
-msgid "Add Bookmark"
-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 "پھر گول چوراہے کو %1$s %2$s پے چھوڑ دیں"
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
#, c-format
-msgid "setting '%s' to '%s'\n"
-msgstr "ترتیب '%s' سے '%s'\n"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr "گول چوراہے کو %1$s %2$s پے چھوڑ دیں"
-#. TRANSLATORS: the following counts refer to streets
-msgid "zeroth"
-msgstr "صفر سے"
+msgid "soon"
+msgstr "جلد ہی"
-#, c-format
-msgid "in %d m"
-msgstr "%d میٹر میں"
+msgid "now"
+msgstr "اب"
-#, c-format
-msgid "%d feet"
+msgid "then"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "in %d feet"
+msgid "then merge%1$s|right"
msgstr ""
+#. 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 "%d.%d miles"
+msgid "Merge %1$s%2$s|right"
msgstr ""
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
#, c-format
-msgid "in %d.%d miles"
+msgid "then merge%1$s|left"
msgstr ""
+#. 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 "one mile"
-msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Merge %1$s%2$s|left"
+msgstr ""
-#, c-format
-msgid "in one mile"
-msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgid "on your left"
+msgstr ""
+msgid "on your right"
+msgstr ""
+
+#. 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 "one kilometer"
-msgid_plural "%d kilometers"
-msgstr[0] "ایک کلومیٹر"
-msgstr[1] "%d کلومیٹر"
+msgid "Take exit %1$s %2$s %3$s"
+msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "in one kilometer"
-msgid_plural "in %d kilometers"
-msgstr[0] "ایک کلومیٹر میں"
-msgstr[1] "%d کلومیٹر میں"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+msgid "at exit"
msgstr ""
-msgid "Enter the roundabout soon"
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then continue straight%1$s"
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "Enter the roundabout %s"
+msgid "Continue straight %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "then leave the roundabout at the %s"
+msgid "then keep right%1$s"
msgstr ""
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Keep right %1$s%2$s%3$s"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "%s تک سڑک کے مطابق جایئں"
+msgid "then keep left%1$s"
+msgstr ""
-msgid "soon"
-msgstr "جلد ہی"
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "دایئں"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "بایئں"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "آسانی سے "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "سختی سے "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "سڑک تک %1$s سے %2$s"
@@ -243,32 +324,59 @@ msgstr "سڑک تک %1$s سے %2$s"
msgid "after %i roads"
msgstr "%i سڑکوں کے بعد"
-msgid "now"
-msgstr "اب"
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "%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 ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
-msgid "error"
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
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 arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "پھر آپ اپنی منزل پہ پہنچ جایئں گے"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "آپ اپنی منزل %s پے پہنچ کئے ہیں"
-msgid "then you have reached your destination."
-msgstr "پھر آپ اپنی منزل پہ پہنچ جایئں گے"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "اخراج"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -308,6 +416,9 @@ msgstr ""
msgid "Set as position"
msgstr "بطور موجودہ مقام انتخاب"
+msgid "Set as destination"
+msgstr "بطور منزل انتخاب"
+
msgid "Add as bookmark"
msgstr "بک مارک میں محفوظ کریں"
@@ -1395,6 +1506,9 @@ msgstr "سڑک"
msgid "Number"
msgstr "نمبر"
+msgid "Enter Destination"
+msgstr "منزل داخل کریں"
+
msgid "Zip Code"
msgstr "زپ کوڈ"
@@ -1504,6 +1618,9 @@ msgstr "دکھیں/نہ دیکھیں سفر کی تفصیل"
msgid "_Autozoom"
msgstr "خودکار زوم"
+msgid "Enable/disable automatic zoom level changing"
+msgstr "فعال/غیر فعال کریں زوم کی خود کار تبدیلی"
+
msgid "_Fullscreen"
msgstr "پوری سکرین"
@@ -1753,6 +1870,9 @@ msgstr ""
msgid "Show Satellite Status"
msgstr "سٹلائٹ کی حالت دیکھیں"
+msgid " Elevation "
+msgstr " ارتفاع "
+
msgid " Azimuth "
msgstr " سمت "
@@ -1769,6 +1889,10 @@ msgid "pedestrian"
msgstr "پیدل"
#, c-format
+msgid "Current profile: %s"
+msgstr "موجودہ پروفائل: %s"
+
+#, c-format
msgid "Change profile to: %s"
msgstr "پروفائل کو :%s میں بدلیں"
@@ -1781,6 +1905,9 @@ msgstr "سٹلائٹ کی حالت دیکھیں"
msgid "Show NMEA data"
msgstr "NMEA ڈیٹا دیکھیں"
+msgid "Add Bookmark"
+msgstr "بک مارک میں شامل"
+
msgid "Rename"
msgstr "تبدیل نام"
@@ -1804,10 +1931,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/vi.po.in b/po/vi.po.in
index 1d75adf6..2998e141 100644
--- a/po/vi.po.in
+++ b/po/vi.po.in
@@ -5,19 +5,19 @@
# Hoàng Đỗ Can Trực https://launchpad.net/~truc294
# Le Viet Thanh https://launchpad.net/~lethanhx2k
# Saki https://launchpad.net/~nhkhoi
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:43+0000\n"
"Last-Translator: Nguyễn Hào Khôi <Unknown>\n"
"Language-Team: Vietnamese <vi@li.org>\n"
+"Language: vi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Language: vi\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -133,88 +133,188 @@ msgid "in one kilometer"
msgid_plural "in %d kilometers"
msgstr[0] "trong %d km"
-msgid "exit"
-msgstr "thoát"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
-msgid "into the ramp"
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "vào dốc"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%svào phố %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%svào %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%svào %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%svào %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%svào %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%svào %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%svào %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%svào %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
#, c-format
msgid "%sinto the %s"
msgstr "%svào %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "phải"
+msgid "When possible, please turn around"
+msgstr "Khi có thể, hãy quay vòng"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "trái"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "dễ dàng "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Đường tiếp theo %s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "mạnh "
+msgid "Enter the roundabout soon"
+msgstr "Sắp tới chỗ vòng"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "sau đó ra khỏi đường vòng tại %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 "Ra khỏi đường vòng tại %1$s %2$s"
+
+msgid "soon"
+msgstr "ngay"
+
+msgid "now"
+msgstr "bây giờ"
+
+msgid "then"
+msgstr "sau đó"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "Khi có thể, hãy quay vòng"
+#. 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 ""
-msgid "Enter the roundabout soon"
-msgstr "Sắp tới chỗ vòng"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
msgstr ""
+msgid "on your right"
+msgstr ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Đường tiếp theo %s"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "ngay"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "phải"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "trái"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "dễ dàng "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "mạnh "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "Có %1$s đường đến %2$s"
@@ -223,32 +323,59 @@ msgstr "Có %1$s đường đến %2$s"
msgid "after %i roads"
msgstr "sau %i đường"
-msgid "now"
-msgstr "bây giờ"
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "Rẽ %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 ""
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
-msgid "error"
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
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 arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "sau đó bạn tới điểm đích"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Bạn vừa tới điểm đích: %s"
-msgid "then you have reached your destination."
-msgstr "sau đó bạn tới điểm đích"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "Thoát"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1803,10 +1930,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in
index d6db35f7..505d137e 100644
--- a/po/zh_CN.po.in
+++ b/po/zh_CN.po.in
@@ -9,19 +9,19 @@
# Lele Long https://launchpad.net/~schemacs
# Li Jin https://launchpad.net/~lijin
# kelvin https://launchpad.net/~kelvinz
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:46+0000\n"
"Last-Translator: Kyle WANG <waxaca@163.com>\n"
"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Language: \n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -137,88 +137,188 @@ msgid "in one kilometer"
msgid_plural "in %d kilometers"
msgstr[0] "距离%d千米"
-msgid "exit"
-msgstr "退出"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "进入坡道"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s 到达街区 %s%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%s到达 %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
-msgstr "%s 到达 %s%s%s | male form"
+msgid "%sinto %s%s%s|masculine form"
+msgstr "%s到达 %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
-msgstr "%s 到达 %s%s%s | female form"
+msgid "%sinto %s%s%s|feminine form"
+msgstr "%s到达 %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
-msgstr "%s 到达 %s%s%s | neutral form"
+msgid "%sinto %s%s%s|neuter form"
+msgstr "%s到达 %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 到达 %s"
+msgstr "%s到达 %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "右"
+msgid "When possible, please turn around"
+msgstr "当遇到路口的时候,请转弯"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "左"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "缓 "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "沿路继续行驶%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "急转 "
+msgid "Enter the roundabout soon"
+msgstr "不久将进入环形交叉路口"
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "然后在%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 "还有%1$s %2$s就将驶离环形区"
+
+msgid "soon"
+msgstr "不久"
+
+msgid "now"
+msgstr "现在"
+
+msgid "then"
+msgstr "然后"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "当遇到路口的时候,请转弯"
+#. 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 ""
-msgid "Enter the roundabout soon"
-msgstr "不久将进入环形交叉路口"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
msgstr ""
+msgid "on your right"
+msgstr ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
+msgstr ""
+
+msgid "at exit"
msgstr ""
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "沿路继续行驶%s"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "不久"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "右"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "左"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "缓 "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "急转 "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "可以经由道路 %1$s 到 %2$s"
@@ -227,32 +327,59 @@ msgstr "可以经由道路 %1$s 到 %2$s"
msgid "after %i roads"
msgstr "之后有 %i 条道路"
-msgid "now"
-msgstr "现在"
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "转向 %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 ""
+
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
-msgid "error"
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
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 arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "然后你就到达您的目的地"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "您已经抵达您的目的地 %s"
-msgid "then you have reached your destination."
-msgstr "然后你就到达您的目的地"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr "交流道"
+
+msgid "Exit"
+msgstr "退出"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1807,10 +1934,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
diff --git a/po/zh_HK.po.in b/po/zh_HK.po.in
index 88ecf81b..89ec3793 100644
--- a/po/zh_HK.po.in
+++ b/po/zh_HK.po.in
@@ -5,19 +5,19 @@
# KaZeR https://launchpad.net/~kazer
# Kyle https://launchpad.net/~kylelover
# Walter Cheuk https://launchpad.net/~wwycheuk
-
msgid ""
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 02:23+0200\n"
"PO-Revision-Date: 2013-09-28 01:45+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
+"Language: zh_HK\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Language: zh_HK\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
msgid "Running from source directory\n"
@@ -133,30 +133,53 @@ msgid "in one kilometer"
msgid_plural "in %d kilometers"
msgstr[0] "在 %d 千米內"
-msgid "exit"
-msgstr "退出"
+#. 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 ""
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
+#, c-format
+msgid "%1$sonto %2$s"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
-msgid "into the ramp"
+#. 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 ""
+
+#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
+msgid "onto the motorway ramp"
msgstr "進入斜路"
#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s進入 %s 街道%s%s"
+msgid "%sinto %s%s%s"
+msgstr "%s進入 %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|male form"
+msgid "%sinto %s%s%s|masculine form"
msgstr "%s進入 %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|female form"
+msgid "%sinto %s%s%s|feminine form"
msgstr "%s進入 %s%s%s"
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#. 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 the %s%s%s|neutral form"
+msgid "%sinto %s%s%s|neuter form"
msgstr "%s進入 %s%s%s"
#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
@@ -164,57 +187,134 @@ msgstr "%s進入 %s%s%s"
msgid "%sinto the %s"
msgstr "%s進入 %s"
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "右"
+msgid "When possible, please turn around"
+msgstr "如可以請掉頭"
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "左"
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "简单 "
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "直走到下一个%s"
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "大力轉 "
+msgid "Enter the roundabout soon"
+msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
+#. TRANSLATORS: %s is the distance to the roundabout
+#, c-format
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
+#. 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 "然後在 %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 "在 %1$s %2$s 離開迴旋處"
+
+msgid "soon"
+msgstr "即將"
+
+msgid "now"
+msgstr "現在"
+
+msgid "then"
+msgstr "然後"
+
+#. 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 ""
-msgid "When possible, please turn around"
-msgstr "如可以請掉頭"
+#. 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 ""
-msgid "Enter the roundabout soon"
+#. 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 ""
-#. TRANSLATORS: %s is the distance to the roundabout
+#. 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 "Enter the roundabout %s"
+msgid "Merge %1$s%2$s|left"
+msgstr ""
+
+msgid "on your left"
msgstr ""
+msgid "on your right"
+msgstr ""
+
+#. 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 "then leave the roundabout at the %s"
+msgid "Take exit %1$s %2$s %3$s"
msgstr ""
+#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
#, c-format
-msgid "Leave the roundabout at the %s"
+msgid "Take the exit %1$s %2$s%3$s"
+msgstr ""
+
+#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
+msgid "at interchange"
msgstr ""
+msgid "at exit"
+msgstr ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
#, c-format
-msgid "Follow the road for the next %s"
-msgstr "直走到下一个%s"
+msgid "then continue straight%1$s"
+msgstr ""
-msgid "soon"
-msgstr "即將"
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep right%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: the arg. is where to do the maneuver
+#, c-format
+msgid "then keep left%1$s"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: "right" as in "turn right"
+msgid "right"
+msgstr "右"
+
+#. TRANSLATORS: "left" as in "turn left"
+msgid "left"
+msgstr "左"
+
+#. TRANSLATORS: as in "turn easily right"
+msgid "easily "
+msgstr "简单 "
+
+#. TRANSLATORS: as in "turn strongly right"
+msgid "strongly "
+msgstr "大力轉 "
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, c-format
msgid "Take the %1$s road to the %2$s"
msgstr "取 %1$s 路往%2$s方向"
@@ -223,32 +323,59 @@ msgstr "取 %1$s 路往%2$s方向"
msgid "after %i roads"
msgstr "%i 條路之後"
-msgid "now"
-msgstr "現在"
+#. cave: no else - may come from 'if (skip_roads)' above !
+#. 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 "%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 ""
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "then take the %1$s road to the %2$s"
+msgid "Make a U-turn %1$s|left"
msgstr ""
-msgid "error"
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
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 arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
+msgid "Make a U-turn %1$s|right"
msgstr ""
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
+#. An empty placeholder that we can use in the future for
+#. * some motorway commands that are now suppressed but we
+#. * can in some cases make it say here :
+#. * 'follow destination blabla' without any further driving instructions,
+#. * in cases where relevant destination info is available.
+#. * Even if there is no driving command to be announced, in some cases
+#. * there is an overhead roadsign in preparation of an upcoming road-split,
+#. * and then we can give usefull info to the driver.
+#. *
+#. * UNTESTED !
+#. *
+#.
+msgid "follow"
msgstr ""
+msgid "then you have reached your destination."
+msgstr "然後會到達目的地"
+
+#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "已到達目的地 %s"
-msgid "then you have reached your destination."
-msgstr "然後會到達目的地"
+#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
+msgid "Interchange"
+msgstr ""
+
+msgid "Exit"
+msgstr "退出"
#. Android resource: @strings/position_popup_title
msgid "Position"
@@ -1803,10 +1930,10 @@ msgstr ""
msgid "Enter Coordinates"
msgstr ""
-#.
+#.
#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
#. gui_internal_widget_append(wb, w)
-#.
+#.
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"