1 files changed, 123 insertions, 54 deletions
diff --git a/po/uk.po.in b/po/uk.po.in
index d8d9e2be..6f92355f 100644
--- a/po/uk.po.in
+++ b/po/uk.po.in
@@ -139,8 +139,10 @@ msgstr[0] "за %d кілометр"
 msgstr[1] "за %d кілометри"
 msgstr[2] "за %d кілометрів"
 
-msgid "exit"
-msgstr "виїзд"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "з'їзд на"
@@ -170,33 +172,18 @@ 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 "дуже круто "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-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 "Скоро виїзд на дорогу з кільцевим рухом"
 
@@ -205,56 +192,133 @@ 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"
-msgstr "тоді виїдьте з кільця через %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Виїдьте з кільця через %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 "Follow the road for the next %s"
-msgstr "Їдьте дорогою наступні %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "скоро"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "зараз"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "З’їдьте на дорогу %1$s до %2$s"
 
+msgid "right"
+msgstr "праворуч"
+
 #, c-format
 msgid "after %i roads"
 msgstr "після %i дороги"
 
-msgid "now"
-msgstr "зараз"
-
+#. 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 ""
 
-msgid "error"
-msgstr "помилка"
+msgid "easily "
+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 "strongly "
+msgstr "круто "
+
+msgid "left"
+msgstr "ліворуч"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Поверніть на %1$s%2$s %3$s%4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "тоді поверніть на %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
 
+msgid "then you have reached your destination."
+msgstr "і тоді Ви прибудете в місце призначення."
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Ви досягли місця призначення %s"
 
-msgid "then you have reached your destination."
-msgstr "і тоді Ви прибудете в місце призначення."
+msgid "exit"
+msgstr "виїзд"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1314,11 +1378,13 @@ msgstr "Новідомо, додайте is_in теґ до цих міст"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
@@ -1682,6 +1748,9 @@ msgstr ""
 msgid "Show results on the map"
 msgstr ""
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Вирізати закладку"