1 files changed, 124 insertions, 63 deletions
diff --git a/po/sk.po.in b/po/sk.po.in
index 86f39c65..a7c17ab3 100644
--- a/po/sk.po.in
+++ b/po/sk.po.in
@@ -7,7 +7,6 @@
 # GizmoSK https://launchpad.net/~gizmosk
 # KaZeR https://launchpad.net/~kazer
 # Miroslav Ďurian https://launchpad.net/~aasami
-# Prescott_SK https://launchpad.net/~prescott66
 # helix84 https://launchpad.net/~helix84
 # kayle.sk https://launchpad.net/~kayle.sk
 # laznik https://launchpad.net/~orders-strings
@@ -16,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-11-07 17:39+0000\n"
+"PO-Revision-Date: 2014-11-15 22:08+0000\n"
 "Last-Translator: GizmoSK <gizmosk@gmail.com>\n"
 "Language-Team: Slovenčina\n"
 "MIME-Version: 1.0\n"
@@ -145,8 +144,10 @@ msgstr[0] "o %d kilometrov"
 msgstr[1] "o jeden kilometer"
 msgstr[2] "o %d kilometre"
 
-msgid "exit"
-msgstr "výjazd"
+#. 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 "na privádzač"
@@ -176,33 +177,18 @@ msgstr "%s do %s%s%s"
 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 "naozaj silno "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "neznámy "
-
 msgid "When possible, please turn around"
 msgstr "Ak to bude možné, prosím, otočte sa"
 
+#. 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 "Pokračujte naďalej po ceste %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Vstúpte do kruhového objazdu onedlho"
 
@@ -211,56 +197,133 @@ 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 %s"
-msgstr "potom opustite kruhový objazd na %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Opustite kruhový objazd na %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 "Pokračujte naďalej po ceste %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "onedlho"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "teraz"
+
+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 "Choďte %1$s cestou na %2$s"
 
+msgid "right"
+msgstr "vpravo"
+
 #, c-format
 msgid "after %i roads"
 msgstr "po %i cestách"
 
-msgid "now"
-msgstr "teraz"
-
+#. 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 "potom nasledujte cestu %1$s do %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "chyba"
+msgid "easily "
+msgstr "mierne "
 
-#. 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 "prudko "
+
+msgid "left"
+msgstr "vľavo"
+
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Odbočte %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 "potom %1$s odbočte %2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+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"
 
-msgid "then you have reached your destination."
-msgstr "potom dosiahnete svoj cieľ cesty"
+msgid "exit"
+msgstr "výjazd"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -1320,19 +1383,14 @@ msgstr "* Neznáme, pridajte is_in tag v týchto mestách."
 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 ""
-"navit použitie:\n"
-"navit [options] [configfile]\n"
-"\t-c <file>: použiť <file> ako konfiguračný súbor\n"
-"\t-d <n>: nastaviť globálnu výstupnú ladiacu úroveň na <n> (0-3). Preťaží "
-"nastavenia z konfiguračného súboru.\n"
-"\t-h: vytlačiť túto informáciu použitia a ukončiť.\n"
-"\t-v: Vytlačiť verziu a ukončiť.\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1698,6 +1756,9 @@ msgstr "Odstrániť výsledky vyhľadávania z mapy"
 msgid "Show results on the map"
 msgstr "Zobraziť výsledky vyhľadávania na mape"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Vystrihnúť záložku"