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, 23 insertions, 31 deletions

diff --git a/po/fil.po.in b/po/fil.po.in
index e139750c..229770a1 100644
--- a/po/fil.po.in
+++ b/po/fil.po.in
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2012-09-26 07:21+0000\n"
+"PO-Revision-Date: 2015-07-19 03:58+0000\n"
 "Last-Translator: chito <cnuarin@gmail.com>\n"
 "Language-Team: Filipino <fil@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -69,35 +69,39 @@ msgid "sixth exit"
 msgstr "pang-anim na labasan"
 
 #, 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 "%d.%d kilometro"
 
 #, 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] ""
@@ -164,22 +156,22 @@ 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 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 ""
+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 ""
+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. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr ""
+msgstr "%s sa kalyeng %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
@@ -187,7 +179,7 @@ msgid "%sinto the %s"
 msgstr ""
 
 msgid "When possible, please turn around"
-msgstr "kung maari ay bumalik"
+msgstr "Kung maari ay bumalik"
 
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
@@ -209,12 +201,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 "pagkatapos ay lumabas sa rotonda sa may %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 "Lisanin ang rotonda sa may %1$s %2$s"
 
 msgid "soon"
 msgstr ""
@@ -374,7 +366,7 @@ msgid "Interchange"
 msgstr ""
 
 msgid "Exit"
-msgstr ""
+msgstr "Labasan"
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"