Update:Translations:Massive translation update from launchpad. Mostly fixing high five merge updatesv0.5.0-beta.1

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

1 files changed, 14 insertions, 22 deletions

diff --git a/po/kk.po.in b/po/kk.po.in
index a8d02f7d9..428eca042 100644
--- a/po/kk.po.in
+++ b/po/kk.po.in
@@ -69,35 +69,39 @@ msgid "sixth exit"
 msgstr ""
 
 #, c-format
-msgid "%d m"
+msgid "%d feet"
 msgstr ""
 
 #, c-format
-msgid "in %d m"
+msgid "in %d feet"
 msgstr ""
 
 #, c-format
-msgid "%d feet"
+msgid "%d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "in %d feet"
+msgid "in %d.%d miles"
 msgstr ""
 
 #, c-format
-msgid "%d meters"
-msgstr ""
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "in %d meters"
-msgstr ""
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "%d.%d miles"
+msgid "%d meters"
 msgstr ""
 
 #, c-format
-msgid "in %d.%d miles"
+msgid "in %d meters"
 msgstr ""
 
 #, c-format
@@ -109,18 +113,6 @@ msgid "in %d.%d kilometers"
 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] ""