Update:Translations:Massive translation update from launchpad. Mostly fixing high five merge updates

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6129 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 33 insertions, 40 deletions

diff --git a/po/mk.po.in b/po/mk.po.in
index a66f736d..6d208fc1 100644
--- a/po/mk.po.in
+++ b/po/mk.po.in
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Dejan Angelov https://launchpad.net/~dejanangelov
+# Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Naum Spaseski https://launchpad.net/~naum-spaseski-gmail
 # Robert Mileski https://launchpad.net/~mileski
 # goran.cvetkovski https://launchpad.net/~goran-cvetkovski
@@ -11,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2013-12-10 00:53+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-07-19 03:59+0000\n"
+"Last-Translator: Michael von Glasow <Unknown>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,14 +74,6 @@ msgid "sixth exit"
 msgstr "шести излез"
 
 #, c-format
-msgid "%d m"
-msgstr "%d м"
-
-#, c-format
-msgid "in %d m"
-msgstr "после %d м"
-
-#, c-format
 msgid "%d feet"
 msgstr "%d стапки"
 
@@ -89,14 +82,6 @@ msgid "in %d feet"
 msgstr "за %d стапки"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d метри"
-
-#, c-format
-msgid "in %d meters"
-msgstr "после %d метра"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d милји"
 
@@ -105,14 +90,6 @@ msgid "in %d.%d miles"
 msgstr "за %d.%d милји"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d километри"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "после %d.%d километри"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] ""
@@ -125,6 +102,22 @@ msgstr[0] ""
 msgstr[1] "за %d милји"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d метри"
+
+#, c-format
+msgid "in %d meters"
+msgstr "после %d метра"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d километри"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "после %d.%d километри"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d километри"
@@ -163,27 +156,27 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "на рампа"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr ""
+msgstr "%sна %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 ""
+msgstr "%sна %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 ""
+msgstr "%sна %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 ""
+msgstr "%sна %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -213,12 +206,12 @@ 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 ""
+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 ""
+msgstr "Излегувате од кружен тек на %1$s %2$s"
 
 msgid "soon"
 msgstr "наскоро"
@@ -227,7 +220,7 @@ msgid "now"
 msgstr "сега"
 
 msgid "then"
-msgstr ""
+msgstr "тогаш"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -330,25 +323,25 @@ msgstr "после %i патишта"
 #. 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 ""
+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 ""
+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 ""
+msgstr "Свртете %1$s"
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+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 ""
+msgstr "Свртете %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -378,7 +371,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Излез"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"