Menu
▾
▴
navit-cvs-commit — CVS commit mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
(59) |
Sep
(43) |
Oct
(95) |
Nov
(135) |
Dec
(108) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(229) |
Feb
(141) |
Mar
(59) |
Apr
(70) |
May
(64) |
Jun
(87) |
Jul
(57) |
Aug
(108) |
Sep
(74) |
Oct
(203) |
Nov
(141) |
Dec
(108) |
| 2009 |
Jan
(114) |
Feb
(91) |
Mar
(101) |
Apr
(69) |
May
(54) |
Jun
(82) |
Jul
(49) |
Aug
(109) |
Sep
(81) |
Oct
(93) |
Nov
(100) |
Dec
(79) |
| 2010 |
Jan
(46) |
Feb
(36) |
Mar
(135) |
Apr
(103) |
May
(116) |
Jun
(130) |
Jul
(52) |
Aug
(31) |
Sep
(46) |
Oct
(48) |
Nov
(98) |
Dec
(110) |
| 2011 |
Jan
(234) |
Feb
(184) |
Mar
(150) |
Apr
(43) |
May
(53) |
Jun
(52) |
Jul
(112) |
Aug
(72) |
Sep
(79) |
Oct
(23) |
Nov
(6) |
Dec
(30) |
| 2012 |
Jan
(39) |
Feb
(37) |
Mar
(49) |
Apr
(60) |
May
(63) |
Jun
(38) |
Jul
(33) |
Aug
(24) |
Sep
(20) |
Oct
(14) |
Nov
(23) |
Dec
(50) |
| 2013 |
Jan
(30) |
Feb
(32) |
Mar
(27) |
Apr
(41) |
May
(59) |
Jun
(21) |
Jul
(10) |
Aug
(73) |
Sep
(23) |
Oct
(60) |
Nov
(14) |
Dec
(15) |
| 2014 |
Jan
(4) |
Feb
(8) |
Mar
(11) |
Apr
(6) |
May
(27) |
Jun
(4) |
Jul
(29) |
Aug
(62) |
Sep
(11) |
Oct
(17) |
Nov
(58) |
Dec
(9) |
| 2015 |
Jan
(23) |
Feb
(3) |
Mar
(26) |
Apr
(47) |
May
(8) |
Jun
(28) |
Jul
(10) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ka...@us...> - 2015-04-22 23:52:21
|
Revision: 6086
http://sourceforge.net/p/navit/code/6086
Author: kazer_
Date: 2015-04-22 23:52:19 +0000 (Wed, 22 Apr 2015)
Log Message:
-----------
Update:Translations:Updated German translation from launchpad
Modified Paths:
--------------
trunk/navit/po/de.po.in
Modified: trunk/navit/po/de.po.in
===================================================================
--- trunk/navit/po/de.po.in 2015-04-21 01:41:25 UTC (rev 6085)
+++ trunk/navit/po/de.po.in 2015-04-22 23:52:19 UTC (rev 6086)
@@ -1,5 +1,5 @@
# German translations for navit
-# Copyright (C) 2006-2014 The Navit Team
+# Copyright (C) 2006-2015 The Navit Team
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# Achim Behrens https://launchpad.net/~k1l
@@ -19,6 +19,7 @@
# Lukas Bögelein https://launchpad.net/~lukas-boegelein
# MUrks https://launchpad.net/~tabstop
# Manuel Hohmann https://launchpad.net/~mhohmann
+# Mathias Klein https://launchpad.net/~ma-klein
# Paulodile https://launchpad.net/~stuff4tschaka
# Roadrunner IN https://launchpad.net/~online
# Roschkor https://launchpad.net/~bound-one2000
@@ -38,8 +39,8 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-04-13 06:48+0000\n"
-"Last-Translator: Manuel Hohmann <mho...@ph...>\n"
+"PO-Revision-Date: 2015-04-22 22:10+0000\n"
+"Last-Translator: Mathias Klein <ma_...@gm...>\n"
"Language-Team: Martin Schaller <mar...@so...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -216,7 +217,7 @@
#. TRANSLATORS: Don't forget the ending space
msgid "unknown "
-msgstr ""
+msgstr "unbekannt "
#
msgid "When possible, please turn around"
@@ -1582,7 +1583,7 @@
msgstr "Einkaufen"
msgid "Distance from screen center (km)"
-msgstr ""
+msgstr "Entfernung vom Bildschirmmittelpunkt (km)"
#, c-format
msgid "POI %s. %s"
@@ -1590,11 +1591,11 @@
#, c-format
msgid "Set destination to %ld, %ld \n"
-msgstr ""
+msgstr "Setze Ziel auf %ld, %ld \n"
#, c-format
msgid "Set map to %ld, %ld \n"
-msgstr ""
+msgstr "Setze Karte auf %ld, %ld \n"
#, c-format
msgid "Set next visit to %ld, %ld \n"
@@ -1622,13 +1623,13 @@
msgstr "Richtung"
msgid "Distance(m)"
-msgstr ""
+msgstr "Entfernung (m)"
msgid "Name"
-msgstr ""
+msgstr "Bezeichnung"
msgid "Visit Before"
-msgstr ""
+msgstr "vorherige Ziele"
msgid "N"
msgstr "N"
@@ -1954,6 +1955,8 @@
"Sorry, we currently do not support maps above 3.8G on Android, please select "
"a smaller one."
msgstr ""
+"Entschuldigung. Derzeit untestützen wir auf Android keine Karten die größer "
+"als 3,8Gigabyte sind. Bitte wählen Sie eine kleinere Karte aus."
msgid "Cancel"
msgstr "Abbrechen"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-21 01:41:28
|
Revision: 6085
http://sourceforge.net/p/navit/code/6085
Author: kazer_
Date: 2015-04-21 01:41:25 +0000 (Tue, 21 Apr 2015)
Log Message:
-----------
Update:Translations:Updated Russian (ru) translation from launchpad
Modified Paths:
--------------
trunk/navit/po/ru.po.in
Modified: trunk/navit/po/ru.po.in
===================================================================
--- trunk/navit/po/ru.po.in 2015-04-15 18:17:25 UTC (rev 6084)
+++ trunk/navit/po/ru.po.in 2015-04-21 01:41:25 UTC (rev 6085)
@@ -30,8 +30,8 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-04-03 18:26+0000\n"
-"Last-Translator: Nkolay Parukhin <par...@gm...>\n"
+"PO-Revision-Date: 2015-04-20 20:06+0000\n"
+"Last-Translator: tryagain <md...@ya...>\n"
"Language-Team: Rustam T. Usmanov\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -209,11 +209,11 @@
#. TRANSLATORS: Don't forget the ending space
msgid "really strongly "
-msgstr ""
+msgstr "очень круто "
#. TRANSLATORS: Don't forget the ending space
msgid "unknown "
-msgstr ""
+msgstr "неизвестно "
msgid "When possible, please turn around"
msgstr "Развернитесь, пожалуйста, если это возможно"
@@ -228,11 +228,11 @@
#, c-format
msgid "then leave the roundabout at the %s"
-msgstr ""
+msgstr "потом съезжайте с кругового движения на %s"
#, c-format
msgid "Leave the roundabout at the %s"
-msgstr ""
+msgstr "Съезжайте с кругового движения на %s"
#, c-format
msgid "Follow the road for the next %s"
@@ -255,20 +255,20 @@
#, c-format
msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgstr "затем выезжайте на дорогу %1$s в направлении %2$s"
msgid "error"
-msgstr ""
+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'
#, c-format
msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgstr "Сверните %1$s%2$s %3$s%4$s"
#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
#, c-format
msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgstr "после чего поверните %1$s%2$s на %3$s%4$s"
#, c-format
msgid "You have reached your destination %s"
@@ -1602,7 +1602,7 @@
msgstr "Выберите расстояние для поиска (км)"
msgid "Select a POI"
-msgstr ""
+msgstr "Выберите POI"
msgid " "
msgstr " "
@@ -1938,6 +1938,9 @@
"Please restart Navit after you attach an SD card or select a different map "
"location."
msgstr ""
+"Папка s, выбранная для хранения карт, недоступна.\n"
+"Пожалуйста, перезагрузите Navit после подключения SD карты, или выберите "
+"другую папку."
msgid "Downloaded maps"
msgstr "Загруженные карты"
@@ -1946,6 +1949,8 @@
"Sorry, we currently do not support maps above 3.8G on Android, please select "
"a smaller one."
msgstr ""
+"К сожалению, карты свыше 3.8 Гб не поддерживаются в Android версии. Выберите "
+"другую карту."
msgid "Cancel"
msgstr "Отмена"
@@ -1957,6 +1962,8 @@
"New location set to %s\n"
"Restart Navit to apply the changes."
msgstr ""
+"Выбрана папка %s\n"
+"Перезапустите Navit для применения изменений."
msgid "Whole Planet"
msgstr "Вся планета"
@@ -2329,7 +2336,7 @@
msgstr "готово"
msgid "Media selected for map storage is not available"
-msgstr ""
+msgstr "Устройство для хранения карт недоступно."
#. Android resource: @strings/map_download_not_enough_free_space
msgid "Not enough free space"
@@ -2519,7 +2526,7 @@
#. Android resource: @strings/optionsmenu_set_map_location
msgid "Set map location"
-msgstr ""
+msgstr "Выбрать папку для хранения карт"
#. Android resource: @strings/map_delete
msgid "Delete this map?"
@@ -2659,3 +2666,7 @@
"currently selected engine reports it is unable to speak in your language. "
"Should we ask the system to show voice download dialog?"
msgstr ""
+"Navit может использовать любое установленное в системе приложение "
+"преобразования текста в речь. Выбранное сейчас приложение сообщает о "
+"невозможности работы на выбранном языке. Попросим систему показать диалог "
+"загрузки голосовых данных?"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-15 18:17:32
|
Revision: 6084
http://sourceforge.net/p/navit/code/6084
Author: kazer_
Date: 2015-04-15 18:17:25 +0000 (Wed, 15 Apr 2015)
Log Message:
-----------
Fix:Dbus:Fixed return value of route_export_geojson, addresses Coverity #25343
Modified Paths:
--------------
trunk/navit/navit/binding/dbus/binding_dbus.c
Modified: trunk/navit/navit/binding/dbus/binding_dbus.c
===================================================================
--- trunk/navit/navit/binding/dbus/binding_dbus.c 2015-04-15 18:03:42 UTC (rev 6083)
+++ trunk/navit/navit/binding/dbus/binding_dbus.c 2015-04-15 18:17:25 UTC (rev 6084)
@@ -1492,7 +1492,7 @@
nav = navit_get_navigation(navit);
if(!nav) {
- return;
+ return dbus_error_navigation_not_configured(connection, message);
}
map = navigation_get_map(nav);
if(map)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-15 18:03:45
|
Revision: 6083
http://sourceforge.net/p/navit/code/6083
Author: kazer_
Date: 2015-04-15 18:03:42 +0000 (Wed, 15 Apr 2015)
Log Message:
-----------
Update:Translations:Updated Lithuanian translation from launchpad
Modified Paths:
--------------
trunk/navit/po/lt.po.in
Modified: trunk/navit/po/lt.po.in
===================================================================
--- trunk/navit/po/lt.po.in 2015-04-15 18:03:27 UTC (rev 6082)
+++ trunk/navit/po/lt.po.in 2015-04-15 18:03:42 UTC (rev 6083)
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the navit package.
# Many thanks to the contributors of this translation:
# Aidas Kasparas https://launchpad.net/~a-kasparas
+# KaZeR https://launchpad.net/~kazer
# Mantas Kriaučiūnas https://launchpad.net/~mantas
# Rytis Ūsalis https://launchpad.net/~rytis-usalis
# laimonas https://launchpad.net/~laimonas-mockus
@@ -11,8 +12,8 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-03-10 10:51+0000\n"
-"Last-Translator: Mantas Kriaučiūnas <ma...@ak...>\n"
+"PO-Revision-Date: 2015-04-15 00:07+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Lithuanian <lt...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-15 18:03:34
|
Revision: 6082
http://sourceforge.net/p/navit/code/6082
Author: kazer_
Date: 2015-04-15 18:03:27 +0000 (Wed, 15 Apr 2015)
Log Message:
-----------
Update:Translations:Updated Estonian translation from launchpad
Modified Paths:
--------------
trunk/navit/po/et.po.in
Modified: trunk/navit/po/et.po.in
===================================================================
--- trunk/navit/po/et.po.in 2015-04-15 18:03:09 UTC (rev 6081)
+++ trunk/navit/po/et.po.in 2015-04-15 18:03:27 UTC (rev 6082)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-01-05 22:03+0000\n"
+"PO-Revision-Date: 2015-04-13 06:57+0000\n"
"Last-Translator: Manuel Hohmann <mho...@ph...>\n"
"Language-Team: Estonian <et...@li...>\n"
"MIME-Version: 1.0\n"
@@ -186,7 +186,7 @@
#. TRANSLATORS: Don't forget the ending space
msgid "really strongly "
-msgstr ""
+msgstr "väga järsult "
#. TRANSLATORS: Don't forget the ending space
msgid "unknown "
@@ -205,11 +205,11 @@
#, c-format
msgid "then leave the roundabout at the %s"
-msgstr ""
+msgstr "siis lahku ringteelt %s"
#, c-format
msgid "Leave the roundabout at the %s"
-msgstr ""
+msgstr "Lahku ringteelt %s"
#, c-format
msgid "Follow the road for the next %s"
@@ -232,20 +232,20 @@
#, c-format
msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgstr "siis vali %1$s mis viib %2$s"
msgid "error"
-msgstr ""
+msgstr "viga"
#. 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'
#, c-format
msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgstr "Pööra %1$s%2$s %3$s%4$s"
#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
#, c-format
msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgstr "siis pööra %1$s%2$s %3$s%4$s"
#, c-format
msgid "You have reached your destination %s"
@@ -1570,34 +1570,34 @@
msgstr ""
msgid "POI search"
-msgstr ""
+msgstr "POI otsing"
msgid "Select a category"
-msgstr ""
+msgstr "Vali kategooria"
msgid "Select a distance to look for (km)"
msgstr ""
msgid "Select a POI"
-msgstr ""
+msgstr "Vali POI"
msgid " "
-msgstr ""
+msgstr " "
msgid "Category"
-msgstr ""
+msgstr "Kategooria"
msgid "Direction"
-msgstr ""
+msgstr "Suund"
msgid "Distance(m)"
msgstr ""
msgid "Name"
-msgstr ""
+msgstr "Nimi"
msgid "Visit Before"
-msgstr ""
+msgstr "Külasta enne"
msgid "N"
msgstr "N"
@@ -1816,7 +1816,7 @@
#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
#. gui_internal_widget_append(w, we)
msgid "Latitude Longitude"
-msgstr ""
+msgstr "Laiuskraad Pikkuskraad"
msgid "Enter coordinates, for example:"
msgstr "Sisesta koordinaadid, näiteks:"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-15 18:03:16
|
Revision: 6081
http://sourceforge.net/p/navit/code/6081
Author: kazer_
Date: 2015-04-15 18:03:09 +0000 (Wed, 15 Apr 2015)
Log Message:
-----------
Update:Translations:Updated German translation from launchpad
Modified Paths:
--------------
trunk/navit/po/de.po.in
Modified: trunk/navit/po/de.po.in
===================================================================
--- trunk/navit/po/de.po.in 2015-04-14 18:24:19 UTC (rev 6080)
+++ trunk/navit/po/de.po.in 2015-04-15 18:03:09 UTC (rev 6081)
@@ -18,6 +18,7 @@
# Lars Hennig https://launchpad.net/~elhennig
# Lukas Bögelein https://launchpad.net/~lukas-boegelein
# MUrks https://launchpad.net/~tabstop
+# Manuel Hohmann https://launchpad.net/~mhohmann
# Paulodile https://launchpad.net/~stuff4tschaka
# Roadrunner IN https://launchpad.net/~online
# Roschkor https://launchpad.net/~bound-one2000
@@ -37,8 +38,8 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-09-12 20:49+0000\n"
-"Last-Translator: Artem Anufrij <Unknown>\n"
+"PO-Revision-Date: 2015-04-13 06:48+0000\n"
+"Last-Translator: Manuel Hohmann <mho...@ph...>\n"
"Language-Team: Martin Schaller <mar...@so...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -211,7 +212,7 @@
#. TRANSLATORS: Don't forget the ending space
msgid "really strongly "
-msgstr ""
+msgstr "sehr stark "
#. TRANSLATORS: Don't forget the ending space
msgid "unknown "
@@ -231,11 +232,11 @@
#, c-format
msgid "then leave the roundabout at the %s"
-msgstr ""
+msgstr "anschliessend verlassen Sie den Kreisverkehr an der %s"
#, c-format
msgid "Leave the roundabout at the %s"
-msgstr ""
+msgstr "Verlassen Sie den Kreisverkehr an der %s"
#, c-format
msgid "Follow the road for the next %s"
@@ -258,20 +259,20 @@
#, c-format
msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgstr "dann die %1$s Straße %2$s abbiegen"
msgid "error"
-msgstr ""
+msgstr "Fehler"
#. 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'
#, c-format
msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgstr "%3$s %1$s%2$s abbiegen%4$s"
#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
#, c-format
msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgstr "dann %3$s %1$s%2$s abbiegen%4$s"
#, c-format
msgid "You have reached your destination %s"
@@ -1536,49 +1537,49 @@
msgstr "Daten"
msgid "Pharmacy"
-msgstr ""
+msgstr "Apotheke"
msgid "Restaurant"
-msgstr ""
+msgstr "Restaurant"
msgid "Restaurant. Fast food"
-msgstr ""
+msgstr "Fast-Food Restaurant"
msgid "Hotel"
-msgstr ""
+msgstr "Hotel"
msgid "Car parking"
-msgstr ""
+msgstr "Parkplatz"
msgid "Fuel station"
-msgstr ""
+msgstr "Tankstelle"
msgid "Bank"
-msgstr ""
+msgstr "Bank"
msgid "Hospital"
-msgstr ""
+msgstr "Krankenhaus"
msgid "Cinema"
-msgstr ""
+msgstr "Kino"
msgid "Train station"
-msgstr ""
+msgstr "Bahnhof"
msgid "School"
-msgstr ""
+msgstr "Schule"
msgid "Police"
-msgstr ""
+msgstr "Polizei"
msgid "Justice"
-msgstr ""
+msgstr "Gericht"
msgid "Taxi"
-msgstr ""
+msgstr "Taxi"
msgid "Shopping"
-msgstr ""
+msgstr "Einkaufen"
msgid "Distance from screen center (km)"
msgstr ""
@@ -1600,25 +1601,25 @@
msgstr ""
msgid "POI search"
-msgstr ""
+msgstr "POI Suche"
msgid "Select a category"
-msgstr ""
+msgstr "Eine Kategorie auswählen"
msgid "Select a distance to look for (km)"
-msgstr ""
+msgstr "Wählen Sie eine Suchdistanz (km)"
msgid "Select a POI"
-msgstr ""
+msgstr "Wählen Sie ein POI"
msgid " "
-msgstr ""
+msgstr " "
msgid "Category"
-msgstr ""
+msgstr "Kategorie"
msgid "Direction"
-msgstr ""
+msgstr "Richtung"
msgid "Distance(m)"
msgstr ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-14 18:24:26
|
Revision: 6080
http://sourceforge.net/p/navit/code/6080
Author: kazer_
Date: 2015-04-14 18:24:19 +0000 (Tue, 14 Apr 2015)
Log Message:
-----------
Fix:CI:Merge into master only if the tests were successful
Modified Paths:
--------------
trunk/navit/circle.yml
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-14 18:13:41 UTC (rev 6079)
+++ trunk/navit/circle.yml 2015-04-14 18:24:19 UTC (rev 6080)
@@ -66,3 +66,8 @@
- import -window root $CIRCLE_ARTIFACTS/default.png
- python ci/dbus_tests.py $CIRCLE_TEST_REPORTS/
- dbus-send --print-reply --session --dest=org.navit_project.navit /org/navit_project/navit/default_navit org.navit_project.navit.navit.quit
+deployment:
+ merge_into_master:
+ branch: trunk
+ commands:
+ - git push origin $CIRCLE_SHA1:refs/heads/master
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-14 18:13:43
|
Revision: 6079
http://sourceforge.net/p/navit/code/6079
Author: kazer_
Date: 2015-04-14 18:13:41 +0000 (Tue, 14 Apr 2015)
Log Message:
-----------
Add:CI:Pip-install junit library for tests
Modified Paths:
--------------
trunk/navit/circle.yml
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-14 17:58:42 UTC (rev 6078)
+++ trunk/navit/circle.yml 2015-04-14 18:13:41 UTC (rev 6079)
@@ -47,6 +47,8 @@
- cmake -Dbinding/python:BOOL=FALSE -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make && make package:
pwd: win32/
- cp win32/*.exe $CIRCLE_ARTIFACTS/
+# For python testing with junit reporting
+ - sudo pip install junit-xml
test:
post:
- sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-14 17:58:44
|
Revision: 6078
http://sourceforge.net/p/navit/code/6078
Author: kazer_
Date: 2015-04-14 17:58:42 +0000 (Tue, 14 Apr 2015)
Log Message:
-----------
Add:CI:Added a basic dbus test with JUnit report using python
Modified Paths:
--------------
trunk/navit/circle.yml
Added Paths:
-----------
trunk/navit/ci/dbus_tests.py
Added: trunk/navit/ci/dbus_tests.py
===================================================================
--- trunk/navit/ci/dbus_tests.py (rev 0)
+++ trunk/navit/ci/dbus_tests.py 2015-04-14 17:58:42 UTC (rev 6078)
@@ -0,0 +1,52 @@
+import glob
+import dbus
+from dbus import glib
+import gobject
+import sys
+import os
+import time
+from subprocess import call
+from junit_xml import TestSuite, TestCase
+
+
+gobject.threads_init()
+
+glib.init_threads()
+
+bus = dbus.SessionBus()
+
+navit_object = bus.get_object("org.navit_project.navit", # Connection name
+ "/org/navit_project/navit/default_navit" ) # Object's path
+
+iface = dbus.Interface(navit_object, dbus_interface="org.navit_project.navit.navit")
+junit_directory=sys.argv[1]
+if not os.path.exists(junit_directory):
+ os.makedirs(junit_directory)
+
+tests=[]
+start_time = time.time()
+test_cases = TestCase("zoom (factor) expected 512", '', time.time() - start_time, '', '')
+iface.zoom(-2)
+zoom=iface.get_attr("zoom")[1]
+if zoom !=512 :
+ test_cases.add_failure_info('zoom level mismatch. Got '+str(zoom)+', expected 512')
+tests.append(test_cases)
+
+test_cases = TestCase("zoom (factor) expected 1024", '', time.time() - start_time, '', '')
+iface.zoom(-2)
+zoom=iface.get_attr("zoom")[1]
+if zoom !=1024 :
+ test_cases.add_failure_info('zoom level mismatch. Got '+str(zoom)+', expected 1024')
+tests.append(test_cases)
+
+test_cases = TestCase("zoom via set_attr expected 512", '', time.time() - start_time, '', '')
+iface.set_attr("zoom", 512)
+zoom=iface.get_attr("zoom")[1]
+if zoom !=512 :
+ test_cases.add_failure_info('zoom level mismatch. Got '+str(zoom)+', expected 512')
+tests.append(test_cases)
+
+ts = [TestSuite("Navit dbus tests", tests)]
+
+with open(junit_directory+'dbus.xml', 'w+') as f:
+ TestSuite.to_file(f, ts, prettyprint=False)
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-13 20:10:14 UTC (rev 6077)
+++ trunk/navit/circle.yml 2015-04-14 17:58:42 UTC (rev 6078)
@@ -62,4 +62,5 @@
background: true
- sleep 5
- import -window root $CIRCLE_ARTIFACTS/default.png
+ - python ci/dbus_tests.py $CIRCLE_TEST_REPORTS/
- dbus-send --print-reply --session --dest=org.navit_project.navit /org/navit_project/navit/default_navit org.navit_project.navit.navit.quit
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wog...@us...> - 2015-04-13 20:10:16
|
Revision: 6077
http://sourceforge.net/p/navit/code/6077
Author: woglinde
Date: 2015-04-13 20:10:14 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
Fix:gui_internal:correct typo
Modified Paths:
--------------
trunk/navit/navit/gui/internal/gui_internal_widget.h
Modified: trunk/navit/navit/gui/internal/gui_internal_widget.h
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal_widget.h 2015-04-13 20:10:07 UTC (rev 6076)
+++ trunk/navit/navit/gui/internal/gui_internal_widget.h 2015-04-13 20:10:14 UTC (rev 6077)
@@ -97,7 +97,7 @@
struct widget * prev_button;
/**
* a pointer to the gui context.
- * This is needed by the free function to destory the buttons.
+ * This is needed by the free function to destroy the buttons.
*/
struct gui_priv * this;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wog...@us...> - 2015-04-13 20:10:10
|
Revision: 6076
http://sourceforge.net/p/navit/code/6076
Author: woglinde
Date: 2015-04-13 20:10:07 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
Fix:osd: use early return for osd_destory when the osd is null, found be coverity
Modified Paths:
--------------
trunk/navit/navit/osd.c
Modified: trunk/navit/navit/osd.c
===================================================================
--- trunk/navit/navit/osd.c 2015-04-13 19:02:57 UTC (rev 6075)
+++ trunk/navit/navit/osd.c 2015-04-13 20:10:07 UTC (rev 6076)
@@ -105,9 +105,10 @@
static void
osd_destroy(struct osd *osd)
{
- if (osd && osd->meth.destroy) {
+ if (!osd)
+ return;
+ if (osd->meth.destroy)
osd->meth.destroy(osd->priv);
- }
attr_list_free(osd->attrs);
g_free(osd);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-13 19:03:04
|
Revision: 6075
http://sourceforge.net/p/navit/code/6075
Author: kazer_
Date: 2015-04-13 19:02:57 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
Fix:CI:Fixed coverity upload
Modified Paths:
--------------
trunk/navit/ci/build.sh
Modified: trunk/navit/ci/build.sh
===================================================================
--- trunk/navit/ci/build.sh 2015-04-13 17:54:26 UTC (rev 6074)
+++ trunk/navit/ci/build.sh 2015-04-13 19:02:57 UTC (rev 6075)
@@ -11,4 +11,4 @@
--form fi...@na... \
--form version="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \
--form description="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \
- https://scan.coverity.com/builds?project=$COVERITY_PROJECT
+ https://scan.coverity.com/builds?project=$CIRCLE_PROJECT_USERNAME
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-13 17:54:33
|
Revision: 6074
http://sourceforge.net/p/navit/code/6074
Author: kazer_
Date: 2015-04-13 17:54:26 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
Add:binding_dbus:expose zoom_to_route over dbus
Modified Paths:
--------------
trunk/navit/navit/binding/dbus/binding_dbus.c
Modified: trunk/navit/navit/binding/dbus/binding_dbus.c
===================================================================
--- trunk/navit/navit/binding/dbus/binding_dbus.c 2015-04-13 06:05:50 UTC (rev 6073)
+++ trunk/navit/navit/binding/dbus/binding_dbus.c 2015-04-13 17:54:26 UTC (rev 6074)
@@ -1357,6 +1357,25 @@
* @returns An empty reply if everything went right, otherwise DBUS_HANDLER_RESULT_NOT_YET_HANDLED
*/
static DBusHandlerResult
+request_navit_zoom_to_route(DBusConnection *connection, DBusMessage *message)
+{
+ struct navit *navit;
+ DBusMessageIter iter;
+
+ navit = object_get_from_message(message, "navit");
+ if (! navit)
+ return dbus_error_invalid_object_path(connection, message);
+
+ dbus_message_iter_init(message, &iter);
+ dbg(lvl_debug,"%s\n", dbus_message_iter_get_signature(&iter));
+
+ navit_zoom_to_route(navit,0);
+
+ return empty_reply(connection, message);
+
+}
+
+static DBusHandlerResult
request_navit_route_export_gpx(DBusConnection *connection, DBusMessage *message)
{
char * filename;
@@ -1949,6 +1968,7 @@
{".navit", "set_layout", "s", "layoutname", "", "", request_navit_set_layout},
{".navit", "zoom", "i(ii)", "factor(pixel_x,pixel_y)", "", "", request_navit_zoom},
{".navit", "zoom", "i", "factor", "", "", request_navit_zoom},
+ {".navit", "zoom_to_route", "", "", "", "", request_navit_zoom_to_route},
{".navit", "quit", "", "", "", "", request_navit_quit},
{".navit", "export_as_gpx", "s", "filename", "", "", request_navit_route_export_gpx},
{".navit", "export_as_geojson", "s", "filename", "", "", request_navit_route_export_geojson},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-13 06:05:51
|
Revision: 6073
http://sourceforge.net/p/navit/code/6073
Author: kazer_
Date: 2015-04-13 06:05:50 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
Update:CI:Added win32 binary build
Modified Paths:
--------------
trunk/navit/circle.yml
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-13 05:50:04 UTC (rev 6072)
+++ trunk/navit/circle.yml 2015-04-13 06:05:50 UTC (rev 6073)
@@ -38,6 +38,15 @@
- sudo apt-get install lib32stdc++6
- sudo apt-get install lib32z1
- bash ci/build_android.sh
+# Windows build
+ - sudo apt-get install mingw32 mingw32-binutils mingw32-runtime
+ - sudo apt-get install default-jdk nsis
+# for sys/select.h
+# - sudo apt-get install -y libc6-dev
+ - mkdir win32
+ - cmake -Dbinding/python:BOOL=FALSE -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make && make package:
+ pwd: win32/
+ - cp win32/*.exe $CIRCLE_ARTIFACTS/
test:
post:
- sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-13 05:50:11
|
Revision: 6072
http://sourceforge.net/p/navit/code/6072
Author: kazer_
Date: 2015-04-13 05:50:04 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
Update:CI:Removing unneeded Android build deps
Modified Paths:
--------------
trunk/navit/circle.yml
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-13 05:37:13 UTC (rev 6071)
+++ trunk/navit/circle.yml 2015-04-13 05:50:04 UTC (rev 6072)
@@ -30,13 +30,6 @@
# Android build
- wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE
- wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE
- - sudo apt-get install gpsd
- - sudo apt-get install gpsd-clients
- - sudo apt-get install libgps-dev
- - sudo apt-get install freeglut3-dev
- - sudo apt-get install libxft-dev
- - sudo apt-get install libglib2.0-dev
- - sudo apt-get install libfreeimage-dev
- sudo apt-get install gettext
- sudo apt-get install openjdk-7-jdk
- sudo apt-get install ant
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-13 05:37:16
|
Revision: 6071
http://sourceforge.net/p/navit/code/6071
Author: kazer_
Date: 2015-04-13 05:37:13 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
Update:Core:Fixing the Lithuanian translation issue
Modified Paths:
--------------
trunk/navit/po/lt.po.in
Modified: trunk/navit/po/lt.po.in
===================================================================
--- trunk/navit/po/lt.po.in 2015-04-12 20:51:23 UTC (rev 6070)
+++ trunk/navit/po/lt.po.in 2015-04-13 05:37:13 UTC (rev 6071)
@@ -116,7 +116,7 @@
#, c-format
msgid "one mile"
msgid_plural "%d miles"
-msgstr[0] "viena mylia"
+msgstr[0] "%d mylia"
msgstr[1] "%d mylios"
msgstr[2] "%d mylių"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wog...@us...> - 2015-04-12 20:51:26
|
Revision: 6070
http://sourceforge.net/p/navit/code/6070
Author: woglinde
Date: 2015-04-12 20:51:23 +0000 (Sun, 12 Apr 2015)
Log Message:
-----------
Fix:core:close the filehandle when using a startup file, found by coverity
Modified Paths:
--------------
trunk/navit/navit/start_real.c
Modified: trunk/navit/navit/start_real.c
===================================================================
--- trunk/navit/navit/start_real.c 2015-04-09 22:00:07 UTC (rev 6069)
+++ trunk/navit/navit/start_real.c 2015-04-12 20:51:23 UTC (rev 6070)
@@ -213,13 +213,20 @@
conf.type=attr_config;
conf.u.config=config;
if (startup_file) {
- FILE *f=fopen(startup_file,"r");
+ FILE *f = fopen(startup_file,"r");
if (f) {
char buffer[4096];
+ int fclose_ret;
while(fgets(buffer, sizeof(buffer), f)) {
command_evaluate(&conf, buffer);
}
- }
+ fclose_ret = fclose(f);
+ if (fclose_ret != 0) {
+ dbg(lvl_error, "Could not close the specified startup file: %s\n", startup_file);
+ }
+ } else {
+ dbg(lvl_error, "Could not open the specified startup file: %s", startup_file);
+ }
}
if (command) {
command_evaluate(&conf, command);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-09 22:00:21
|
Revision: 6069
http://sourceforge.net/p/navit/code/6069
Author: kazer_
Date: 2015-04-09 22:00:07 +0000 (Thu, 09 Apr 2015)
Log Message:
-----------
Update:Core:semi-automated translations update from launchpad
Modified Paths:
--------------
trunk/navit/po/af.po.in
trunk/navit/po/ar.po.in
trunk/navit/po/ast.po.in
trunk/navit/po/be.po.in
trunk/navit/po/bg.po.in
trunk/navit/po/bs.po.in
trunk/navit/po/ca.po.in
trunk/navit/po/ckb.po.in
trunk/navit/po/cs.po.in
trunk/navit/po/cy.po.in
trunk/navit/po/da.po.in
trunk/navit/po/de.po.in
trunk/navit/po/de_CH.po.in
trunk/navit/po/el.po.in
trunk/navit/po/en_AU.po.in
trunk/navit/po/en_CA.po.in
trunk/navit/po/en_GB.po.in
trunk/navit/po/eo.po.in
trunk/navit/po/es.po.in
trunk/navit/po/et.po.in
trunk/navit/po/eu.po.in
trunk/navit/po/fa.po.in
trunk/navit/po/fi.po.in
trunk/navit/po/fil.po.in
trunk/navit/po/fo.po.in
trunk/navit/po/fr.po.in
trunk/navit/po/fr_CH.po.in
trunk/navit/po/fy.po.in
trunk/navit/po/gl.po.in
trunk/navit/po/he.po.in
trunk/navit/po/hi.po.in
trunk/navit/po/hr.po.in
trunk/navit/po/hu.po.in
trunk/navit/po/id.po.in
trunk/navit/po/it.po.in
trunk/navit/po/ja.po.in
trunk/navit/po/jv.po.in
trunk/navit/po/kk.po.in
trunk/navit/po/kn.po.in
trunk/navit/po/ko.po.in
trunk/navit/po/ku.po.in
trunk/navit/po/lb.po.in
trunk/navit/po/lt.po.in
trunk/navit/po/lv.po.in
trunk/navit/po/mk.po.in
trunk/navit/po/ml.po.in
trunk/navit/po/mn.po.in
trunk/navit/po/mr.po.in
trunk/navit/po/nb.po.in
trunk/navit/po/nds.po.in
trunk/navit/po/nl.po.in
trunk/navit/po/nn.po.in
trunk/navit/po/pl.po.in
trunk/navit/po/pms.po.in
trunk/navit/po/pt.po.in
trunk/navit/po/pt_BR.po.in
trunk/navit/po/ro.po.in
trunk/navit/po/ru.po.in
trunk/navit/po/sc.po.in
trunk/navit/po/si.po.in
trunk/navit/po/sk.po.in
trunk/navit/po/sl.po.in
trunk/navit/po/sr.po.in
trunk/navit/po/sv.po.in
trunk/navit/po/sw.po.in
trunk/navit/po/ta.po.in
trunk/navit/po/te.po.in
trunk/navit/po/th.po.in
trunk/navit/po/tr.po.in
trunk/navit/po/uk.po.in
trunk/navit/po/ur.po.in
trunk/navit/po/vi.po.in
trunk/navit/po/zh_CN.po.in
trunk/navit/po/zh_HK.po.in
Modified: trunk/navit/po/af.po.in
===================================================================
--- trunk/navit/po/af.po.in 2015-04-08 22:28:34 UTC (rev 6068)
+++ trunk/navit/po/af.po.in 2015-04-09 22:00:07 UTC (rev 6069)
@@ -138,10 +138,8 @@
msgstr[0] "na een kilometer"
msgstr[1] "na %d kilometer"
-#. 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 "exit"
+msgstr "afrit"
msgid "into the ramp"
msgstr "na die afrit"
@@ -171,154 +169,92 @@
msgid "%sinto the %s"
msgstr "%sin die %s in"
-msgid "When possible, please turn around"
-msgstr "Draai asseblief om wanneer moontlik"
+#. TRANSLATORS: right, as in 'Turn right'
+msgid "right"
+msgstr "regs"
-#. TRANSLATORS: the argument is the destination to follow
-#, c-format
-msgid "towards %s"
-msgstr ""
+#. TRANSLATORS: left, as in 'Turn left'
+msgid "left"
+msgstr "links"
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Volg die pad vir die volgende %s"
+#. TRANSLATORS: Don't forget the ending space
+msgid "easily "
+msgstr "maklik "
-msgid "Enter the roundabout soon"
-msgstr "Gaan kortliks in die sirkel in"
+#. TRANSLATORS: Don't forget the ending space
+msgid "strongly "
+msgstr "skerp "
-#. TRANSLATORS: %s is the distance to the roundabout
-#, c-format
-msgid "Enter the roundabout %s"
+#. TRANSLATORS: Don't forget the ending space
+msgid "really strongly "
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"
+#. TRANSLATORS: Don't forget the ending space
+msgid "unknown "
msgstr ""
-#. 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 ""
+msgid "When possible, please turn around"
+msgstr "Draai asseblief om wanneer moontlik"
-msgid "soon"
-msgstr "kortliks"
+msgid "Enter the roundabout soon"
+msgstr "Gaan kortliks in die sirkel in"
-msgid "now"
-msgstr "nou"
-
-msgid "then"
-msgstr ""
-
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
-msgid "%1$s merge left %2$s"
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
-msgid "%1$s merge right %2$s"
+msgid "then leave the roundabout at the %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"
+msgid "Leave the roundabout at the %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 "Follow the road for the next %s"
+msgstr "Volg die pad vir die volgende %s"
-msgid " at the exit "
-msgstr ""
+msgid "soon"
+msgstr "kortliks"
-msgid " at the interchange "
-msgstr ""
-
-#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, 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 "Neem die %1$s pad na %2$s"
-msgid "right"
-msgstr "regs"
-
#, c-format
msgid "after %i roads"
msgstr "na %i paaie"
-#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
+msgid "now"
+msgstr "nou"
+
#, c-format
-msgid "Turn %1$s%2$s %3$s %4$s"
+msgid "then take the %1$s road to the %2$s"
msgstr ""
-msgid "easily "
-msgstr "maklik "
+msgid "error"
+msgstr ""
-msgid "strongly "
-msgstr "skerp "
-
-msgid "left"
-msgstr "links"
-
-#. TRANSLATORS: the arg. is distance
+#. 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'
#, c-format
-msgid "%1$s left turnaround"
+msgid "Turn %1$s%2$s %3$s%4$s"
msgstr ""
-#. TRANSLATORS: the arg. is distance
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
#, c-format
-msgid "%1$s right turnaround"
+msgid "then turn %1$s%2$s %3$s%4$s"
msgstr ""
-msgid "then you have reached your destination."
-msgstr "dan het jy jou bestemming bereik."
-
-#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Jy het jou bestemming bereik %s"
-msgid "exit"
-msgstr "afrit"
+msgid "then you have reached your destination."
+msgstr "dan het jy jou bestemming bereik."
-msgid "interchange"
-msgstr ""
-
-#, c-format
-msgid "%s %s"
-msgstr ""
-
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posisie"
@@ -1747,9 +1683,6 @@
msgid "Show results on the map"
msgstr ""
-msgid "Foursquare"
-msgstr ""
-
msgid "Cut Bookmark"
msgstr "Sny Boekmerk"
@@ -1976,12 +1909,31 @@
msgid "Map data (c) OpenStreetMap contributors, ODBL"
msgstr ""
+msgid ""
+"Current map location %s is not available\n"
+"Please restart Navit after you attach an SD card or select a different map "
+"location."
+msgstr ""
+
msgid "Downloaded maps"
msgstr ""
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
+msgstr ""
+
msgid "Cancel"
msgstr ""
+msgid "filenamePath"
+msgstr ""
+
+msgid ""
+"New location set to %s\n"
+"Restart Navit to apply the changes."
+msgstr ""
+
msgid "Whole Planet"
msgstr ""
@@ -2352,13 +2304,16 @@
msgid "ready"
msgstr ""
-msgid "Error downloading map!"
+msgid "Media selected for map storage is not available"
msgstr ""
#. Android resource: @strings/map_download_not_enough_free_space
msgid "Not enough free space"
msgstr ""
+msgid "Error downloading map!"
+msgstr ""
+
msgid "Error writing map!"
msgstr ""
@@ -2523,6 +2478,10 @@
msgid "Backup / Restore"
msgstr ""
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
+msgstr ""
+
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr ""
@@ -2648,3 +2607,14 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
+
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
+msgstr ""
+
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
+msgstr ""
Modified: trunk/navit/po/ar.po.in
===================================================================
--- trunk/navit/po/ar.po.in 2015-04-08 22:28:34 UTC (rev 6068)
+++ trunk/navit/po/ar.po.in 2015-04-09 22:00:07 UTC (rev 6069)
@@ -153,10 +153,8 @@
msgstr[4] "بعد %d كلم"
msgstr[5] "بعد %d كلم"
-#. 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 "exit"
+msgstr "خروج"
msgid "into the ramp"
msgstr "إلى داخل الطريق المنحدر"
@@ -186,18 +184,33 @@
msgid "%sinto the %s"
msgstr "%s إلى داخل %s"
-msgid "When possible, please turn around"
-msgstr "حيث ممكن الرجاء اللف"
+#. TRANSLATORS: right, as in 'Turn right'
+msgid "right"
+msgstr "إلى اليمين"
-#. TRANSLATORS: the argument is the destination to follow
-#, c-format
-msgid "towards %s"
+#. 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 ""
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "تابع الطريق لل- %s التالية"
+#. TRANSLATORS: Don't forget the ending space
+msgid "unknown "
+msgstr ""
+msgid "When possible, please turn around"
+msgstr "حيث ممكن الرجاء اللف"
+
msgid "Enter the roundabout soon"
msgstr "قريباً الدخول إلى المستديرة"
@@ -206,134 +219,57 @@
msgid "Enter the roundabout %s"
msgstr "أدخل المسافة %s إلى المستديرة"
-#. 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"
+msgid "then leave the roundabout at the %s"
msgstr ""
-#. 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"
+msgid "Leave the roundabout at the %s"
msgstr ""
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "تابع الطريق لل- %s التالية"
+
msgid "soon"
msgstr "قريبا"
-msgid "now"
-msgstr "الآن"
-
-msgid "then"
-msgstr ""
-
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, 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 طرقات"
-#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
+msgid "now"
+msgstr "الآن"
+
#, c-format
-msgid "Turn %1$s%2$s %3$s %4$s"
+msgid "then take the %1$s road to the %2$s"
msgstr ""
-msgid "easily "
-msgstr "بسهولة "
+msgid "error"
+msgstr ""
-msgid "strongly "
-msgstr "بكل شدة "
-
-msgid "left"
-msgstr "إلى اليسار"
-
-#. TRANSLATORS: the arg. is distance
+#. 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'
#, c-format
-msgid "%1$s left turnaround"
+msgid "Turn %1$s%2$s %3$s%4$s"
msgstr ""
-#. TRANSLATORS: the arg. is distance
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
#, c-format
-msgid "%1$s right turnaround"
+msgid "then turn %1$s%2$s %3$s%4$s"
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 "exit"
-msgstr "خروج"
+msgid "then you have reached your destination."
+msgstr "و بعدها تكون قد وصلت إلى هدفك"
-msgid "interchange"
-msgstr ""
-
-#, c-format
-msgid "%s %s"
-msgstr ""
-
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "الموقع"
@@ -1762,9 +1698,6 @@
msgid "Show results on the map"
msgstr "أعرض النتائج على الخريطة"
-msgid "Foursquare"
-msgstr ""
-
msgid "Cut Bookmark"
msgstr "قص العلامة"
@@ -1991,12 +1924,31 @@
msgid "Map data (c) OpenStreetMap contributors, ODBL"
msgstr ""
+msgid ""
+"Current map location %s is not available\n"
+"Please restart Navit after you attach an SD card or select a different map "
+"location."
+msgstr ""
+
msgid "Downloaded maps"
msgstr "الخرائط المنزلة"
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
+msgstr ""
+
msgid "Cancel"
msgstr "إلغاء"
+msgid "filenamePath"
+msgstr ""
+
+msgid ""
+"New location set to %s\n"
+"Restart Navit to apply the changes."
+msgstr ""
+
msgid "Whole Planet"
msgstr "كامل القرة الأرضية"
@@ -2367,13 +2319,16 @@
msgid "ready"
msgstr "جاهز"
-msgid "Error downloading map!"
-msgstr "خطأ أثناء تنزيل الخريطة!"
+msgid "Media selected for map storage is not available"
+msgstr ""
#. Android resource: @strings/map_download_not_enough_free_space
msgid "Not enough free space"
msgstr "لا يوجد مجال فارغ كافي"
+msgid "Error downloading map!"
+msgstr "خطأ أثناء تنزيل الخريطة!"
+
msgid "Error writing map!"
msgstr "خطأ عند كتابة الخريطة!"
@@ -2538,6 +2493,10 @@
msgid "Backup / Restore"
msgstr ""
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
+msgstr ""
+
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr "حذف هذه الخريطة ؟"
@@ -2663,3 +2622,14 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr "استعادة"
+
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
+msgstr ""
+
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
+msgstr ""
Modified: trunk/navit/po/ast.po.in
===================================================================
--- trunk/navit/po/ast.po.in 2015-04-08 22:28:34 UTC (rev 6068)
+++ trunk/navit/po/ast.po.in 2015-04-09 22:00:07 UTC (rev 6069)
@@ -133,10 +133,8 @@
msgstr[0] "nun quilómetru"
msgstr[1] "en %d quilómetros"
-#. 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 "exit"
+msgstr "salida"
msgid "into the ramp"
msgstr "pal enllaz"
@@ -166,154 +164,92 @@
msgid "%sinto the %s"
msgstr "%s pa la %s"
-msgid "When possible, please turn around"
-msgstr "Cuando seya posible, de la vuelta"
+#. TRANSLATORS: right, as in 'Turn right'
+msgid "right"
+msgstr "drecha"
-#. TRANSLATORS: the argument is the destination to follow
-#, c-format
-msgid "towards %s"
-msgstr ""
+#. TRANSLATORS: left, as in 'Turn left'
+msgid "left"
+msgstr "izquierda"
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Siga pela carretera los siguientes %s"
+#. TRANSLATORS: Don't forget the ending space
+msgid "easily "
+msgstr "selemente "
-msgid "Enter the roundabout soon"
-msgstr "Entre ceo na rotonda"
+#. TRANSLATORS: Don't forget the ending space
+msgid "strongly "
+msgstr "enforma "
-#. TRANSLATORS: %s is the distance to the roundabout
-#, c-format
-msgid "Enter the roundabout %s"
+#. TRANSLATORS: Don't forget the ending space
+msgid "really strongly "
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"
+#. TRANSLATORS: Don't forget the ending space
+msgid "unknown "
msgstr ""
-#. 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 ""
+msgid "When possible, please turn around"
+msgstr "Cuando seya posible, de la vuelta"
-msgid "soon"
-msgstr "aína"
+msgid "Enter the roundabout soon"
+msgstr "Entre ceo na rotonda"
-msgid "now"
-msgstr "agora"
-
-msgid "then"
-msgstr ""
-
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
-msgid "%1$s merge left %2$s"
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
-msgid "%1$s merge right %2$s"
+msgid "then leave the roundabout at the %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"
+msgid "Leave the roundabout at the %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 "Follow the road for the next %s"
+msgstr "Siga pela carretera los siguientes %s"
-msgid " at the exit "
-msgstr ""
+msgid "soon"
+msgstr "aína"
-msgid " at the interchange "
-msgstr ""
-
-#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, 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 "Tome la carretera %1$s dica %2$s"
-msgid "right"
-msgstr "drecha"
-
#, c-format
msgid "after %i roads"
msgstr "tres %i carreteres"
-#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
+msgid "now"
+msgstr "agora"
+
#, c-format
-msgid "Turn %1$s%2$s %3$s %4$s"
+msgid "then take the %1$s road to the %2$s"
msgstr ""
-msgid "easily "
-msgstr "selemente "
+msgid "error"
+msgstr ""
-msgid "strongly "
-msgstr "enforma "
-
-msgid "left"
-msgstr "izquierda"
-
-#. TRANSLATORS: the arg. is distance
+#. 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'
#, c-format
-msgid "%1$s left turnaround"
+msgid "Turn %1$s%2$s %3$s%4$s"
msgstr ""
-#. TRANSLATORS: the arg. is distance
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
#, c-format
-msgid "%1$s right turnaround"
+msgid "then turn %1$s%2$s %3$s%4$s"
msgstr ""
-msgid "then you have reached your destination."
-msgstr "entós llegará al destín."
-
-#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Llegó al destín %s"
-msgid "exit"
-msgstr "salida"
+msgid "then you have reached your destination."
+msgstr "entós llegará al destín."
-msgid "interchange"
-msgstr ""
-
-#, c-format
-msgid "%s %s"
-msgstr ""
-
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posición"
@@ -1742,9 +1678,6 @@
msgid "Show results on the map"
msgstr ""
-msgid "Foursquare"
-msgstr ""
-
msgid "Cut Bookmark"
msgstr "Cortar marcador"
@@ -1971,12 +1904,31 @@
msgid "Map data (c) OpenStreetMap contributors, ODBL"
msgstr ""
+msgid ""
+"Current map location %s is not available\n"
+"Please restart Navit after you attach an SD card or select a different map "
+"location."
+msgstr ""
+
msgid "Downloaded maps"
msgstr ""
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
+msgstr ""
+
msgid "Cancel"
msgstr ""
+msgid "filenamePath"
+msgstr ""
+
+msgid ""
+"New location set to %s\n"
+"Restart Navit to apply the changes."
+msgstr ""
+
msgid "Whole Planet"
msgstr ""
@@ -2347,13 +2299,16 @@
msgid "ready"
msgstr ""
-msgid "Error downloading map!"
+msgid "Media selected for map storage is not available"
msgstr ""
#. Android resource: @strings/map_download_not_enough_free_space
msgid "Not enough free space"
msgstr ""
+msgid "Error downloading map!"
+msgstr ""
+
msgid "Error writing map!"
msgstr ""
@@ -2518,6 +2473,10 @@
msgid "Backup / Restore"
msgstr ""
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
+msgstr ""
+
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr ""
@@ -2643,3 +2602,14 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
+
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
+msgstr ""
+
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
+msgstr ""
Modified: trunk/navit/po/be.po.in
===================================================================
--- trunk/navit/po/be.po.in 2015-04-08 22:28:34 UTC (rev 6068)
+++ trunk/navit/po/be.po.in 2015-04-09 22:00:07 UTC (rev 6069)
@@ -135,10 +135,8 @@
msgstr[0] ""
msgstr[1] ""
-#. 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 "exit"
+msgstr "выхад"
msgid "into the ramp"
msgstr ""
@@ -168,154 +166,92 @@
msgid "%sinto the %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Развярніцеся, калі будзе магчымасць"
+#. TRANSLATORS: right, as in 'Turn right'
+msgid "right"
+msgstr "направа"
-#. TRANSLATORS: the argument is the destination to follow
-#, c-format
-msgid "towards %s"
-msgstr ""
+#. TRANSLATORS: left, as in 'Turn left'
+msgid "left"
+msgstr "налева"
-#, c-format
-msgid "Follow the road for the next %s"
+#. TRANSLATORS: Don't forget the ending space
+msgid "easily "
msgstr ""
-msgid "Enter the roundabout soon"
-msgstr ""
+#. TRANSLATORS: Don't forget the ending space
+msgid "strongly "
+msgstr "мацней "
-#. TRANSLATORS: %s is the distance to the roundabout
-#, c-format
-msgid "Enter the roundabout %s"
+#. TRANSLATORS: Don't forget the ending space
+msgid "really strongly "
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"
+#. TRANSLATORS: Don't forget the ending space
+msgid "unknown "
msgstr ""
-#. 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 ""
+msgid "When possible, please turn around"
+msgstr "Развярніцеся, калі будзе магчымасць"
-msgid "soon"
-msgstr "скора"
-
-msgid "now"
-msgstr "зараз"
-
-msgid "then"
+msgid "Enter the roundabout soon"
msgstr ""
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
-msgid "%1$s merge left %2$s"
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
-msgid "%1$s merge right %2$s"
+msgid "then leave the roundabout at the %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"
+msgid "Leave the roundabout at the %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"
+msgid "Follow the road for the next %s"
msgstr ""
-msgid " at the exit "
-msgstr ""
+msgid "soon"
+msgstr "скора"
-msgid " at the interchange "
-msgstr ""
-
-#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, 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 ""
-msgid "right"
-msgstr "направа"
-
#, c-format
msgid "after %i roads"
msgstr ""
-#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
+msgid "now"
+msgstr "зараз"
+
#, c-format
-msgid "Turn %1$s%2$s %3$s %4$s"
+msgid "then take the %1$s road to the %2$s"
msgstr ""
-msgid "easily "
+msgid "error"
msgstr ""
-msgid "strongly "
-msgstr "мацней "
-
-msgid "left"
-msgstr "налева"
-
-#. TRANSLATORS: the arg. is distance
+#. 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'
#, c-format
-msgid "%1$s left turnaround"
+msgid "Turn %1$s%2$s %3$s%4$s"
msgstr ""
-#. TRANSLATORS: the arg. is distance
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
#, c-format
-msgid "%1$s right turnaround"
+msgid "then turn %1$s%2$s %3$s%4$s"
msgstr ""
-msgid "then you have reached your destination."
-msgstr ""
-
-#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr ""
-msgid "exit"
-msgstr "выхад"
-
-msgid "interchange"
+msgid "then you have reached your destination."
msgstr ""
-#, c-format
-msgid "%s %s"
-msgstr ""
-
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Размяшчэнне"
@@ -1744,9 +1680,6 @@
msgid "Show results on the map"
msgstr ""
-msgid "Foursquare"
-msgstr ""
-
msgid "Cut Bookmark"
msgstr ""
@@ -1973,12 +1906,31 @@
msgid "Map data (c) OpenStreetMap contributors, ODBL"
msgstr ""
+msgid ""
+"Current map location %s is not available\n"
+"Please restart Navit after you attach an SD card or select a different map "
+"location."
+msgstr ""
+
msgid "Downloaded maps"
msgstr ""
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
+msgstr ""
+
msgid "Cancel"
msgstr ""
+msgid "filenamePath"
+msgstr ""
+
+msgid ""
+"New location set to %s\n"
+"Restart Navit to apply the changes."
+msgstr ""
+
msgid "Whole Planet"
msgstr ""
@@ -2349,13 +2301,16 @@
msgid "ready"
msgstr ""
-msgid "Error downloading map!"
+msgid "Media selected for map storage is not available"
msgstr ""
#. Android resource: @strings/map_download_not_enough_free_space
msgid "Not enough free space"
msgstr ""
+msgid "Error downloading map!"
+msgstr ""
+
msgid "Error writing map!"
msgstr ""
@@ -2516,6 +2471,10 @@
msgid "Backup / Restore"
msgstr ""
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
+msgstr ""
+
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr ""
@@ -2641,3 +2600,14 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
+
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
+msgstr ""
+
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
+msgstr ""
Modified: trunk/navit/po/bg.po.in
===================================================================
--- trunk/navit/po/bg.po.in 2015-04-08 22:28:34 UTC (rev 6068)
+++ trunk/navit/po/bg.po.in 2015-04-09 22:00:07 UTC (rev 6069)
@@ -137,10 +137,8 @@
msgstr[0] "след един километър"
msgstr[1] "след %d километра"
-#. 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 "exit"
+msgstr "изход"
msgid "into the ramp"
msgstr "на рампата"
@@ -170,154 +168,92 @@
msgid "%sinto the %s"
msgstr ""
-msgid "When possible, please turn around"
-msgstr "Когато е възможно обърнете"
+#. TRANSLATORS: right, as in 'Turn right'
+msgid "right"
+msgstr "надясно"
-#. TRANSLATORS: the argument is the destination to follow
-#, c-format
-msgid "towards %s"
-msgstr ""
+#. TRANSLATORS: left, as in 'Turn left'
+msgid "left"
+msgstr "наляво"
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Следвайте пътя през следващите %s"
+#. TRANSLATORS: Don't forget the ending space
+msgid "easily "
+msgstr "леко "
-msgid "Enter the roundabout soon"
-msgstr "Скоро навлизате в кръгово"
+#. TRANSLATORS: Don't forget the ending space
+msgid "strongly "
+msgstr "силно "
-#. TRANSLATORS: %s is the distance to the roundabout
-#, c-format
-msgid "Enter the roundabout %s"
+#. TRANSLATORS: Don't forget the ending space
+msgid "really strongly "
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"
+#. TRANSLATORS: Don't forget the ending space
+msgid "unknown "
msgstr ""
-#. 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 ""
+msgid "When possible, please turn around"
+msgstr "Когато е възможно обърнете"
-msgid "soon"
-msgstr "скоро"
+msgid "Enter the roundabout soon"
+msgstr "Скоро навлизате в кръгово"
-msgid "now"
-msgstr "сега"
-
-msgid "then"
-msgstr ""
-
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
-msgid "%1$s merge left %2$s"
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
-msgid "%1$s merge right %2$s"
+msgid "then leave the roundabout at the %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"
+msgid "Leave the roundabout at the %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 "Follow the road for the next %s"
+msgstr "Следвайте пътя през следващите %s"
-msgid " at the exit "
-msgstr ""
+msgid "soon"
+msgstr "скоро"
-msgid " at the interchange "
-msgstr ""
-
-#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, 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 пресечки"
-#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
+msgid "now"
+msgstr "сега"
+
#, c-format
-msgid "Turn %1$s%2$s %3$s %4$s"
+msgid "then take the %1$s road to the %2$s"
msgstr ""
-msgid "easily "
-msgstr "леко "
+msgid "error"
+msgstr ""
-msgid "strongly "
-msgstr "силно "
-
-msgid "left"
-msgstr "наляво"
-
-#. TRANSLATORS: the arg. is distance
+#. 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'
#, c-format
-msgid "%1$s left turnaround"
+msgid "Turn %1$s%2$s %3$s%4$s"
msgstr ""
-#. TRANSLATORS: the arg. is distance
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
#, c-format
-msgid "%1$s right turnaround"
+msgid "then turn %1$s%2$s %3$s%4$s"
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 "exit"
-msgstr "изход"
+msgid "then you have reached your destination."
+msgstr "след това пристигате на местоназначението"
-msgid "interchange"
-msgstr ""
-
-#, c-format
-msgid "%s %s"
-msgstr ""
-
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Позиция"
@@ -1746,9 +1682,6 @@
msgid "Show results on the map"
msgstr ""
-msgid "Foursquare"
-msgstr ""
-
msgid "Cut Bookmark"
msgstr ""
@@ -1975,12 +1908,31 @@
msgid "Map data (c) OpenStreetMap contributors, ODBL"
msgstr ""
+msgid ""
+"Current map location %s is not available\n"
+"Please restart Navit after you attach an SD card or select a different map "
+"location."
+msgstr ""
+
msgid "Downloaded maps"
msgstr ""
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
+msgstr ""
+
msgid "Cancel"
msgstr ""
+msgid "filenamePath"
+msgstr ""
+
+msgid ""
+"New location set to %s\n"
+"Restart Navit to apply the changes."
+msgstr ""
+
msgid "Whole Planet"
msgstr ""
@@ -2351,13 +2303,16 @@
msgid "ready"
msgstr ""
-msgid "Error downloading map!"
+msgid "Media selected for map storage is not available"
msgstr ""
#. Android resource: @strings/map_download_not_enough_free_space
msgid "Not enough free space"
msgstr ""
+msgid "Error downloading map!"
+msgstr ""
+
msgid "Error writing map!"
msgstr ""
@@ -2522,6 +2477,10 @@
msgid "Backup / Restore"
msgstr ""
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
+msgstr ""
+
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr ""
@@ -2647,3 +2606,14 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
+
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
+msgstr ""
+
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
+msgstr ""
Modified: trunk/navit/po/bs.po.in
===================================================================
--- trunk/navit/po/bs.po.in 2015-04-08 22:28:34 UTC (rev 6068)
+++ trunk/navit/po/bs.po.in 2015-04-09 22:00:07 UTC (rev 6069)
@@ -136,10 +136,8 @@
msgstr[1] "u %d kilometara"
msgstr[2] "u %d kilometara"
-#. 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 "exit"
+msgstr "izlaz"
msgid "into the ramp"
msgstr "u rampu"
@@ -169,154 +167,92 @@
msgid "%sinto the %s"
msgstr ""
-msgid "When possible, please turn around"
+#. TRANSLATORS: right, as in 'Turn right'
+msgid "right"
msgstr ""
-#. TRANSLATORS: the argument is the destination to follow
-#, c-format
-msgid "towards %s"
+#. TRANSLATORS: left, as in 'Turn left'
+msgid "left"
msgstr ""
-#, c-format
-msgid "Follow the road for the next %s"
+#. TRANSLATORS: Don't forget the ending space
+msgid "easily "
msgstr ""
-msgid "Enter the roundabout soon"
+#. TRANSLATORS: Don't forget the ending space
+msgid "strongly "
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
-#, c-format
-msgid "Enter the roundabout %s"
+#. TRANSLATORS: Don't forget the ending space
+msgid "really strongly "
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"
+#. TRANSLATORS: Don't forget the ending space
+msgid "unknown "
msgstr ""
-#. 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"
+msgid "When possible, please turn around"
msgstr ""
-msgid "soon"
+msgid "Enter the roundabout soon"
msgstr ""
-msgid "now"
-msgstr ""
-
-msgid "then"
-msgstr ""
-
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
-msgid "%1$s merge left %2$s"
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
-msgid "%1$s merge right %2$s"
+msgid "then leave the roundabout at the %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"
+msgid "Leave the roundabout at the %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"
+msgid "Follow the road for the next %s"
msgstr ""
-msgid " at the exit "
+msgid "soon"
msgstr ""
-msgid " at the interchange "
-msgstr ""
-
-#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, 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 ""
-msgid "right"
-msgstr ""
-
#, c-format
msgid "after %i roads"
msgstr ""
-#. 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"
+msgid "now"
msgstr ""
-msgid "easily "
+#, c-format
+msgid "then take the %1$s road to the %2$s"
msgstr ""
-msgid "strongly "
+msgid "error"
msgstr ""
-msgid "left"
-msgstr ""
-
-#. TRANSLATORS: the arg. is distance
+#. 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'
#, c-format
-msgid "%1$s left turnaround"
+msgid "Turn %1$s%2$s %3$s%4$s"
msgstr ""
-#. TRANSLATORS: the arg. is distance
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
#, c-format
-msgid "%1$s right turnaround"
+msgid "then turn %1$s%2$s %3$s%4$s"
msgstr ""
-msgid "then you have reached your destination."
-msgstr ""
-
-#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr ""
-msgid "exit"
-msgstr "izlaz"
-
-msgid "interchange"
+msgid "then you have reached your destination."
msgstr ""
-#, c-format
-msgid "%s %s"
-msgstr ""
-
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1745,9 +1681,6 @@
msgid "Show results on the map"
msgstr ""
-msgid "Foursquare"
-msgstr ""
-
msgid "Cut Bookmark"
msgstr ""
@@ -1974,12 +1907,31 @@
msgid "Map data (c) OpenStreetMap contributors, ODBL"
msgstr ""
+msgid ""
+"Current map location %s is not available\n"
+"Please restart Navit after you attach an SD card or select a different map "
+"location."
+msgstr ""
+
msgid "Downloaded maps"
msgstr ""
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
+msgstr ""
+
msgid "Cancel"
msgstr ""
+msgid "filenamePath"
+msgstr ""
+
+msgid ""
+"New location set to %s\n"
+"Restart Navit to apply the changes."
+msgstr ""
+
msgid "Whole Planet"
msgstr ""
@@ -2350,13 +2302,16 @@
msgid "ready"
msgstr ""
-msgid "Error downloading map!"
+msgid "Media selected for map storage is not available"
msgstr ""
#. Android resource: @strings/map_download_not_enough_free_space
msgid "Not enough free space"
msgstr ""
+msgid "Error downloading map!"
+msgstr ""
+
msgid "Error writing map!"
msgstr ""
@@ -2517,6 +2472,10 @@
msgid "Backup / Restore"
msgstr ""
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
+msgstr ""
+
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr ""
@@ -2642,3 +2601,14 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
+
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
+msgstr ""
+
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
+msgstr ""
Modified: trunk/navit/po/ca.po.in
===================================================================
--- trunk/navit/po/ca.po.in 2015-04-08 22:28:34 UTC (rev 6068)
+++ trunk/navit/po/ca.po.in 2015-04-09 22:00:07 UTC (rev 6069)
@@ -143,10 +143,8 @@
msgstr[0] "d'aquí a un quilòmetre"
msgstr[1] "d'aquí a %d quilòmetres"
-#. 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 "exit"
+msgstr "surt"
msgid "into the ramp"
msgstr "a la sortida"
@@ -176,154 +174,92 @@
msgid "%sinto the %s"
msgstr "%s cap a la %s"
-msgid "When possible, please turn around"
-msgstr "Quan sigui possible, doneu mitja volta"
+#. TRANSLATORS: right, as in 'Turn right'
+msgid "right"
+msgstr "dreta"
-#. TRANSLATORS: the argument is the destination to follow
-#, c-format
-msgid "towards %s"
-msgstr ""
+#. TRANSLATORS: left, as in 'Turn left'
+msgid "left"
+msgstr "esquerra"
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "Seguiu per la carretera durant els propers %s"
+#. TRANSLATORS: Don't forget the ending space
+msgid "easily "
+msgstr "fàcilment "
-msgid "Enter the roundabout soon"
-msgstr "Entreu a la rotonda vinent"
+#. TRANSLATORS: Don't forget the ending space
+msgid "strongly "
+msgstr "fortament "
-#. TRANSLATORS: %s is the distance to the roundabout
-#, c-format
-msgid "Enter the roundabout %s"
+#. TRANSLATORS: Don't forget the ending space
+msgid "really strongly "
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"
+#. TRANSLATORS: Don't forget the ending space
+msgid "unknown "
msgstr ""
-#. 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 ""
+msgid "When possible, please turn around"
+msgstr "Quan sigui possible, doneu mitja volta"
-msgid "soon"
-msgstr "aviat"
+msgid "Enter the roundabout soon"
+msgstr "Entreu a la rotonda vinent"
-msgid "now"
-msgstr "ara"
-
-msgid "then"
-msgstr ""
-
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
-msgid "%1$s merge left %2$s"
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
-msgid "%1$s merge right %2$s"
+msgid "then leave the roundabout at the %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"
+msgid "Leave the roundabout at the %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 "Follow the road for the next %s"
+msgstr "Seguiu per la carretera durant els propers %s"
-msgid " at the exit "
-msgstr ""
+msgid "soon"
+msgstr "aviat"
-msgid " at the interchange "
-msgstr ""
-
-#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, 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 "Preneu el %1$s carrer a la %2$s"
-msgid "right"
-msgstr "dreta"
-
#, c-format
msgid "after %i roads"
msgstr "després de %i carrers"
-#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
+msgid "now"
+msgstr "ara"
+
#, c-format
-msgid "Turn %1$s%2$s %3$s %4$s"
+msgid "then take the %1$s road to the %2$s"
msgstr ""
-msgid "easily "
-msgstr "fàcilment "
+msgid "error"
+msgstr ""
-msgid "strongly "
-msgstr "fortament "
-
-msgid "left"
-msgstr "esquerra"
-
-#. TRANSLATORS: the arg. is distance
+#. 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'
#, c-format
-msgid "%1$s left turnaround"
+msgid "Turn %1$s%2$s %3$s%4$s"
msgstr ""
-#. TRANSLATORS: the arg. is distance
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
#, c-format
-msgid "%1$s right turnaround"
+msgid "then turn %1$s%2$s %3$s%4$s"
msgstr ""
-msgid "then you have reached your destination."
-msgstr "aleshores heu arribat a destí"
-
-#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr "Heu arribat a la destinació %s"
-msgid "exit"
-msgstr "surt"
+msgid "then you have reached your destination."
+msgstr "aleshores heu arribat a destí"
-msgid "interchange"
-msgstr ""
-
-#, c-format
-msgid "%s %s"
-msgstr ""
-
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posició"
@@ -1752,9 +1688,6 @@
msgid "Show results on the map"
msgstr ""
-msgid "Foursquare"
-msgstr ""
-
msgid "Cut Bookmark"
msgstr "Retalla el punt"
@@ -1981,12 +1914,31 @@
msgid "Map data (c) OpenStreetMap contributors, ODBL"
msgstr ""
+msgid ""
+"Current map location %s is not available\n"
+"Please restart Navit after you attach an SD card or select a different map "
+"location."
+msgstr ""
+
msgid "Downloaded maps"
msgstr ""
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
+msgstr ""
+
msgid "Cancel"
msgstr ""
+msgid "filenamePath"
+msgstr ""
+
+msgid ""
+"New location set to %s\n"
+"Restart Navit to apply the changes."
+msgstr ""
+
msgid "Whole Planet"
msgstr ""
@@ -2357,13 +2309,16 @@
msgid "ready"
msgstr ""
-msgid "Error downloading map!"
+msgid "Media selected for map storage is not available"
msgstr ""
#. Android resource: @strings/map_download_not_enough_free_space
msgid "Not enough free space"
msgstr ""
+msgid "Error downloading map!"
+msgstr ""
+
msgid "Error writing map!"
msgstr ""
@@ -2528,6 +2483,10 @@
msgid "Backup / Restore"
msgstr ""
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
+msgstr ""
+
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr ""
@@ -2653,3 +2612,14 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
+
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
+msgstr ""
+
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
+msgstr ""
Modified: trunk/navit/po/ckb.po.in
===================================================================
--- trunk/navit/po/ckb.po.in 2015-04-08 22:28:34 UTC (rev 6068)
+++ trunk/navit/po/ckb.po.in 2015-04-09 22:00:07 UTC (rev 6069)
@@ -132,9 +132,7 @@
msgstr[0] ""
msgstr[1] ""
-#. 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"
+msgid "exit"
msgstr ""
msgid "into the ramp"
@@ -165,154 +163,92 @@
msgid "%sinto the %s"
msgstr ""
-msgid "When possible, please turn around"
+#. TRANSLATORS: right, as in 'Turn right'
+msgid "right"
msgstr ""
-#. TRANSLATORS: the argument is the destination to follow
-#, c-format
-msgid "towards %s"
+#. TRANSLATORS: left, as in 'Turn left'
+msgid "left"
msgstr ""
-#, c-format
-msgid "Follow the road for the next %s"
+#. TRANSLATORS: Don't forget the ending space
+msgid "easily "
msgstr ""
-msgid "Enter the roundabout soon"
+#. TRANSLATORS: Don't forget the ending space
+msgid "strongly "
msgstr ""
-#. TRANSLATORS: %s is the distance to the roundabout
-#, c-format
-msgid "Enter the roundabout %s"
+#. TRANSLATORS: Don't forget the ending space
+msgid "really strongly "
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"
+#. TRANSLATORS: Don't forget the ending space
+msgid "unknown "
msgstr ""
-#. 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"
+msgid "When possible, please turn around"
msgstr ""
-msgid "soon"
+msgid "Enter the roundabout soon"
msgstr ""
-msgid "now"
-msgstr ""
-
-msgid "then"
-msgstr ""
-
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#. TRANSLATORS: %s is the distance to the roundabout
#, c-format
-msgid "%1$s merge left %2$s"
+msgid "Enter the roundabout %s"
msgstr ""
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
#, c-format
-msgid "%1$s merge right %2$s"
+msgid "then leave the roundabout at the %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"
+msgid "Leave the roundabout at the %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"
+msgid "Follow the road for the next %s"
msgstr ""
-msgid " at the exit "
+msgid "soon"
msgstr ""
-msgid " at the interchange "
-msgstr ""
-
-#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
#, 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 ""
-msgid "right"
-msgstr ""
-
#, c-format
msgid "after %i roads"
msgstr ""
-#. 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"
+msgid "now"
msgstr ""
-msgid "easily "
+#, c-format
+msgid "then take the %1$s road to the %2$s"
msgstr ""
-msgid "strongly "
+msgid "error"
msgstr ""
-msgid "left"
-msgstr ""
-
-#. TRANSLATORS: the arg. is distance
+#. 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'
#, c-format
-msgid "%1$s left turnaround"
+msgid "Turn %1$s%2$s %3$s%4$s"
msgstr ""
-#. TRANSLATORS: the arg. is distance
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
#, c-format
-msgid "%1$s right turnaround"
+msgid "then turn %1$s%2$s %3$s%4$s"
msgstr ""
-msgid "then you have reached your destination."
-msgstr ""
-
-#. TRANSLATORS: the arg. is distance
#, c-format
msgid "You have reached your destination %s"
msgstr ""
-msgid "exit"
+msgid "then you have reached your destination."
msgstr ""
-msgid "interchange"
-msgstr ""
-
-#, c-format
-msgid "%s %s"
-msgstr ""
-
#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr ""
@@ -1741,9 +1677,6 @@
msgid "Show results on the map"
msgstr ""
-msgid "Foursquare"
-msgstr ""
-
msgid "Cut Bookmark"
msgstr ""
@@ -1970,12 +1903,31 @@
msgid "Map data (c) OpenStreetMap contributors, ODBL"
msgstr ""
+msgid ""
+"Current map location %s is not available\n"
+"Please restart Navit after you attach an SD card or select a different map "
+"location."
+msgstr ""
+
msgid "Downloaded maps"
msgstr ""
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
+msgstr ""
+
msgid "Cancel"
msgstr ""
+msgid "filenamePath"
+msgstr ""
+
+msgid ""
+"New location set to %s\n"
+"Restart Navit to apply the changes."
+msgstr ""
+
msgid "Whole Planet"
msgstr ""
@@ -2346,13 +2298,16 @@
msgid "ready"
msgstr ""
-msgid "Error downloading map!"
+msgid "Media selected for map storage is not available"
msgstr ""
#. Android resource: @strings/map_download_not_enough_free_space
msgid "Not enough free space"
msgstr ""
+msgid "Error downloading map!"
+msgstr ""
+
msgid "Error writing map!"
msgstr ""
@@ -2513,6 +2468,10 @@
msgid "Backup / Restore"
msgstr ""
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
+msgstr ""
+
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr ""
@@ -2638,3 +2597,14 @@
#. Android resource: @strings/restore
msgid "Restore"
msgstr ""
+
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
+msgstr ""
+
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
+msgstr ""
Modified: trunk/navit/po/cs.po.in
===================================================================
--- trunk/navit/po/cs.po.in 2015-04-08 22:28:34 UTC (rev 6068)
+++ trunk/navit/po/cs.po.in 2015-04-09 22:00:07 UTC (rev 6069)
@@ -149,10 +149,8 @@
msgstr[1] "za %d kilometry"
msgstr[2] "za %d kilometrů"
-#. 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 "exit"
+msgstr "ukončit"
msgid "into the ramp"
msgstr "na přivadeč"
@@ -182,18 +180,33 @@
msgid "%sinto the %s"
msgstr "%sna %s"
-msgid "When possible, please turn around"
-msgstr "Až to bude možné, otočte se"
+#. TRANSLATORS: right, as in 'Turn right'
+msgid "right"
+msgstr "vpravo"
-#. TRANSLATORS: the argument is the destination to follow
-#, c-format
-msgid "towards %s"
+#. TRANSLATORS: left, as in 'Turn left'
+msgid "left"
+msgstr "vlevo"
+
+#. TRANSLATORS: Don't forget the ending space
+msgid "easily "
+msgstr "mírně "
+
+#. TRANSLATORS: Don't forget the ending space
+msgid "strongly "
+msgstr "silně "
+
+#. TRANSLATORS: Don't forget...
[truncated message content] |
|
From: <ka...@us...> - 2015-04-08 22:28:42
|
Revision: 6068
http://sourceforge.net/p/navit/code/6068
Author: kazer_
Date: 2015-04-08 22:28:34 +0000 (Wed, 08 Apr 2015)
Log Message:
-----------
Update:Plugin:Updated the j1850 plugin to avoid the use of magic numbers in dbg()
Modified Paths:
--------------
trunk/navit/navit/plugin/j1850/j1850.c
Modified: trunk/navit/navit/plugin/j1850/j1850.c
===================================================================
--- trunk/navit/navit/plugin/j1850/j1850.c 2015-04-08 19:07:19 UTC (rev 6067)
+++ trunk/navit/navit/plugin/j1850/j1850.c 2015-04-08 22:28:34 UTC (rev 6068)
@@ -1,7 +1,7 @@
/* vim: set tabstop=4 expandtab: */
/**
* Navit, a modular navigation system.
- * Copyright (C) 2005-2008 Navit Team
+ * Copyright (C) 2005-2014 Navit Team
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -52,17 +52,6 @@
#include "color.h"
#include "osd.h"
-const char *init_string[] = {
- "ATZ\r\n",
- "ATI\r\n",
- "ATL1\r\n",
- "ATH1\r\n",
- "ATS1\r\n",
- "ATAL\r\n",
- "ATMA\r\n",
- NULL
-};
-
struct j1850 {
struct navit *nav;
int status;
@@ -78,7 +67,9 @@
struct callback *click_cb;
int init_string_index;
- int rpm;
+ int engine_rpm;
+ int trans_rpm;
+ int map;
int tank_level;
int odo;
};
@@ -121,7 +112,7 @@
n_written += write( device, &cmd[n_written], 1 );
}
while (cmd[n_written-1] != '\r' && n_written > 0);
- dbg(0,"sent %s to the serial port\n",cmd);
+ dbg(lvl_info,"sent %s to the serial port\n",cmd);
}
/**
@@ -146,10 +137,22 @@
char header[3]; // a buffer to store the j1850 header for easier matching
struct timeval tv; // used to timestamp the logs
struct attr navit;
+
+ const char *init_string[] = {
+ "ATZ\r\n",
+ "ATI\r\n",
+ "ATL1\r\n",
+ "ATH1\r\n",
+ "ATS1\r\n",
+ "ATAL\r\n",
+ "ATMA\r\n",
+ NULL
+ };
+
// Make sure we sent all init commands before trying to read
if ( init_string[j1850->init_string_index])
{
- dbg(0,"Sending next init command : %s\n",init_string[j1850->init_string_index]);
+ dbg(lvl_info,"Sending next init command : %s\n",init_string[j1850->init_string_index]);
if (j1850->device > 0 ){
write_to_serial_port(init_string[j1850->init_string_index++],j1850->device);
}
@@ -174,9 +177,9 @@
n = read( j1850->device, &buf, 1 );
if(n == -1) {
- dbg(1,"x\n");
+ dbg(lvl_debug,"x\n");
} else if (n==0) {
- dbg(1,".\n");
+ dbg(lvl_debug,".\n");
} else {
if( buf == 13 ) {
gettimeofday(&tv, NULL);
@@ -192,31 +195,35 @@
strncpy(header, j1850->message, 2);
header[2]='\0';
if( strncmp(header,"10",2)==0 ) {
- char * w1 = strndup(j1850->message+2, 4);
- j1850->rpm = ((int)strtol(w1, NULL, 16) ) / 4 ;
+ char * w1 = strndup(j1850->message+2, 2);
+ char * w2 = strndup(j1850->message+4, 2);
+ char * w3 = strndup(j1850->message+6, 2);
+ j1850->engine_rpm = ((int)strtol(w1, NULL, 16) ) / 4 ;
+ j1850->trans_rpm = ((int)strtol(w2, NULL, 16) ) / 4 ;
+ j1850->map = (int)strtol(w3, NULL, 16);
} else if( strncmp(header,"3D",2)==0 ) {
if (strcmp(j1850->message, "3D110000EE") == 0) {
// noise
} else if (strcmp(j1850->message, "3D1120009B") == 0) {
- dbg(0,"L1\n");
+ dbg(lvl_error,"L1\n");
command_evaluate(&navit, "gui.spotify_volume_up()" );
} else if (strcmp(j1850->message, "3D110080C8") == 0) {
- dbg(0,"L2\n");
+ dbg(lvl_error,"L2\n");
command_evaluate(&navit, "gui.spotify_volume_toggle()" );
} else if (strcmp(j1850->message, "3D1110005A") == 0) {
- dbg(0,"L3\n");
+ dbg(lvl_error,"L3\n");
command_evaluate(&navit, "gui.spotify_volume_down()" );
} else if (strcmp(j1850->message, "3D110400C3") == 0) {
- dbg(0,"R1\n");
+ dbg(lvl_error,"R1\n");
command_evaluate(&navit, "gui.spotify_next_track()" );
} else if (strcmp(j1850->message, "3D110002D4") == 0) {
- dbg(0,"R2\n");
+ dbg(lvl_error,"R2\n");
command_evaluate(&navit, "gui.spotify_toggle()" );
} else if (strcmp(j1850->message, "3D11020076") == 0) {
- dbg(0,"R3\n");
+ dbg(lvl_error,"R3\n");
command_evaluate(&navit, "gui.spotify_previous_track()" );
} else {
- dbg(0,"Got button from %s\n", j1850->message);
+ dbg(lvl_error,"Got button from %s\n", j1850->message);
}
} else if( strncmp(header,"72",2)==0 ) {
char * data=strndup(j1850->message+2, 8);
@@ -269,7 +276,7 @@
osd_j1850_draw(struct j1850 *this, struct navit *nav,
struct vehicle *v)
{
- osd_fill_with_bgcolor(&this->osd_item);
+ osd_std_draw(&this->osd_item);
struct point p, bbox[4];
@@ -358,21 +365,21 @@
{
n = read( USB, &buf, 1 );
if(n == -1) {
- dbg(1,"x");
+ dbg(lvl_debug,"x");
} else if (n==0) {
- dbg(1,".");
+ dbg(lvl_debug,".");
} else {
- dbg(1,"[%s]", &buf);
+ dbg(lvl_debug,"[%s]", &buf);
}
}
while( buf != '\r' && n > 0);
if (n < 0) {
- dbg(0,"Read error\n");
+ dbg(lvl_error,"Read error\n");
} else if (n == 0) {
- dbg(0,"Nothing to read?\n");
+ dbg(lvl_error,"Nothing to read?\n");
} else {
- dbg(0,"Response : \n");
+ dbg(lvl_error,"Response : \n");
}
}
@@ -393,7 +400,7 @@
j1850->device = open( "/dev/ttyUSB0", O_RDWR| O_NOCTTY );
if ( j1850->device < 0 )
{
- dbg(0,"Can't open port\n");
+ dbg(lvl_error,"Can't open port\n");
j1850->idle=event_add_timeout(100, 1, j1850->callback);
return;
}
@@ -405,7 +412,7 @@
/* Error Handling */
if ( tcgetattr ( j1850->device, &tty ) != 0 )
{
- dbg(0,"Error\n");
+ dbg(lvl_error,"Error\n");
return;
}
@@ -434,11 +441,11 @@
tcflush( j1850->device, TCIFLUSH );
if ( tcsetattr ( j1850->device, TCSANOW, &tty ) != 0)
{
- dbg(0,"Flush error\n");
+ dbg(lvl_error,"Flush error\n");
return;
}
- dbg(0,"Port init ok\n");
+ dbg(lvl_error,"Port init ok\n");
// For the init part, we want to wait 1sec before each init string
j1850->idle=event_add_timeout(1000, 1, j1850->callback);
}
@@ -462,8 +469,8 @@
this->nav=nav;
time_t current_time = time(NULL);
// FIXME : make sure that the directory we log to exists!
- this->filename=g_strdup_printf("/home/navit/.navit/obd/%i.log",current_time);
- dbg(0,"Will log to %s\n", this->filename);
+ this->filename=g_strdup_printf("/home/navit/.navit/obd/%ld.log",(long)current_time);
+ dbg(lvl_error,"Will log to %s\n", this->filename);
this->init_string_index=0;
struct attr *attr;
this->osd_item.p.x = 120;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-08 19:07:21
|
Revision: 6067
http://sourceforge.net/p/navit/code/6067
Author: kazer_
Date: 2015-04-08 19:07:19 +0000 (Wed, 08 Apr 2015)
Log Message:
-----------
Update:CI:Importing Jan's settings for android build
Modified Paths:
--------------
trunk/navit/ci/build_android.sh
trunk/navit/circle.yml
Modified: trunk/navit/ci/build_android.sh
===================================================================
--- trunk/navit/ci/build_android.sh 2015-04-08 04:37:40 UTC (rev 6066)
+++ trunk/navit/ci/build_android.sh 2015-04-08 19:07:19 UTC (rev 6067)
@@ -23,16 +23,16 @@
export ANDROID_BUILD_CHECK=$ANDROID_SDK"/build-tools/"$BUILD_TOOLS
export ANDROID_PLATFORM_LATEST="android-21"
-export ANDROID_PLATFORM_MIN="android-10"
+export ANDROID_PLATFORM_MIN="android-7"
export ANDROID_PLATFORM_CHECK_MIN=$ANDROID_SDK"/platforms/"$ANDROID_PLATFORM_MIN"/images"
export ANDROID_PLATFORM_CHECK_MAX=$ANDROID_SDK"/platforms/"$ANDROID_PLATFORM_LATEST"/images"
export BUILD_PATH=$START_PATH"/android-build"
export ANDROID_ENV=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS
-export SDK_ADD_FILTER="platform-tool,tools,build-tools-21.1.2,extra-android-m2repository,extra-android-support,android-10,sysimg-10,addon-google_apis-google-10,android-9,addon-google_apis-google-9,android-21,sysimg-21,addon-google_apis-google-21"
+export SDK_ADD_FILTER="platform-tool,tools,build-tools-21.0.1,extra-android-m2repository,extra-android-support,android-10,sysimg-10,addon-google_apis-google-10,android-9,addon-google_apis-google-9,android-21,sysimg-21,addon-google_apis-google-21"
-export SDK_UPD_FILTER="platform-tool,tools,build-tools-21.1.2,extra-android-m2repository,extra-android-support"
+export SDK_UPD_FILTER="platform-tool,tools,build-tools-21.0.1,extra-android-m2repository,extra-android-support"
mkdir $ANDROID_HOME
@@ -106,11 +106,11 @@
# $ADD_SDK
#}
#
-#function updateSDK {
-# export UPD_SDK="echo y|android update sdk --no-ui --filter $SDK_UPD_FILTER"
-#echo $UPD_SDK
-# $UPD_SDK
-#}
+function updateSDK {
+ export UPD_SDK="echo y|android update sdk --no-ui --filter $SDK_UPD_FILTER"
+echo $UPD_SDK
+ $UPD_SDK
+}
#
#if [ ! -d $ANDROID_PLATFORM_CHECK_MIN ]; then {
# echo -e -n "${yel}" " Android SDK Platform ... MISSING, downloading may take a very long time... "
@@ -125,16 +125,19 @@
#}
#fi
+updateSDK
mkdir -p $BUILD_PATH
cd $BUILD_PATH
export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
android list targets
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=10 $SOURCE_PATH
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=19 $SOURCE_PATH
make && make apkg || exit 1
mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk
-mv navit/android/bin/Navit-debug-unaligned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug-unaligned.apk
-make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk
+#mv navit/android/bin/Navit-debug-unaligned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug-unaligned.apk
+#make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk
+echo $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk
+
echo
echo "Build leftovers :"
ls navit/android/bin/
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-08 04:37:40 UTC (rev 6066)
+++ trunk/navit/circle.yml 2015-04-08 19:07:19 UTC (rev 6067)
@@ -1,11 +1,11 @@
machine:
environment:
- #ANDROID_HOME: /home/ubuntu/android
- #ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk
- #ANDROID_SDK_CDN: https://dl.google.com/android
- #ANDROID_SDK_FILE: android-sdk_r24.0.2-linux.tgz
- #ANDROID_NDK_CDN: http://dl.google.com/android/ndk
- #ANDROID_NDK_FILE: android-ndk-r10d-linux-x86_64.bin
+ ANDROID_HOME: /home/ubuntu/android
+ ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk
+ ANDROID_SDK_CDN: https://dl.google.com/android
+ ANDROID_SDK_FILE: android-sdk_r24.0.2-linux.tgz
+ ANDROID_NDK_CDN: http://dl.google.com/android/ndk
+ ANDROID_NDK_FILE: android-ndk-r10d-linux-x86_64.bin
CMAKE_FILE: ../Toolchain/arm-eabi.cmake
dependencies:
cache_directories:
@@ -28,8 +28,8 @@
- cp bin/po/navit.pot $CIRCLE_ARTIFACTS/
- "curl 'https://translations.launchpad.net/navit/trunk/+translations-upload' -H \"$lp_cookie\" -H 'Referer: https://translations.launchpad.net/navit/trunk/+translations-upload' -F file=@bin/po/navit.pot"
# Android build
- # - wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE
- # - wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE
+ - wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE
+ - wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE
- sudo apt-get install gpsd
- sudo apt-get install gpsd-clients
- sudo apt-get install libgps-dev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-08 04:37:48
|
Revision: 6066
http://sourceforge.net/p/navit/code/6066
Author: kazer_
Date: 2015-04-08 04:37:40 +0000 (Wed, 08 Apr 2015)
Log Message:
-----------
Update:CI:Clear the plural field in template which is breaking the import
Modified Paths:
--------------
trunk/navit/circle.yml
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-08 04:21:40 UTC (rev 6065)
+++ trunk/navit/circle.yml 2015-04-08 04:37:40 UTC (rev 6066)
@@ -24,6 +24,9 @@
- sudo apt-get install libdbus-glib-1-dev
- sudo apt-get install g++
- bash ci/build.sh
+ - sed -i '/INTEGER/d' bin/po/navit.pot
+ - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/
+ - "curl 'https://translations.launchpad.net/navit/trunk/+translations-upload' -H \"$lp_cookie\" -H 'Referer: https://translations.launchpad.net/navit/trunk/+translations-upload' -F file=@bin/po/navit.pot"
# Android build
# - wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE
# - wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE
@@ -41,7 +44,6 @@
# for aapt
- sudo apt-get install lib32stdc++6
- sudo apt-get install lib32z1
- - "curl 'https://translations.launchpad.net/navit/trunk/+translations-upload' -H \"$lp_cookie\" -H 'Referer: https://translations.launchpad.net/navit/trunk/+translations-upload' -F file=@bin/po/navit.pot"
- bash ci/build_android.sh
test:
post:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-08 04:21:41
|
Revision: 6065
http://sourceforge.net/p/navit/code/6065
Author: kazer_
Date: 2015-04-08 04:21:40 +0000 (Wed, 08 Apr 2015)
Log Message:
-----------
Update:CI:Fixed typo in the ci script
Modified Paths:
--------------
trunk/navit/circle.yml
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-08 04:13:53 UTC (rev 6064)
+++ trunk/navit/circle.yml 2015-04-08 04:21:40 UTC (rev 6065)
@@ -41,7 +41,7 @@
# for aapt
- sudo apt-get install lib32stdc++6
- sudo apt-get install lib32z1
- - "curl 'https://translations.launchpad.net/navit/trunk/+translations-upload' -H \"$lp_cookie\" -H 'Referer: https://translations.launchpad.net/navit/trunk/+translations-upload' F file=@bin/po/navit.pot"
+ - "curl 'https://translations.launchpad.net/navit/trunk/+translations-upload' -H \"$lp_cookie\" -H 'Referer: https://translations.launchpad.net/navit/trunk/+translations-upload' -F file=@bin/po/navit.pot"
- bash ci/build_android.sh
test:
post:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-08 04:13:54
|
Revision: 6064
http://sourceforge.net/p/navit/code/6064
Author: kazer_
Date: 2015-04-08 04:13:53 +0000 (Wed, 08 Apr 2015)
Log Message:
-----------
Update:CI:Escaping the cookie in the ci script
Modified Paths:
--------------
trunk/navit/circle.yml
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-08 01:56:03 UTC (rev 6063)
+++ trunk/navit/circle.yml 2015-04-08 04:13:53 UTC (rev 6064)
@@ -41,7 +41,7 @@
# for aapt
- sudo apt-get install lib32stdc++6
- sudo apt-get install lib32z1
- - "curl 'https://translations.launchpad.net/navit/trunk/+translations-upload' -H $lp_cookie -H 'Referer: https://translations.launchpad.net/navit/trunk/+translations-upload' F file=@bin/po/navit.pot"
+ - "curl 'https://translations.launchpad.net/navit/trunk/+translations-upload' -H \"$lp_cookie\" -H 'Referer: https://translations.launchpad.net/navit/trunk/+translations-upload' F file=@bin/po/navit.pot"
- bash ci/build_android.sh
test:
post:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-08 01:56:04
|
Revision: 6063
http://sourceforge.net/p/navit/code/6063
Author: kazer_
Date: 2015-04-08 01:56:03 +0000 (Wed, 08 Apr 2015)
Log Message:
-----------
Update:CI:Fixed typo in the ci script
Modified Paths:
--------------
trunk/navit/circle.yml
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-08 01:51:29 UTC (rev 6062)
+++ trunk/navit/circle.yml 2015-04-08 01:56:03 UTC (rev 6063)
@@ -41,7 +41,7 @@
# for aapt
- sudo apt-get install lib32stdc++6
- sudo apt-get install lib32z1
- - curl 'https://translations.launchpad.net/navit/trunk/+translations-upload' -H $lp_cookie -H 'Referer: https://translations.launchpad.net/navit/trunk/+translations-upload' F file=@bin/po/navit.pot
+ - "curl 'https://translations.launchpad.net/navit/trunk/+translations-upload' -H $lp_cookie -H 'Referer: https://translations.launchpad.net/navit/trunk/+translations-upload' F file=@bin/po/navit.pot"
- bash ci/build_android.sh
test:
post:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2015-04-08 01:51:37
|
Revision: 6062
http://sourceforge.net/p/navit/code/6062
Author: kazer_
Date: 2015-04-08 01:51:29 +0000 (Wed, 08 Apr 2015)
Log Message:
-----------
Update:CI:Attempt to automatically upload .pot to launchpad
Modified Paths:
--------------
trunk/navit/circle.yml
Modified: trunk/navit/circle.yml
===================================================================
--- trunk/navit/circle.yml 2015-04-07 20:43:10 UTC (rev 6061)
+++ trunk/navit/circle.yml 2015-04-08 01:51:29 UTC (rev 6062)
@@ -1,11 +1,11 @@
machine:
environment:
- ANDROID_HOME: /home/ubuntu/android
- ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk
- ANDROID_SDK_CDN: https://dl.google.com/android
- ANDROID_SDK_FILE: android-sdk_r24.0.2-linux.tgz
- ANDROID_NDK_CDN: http://dl.google.com/android/ndk
- ANDROID_NDK_FILE: android-ndk-r10d-linux-x86_64.bin
+ #ANDROID_HOME: /home/ubuntu/android
+ #ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk
+ #ANDROID_SDK_CDN: https://dl.google.com/android
+ #ANDROID_SDK_FILE: android-sdk_r24.0.2-linux.tgz
+ #ANDROID_NDK_CDN: http://dl.google.com/android/ndk
+ #ANDROID_NDK_FILE: android-ndk-r10d-linux-x86_64.bin
CMAKE_FILE: ../Toolchain/arm-eabi.cmake
dependencies:
cache_directories:
@@ -25,8 +25,8 @@
- sudo apt-get install g++
- bash ci/build.sh
# Android build
- - wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE
- - wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE
+ # - wget -c -N -q $ANDROID_SDK_CDN/$ANDROID_SDK_FILE -O $ANDROID_HOME/$ANDROID_SDK_FILE
+ # - wget -c -N -q $ANDROID_NDK_CDN/$ANDROID_NDK_FILE -O $ANDROID_HOME/$ANDROID_NDK_FILE
- sudo apt-get install gpsd
- sudo apt-get install gpsd-clients
- sudo apt-get install libgps-dev
@@ -41,6 +41,7 @@
# for aapt
- sudo apt-get install lib32stdc++6
- sudo apt-get install lib32z1
+ - curl 'https://translations.launchpad.net/navit/trunk/+translations-upload' -H $lp_cookie -H 'Referer: https://translations.launchpad.net/navit/trunk/+translations-upload' F file=@bin/po/navit.pot
- bash ci/build_android.sh
test:
post:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
13 messages has been excluded from this view by a project administrator.
