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: <md...@us...> - 2013-08-26 19:34:39
|
Revision: 5606
http://sourceforge.net/p/navit/code/5606
Author: mdankov
Date: 2013-08-26 19:34:36 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Fix:core:Rename Libya to follow official changes.
Modified Paths:
--------------
trunk/navit/navit/country.c
Modified: trunk/navit/navit/country.c
===================================================================
--- trunk/navit/navit/country.c 2013-08-26 19:27:22 UTC (rev 5605)
+++ trunk/navit/navit/country.c 2013-08-26 19:34:36 UTC (rev 5606)
@@ -175,7 +175,7 @@
{440, "LT", "LT", "LTU", /* 440 */ _n("Lithuania")},
{442, "L", "LU", "LUX", /* 442 */ _n("Luxembourg")},
{428, "LV", "LV", "LVA", /* 428 */ _n("Latvia")},
- {434, "LAR", "LY", "LBY", /* 434 */ _n("Libyan Arab Jamahiriya")},
+ {434, "LAR", "LY", "LBY", /* 434 */ _n("Libya")},
{504, "MA", "MA", "MAR", /* 504 */ _n("Morocco")},
{492, "MC", "MC", "MCO", /* 492 */ _n("Monaco")},
{498, "MD", "MD", "MDA", /* 498 */ _n("Moldova, Republic of")},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2013-08-26 19:27:29
|
Revision: 5605
http://sourceforge.net/p/navit/code/5605
Author: mdankov
Date: 2013-08-26 19:27:22 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Add:core:Import translatable strings from Android Java sources to gettext db.
Modified Paths:
--------------
trunk/navit/po/CMakeLists.txt
trunk/navit/po/Makefile.am
trunk/navit/po/af.po.in
trunk/navit/po/ar.po.in
trunk/navit/po/ast.po.in
trunk/navit/po/bg.po.in
trunk/navit/po/ca.po.in
trunk/navit/po/cs.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_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/fi.po.in
trunk/navit/po/fo.po.in
trunk/navit/po/fr.po.in
trunk/navit/po/fr_CH.po.in
trunk/navit/po/gl.po.in
trunk/navit/po/he.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/lt.po.in
trunk/navit/po/lv.po.in
trunk/navit/po/mk.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/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/sk.po.in
trunk/navit/po/sl.po.in
trunk/navit/po/sr.po.in
trunk/navit/po/sv.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/CMakeLists.txt
===================================================================
--- trunk/navit/po/CMakeLists.txt 2013-08-26 19:18:28 UTC (rev 5604)
+++ trunk/navit/po/CMakeLists.txt 2013-08-26 19:27:22 UTC (rev 5605)
@@ -22,6 +22,13 @@
${PROJECT_SOURCE_DIR}/navit/gui/internal/gui_internal_search.c
${PROJECT_SOURCE_DIR}/navit/gui/internal/gui_internal_widget.c
${PROJECT_SOURCE_DIR}/navit/osd/core/osd_core.c
+ ${PROJECT_SOURCE_DIR}/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
+ ${PROJECT_SOURCE_DIR}/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java
+ ${PROJECT_SOURCE_DIR}/navit/android/src/org/navitproject/navit/NavitDialogs.java
+ ${PROJECT_SOURCE_DIR}/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
+ ${PROJECT_SOURCE_DIR}/navit/android/src/org/navitproject/navit/NavitGraphics.java
+ ${PROJECT_SOURCE_DIR}/navit/android/src/org/navitproject/navit/Navit.java
+ ${PROJECT_SOURCE_DIR}/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
${CMAKE_CURRENT_BINARY_DIR}/navit_shipped.c
${CMAKE_CURRENT_BINARY_DIR}/strings_xml.c
)
Modified: trunk/navit/po/Makefile.am
===================================================================
--- trunk/navit/po/Makefile.am 2013-08-26 19:18:28 UTC (rev 5604)
+++ trunk/navit/po/Makefile.am 2013-08-26 19:27:22 UTC (rev 5605)
@@ -23,6 +23,13 @@
$(top_srcdir)/navit/gui/internal/gui_internal_search.c \
$(top_srcdir)/navit/gui/internal/gui_internal_widget.c \
$(top_srcdir)/navit/osd/core/osd_core.c \
+ $(top_srcdir)/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java \
+ $(top_srcdir)/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java \
+ $(top_srcdir)/navit/android/src/org/navitproject/navit/NavitDialogs.java \
+ $(top_srcdir)/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java \
+ $(top_srcdir)/navit/android/src/org/navitproject/navit/NavitGraphics.java \
+ $(top_srcdir)/navit/android/src/org/navitproject/navit/Navit.java \
+ $(top_srcdir)/navit/android/src/org/navitproject/navit/NavitMapDownloader.java \
$(top_builddir)/navit/navit_shipped.c \
$(top_builddir)/navit/strings.c
Modified: trunk/navit/po/af.po.in
===================================================================
--- trunk/navit/po/af.po.in 2013-08-26 19:18:28 UTC (rev 5604)
+++ trunk/navit/po/af.po.in 2013-08-26 19:27:22 UTC (rev 5605)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-24 22:34+0400\n"
+"POT-Creation-Date: 2013-08-26 00:37+0400\n"
"PO-Revision-Date: 2009-12-20 20:36+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Afrikaans <af...@li...>\n"
@@ -1335,6 +1335,7 @@
msgid "unknown street"
msgstr ""
+#. Safe cast: attr_generic_set_attr does not modify its parameter.
msgid "Unnamed vehicle"
msgstr ""
@@ -1780,6 +1781,421 @@
msgid "Please decrease your speed"
msgstr ""
+msgid "partial match"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+msgid "Map data (c) OpenStreetMap contributors, ODBL"
+msgstr ""
+
+msgid "Downloaded maps"
+msgstr ""
+
+msgid "Whole Planet"
+msgstr ""
+
+msgid "Africa"
+msgstr ""
+
+msgid "Canary Islands"
+msgstr ""
+
+msgid "Libya"
+msgstr ""
+
+msgid "Asia"
+msgstr ""
+
+msgid "Korea"
+msgstr ""
+
+msgid "Taiwan"
+msgstr ""
+
+msgid "UAE+Other"
+msgstr ""
+
+msgid "Oceania"
+msgstr ""
+
+msgid "Tasmania"
+msgstr ""
+
+msgid "Victoria"
+msgstr ""
+
+msgid "New South Wales"
+msgstr ""
+
+msgid "Europe"
+msgstr ""
+
+msgid "Western Europe"
+msgstr ""
+
+msgid "Azores"
+msgstr ""
+
+msgid "BeNeLux"
+msgstr ""
+
+msgid "Alsace"
+msgstr ""
+
+msgid "Aquitaine"
+msgstr ""
+
+msgid "Auvergne"
+msgstr ""
+
+msgid "Basse-Normandie"
+msgstr ""
+
+msgid "Bourgogne"
+msgstr ""
+
+msgid "Bretagne"
+msgstr ""
+
+msgid "Centre"
+msgstr ""
+
+msgid "Champagne-Ardenne"
+msgstr ""
+
+msgid "Corse"
+msgstr ""
+
+msgid "Franche-Comte"
+msgstr ""
+
+msgid "Haute-Normandie"
+msgstr ""
+
+msgid "Ile-de-France"
+msgstr ""
+
+msgid "Languedoc-Roussillon"
+msgstr ""
+
+msgid "Limousin"
+msgstr ""
+
+msgid "Lorraine"
+msgstr ""
+
+msgid "Midi-Pyrenees"
+msgstr ""
+
+msgid "Nord-pas-de-Calais"
+msgstr ""
+
+msgid "Pays-de-la-Loire"
+msgstr ""
+
+msgid "Picardie"
+msgstr ""
+
+msgid "Poitou-Charentes"
+msgstr ""
+
+msgid "Provence-Alpes-Cote-d-Azur"
+msgstr ""
+
+msgid "Rhone-Alpes"
+msgstr ""
+
+msgid "Baden-Wuerttemberg"
+msgstr ""
+
+msgid "Bayern"
+msgstr ""
+
+msgid "Mittelfranken"
+msgstr ""
+
+msgid "Niederbayern"
+msgstr ""
+
+msgid "Oberbayern"
+msgstr ""
+
+msgid "Oberfranken"
+msgstr ""
+
+msgid "Oberpfalz"
+msgstr ""
+
+msgid "Schwaben"
+msgstr ""
+
+msgid "Unterfranken"
+msgstr ""
+
+msgid "Berlin"
+msgstr ""
+
+msgid "Brandenburg"
+msgstr ""
+
+msgid "Bremen"
+msgstr ""
+
+msgid "Hamburg"
+msgstr ""
+
+msgid "Hessen"
+msgstr ""
+
+msgid "Mecklenburg-Vorpommern"
+msgstr ""
+
+msgid "Niedersachsen"
+msgstr ""
+
+msgid "Nordrhein-westfalen"
+msgstr ""
+
+msgid "Rheinland-Pfalz"
+msgstr ""
+
+msgid "Saarland"
+msgstr ""
+
+msgid "Sachsen-Anhalt"
+msgstr ""
+
+msgid "Sachsen"
+msgstr ""
+
+msgid "Schleswig-Holstein"
+msgstr ""
+
+msgid "Thueringen"
+msgstr ""
+
+msgid "Mallorca"
+msgstr ""
+
+msgid "Galicia"
+msgstr ""
+
+msgid "Scandinavia"
+msgstr ""
+
+msgid "England"
+msgstr ""
+
+msgid "Buckinghamshire"
+msgstr ""
+
+msgid "Cambridgeshire"
+msgstr ""
+
+msgid "Cumbria"
+msgstr ""
+
+msgid "East yorkshire with hull"
+msgstr ""
+
+msgid "Essex"
+msgstr ""
+
+msgid "Herefordshire"
+msgstr ""
+
+msgid "Kent"
+msgstr ""
+
+msgid "Lancashire"
+msgstr ""
+
+msgid "Leicestershire"
+msgstr ""
+
+msgid "Norfolk"
+msgstr ""
+
+msgid "Nottinghamshire"
+msgstr ""
+
+msgid "Oxfordshire"
+msgstr ""
+
+msgid "Shropshire"
+msgstr ""
+
+msgid "Somerset"
+msgstr ""
+
+msgid "South yorkshire"
+msgstr ""
+
+msgid "Suffolk"
+msgstr ""
+
+msgid "Surrey"
+msgstr ""
+
+msgid "Wiltshire"
+msgstr ""
+
+msgid "Scotland"
+msgstr ""
+
+msgid "Wales"
+msgstr ""
+
+msgid "Crete"
+msgstr ""
+
+msgid "North America"
+msgstr ""
+
+msgid "Alaska"
+msgstr ""
+
+msgid "Hawaii"
+msgstr ""
+
+msgid "USA"
+msgstr ""
+
+msgid " (except Alaska and Hawaii)"
+msgstr ""
+
+msgid "Midwest"
+msgstr ""
+
+msgid "Michigan"
+msgstr ""
+
+msgid "Ohio"
+msgstr ""
+
+msgid "Northeast"
+msgstr ""
+
+msgid "Massachusetts"
+msgstr ""
+
+msgid "Vermont"
+msgstr ""
+
+msgid "Pacific"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "Arkansas"
+msgstr ""
+
+msgid "District of Columbia"
+msgstr ""
+
+msgid "Florida"
+msgstr ""
+
+msgid "Louisiana"
+msgstr ""
+
+msgid "Maryland"
+msgstr ""
+
+msgid "Mississippi"
+msgstr ""
+
+msgid "Oklahoma"
+msgstr ""
+
+msgid "Texas"
+msgstr ""
+
+msgid "Virginia"
+msgstr ""
+
+msgid "West Virginia"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "Arizona"
+msgstr ""
+
+msgid "California"
+msgstr ""
+
+msgid "Colorado"
+msgstr ""
+
+msgid "Idaho"
+msgstr ""
+
+msgid "Montana"
+msgstr ""
+
+msgid "New Mexico"
+msgstr ""
+
+msgid "Nevada"
+msgstr ""
+
+msgid "Oregon"
+msgstr ""
+
+msgid "Utah"
+msgstr ""
+
+msgid "Washington State"
+msgstr ""
+
+msgid "South+Middle America"
+msgstr ""
+
+msgid "Guyane Francaise"
+msgstr ""
+
+msgid "downloading"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+msgid "Error downloading map!"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+msgid "Error writing map!"
+msgstr ""
+
+msgid "Map download aborted!"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
msgid "Vehicle Position"
msgstr "Voertuig posisie"
@@ -1844,30 +2260,14 @@
msgid "Backup / Restore"
msgstr ""
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr ""
-#. Android resource: @strings/map_download_title
-msgid "Map download"
-msgstr ""
-
#. Android resource: @strings/map_download_downloading
msgid "Downloading:"
msgstr ""
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
-msgstr ""
-
-#. Android resource: @strings/map_download_ready
-msgid "ready"
-msgstr ""
-
#. Android resource: @strings/map_download_download_error
msgid "Error downloading map."
msgstr ""
@@ -1876,10 +2276,6 @@
msgid "Map download aborted"
msgstr ""
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
-msgstr ""
-
#. Android resource: @strings/map_no_fix
msgid "No location. Reopen after location fix."
msgstr ""
@@ -1900,10 +2296,6 @@
msgid "Match partial address"
msgstr ""
-#. Android resource: @strings/address_search_button
-msgid "Search"
-msgstr ""
-
#. Android resource: @strings/address_search_searching
msgid "Searching..."
msgstr ""
@@ -1932,10 +2324,6 @@
msgid "Setting destination to:"
msgstr ""
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
-msgstr ""
-
#. Android resource: @strings/choose_an_action
msgid "Choose an action"
msgstr ""
Modified: trunk/navit/po/ar.po.in
===================================================================
--- trunk/navit/po/ar.po.in 2013-08-26 19:18:28 UTC (rev 5604)
+++ trunk/navit/po/ar.po.in 2013-08-26 19:27:22 UTC (rev 5605)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-24 22:34+0400\n"
+"POT-Creation-Date: 2013-08-26 00:37+0400\n"
"PO-Revision-Date: 2010-02-01 17:37+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -1352,6 +1352,7 @@
msgid "unknown street"
msgstr ""
+#. Safe cast: attr_generic_set_attr does not modify its parameter.
msgid "Unnamed vehicle"
msgstr ""
@@ -1797,6 +1798,421 @@
msgid "Please decrease your speed"
msgstr ""
+msgid "partial match"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+msgid "Map data (c) OpenStreetMap contributors, ODBL"
+msgstr ""
+
+msgid "Downloaded maps"
+msgstr ""
+
+msgid "Whole Planet"
+msgstr ""
+
+msgid "Africa"
+msgstr ""
+
+msgid "Canary Islands"
+msgstr ""
+
+msgid "Libya"
+msgstr ""
+
+msgid "Asia"
+msgstr ""
+
+msgid "Korea"
+msgstr ""
+
+msgid "Taiwan"
+msgstr ""
+
+msgid "UAE+Other"
+msgstr ""
+
+msgid "Oceania"
+msgstr ""
+
+msgid "Tasmania"
+msgstr ""
+
+msgid "Victoria"
+msgstr ""
+
+msgid "New South Wales"
+msgstr ""
+
+msgid "Europe"
+msgstr ""
+
+msgid "Western Europe"
+msgstr ""
+
+msgid "Azores"
+msgstr ""
+
+msgid "BeNeLux"
+msgstr ""
+
+msgid "Alsace"
+msgstr ""
+
+msgid "Aquitaine"
+msgstr ""
+
+msgid "Auvergne"
+msgstr ""
+
+msgid "Basse-Normandie"
+msgstr ""
+
+msgid "Bourgogne"
+msgstr ""
+
+msgid "Bretagne"
+msgstr ""
+
+msgid "Centre"
+msgstr ""
+
+msgid "Champagne-Ardenne"
+msgstr ""
+
+msgid "Corse"
+msgstr ""
+
+msgid "Franche-Comte"
+msgstr ""
+
+msgid "Haute-Normandie"
+msgstr ""
+
+msgid "Ile-de-France"
+msgstr ""
+
+msgid "Languedoc-Roussillon"
+msgstr ""
+
+msgid "Limousin"
+msgstr ""
+
+msgid "Lorraine"
+msgstr ""
+
+msgid "Midi-Pyrenees"
+msgstr ""
+
+msgid "Nord-pas-de-Calais"
+msgstr ""
+
+msgid "Pays-de-la-Loire"
+msgstr ""
+
+msgid "Picardie"
+msgstr ""
+
+msgid "Poitou-Charentes"
+msgstr ""
+
+msgid "Provence-Alpes-Cote-d-Azur"
+msgstr ""
+
+msgid "Rhone-Alpes"
+msgstr ""
+
+msgid "Baden-Wuerttemberg"
+msgstr ""
+
+msgid "Bayern"
+msgstr ""
+
+msgid "Mittelfranken"
+msgstr ""
+
+msgid "Niederbayern"
+msgstr ""
+
+msgid "Oberbayern"
+msgstr ""
+
+msgid "Oberfranken"
+msgstr ""
+
+msgid "Oberpfalz"
+msgstr ""
+
+msgid "Schwaben"
+msgstr ""
+
+msgid "Unterfranken"
+msgstr ""
+
+msgid "Berlin"
+msgstr ""
+
+msgid "Brandenburg"
+msgstr ""
+
+msgid "Bremen"
+msgstr ""
+
+msgid "Hamburg"
+msgstr ""
+
+msgid "Hessen"
+msgstr ""
+
+msgid "Mecklenburg-Vorpommern"
+msgstr ""
+
+msgid "Niedersachsen"
+msgstr ""
+
+msgid "Nordrhein-westfalen"
+msgstr ""
+
+msgid "Rheinland-Pfalz"
+msgstr ""
+
+msgid "Saarland"
+msgstr ""
+
+msgid "Sachsen-Anhalt"
+msgstr ""
+
+msgid "Sachsen"
+msgstr ""
+
+msgid "Schleswig-Holstein"
+msgstr ""
+
+msgid "Thueringen"
+msgstr ""
+
+msgid "Mallorca"
+msgstr ""
+
+msgid "Galicia"
+msgstr ""
+
+msgid "Scandinavia"
+msgstr ""
+
+msgid "England"
+msgstr ""
+
+msgid "Buckinghamshire"
+msgstr ""
+
+msgid "Cambridgeshire"
+msgstr ""
+
+msgid "Cumbria"
+msgstr ""
+
+msgid "East yorkshire with hull"
+msgstr ""
+
+msgid "Essex"
+msgstr ""
+
+msgid "Herefordshire"
+msgstr ""
+
+msgid "Kent"
+msgstr ""
+
+msgid "Lancashire"
+msgstr ""
+
+msgid "Leicestershire"
+msgstr ""
+
+msgid "Norfolk"
+msgstr ""
+
+msgid "Nottinghamshire"
+msgstr ""
+
+msgid "Oxfordshire"
+msgstr ""
+
+msgid "Shropshire"
+msgstr ""
+
+msgid "Somerset"
+msgstr ""
+
+msgid "South yorkshire"
+msgstr ""
+
+msgid "Suffolk"
+msgstr ""
+
+msgid "Surrey"
+msgstr ""
+
+msgid "Wiltshire"
+msgstr ""
+
+msgid "Scotland"
+msgstr ""
+
+msgid "Wales"
+msgstr ""
+
+msgid "Crete"
+msgstr ""
+
+msgid "North America"
+msgstr ""
+
+msgid "Alaska"
+msgstr ""
+
+msgid "Hawaii"
+msgstr ""
+
+msgid "USA"
+msgstr ""
+
+msgid " (except Alaska and Hawaii)"
+msgstr ""
+
+msgid "Midwest"
+msgstr ""
+
+msgid "Michigan"
+msgstr ""
+
+msgid "Ohio"
+msgstr ""
+
+msgid "Northeast"
+msgstr ""
+
+msgid "Massachusetts"
+msgstr ""
+
+msgid "Vermont"
+msgstr ""
+
+msgid "Pacific"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "Arkansas"
+msgstr ""
+
+msgid "District of Columbia"
+msgstr ""
+
+msgid "Florida"
+msgstr ""
+
+msgid "Louisiana"
+msgstr ""
+
+msgid "Maryland"
+msgstr ""
+
+msgid "Mississippi"
+msgstr ""
+
+msgid "Oklahoma"
+msgstr ""
+
+msgid "Texas"
+msgstr ""
+
+msgid "Virginia"
+msgstr ""
+
+msgid "West Virginia"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "Arizona"
+msgstr ""
+
+msgid "California"
+msgstr ""
+
+msgid "Colorado"
+msgstr ""
+
+msgid "Idaho"
+msgstr ""
+
+msgid "Montana"
+msgstr ""
+
+msgid "New Mexico"
+msgstr ""
+
+msgid "Nevada"
+msgstr ""
+
+msgid "Oregon"
+msgstr ""
+
+msgid "Utah"
+msgstr ""
+
+msgid "Washington State"
+msgstr ""
+
+msgid "South+Middle America"
+msgstr ""
+
+msgid "Guyane Francaise"
+msgstr ""
+
+msgid "downloading"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+msgid "Error downloading map!"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+msgid "Error writing map!"
+msgstr ""
+
+msgid "Map download aborted!"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
msgid "Vehicle Position"
msgstr "موقع وسيلة التنقل"
@@ -1861,30 +2277,14 @@
msgid "Backup / Restore"
msgstr ""
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr ""
-#. Android resource: @strings/map_download_title
-msgid "Map download"
-msgstr ""
-
#. Android resource: @strings/map_download_downloading
msgid "Downloading:"
msgstr ""
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
-msgstr ""
-
-#. Android resource: @strings/map_download_ready
-msgid "ready"
-msgstr ""
-
#. Android resource: @strings/map_download_download_error
msgid "Error downloading map."
msgstr ""
@@ -1893,10 +2293,6 @@
msgid "Map download aborted"
msgstr ""
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
-msgstr ""
-
#. Android resource: @strings/map_no_fix
msgid "No location. Reopen after location fix."
msgstr ""
@@ -1917,10 +2313,6 @@
msgid "Match partial address"
msgstr ""
-#. Android resource: @strings/address_search_button
-msgid "Search"
-msgstr ""
-
#. Android resource: @strings/address_search_searching
msgid "Searching..."
msgstr ""
@@ -1949,10 +2341,6 @@
msgid "Setting destination to:"
msgstr ""
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
-msgstr ""
-
#. Android resource: @strings/choose_an_action
msgid "Choose an action"
msgstr ""
Modified: trunk/navit/po/ast.po.in
===================================================================
--- trunk/navit/po/ast.po.in 2013-08-26 19:18:28 UTC (rev 5604)
+++ trunk/navit/po/ast.po.in 2013-08-26 19:27:22 UTC (rev 5605)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-24 22:34+0400\n"
+"POT-Creation-Date: 2013-08-26 00:37+0400\n"
"PO-Revision-Date: 2010-05-21 17:35+0000\n"
"Last-Translator: Xuacu Saturio <xua...@gm...>\n"
"Language-Team: Asturian <as...@li...>\n"
@@ -1335,6 +1335,7 @@
msgid "unknown street"
msgstr ""
+#. Safe cast: attr_generic_set_attr does not modify its parameter.
msgid "Unnamed vehicle"
msgstr ""
@@ -1780,6 +1781,421 @@
msgid "Please decrease your speed"
msgstr ""
+msgid "partial match"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+msgid "Map data (c) OpenStreetMap contributors, ODBL"
+msgstr ""
+
+msgid "Downloaded maps"
+msgstr ""
+
+msgid "Whole Planet"
+msgstr ""
+
+msgid "Africa"
+msgstr ""
+
+msgid "Canary Islands"
+msgstr ""
+
+msgid "Libya"
+msgstr ""
+
+msgid "Asia"
+msgstr ""
+
+msgid "Korea"
+msgstr ""
+
+msgid "Taiwan"
+msgstr ""
+
+msgid "UAE+Other"
+msgstr ""
+
+msgid "Oceania"
+msgstr ""
+
+msgid "Tasmania"
+msgstr ""
+
+msgid "Victoria"
+msgstr ""
+
+msgid "New South Wales"
+msgstr ""
+
+msgid "Europe"
+msgstr ""
+
+msgid "Western Europe"
+msgstr ""
+
+msgid "Azores"
+msgstr ""
+
+msgid "BeNeLux"
+msgstr ""
+
+msgid "Alsace"
+msgstr ""
+
+msgid "Aquitaine"
+msgstr ""
+
+msgid "Auvergne"
+msgstr ""
+
+msgid "Basse-Normandie"
+msgstr ""
+
+msgid "Bourgogne"
+msgstr ""
+
+msgid "Bretagne"
+msgstr ""
+
+msgid "Centre"
+msgstr ""
+
+msgid "Champagne-Ardenne"
+msgstr ""
+
+msgid "Corse"
+msgstr ""
+
+msgid "Franche-Comte"
+msgstr ""
+
+msgid "Haute-Normandie"
+msgstr ""
+
+msgid "Ile-de-France"
+msgstr ""
+
+msgid "Languedoc-Roussillon"
+msgstr ""
+
+msgid "Limousin"
+msgstr ""
+
+msgid "Lorraine"
+msgstr ""
+
+msgid "Midi-Pyrenees"
+msgstr ""
+
+msgid "Nord-pas-de-Calais"
+msgstr ""
+
+msgid "Pays-de-la-Loire"
+msgstr ""
+
+msgid "Picardie"
+msgstr ""
+
+msgid "Poitou-Charentes"
+msgstr ""
+
+msgid "Provence-Alpes-Cote-d-Azur"
+msgstr ""
+
+msgid "Rhone-Alpes"
+msgstr ""
+
+msgid "Baden-Wuerttemberg"
+msgstr ""
+
+msgid "Bayern"
+msgstr ""
+
+msgid "Mittelfranken"
+msgstr ""
+
+msgid "Niederbayern"
+msgstr ""
+
+msgid "Oberbayern"
+msgstr ""
+
+msgid "Oberfranken"
+msgstr ""
+
+msgid "Oberpfalz"
+msgstr ""
+
+msgid "Schwaben"
+msgstr ""
+
+msgid "Unterfranken"
+msgstr ""
+
+msgid "Berlin"
+msgstr ""
+
+msgid "Brandenburg"
+msgstr ""
+
+msgid "Bremen"
+msgstr ""
+
+msgid "Hamburg"
+msgstr ""
+
+msgid "Hessen"
+msgstr ""
+
+msgid "Mecklenburg-Vorpommern"
+msgstr ""
+
+msgid "Niedersachsen"
+msgstr ""
+
+msgid "Nordrhein-westfalen"
+msgstr ""
+
+msgid "Rheinland-Pfalz"
+msgstr ""
+
+msgid "Saarland"
+msgstr ""
+
+msgid "Sachsen-Anhalt"
+msgstr ""
+
+msgid "Sachsen"
+msgstr ""
+
+msgid "Schleswig-Holstein"
+msgstr ""
+
+msgid "Thueringen"
+msgstr ""
+
+msgid "Mallorca"
+msgstr ""
+
+msgid "Galicia"
+msgstr ""
+
+msgid "Scandinavia"
+msgstr ""
+
+msgid "England"
+msgstr ""
+
+msgid "Buckinghamshire"
+msgstr ""
+
+msgid "Cambridgeshire"
+msgstr ""
+
+msgid "Cumbria"
+msgstr ""
+
+msgid "East yorkshire with hull"
+msgstr ""
+
+msgid "Essex"
+msgstr ""
+
+msgid "Herefordshire"
+msgstr ""
+
+msgid "Kent"
+msgstr ""
+
+msgid "Lancashire"
+msgstr ""
+
+msgid "Leicestershire"
+msgstr ""
+
+msgid "Norfolk"
+msgstr ""
+
+msgid "Nottinghamshire"
+msgstr ""
+
+msgid "Oxfordshire"
+msgstr ""
+
+msgid "Shropshire"
+msgstr ""
+
+msgid "Somerset"
+msgstr ""
+
+msgid "South yorkshire"
+msgstr ""
+
+msgid "Suffolk"
+msgstr ""
+
+msgid "Surrey"
+msgstr ""
+
+msgid "Wiltshire"
+msgstr ""
+
+msgid "Scotland"
+msgstr ""
+
+msgid "Wales"
+msgstr ""
+
+msgid "Crete"
+msgstr ""
+
+msgid "North America"
+msgstr ""
+
+msgid "Alaska"
+msgstr ""
+
+msgid "Hawaii"
+msgstr ""
+
+msgid "USA"
+msgstr ""
+
+msgid " (except Alaska and Hawaii)"
+msgstr ""
+
+msgid "Midwest"
+msgstr ""
+
+msgid "Michigan"
+msgstr ""
+
+msgid "Ohio"
+msgstr ""
+
+msgid "Northeast"
+msgstr ""
+
+msgid "Massachusetts"
+msgstr ""
+
+msgid "Vermont"
+msgstr ""
+
+msgid "Pacific"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "Arkansas"
+msgstr ""
+
+msgid "District of Columbia"
+msgstr ""
+
+msgid "Florida"
+msgstr ""
+
+msgid "Louisiana"
+msgstr ""
+
+msgid "Maryland"
+msgstr ""
+
+msgid "Mississippi"
+msgstr ""
+
+msgid "Oklahoma"
+msgstr ""
+
+msgid "Texas"
+msgstr ""
+
+msgid "Virginia"
+msgstr ""
+
+msgid "West Virginia"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "Arizona"
+msgstr ""
+
+msgid "California"
+msgstr ""
+
+msgid "Colorado"
+msgstr ""
+
+msgid "Idaho"
+msgstr ""
+
+msgid "Montana"
+msgstr ""
+
+msgid "New Mexico"
+msgstr ""
+
+msgid "Nevada"
+msgstr ""
+
+msgid "Oregon"
+msgstr ""
+
+msgid "Utah"
+msgstr ""
+
+msgid "Washington State"
+msgstr ""
+
+msgid "South+Middle America"
+msgstr ""
+
+msgid "Guyane Francaise"
+msgstr ""
+
+msgid "downloading"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+msgid "Error downloading map!"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+msgid "Error writing map!"
+msgstr ""
+
+msgid "Map download aborted!"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
msgid "Vehicle Position"
msgstr "Posición del vehículu"
@@ -1844,30 +2260,14 @@
msgid "Backup / Restore"
msgstr ""
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr ""
-#. Android resource: @strings/map_download_title
-msgid "Map download"
-msgstr ""
-
#. Android resource: @strings/map_download_downloading
msgid "Downloading:"
msgstr ""
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
-msgstr ""
-
-#. Android resource: @strings/map_download_ready
-msgid "ready"
-msgstr ""
-
#. Android resource: @strings/map_download_download_error
msgid "Error downloading map."
msgstr ""
@@ -1876,10 +2276,6 @@
msgid "Map download aborted"
msgstr ""
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
-msgstr ""
-
#. Android resource: @strings/map_no_fix
msgid "No location. Reopen after location fix."
msgstr ""
@@ -1900,10 +2296,6 @@
msgid "Match partial address"
msgstr ""
-#. Android resource: @strings/address_search_button
-msgid "Search"
-msgstr ""
-
#. Android resource: @strings/address_search_searching
msgid "Searching..."
msgstr ""
@@ -1932,10 +2324,6 @@
msgid "Setting destination to:"
msgstr ""
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
-msgstr ""
-
#. Android resource: @strings/choose_an_action
msgid "Choose an action"
msgstr ""
Modified: trunk/navit/po/bg.po.in
===================================================================
--- trunk/navit/po/bg.po.in 2013-08-26 19:18:28 UTC (rev 5604)
+++ trunk/navit/po/bg.po.in 2013-08-26 19:27:22 UTC (rev 5605)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-24 22:34+0400\n"
+"POT-Creation-Date: 2013-08-26 00:37+0400\n"
"PO-Revision-Date: 2009-12-20 20:36+0000\n"
"Last-Translator: Alex Stanev <al...@st...>\n"
"Language-Team: Bulgarian <bg...@li...>\n"
@@ -1335,6 +1335,7 @@
msgid "unknown street"
msgstr ""
+#. Safe cast: attr_generic_set_attr does not modify its parameter.
msgid "Unnamed vehicle"
msgstr ""
@@ -1780,6 +1781,421 @@
msgid "Please decrease your speed"
msgstr ""
+msgid "partial match"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+msgid "Map data (c) OpenStreetMap contributors, ODBL"
+msgstr ""
+
+msgid "Downloaded maps"
+msgstr ""
+
+msgid "Whole Planet"
+msgstr ""
+
+msgid "Africa"
+msgstr ""
+
+msgid "Canary Islands"
+msgstr ""
+
+msgid "Libya"
+msgstr ""
+
+msgid "Asia"
+msgstr ""
+
+msgid "Korea"
+msgstr ""
+
+msgid "Taiwan"
+msgstr ""
+
+msgid "UAE+Other"
+msgstr ""
+
+msgid "Oceania"
+msgstr ""
+
+msgid "Tasmania"
+msgstr ""
+
+msgid "Victoria"
+msgstr ""
+
+msgid "New South Wales"
+msgstr ""
+
+msgid "Europe"
+msgstr ""
+
+msgid "Western Europe"
+msgstr ""
+
+msgid "Azores"
+msgstr ""
+
+msgid "BeNeLux"
+msgstr ""
+
+msgid "Alsace"
+msgstr ""
+
+msgid "Aquitaine"
+msgstr ""
+
+msgid "Auvergne"
+msgstr ""
+
+msgid "Basse-Normandie"
+msgstr ""
+
+msgid "Bourgogne"
+msgstr ""
+
+msgid "Bretagne"
+msgstr ""
+
+msgid "Centre"
+msgstr ""
+
+msgid "Champagne-Ardenne"
+msgstr ""
+
+msgid "Corse"
+msgstr ""
+
+msgid "Franche-Comte"
+msgstr ""
+
+msgid "Haute-Normandie"
+msgstr ""
+
+msgid "Ile-de-France"
+msgstr ""
+
+msgid "Languedoc-Roussillon"
+msgstr ""
+
+msgid "Limousin"
+msgstr ""
+
+msgid "Lorraine"
+msgstr ""
+
+msgid "Midi-Pyrenees"
+msgstr ""
+
+msgid "Nord-pas-de-Calais"
+msgstr ""
+
+msgid "Pays-de-la-Loire"
+msgstr ""
+
+msgid "Picardie"
+msgstr ""
+
+msgid "Poitou-Charentes"
+msgstr ""
+
+msgid "Provence-Alpes-Cote-d-Azur"
+msgstr ""
+
+msgid "Rhone-Alpes"
+msgstr ""
+
+msgid "Baden-Wuerttemberg"
+msgstr ""
+
+msgid "Bayern"
+msgstr ""
+
+msgid "Mittelfranken"
+msgstr ""
+
+msgid "Niederbayern"
+msgstr ""
+
+msgid "Oberbayern"
+msgstr ""
+
+msgid "Oberfranken"
+msgstr ""
+
+msgid "Oberpfalz"
+msgstr ""
+
+msgid "Schwaben"
+msgstr ""
+
+msgid "Unterfranken"
+msgstr ""
+
+msgid "Berlin"
+msgstr ""
+
+msgid "Brandenburg"
+msgstr ""
+
+msgid "Bremen"
+msgstr ""
+
+msgid "Hamburg"
+msgstr ""
+
+msgid "Hessen"
+msgstr ""
+
+msgid "Mecklenburg-Vorpommern"
+msgstr ""
+
+msgid "Niedersachsen"
+msgstr ""
+
+msgid "Nordrhein-westfalen"
+msgstr ""
+
+msgid "Rheinland-Pfalz"
+msgstr ""
+
+msgid "Saarland"
+msgstr ""
+
+msgid "Sachsen-Anhalt"
+msgstr ""
+
+msgid "Sachsen"
+msgstr ""
+
+msgid "Schleswig-Holstein"
+msgstr ""
+
+msgid "Thueringen"
+msgstr ""
+
+msgid "Mallorca"
+msgstr ""
+
+msgid "Galicia"
+msgstr ""
+
+msgid "Scandinavia"
+msgstr ""
+
+msgid "England"
+msgstr ""
+
+msgid "Buckinghamshire"
+msgstr ""
+
+msgid "Cambridgeshire"
+msgstr ""
+
+msgid "Cumbria"
+msgstr ""
+
+msgid "East yorkshire with hull"
+msgstr ""
+
+msgid "Essex"
+msgstr ""
+
+msgid "Herefordshire"
+msgstr ""
+
+msgid "Kent"
+msgstr ""
+
+msgid "Lancashire"
+msgstr ""
+
+msgid "Leicestershire"
+msgstr ""
+
+msgid "Norfolk"
+msgstr ""
+
+msgid "Nottinghamshire"
+msgstr ""
+
+msgid "Oxfordshire"
+msgstr ""
+
+msgid "Shropshire"
+msgstr ""
+
+msgid "Somerset"
+msgstr ""
+
+msgid "South yorkshire"
+msgstr ""
+
+msgid "Suffolk"
+msgstr ""
+
+msgid "Surrey"
+msgstr ""
+
+msgid "Wiltshire"
+msgstr ""
+
+msgid "Scotland"
+msgstr ""
+
+msgid "Wales"
+msgstr ""
+
+msgid "Crete"
+msgstr ""
+
+msgid "North America"
+msgstr ""
+
+msgid "Alaska"
+msgstr ""
+
+msgid "Hawaii"
+msgstr ""
+
+msgid "USA"
+msgstr ""
+
+msgid " (except Alaska and Hawaii)"
+msgstr ""
+
+msgid "Midwest"
+msgstr ""
+
+msgid "Michigan"
+msgstr ""
+
+msgid "Ohio"
+msgstr ""
+
+msgid "Northeast"
+msgstr ""
+
+msgid "Massachusetts"
+msgstr ""
+
+msgid "Vermont"
+msgstr ""
+
+msgid "Pacific"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "Arkansas"
+msgstr ""
+
+msgid "District of Columbia"
+msgstr ""
+
+msgid "Florida"
+msgstr ""
+
+msgid "Louisiana"
+msgstr ""
+
+msgid "Maryland"
+msgstr ""
+
+msgid "Mississippi"
+msgstr ""
+
+msgid "Oklahoma"
+msgstr ""
+
+msgid "Texas"
+msgstr ""
+
+msgid "Virginia"
+msgstr ""
+
+msgid "West Virginia"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "Arizona"
+msgstr ""
+
+msgid "California"
+msgstr ""
+
+msgid "Colorado"
+msgstr ""
+
+msgid "Idaho"
+msgstr ""
+
+msgid "Montana"
+msgstr ""
+
+msgid "New Mexico"
+msgstr ""
+
+msgid "Nevada"
+msgstr ""
+
+msgid "Oregon"
+msgstr ""
+
+msgid "Utah"
+msgstr ""
+
+msgid "Washington State"
+msgstr ""
+
+msgid "South+Middle America"
+msgstr ""
+
+msgid "Guyane Francaise"
+msgstr ""
+
+msgid "downloading"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+msgid "Error downloading map!"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+msgid "Error writing map!"
+msgstr ""
+
+msgid "Map download aborted!"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
msgid "Vehicle Position"
msgstr "Позиция на автомобил"
@@ -1844,30 +2260,14 @@
msgid "Backup / Restore"
msgstr ""
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr ""
-#. Android resource: @strings/map_download_title
-msgid "Map download"
-msgstr ""
-
#. Android resource: @strings/map_download_downloading
msgid "Downloading:"
msgstr ""
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
-msgstr ""
-
-#. Android resource: @strings/map_download_ready
-msgid "ready"
-msgstr ""
-
#. Android resource: @strings/map_download_download_error
msgid "Error downloading map."
msgstr ""
@@ -1876,10 +2276,6 @@
msgid "Map download aborted"
msgstr ""
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
-msgstr ""
-
#. Android resource: @strings/map_no_fix
msgid "No location. Reopen after location fix."
msgstr ""
@@ -1900,10 +2296,6 @@
msgid "Match partial address"
msgstr ""
-#. Android resource: @strings/address_search_button
-msgid "Search"
-msgstr ""
-
#. Android resource: @strings/address_search_searching
msgid "Searching..."
msgstr ""
@@ -1932,10 +2324,6 @@
msgid "Setting destination to:"
msgstr ""
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
-msgstr ""
-
#. Android resource: @strings/choose_an_action
msgid "Choose an action"
msgstr ""
Modified: trunk/navit/po/ca.po.in
===================================================================
--- trunk/navit/po/ca.po.in 2013-08-26 19:18:28 UTC (rev 5604)
+++ trunk/navit/po/ca.po.in 2013-08-26 19:27:22 UTC (rev 5605)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-24 22:34+0400\n"
+"POT-Creation-Date: 2013-08-26 00:37+0400\n"
"PO-Revision-Date: 2010-05-18 09:31+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Catalan <ca...@li...>\n"
@@ -1335,6 +1335,7 @@
msgid "unknown street"
msgstr ""
+#. Safe cast: attr_generic_set_attr does not modify its parameter.
msgid "Unnamed vehicle"
msgstr ""
@@ -1780,6 +1781,421 @@
msgid "Please decrease your speed"
msgstr ""
+msgid "partial match"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+msgid "Map data (c) OpenStreetMap contributors, ODBL"
+msgstr ""
+
+msgid "Downloaded maps"
+msgstr ""
+
+msgid "Whole Planet"
+msgstr ""
+
+msgid "Africa"
+msgstr ""
+
+msgid "Canary Islands"
+msgstr ""
+
+msgid "Libya"
+msgstr ""
+
+msgid "Asia"
+msgstr ""
+
+msgid "Korea"
+msgstr ""
+
+msgid "Taiwan"
+msgstr ""
+
+msgid "UAE+Other"
+msgstr ""
+
+msgid "Oceania"
+msgstr ""
+
+msgid "Tasmania"
+msgstr ""
+
+msgid "Victoria"
+msgstr ""
+
+msgid "New South Wales"
+msgstr ""
+
+msgid "Europe"
+msgstr ""
+
+msgid "Western Europe"
+msgstr ""
+
+msgid "Azores"
+msgstr ""
+
+msgid "BeNeLux"
+msgstr ""
+
+msgid "Alsace"
+msgstr ""
+
+msgid "Aquitaine"
+msgstr ""
+
+msgid "Auvergne"
+msgstr ""
+
+msgid "Basse-Normandie"
+msgstr ""
+
+msgid "Bourgogne"
+msgstr ""
+
+msgid "Bretagne"
+msgstr ""
+
+msgid "Centre"
+msgstr ""
+
+msgid "Champagne-Ardenne"
+msgstr ""
+
+msgid "Corse"
+msgstr ""
+
+msgid "Franche-Comte"
+msgstr ""
+
+msgid "Haute-Normandie"
+msgstr ""
+
+msgid "Ile-de-France"
+msgstr ""
+
+msgid "Languedoc-Roussillon"
+msgstr ""
+
+msgid "Limousin"
+msgstr ""
+
+msgid "Lorraine"
+msgstr ""
+
+msgid "Midi-Pyrenees"
+msgstr ""
+
+msgid "Nord-pas-de-Calais"
+msgstr ""
+
+msgid "Pays-de-la-Loire"
+msgstr ""
+
+msgid "Picardie"
+msgstr ""
+
+msgid "Poitou-Charentes"
+msgstr ""
+
+msgid "Provence-Alpes-Cote-d-Azur"
+msgstr ""
+
+msgid "Rhone-Alpes"
+msgstr ""
+
+msgid "Baden-Wuerttemberg"
+msgstr ""
+
+msgid "Bayern"
+msgstr ""
+
+msgid "Mittelfranken"
+msgstr ""
+
+msgid "Niederbayern"
+msgstr ""
+
+msgid "Oberbayern"
+msgstr ""
+
+msgid "Oberfranken"
+msgstr ""
+
+msgid "Oberpfalz"
+msgstr ""
+
+msgid "Schwaben"
+msgstr ""
+
+msgid "Unterfranken"
+msgstr ""
+
+msgid "Berlin"
+msgstr ""
+
+msgid "Brandenburg"
+msgstr ""
+
+msgid "Bremen"
+msgstr ""
+
+msgid "Hamburg"
+msgstr ""
+
+msgid "Hessen"
+msgstr ""
+
+msgid "Mecklenburg-Vorpommern"
+msgstr ""
+
+msgid "Niedersachsen"
+msgstr ""
+
+msgid "Nordrhein-westfalen"
+msgstr ""
+
+msgid "Rheinland-Pfalz"
+msgstr ""
+
+msgid "Saarland"
+msgstr ""
+
+msgid "Sachsen-Anhalt"
+msgstr ""
+
+msgid "Sachsen"
+msgstr ""
+
+msgid "Schleswig-Holstein"
+msgstr ""
+
+msgid "Thueringen"
+msgstr ""
+
+msgid "Mallorca"
+msgstr ""
+
+msgid "Galicia"
+msgstr ""
+
+msgid "Scandinavia"
+msgstr ""
+
+msgid "England"
+msgstr ""
+
+msgid "Buckinghamshire"
+msgstr ""
+
+msgid "Cambridgeshire"
+msgstr ""
+
+msgid "Cumbria"
+msgstr ""
+
+msgid "East yorkshire with hull"
+msgstr ""
+
+msgid "Essex"
+msgstr ""
+
+msgid "Herefordshire"
+msgstr ""
+
+msgid "Kent"
+msgstr ""
+
+msgid "Lancashire"
+msgstr ""
+
+msgid "Leicestershire"
+msgstr ""
+
+msgid "Norfolk"
+msgstr ""
+
+msgid "Nottinghamshire"
+msgstr ""
+
+msgid "Oxfordshire"
+msgstr ""
+
+msgid "Shropshire"
+msgstr ""
+
+msgid "Somerset"
+msgstr ""
+
+msgid "South yorkshire"
+msgstr ""
+
+msgid "Suffolk"
+msgstr ""
+
+msgid "Surrey"
+msgstr ""
+
+msgid "Wiltshire"
+msgstr ""
+
+msgid "Scotland"
+msgstr ""
+
+msgid "Wales"
+msgstr ""
+
+msgid "Crete"
+msgstr ""
+
+msgid "North America"
+msgstr ""
+
+msgid "Alaska"
+msgstr ""
+
+msgid "Hawaii"
+msgstr ""
+
+msgid "USA"
+msgstr ""
+
+msgid " (except Alaska and Hawaii)"
+msgstr ""
+
+msgid "Midwest"
+msgstr ""
+
+msgid "Michigan"
+msgstr ""
+
+msgid "Ohio"
+msgstr ""
+
+msgid "Northeast"
+msgstr ""
+
+msgid "Massachusetts"
+msgstr ""
+
+msgid "Vermont"
+msgstr ""
+
+msgid "Pacific"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "Arkansas"
+msgstr ""
+
+msgid "District of Columbia"
+msgstr ""
+
+msgid "Florida"
+msgstr ""
+
+msgid "Louisiana"
+msgstr ""
+
+msgid "Maryland"
+msgstr ""
+
+msgid "Mississippi"
+msgstr ""
+
+msgid "Oklahoma"
+msgstr ""
+
+msgid "Texas"
+msgstr ""
+
+msgid "Virginia"
+msgstr ""
+
+msgid "West Virginia"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "Arizona"
+msgstr ""
+
+msgid "California"
+msgstr ""
+
+msgid "Colorado"
+msgstr ""
+
+msgid "Idaho"
+msgstr ""
+
+msgid "Montana"
+msgstr ""
+
+msgid "New Mexico"
+msgstr ""
+
+msgid "Nevada"
+msgstr ""
+
+msgid "Oregon"
+msgstr ""
+
+msgid "Utah"
+msgstr ""
+
+msgid "Washington State"
+msgstr ""
+
+msgid "South+Middle America"
+msgstr ""
+
+msgid "Guyane Francaise"
+msgstr ""
+
+msgid "downloading"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+msgid "Error downloading map!"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+msgid "Error writing map!"
+msgstr ""
+
+msgid "Map download aborted!"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
msgid "Vehicle Position"
msgstr "Posició del vehicle"
@@ -1844,30 +2260,14 @@
msgid "Backup / Restore"
msgstr ""
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr ""
-#. Android resource: @strings/map_download_title
-msgid "Map download"
-msgstr ""
-
#. Android resource: @strings/map_download_downloading
msgid "Downloading:"
msgstr ""
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
-msgstr ""
-
-#. Android resource: @strings/map_download_ready
-msgid "ready"
-msgstr ""
-
#. Android resource: @strings/map_download_download_error
msgid "Error downloading map."
msgstr ""
@@ -1876,10 +2276,6 @@
msgid "Map download aborted"
msgstr ""
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
-msgstr ""
-
#. Android resource: @strings/map_no_fix
msgid "No location. Reopen after location fix."
msgstr ""
@@ -1900,10 +2296,6 @@
msgid "Match partial address"
msgstr ""
-#. Android resource: @strings/address_search_button
-msgid "Search"
-msgstr ""
-
#. Android resource: @strings/address_search_searching
msgid "Searching..."
msgstr ""
@@ -1932,10 +2324,6 @@
msgid "Setting destination to:"
msgstr ""
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
-msgstr ""
-
#. Android resource: @strings/choose_an_action
msgid "Choose an action"
msgstr ""
Modified: trunk/navit/po/cs.po.in
===================================================================
--- trunk/navit/po/cs.po.in 2013-08-26 19:18:28 UTC (rev 5604)
+++ trunk/navit/po/cs.po.in 2013-08-26 19:27:22 UTC (rev 5605)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-24 22:34+0400\n"
+"POT-Creation-Date: 2013-08-26 00:37+0400\n"
"PO-Revision-Date: 2010-06-18 19:02+0000\n"
"Last-Translator: Vladimír Burian <vla...@em...>\n"
"Language-Team: Čeština\n"
@@ -1339,6 +1339,7 @@
msgid "unknown street"
msgstr ""
+#. Safe cast: attr_generic_set_attr does not modify its parameter.
msgid "Unnamed vehicle"
msgstr ""
@@ -1784,6 +1785,421 @@
msgid "Please decrease your speed"
msgstr ""
+msgid "partial match"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+msgid "Map data (c) OpenStreetMap contributors, ODBL"
+msgstr ""
+
+msgid "Downloaded maps"
+msgstr ""
+
+msgid "Whole Planet"
+msgstr ""
+
+msgid "Africa"
+msgstr ""
+
+msgid "Canary Islands"
+msgstr ""
+
+msgid "Libya"
+msgstr ""
+
+msgid "Asia"
+msgstr ""
+
+msgid "Korea"
+msgstr ""
+
+msgid "Taiwan"
+msgstr ""
+
+msgid "UAE+Other"
+msgstr ""
+
+msgid "Oceania"
+msgstr ""
+
+msgid "Tasmania"
+msgstr ""
+
+msgid "Victoria"
+msgstr ""
+
+msgid "New South Wales"
+msgstr ""
+
+msgid "Europe"
+msgstr ""
+
+msgid "Western Europe"
+msgstr ""
+
+msgid "Azores"
+msgstr ""
+
+msgid "BeNeLux"
+msgstr ""
+
+msgid "Alsace"
+msgstr ""
+
+msgid "Aquitaine"
+msgstr ""
+
+msgid "Auvergne"
+msgstr ""
+
+msgid "Basse-Normandie"
+msgstr ""
+
+msgid "Bourgogne"
+msgstr ""
+
+msgid "Bretagne"
+msgstr ""
+
+msgid "Centre"
+msgstr ""
+
+msgid "Champagne-Ardenne"
+msgstr ""
+
+msgid "Corse"
+msgstr ""
+
+msgid "Franche-Comte"
+msgstr ""
+
+msgid "Haute-Normandie"
+msgstr ""
+
+msgid "Ile-de-France"
+msgstr ""
+
+msgid "Languedoc-Roussillon"
+msgstr ""
+
+msgid "Limousin"
+msgstr ""
+
+msgid "Lorraine"
+msgstr ""
+
+msgid "Midi-Pyrenees"
+msgstr ""
+
+msgid "Nord-pas-de-Calais"
+msgstr ""
+
+msgid "Pays-de-la-Loire"
+msgstr ""
+
+msgid "Picardie"
+msgstr ""
+
+msgid "Poitou-Charentes"
+msgstr ""
+
+msgid "Provence-Alpes-Cote-d-Azur"
+msgstr ""
+
+msgid "Rhone-Alpes"
+msgstr ""
+
+msgid "Baden-Wuerttemberg"
+msgstr ""
+
+msgid "Bayern"
+msgstr ""
+
+msgid "Mittelfranken"
+msgstr ""
+
+msgid "Niederbayern"
+msgstr ""
+
+msgid "Oberbayern"
+msgstr ""
+
+msgid "Oberfranken"
+msgstr ""
+
+msgid "Oberpfalz"
+msgstr ""
+
+msgid "Schwaben"
+msgstr ""
+
+msgid "Unterfranken"
+msgstr ""
+
+msgid "Berlin"
+msgstr ""
+
+msgid "Brandenburg"
+msgstr ""
+
+msgid "Bremen"
+msgstr ""
+
+msgid "Hamburg"
+msgstr ""
+
+msgid "Hessen"
+msgstr ""
+
+msgid "Mecklenburg-Vorpommern"
+msgstr ""
+
+msgid "Niedersachsen"
+msgstr ""
+
+msgid "Nordrhein-westfalen"
+msgstr ""
+
+msgid "Rheinland-Pfalz"
+msgstr ""
+
+msgid "Saarland"
+msgstr ""
+
+msgid "Sachsen-Anhalt"
+msgstr ""
+
+msgid "Sachsen"
+msgstr ""
+
+msgid "Schleswig-Holstein"
+msgstr ""
+
+msgid "Thueringen"
+msgstr ""
+
+msgid "Mallorca"
+msgstr ""
+
+msgid "Galicia"
+msgstr ""
+
+msgid "Scandinavia"
+msgstr ""
+
+msgid "England"
+msgstr ""
+
+msgid "Buckinghamshire"
+msgstr ""
+
+msgid "Cambridgeshire"
+msgstr ""
+
+msgid "Cumbria"
+msgstr ""
+
+msgid "East yorkshire with hull"
+msgstr ""
+
+msgid "Essex"
+msgstr ""
+
+msgid "Herefordshire"
+msgstr ""
+
+msgid "Kent"
+msgstr ""
+
+msgid "Lancashire"
+msgstr ""
+
+msgid "Leicestershire"
+msgstr ""
+
+msgid "Norfolk"
+msgstr ""
+
+msgid "Nottinghamshire"
+msgstr ""
+
+msgid "Oxfordshire"
+msgstr ""
+
+msgid "Shropshire"
+msgstr ""
+
+msgid "Somerset"
+msgstr ""
+
+msgid "South yorkshire"
+msgstr ""
+
+msgid "Suffolk"
+msgstr ""
+
+msgid "Surrey"
+msgstr ""
+
+msgid "Wiltshire"
+msgstr ""
+
+msgid "Scotland"
+msgstr ""
+
+msgid "Wales"
+msgstr ""
+
+msgid "Crete"
+msgstr ""
+
+msgid "North America"
+msgstr ""
+
+msgid "Alaska"
+msgstr ""
+
+msgid "Hawaii"
+msgstr ""
+
+msgid "USA"
+msgstr ""
+
+msgid " (except Alaska and Hawaii)"
+msgstr ""
+
+msgid "Midwest"
+msgstr ""
+
+msgid "Michigan"
+msgstr ""
+
+msgid "Ohio"
+msgstr ""
+
+msgid "Northeast"
+msgstr ""
+
+msgid "Massachusetts"
+msgstr ""
+
+msgid "Vermont"
+msgstr ""
+
+msgid "Pacific"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "Arkansas"
+msgstr ""
+
+msgid "District of Columbia"
+msgstr ""
+
+msgid "Florida"
+msgstr ""
+
+msgid "Louisiana"
+msgstr ""
+
+msgid "Maryland"
+msgstr ""
+
+msgid "Mississippi"
+msgstr ""
+
+msgid "Oklahoma"
+msgstr ""
+
+msgid "Texas"
+msgstr ""
+
+msgid "Virginia"
+msgstr ""
+
+msgid "West Virginia"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "Arizona"
+msgstr ""
+
+msgid "California"
+msgstr ""
+
+msgid "Colorado"
+msgstr ""
+
+msgid "Idaho"
+msgstr ""
+
+msgid "Montana"
+msgstr ""
+
+msgid "New Mexico"
+msgstr ""
+
+msgid "Nevada"
+msgstr ""
+
+msgid "Oregon"
+msgstr ""
+
+msgid "Utah"
+msgstr ""
+
+msgid "Washington State"
+msgstr ""
+
+msgid "South+Middle America"
+msgstr ""
+
+msgid "Guyane Francaise"
+msgstr ""
+
+msgid "downloading"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+msgid "Error downloading map!"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+msgid "Error writing map!"
+msgstr ""
+
+msgid "Map download aborted!"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
msgid "Vehicle Position"
msgstr "Poloha vozidla"
@@ -1848,30 +2264,14 @@
msgid "Backup / Restore"
msgstr ""
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr ""
-#. Android resource: @strings/map_download_title
-msgid "Map download"
-msgstr ""
-
#. Android resource: @strings/map_download_downloading
msgid "Downloading:"
msgstr ""
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
-msgstr ""
-
-#. Android resource: @strings/map_download_ready
-msgid "ready"
-msgstr ""
-
#. Android resource: @strings/map_download_download_error
msgid "Error downloading map."
msgstr ""
@@ -1880,10 +2280,6 @@
msgid "Map download aborted"
msgstr ""
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
-msgstr ""
-
#. Android resource: @strings/map_no_fix
msgid "No location. Reopen after location fix."
msgstr ""
@@ -1904,10 +2300,6 @@
msgid "Match partial address"
msgstr ""
-#. Android resource: @strings/address_search_button
-msgid "Search"
-msgstr ""
-
#. Android resource: @strings/address_search_searching
msgid "Searching..."
msgstr ""
@@ -1936,10 +2328,6 @@
msgid "Setting destination to:"
msgstr ""
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
-msgstr ""
-
#. Android resource: @strings/choose_an_action
msgid "Choose an action"
msgstr ""
Modified: trunk/navit/po/da.po.in
===================================================================
--- trunk/navit/po/da.po.in 2013-08-26 19:18:28 UTC (rev 5604)
+++ trunk/navit/po/da.po.in 2013-08-26 19:27:22 UTC (rev 5605)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-24 22:34+0400\n"
+"POT-Creation-Date: 2013-08-26 00:37+0400\n"
"PO-Revision-Date: 2010-05-18 09:31+0000\n"
"Last-Translator: Lasse Luttermann <lut...@si...>\n"
"Language-Team: Glenn Sommer <gl...@gm...>\n"
@@ -1335,6 +1335,7 @@
msgid "unknown street"
msgstr ""
+#. Safe cast: attr_generic_set_attr does not modify its parameter.
msgid "Unnamed vehicle"
msgstr ""
@@ -1780,6 +1781,421 @@
msgid "Please decrease your speed"
msgstr ""
+msgid "partial match"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+msgid "Map data (c) OpenStreetMap contributors, ODBL"
+msgstr ""
+
+msgid "Downloaded maps"
+msgstr ""
+
+msgid "Whole Planet"
+msgstr ""
+
+msgid "Africa"
+msgstr ""
+
+msgid "Canary Islands"
+msgstr ""
+
+msgid "Libya"
+msgstr ""
+
+msgid "Asia"
+msgstr ""
+
+msgid "Korea"
+msgstr ""
+
+msgid "Taiwan"
+msgstr ""
+
+msgid "UAE+Other"
+msgstr ""
+
+msgid "Oceania"
+msgstr ""
+
+msgid "Tasmania"
+msgstr ""
+
+msgid "Victoria"
+msgstr ""
+
+msgid "New South Wales"
+msgstr ""
+
+msgid "Europe"
+msgstr ""
+
+msgid "Western Europe"
+msgstr ""
+
+msgid "Azores"
+msgstr ""
+
+msgid "BeNeLux"
+msgstr ""
+
+msgid "Alsace"
+msgstr ""
+
+msgid "Aquitaine"
+msgstr ""
+
+msgid "Auvergne"
+msgstr ""
+
+msgid "Basse-Normandie"
+msgstr ""
+
+msgid "Bourgogne"
+msgstr ""
+
+msgid "Bretagne"
+msgstr ""
+
+msgid "Centre"
+msgstr ""
+
+msgid "Champagne-Ardenne"
+msgstr ""
+
+msgid "Corse"
+msgstr ""
+
+msgid "Franche-Comte"
+msgstr ""
+
+msgid "Haute-Normandie"
+msgstr ""
+
+msgid "Ile-de-France"
+msgstr ""
+
+msgid "Languedoc-Roussillon"
+msgstr ""
+
+msgid "Limousin"
+msgstr ""
+
+msgid "Lorraine"
+msgstr ""
+
+msgid "Midi-Pyrenees"
+msgstr ""
+
+msgid "Nord-pas-de-Calais"
+msgstr ""
+
+msgid "Pays-de-la-Loire"
+msgstr ""
+
+msgid "Picardie"
+msgstr ""
+
+msgid "Poitou-Charentes"
+msgstr ""
+
+msgid "Provence-Alpes-Cote-d-Azur"
+msgstr ""
+
+msgid "Rhone-Alpes"
+msgstr ""
+
+msgid "Baden-Wuerttemberg"
+msgstr ""
+
+msgid "Bayern"
+msgstr ""
+
+msgid "Mittelfranken"
+msgstr ""
+
+msgid "Niederbayern"
+msgstr ""
+
+msgid "Oberbayern"
+msgstr ""
+
+msgid "Oberfranken"
+msgstr ""
+
+msgid "Oberpfalz"
+msgstr ""
+
+msgid "Schwaben"
+msgstr ""
+
+msgid "Unterfranken"
+msgstr ""
+
+msgid "Berlin"
+msgstr ""
+
+msgid "Brandenburg"
+msgstr ""
+
+msgid "Bremen"
+msgstr ""
+
+msgid "Hamburg"
+msgstr ""
+
+msgid "Hessen"
+msgstr ""
+
+msgid "Mecklenburg-Vorpommern"
+msgstr ""
+
+msgid "Niedersachsen"
+msgstr ""
+
+msgid "Nordrhein-westfalen"
+msgstr ""
+
+msgid "Rheinland-Pfalz"
+msgstr ""
+
+msgid "Saarland"
+msgstr ""
+
+msgid "Sachsen-Anhalt"
+msgstr ""
+
+msgid "Sachsen"
+msgstr ""
+
+msgid "Schleswig-Holstein"
+msgstr ""
+
+msgid "Thueringen"
+msgstr ""
+
+msgid "Mallorca"
+msgstr ""
+
+msgid "Galicia"
+msgstr ""
+
+msgid "Scandinavia"
+msgstr ""
+
+msgid "England"
+msgstr ""
+
+msgid "Buckinghamshire"
+msgstr ""
+
+msgid "Cambridgeshire"
+msgstr ""
+
+msgid "Cumbria"
+msgstr ""
+
+msgid "East yorkshire with hull"
+msgstr ""
+
+msgid "Essex"
+msgstr ""
+
+msgid "Herefordshire"
+msgstr ""
+
+msgid "Kent"
+msgstr ""
+
+msgid "Lancashire"
+msgstr ""
+
+msgid "Leicestershire"
+msgstr ""
+
+msgid "Norfolk"
+msgstr ""
+
+msgid "Nottinghamshire"
+msgstr ""
+
+msgid "Oxfordshire"
+msgstr ""
+
+msgid "Shropshire"
+msgstr ""
+
+msgid "Somerset"
+msgstr ""
+
+msgid "South yorkshire"
+msgstr ""
+
+msgid "Suffolk"
+msgstr ""
+
+msgid "Surrey"
+msgstr ""
+
+msgid "Wiltshire"
+msgstr ""
+
+msgid "Scotland"
+msgstr ""
+
+msgid "Wales"
+msgstr ""
+
+msgid "Crete"
+msgstr ""
+
+msgid "North America"
+msgstr ""
+
+msgid "Alaska"
+msgstr ""
+
+msgid "Hawaii"
+msgstr ""
+
+msgid "USA"
+msgstr ""
+
+msgid " (except Alaska and Hawaii)"
+msgstr ""
+
+msgid "Midwest"
+msgstr ""
+
+msgid "Michigan"
+msgstr ""
+
+msgid "Ohio"
+msgstr ""
+
+msgid "Northeast"
+msgstr ""
+
+msgid "Massachusetts"
+msgstr ""
+
+msgid "Vermont"
+msgstr ""
+
+msgid "Pacific"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "Arkansas"
+msgstr ""
+
+msgid "District of Columbia"
+msgstr ""
+
+msgid "Florida"
+msgstr ""
+
+msgid "Louisiana"
+msgstr ""
+
+msgid "Maryland"
+msgstr ""
+
+msgid "Mississippi"
+msgstr ""
+
+msgid "Oklahoma"
+msgstr ""
+
+msgid "Texas"
+msgstr ""
+
+msgid "Virginia"
+msgstr ""
+
+msgid "West Virginia"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "Arizona"
+msgstr ""
+
+msgid "California"
+msgstr ""
+
+msgid "Colorado"
+msgstr ""
+
+msgid "Idaho"
+msgstr ""
+
+msgid "Montana"
+msgstr ""
+
+msgid "New Mexico"
+msgstr ""
+
+msgid "Nevada"
+msgstr ""
+
+msgid "Oregon"
+msgstr ""
+
+msgid "Utah"
+msgstr ""
+
+msgid "Washington State"
+msgstr ""
+
+msgid "South+Middle America"
+msgstr ""
+
+msgid "Guyane Francaise"
+msgstr ""
+
+msgid "downloading"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+msgid "Error downloading map!"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+msgid "Error writing map!"
+msgstr ""
+
+msgid "Map download aborted!"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
msgid "Vehicle Position"
msgstr "Køretøjsposition"
@@ -1844,30 +2260,14 @@
msgid "Backup / Restore"
msgstr ""
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
#. Android resource: @strings/map_delete
msgid "Delete this map?"
msgstr ""
-#. Android resource: @strings/map_download_title
-msgid "Map download"
-msgstr ""
-
#. Android resource: @strings/map_download_downloading
msgid "Downloading:"
msgstr ""
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
-msgstr ""
-
-#. Android resource: @strings/map_download_ready
-msgid "ready"
-msgstr ""
-
#. Android resource: @strings/map_download_download_error
msgid "Error downloading map."
msgstr ""
@@ -1876,10 +2276,6 @@
msgid "Map download aborted"
msgstr ""
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
-msgstr ""
-
#. Android resource: @strings/map_no_fix
msgid "No location. Reopen after location fix."
msgstr ""
@@ -1900,10 +2296,6 @@
msgid "Match partial address"
msgstr ""
-#. Android resource: @strings/address_search_button
-msgid "Search"
-msgstr ""
-
#. Android resource: @strings/address_search_searching
msgid "Searching..."
msgstr ""
@@ -1932,10 +2324,6 @@
msgid "Setting destination to:"
msgstr ""
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
-msgstr ""
-
#. Android resource: @strings/choose_an_action
msgid "Choose an action"
msgstr ""
Modified: trunk/navit/po/de.po.in
===================================================================
--- trunk/navit/po/de.po.in 2013-08-26 19:18:28 UTC (rev 5604)
+++ trunk/navit/po/de.po.in 2013-08-26 19:27:22 UTC (rev 5605)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-24 22:34+0400\n"
+"POT-Creation-Date: 2013-08-26 00:37+0400\n"
"PO-Revision-Date: 2010-06-01 22:09+0000\n"
"Last-Translator: Achim Behrens <Unknown>\n"
"Language-Team: Martin Schaller <mar...@so...>\n"
@@ -1348,6 +1348,7 @@
msgid "unknown street"
msgstr "unbekannte Straße"
+#. Safe cast: attr_generic_set_attr does not modify its parameter.
msgid "Unnamed vehicle"
msgstr "Namenloses Fahrzeug"
@@ -1795,6 +1796,421 @@
msgid "Please decrease your speed"
msgstr "Bitte Geschwindigkeit verringern"
+msgid "partial match"
+msgstr "ungefähr"
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr "Suche"
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr "Städte"
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr "Ziel setzen"
+
+msgid "Map data (c) OpenStreetMap contributors, ODBL"
+msgstr ""
+
+msgid "Downloaded maps"
+msgstr "Heruntergeladene Karten"
+
+msgid "Whole Planet"
+msgstr ""
+
+msgid "Africa"
+msgstr ""
+
+msgid "Canary Islands"
+msgstr ""
+
+msgid "Libya"
+msgstr ""
+
+msgid "Asia"
+msgstr ""
+
+msgid "Korea"
+msgstr ""
+
+msgid "Taiwan"
+msgstr ""
+
+msgid "UAE+Other"
+msgstr ""
+
+msgid "Oceania"
+msgstr ""
+
+msgid "Tasmania"
+msgstr ""
+
+msgid "Victoria"
+msgstr ""
+
+msgid "New South Wales"
+msgstr ""
+
+msgid "Europe"
+msgstr ""
+
+msgid "Western Europe"
+msgstr ""
+
+msgid "Azores"
+msgstr ""
+
+msgid "BeNeLux"
+msgstr ""
+
+msgid "Alsace"
+msgstr ""
+
+msgid "Aquitaine"
+msgstr ""
+
+msgid "Auvergne"
+msgstr ""
+
+msgid "Basse-Normandie"
+msgstr ""
+
+msgid "Bourgogne"
+msgstr ""
+
+msgid "Bretagne"
+msgstr ""
+
+msgid "Centre"
+msgstr ""
+
+msgid "Champagne-Ardenne"
+msgstr ""
+
+msgid "Corse"
+msgstr ""
+
+msgid "Franche-Comte"
+msgstr ""
+
+msgid "Haute-Normandie"
+msgstr ""
+
+msgid "Ile-de-France"
+msgstr ""
+
+msgid "Languedoc-Roussillon"
+msgstr ""
+
+msgid "Limousin"
+msgstr ""
+
+msgid "Lorraine"
+msgstr ""
+
+msgid "Midi-Pyrenees"
+msgstr ""
+
+msgid "Nord-pas-de-Calais"
+msgstr ""
+
+msgid "Pays-de-la-Loire"
+msgstr ""
+
+msgid "Picardie"
+msgstr ""
+
+msgid "Poitou-Charentes"
+msgstr ""
+
+msgid "Provence-Alpes-Cote-d-Azur"
+msgstr ""
+
+msgid "Rhone-Alpes"
+msgstr ""
+
+msgid "Baden-Wuerttemberg"
+msgstr ""
+
+msgid "Bayern"
+msgstr ""
+
+msgid "Mittelfranken"
+msgstr ""
+
+msgid "Niederbayern"
+msgstr ""
+
+msgid "Oberbayern"
+msgstr ""
+
+msgid "Oberfranken"
+msgstr ""
+
+msgid "Oberpfalz"
+msgstr ""
+
+msgid "Schwaben"
+msgstr ""
+
+msgid "Unterfranken"
+msgstr ""
+
+msgid "Berlin"
+msgstr ""
+
+msgid "Brandenburg"
+msgstr ""
+
+msgid "Bremen"
+msgstr ""
+
+msgid "Hamburg"
+msgstr ""
+
+msgid "Hessen"
+msgstr ""
+
+msgid "Mecklenburg-Vorpommern"
+msgstr ""
+
+msgid "Niedersachsen"
+msgstr ""
+
+msgid "Nordrhein-westfalen"
+msgstr ""
+
+msgid "Rheinland-Pfalz"
+msgstr ""
+
+msgid "Saarland"
+msgstr ""
+
+msgid "Sachsen-Anhalt"
+msgstr ""
+
+msgid "Sachsen"
+msgstr ""
+
+msgid "Schleswig-Holstein"
+msgstr ""
+
+msgid "Thueringen"
+msgstr ""
+
+msgid "Mallorca"
+msgstr ""
+
+msgid "Galicia"
+msgstr ""
+
+msgid "Scandinavia"
+msgstr ""
+
+msgid "England"
+msgstr ""
+
+msgid "Buckinghamshire"
+msgstr ""
+
+msgid "Cambridgeshire"
+msgstr ""
+
+msgid "Cumbria"
+msgstr ""
+
+msgid "East yorkshire with hull"
+msgstr ""
+
+msgid "Essex"
+msgstr ""
+
+msgid "Herefordshire"
+msgstr ""
+
+msgid "Kent"
+msgstr ""
+
+msgid "Lancashire"
+msgstr ""
+
+msgid "Leicestershire"
+msgstr ""
+
+msgid "Norfolk"
+msgstr ""
+
+msgid "Nottinghamshire"
+msgstr ""
+
+msgid "Oxfordshire"
+msgstr ""
+
+msgid "Shropshire"
+msgstr ""
+
+msgid "Somerset"
+msgstr ""
+
+msgid "South yorkshire"
+msgstr ""
+
+msgid "Suffolk"
+msgstr ""
+
+msgid "Surrey"
+msgstr ""
+
+msgid "Wiltshire"
+msgstr ""
+
+msgid "Scotland"
+msgstr ""
+
+msgid "Wales"
+msgstr ""
+
+msgid "Crete"
+msgstr ""
+
+msgid "North America"
+msgstr ""
+
+msgid "Alaska"
+msgstr ""
+
+msgid "Hawaii"
+msgstr ""
+
+msgid "USA"
+msgstr ""
+
+msgid " (except Alaska and Hawaii)"
+msgstr ""
+
+msgid "Midwest"
+msgstr ""
+
+msgid "Michigan"
+msgstr ""
+
+msgid "Ohio"
+msgstr ""
+
+msgid "Northeast"
+msgstr ""
+
+msgid "Massachusetts"
+msgstr ""
+
+msgid "Vermont"
+msgstr ""
+
+msgid "Pacific"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "Arkansas"
+msgstr ""
+
+msgid "District of Columbia"
+msgstr ""
+
+msgid "Florida"
+msgstr ""
+
+msgid "Louisiana"
+msgstr ""
+
+msgid "Maryland"
+msgstr ""
+
+msgid "Mississippi"
+msgstr ""
+
+msgid "Oklahoma"
+msgstr ""
+
+msgid "Texas"
+msgstr ""
+
+msgid "Virginia"
+msgstr ""
+
+msgid "West Virginia"
+msgstr ""
+
+msgid "West"
+msgstr ""
+
+msgid "Arizona"
+msgstr ""
+
+msgid "California"
+msgstr ""
+
+msgid "Colorado"
+msgstr ""
+
+msgid "Idaho"
+msgstr ""
+
+msgid "Montana"
+msgstr ""
+
+msgid "New Mexico"
+msgstr ""
+
+msgid "Nevada"
+msgstr ""
+
+msgid "Oregon"
+msgstr ""
+
+msgid "Utah"
+msgstr ""
+
+msgid "Washington State"
+msgstr ""
+
+msgid "South+Middle America"
+msgstr ""
+
+msgid "Guyane Francaise"
+msgstr ""
+
+msgid "downloading"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr "Fertig in"
+
+msgid "Error downloading map!"
+msgstr "Fehler beim Kartendownload"
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr "Nicht genug freier Speicher"
+
+msgid "Error writing map!"
+msgstr ""
+
+msgid "Map download aborted!"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr "Fertig in"
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr "Kartendownload"
+
msgid "Vehicle Position"
msgstr "Fahrzeugposition"
@@ -1868,30 +2284,14 @@
msgid "Backup / Restore"...
[truncated message content] |
|
From: <md...@us...> - 2013-08-26 19:18:31
|
Revision: 5604
http://sourceforge.net/p/navit/code/5604
Author: mdankov
Date: 2013-08-26 19:18:28 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Add:port_android:Rename country names used in Android port to match names used in country.c
Modified Paths:
--------------
trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java 2013-08-26 19:13:09 UTC (rev 5603)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java 2013-08-26 19:18:28 UTC (rev 5604)
@@ -99,20 +99,20 @@
new osm_map_values(Navit._("Angola"),"11.4","-18.1","24.2","-5.3", 55850695L, 1),
new osm_map_values(Navit._("Burundi"),"28.9","-4.5","30.9","-2.2", 60694550L, 1),
new osm_map_values(Navit._("Canary Islands"),"-18.69","26.52","-12.79","29.99", 58904212L, 1),
- new osm_map_values(Navit._("Democratic Republic of the Congo"),"11.7","-13.6","31.5","5.7", 70168822L, 1),
+ new osm_map_values(Navit._("Congo, Democratic Republic of the"),"11.7","-13.6","31.5","5.7", 70168822L, 1),
new osm_map_values(Navit._("Ethiopia"),"32.89","3.33","48.07","14.97", 68113437L, 1),
new osm_map_values(Navit._("Guinea"),"-15.47","7.12","-7.58","12.74", 57466702L, 1),
- new osm_map_values(Navit._("Ivory Coast"),"-8.72","4.09","-2.43","10.80", 62652062L, 1),
+ new osm_map_values(Navit._("Cote d'Ivoire"),"-8.72","4.09","-2.43","10.80", 62652062L, 1),
new osm_map_values(Navit._("Kenya"),"33.8","-5.2","42.4","4.9", 64420106L, 1),
new osm_map_values(Navit._("Lesotho"),"26.9","-30.7","29.6","-28.4", 55533656L, 1),
new osm_map_values(Navit._("Liberia"),"-15.00","-0.73","-7.20","8.65", 55963569L, 1),
- new osm_map_values(Navit._("Lybia"),"9.32","19.40","25.54","33.63", 63127225L, 1),
+ new osm_map_values(Navit._("Libya"),"9.32","19.40","25.54","33.63", 63127225L, 1),
new osm_map_values(Navit._("Madagascar"),"42.25","-26.63","51.20","-11.31", 56681202L, 1),
- new osm_map_values(Navit._("Nambia")+"+"+Navit._("Botswana"),"11.4","-29.1","29.5","-16.9", 64357926L, 1),
+ new osm_map_values(Navit._("Namibia")+"+"+Navit._("Botswana"),"11.4","-29.1","29.5","-16.9", 64357926L, 1),
new osm_map_values(Navit._("Reunion"),"55.2","-21.4","55.9","-20.9", 59487456L, 1),
new osm_map_values(Navit._("Rwanda"),"28.8","-2.9","30.9","-1.0", 60654274L, 1),
new osm_map_values(Navit._("South Africa")+"+"+Navit._("Lesotho"),"15.93","-36.36","33.65","-22.08", 79904318L, 1),
- new osm_map_values(Navit._("Tanzania"),"29.19","-11.87","40.74","-0.88", 65380211L, 1),
+ new osm_map_values(Navit._("Tanzania, United Republic of"),"29.19","-11.87","40.74","-0.88", 65380211L, 1),
new osm_map_values(Navit._("Uganda"),"29.3","-1.6","35.1","4.3", 61521337L, 1),
new osm_map_values(Navit._("Asia"),"23.8","0.1","195.0","82.4", 1185692230L, 0),
new osm_map_values(Navit._("Azerbaijan"),"44.74","38.34","51.69","42.37", 64563990L, 1),
@@ -120,15 +120,14 @@
new osm_map_values(Navit._("Cyprus"),"32.0","34.5","34.9","35.8", 62657503L, 1),
new osm_map_values(Navit._("India")+"+"+Navit._("Nepal"),"67.9","5.5","89.6","36.0", 96930647L, 1),
new osm_map_values(Navit._("Indonesia"),"93.7","-17.3","155.5","7.6", 81860551L, 1),
- new osm_map_values(Navit._("Iran"),"43.5","24.4","63.6","40.4", 79782055L, 1),
+ new osm_map_values(Navit._("Iran, Islamic Republic of"),"43.5","24.4","63.6","40.4", 79782055L, 1),
new osm_map_values(Navit._("Iraq"),"38.7","28.5","49.2","37.4", 64053119L, 1),
new osm_map_values(Navit._("Israel"),"33.99","29.8","35.95","33.4", 73981247L, 1),
new osm_map_values(Navit._("Japan")+"+"+Navit._("Korea")+"+"+Navit._("Taiwan"),"117.6","20.5","151.3","47.1", 451295345L, 1),
new osm_map_values(Navit._("Kazakhstan"),"46.44","40.89","87.36","55.45", 114949353L, 1),
new osm_map_values(Navit._("Kyrgyzstan"),"69.23","39.13","80.33","43.29", 62425757L, 1),
- new osm_map_values(Navit._("Malasia")+"+"+Navit._("Singapore"),"94.3","-5.9","108.6","6.8", 61142116L, 1),
+ new osm_map_values(Navit._("Malaysia")+"+"+Navit._("Singapore"),"94.3","-5.9","108.6","6.8", 61142116L, 1),
new osm_map_values(Navit._("Mongolia"),"87.5","41.4","120.3","52.7", 66228736L, 1),
- new osm_map_values(Navit._("Nambia")+"+"+Navit._("Botswana"),"11.4","-29.1","29.5","-16.9", 64357926L, 1),
new osm_map_values(Navit._("Pakistan"),"60.83","23.28","77.89","37.15", 74060802L, 1),
new osm_map_values(Navit._("Philippines"),"115.58","4.47","127.85","21.60", 71601316L, 1),
new osm_map_values(Navit._("Saudi Arabia"),"33.2","16.1","55.9","33.5", 100651634L, 1),
@@ -208,12 +207,12 @@
new osm_map_values(Navit._("Finland"),"18.6","59.2","32.3","70.3", 167464389L, 1),
new osm_map_values(Navit._("Denmark"),"7.49","54.33","13.05","57.88", 142017133L, 1),
new osm_map_values(Navit._("Switzerland"),"5.79","45.74","10.59","47.84", 197612725L, 1),
- new osm_map_values(Navit._("UK"),"-9.7","49.6","2.2","61.2", 308044592L, 1),
+ new osm_map_values(Navit._("United Kingdom"),"-9.7","49.6","2.2","61.2", 308044592L, 1),
new osm_map_values(Navit._("England"),"-7.80","48.93","2.41","56.14", 331085897L, 1),
new osm_map_values(Navit._("Buckinghamshire"),"-1.19","51.44","-0.43","52.25", 74619627L, 2),
new osm_map_values(Navit._("Cambridgeshire"),"-0.55","51.96","0.56","52.79", 71849188L, 2),
new osm_map_values(Navit._("Cumbria"),"-3.96","53.85","-2.11","55.24", 71699620L, 2),
- new osm_map_values(Navit._("East_yorkshire_with_hull"),"-1.16","53.50","0.54","54.26", 68241870L, 2),
+ new osm_map_values(Navit._("East yorkshire with hull"),"-1.16","53.50","0.54","54.26", 68241870L, 2),
new osm_map_values(Navit._("Essex"),"-0.07","51.40","1.36","52.14", 82991499L, 2),
new osm_map_values(Navit._("Herefordshire"),"-3.19","51.78","-2.29","52.45", 66471962L, 2),
new osm_map_values(Navit._("Kent"),"-0.02","50.81","1.65","51.53", 75449128L, 2),
@@ -232,9 +231,9 @@
new osm_map_values(Navit._("Wales"),"-5.56","51.28","-2.60","53.60", 84860075L, 2),
new osm_map_values(Navit._("Albania"),"19.09","39.55","21.12","42.72", 71097966L, 1),
new osm_map_values(Navit._("Belarus"),"23.12","51.21","32.87","56.23", 100471644L, 1),
- new osm_map_values(Navit._("Russia"),"27.9","41.5","190.4", "77.6", 508559360L, 1),
+ new osm_map_values(Navit._("Russian Federation"),"27.9","41.5","190.4", "77.6", 508559360L, 1),
new osm_map_values(Navit._("Bulgaria"),"24.7","42.1","24.8","42.1", 62211433L, 1),
- new osm_map_values(Navit._("Bosnia-Herzegovina"),"15.69","42.52","19.67","45.32", 75756822L, 1),
+ new osm_map_values(Navit._("Bosnia and Herzegovina"),"15.69","42.52","19.67","45.32", 75756822L, 1),
new osm_map_values(Navit._("Czech Republic"),"11.91","48.48","19.02","51.17", 288911729L, 1),
new osm_map_values(Navit._("Croatia"),"13.4","42.1","19.4","46.9", 118479986L, 1),
new osm_map_values(Navit._("Estonia"),"21.5","57.5","28.2","59.6", 86149958L, 1),
@@ -289,7 +288,7 @@
new osm_map_values(Navit._("Colombia"),"-79.1","-4.0","-66.7","12.6", 85701114L, 1),
new osm_map_values(Navit._("Ecuador"),"-82.6","-5.4","-74.4","2.3", 63453353L, 1),
new osm_map_values(Navit._("Guyana")+"+"+Navit._("Suriname")+"+"+Navit._("Guyane Francaise"),"-62.0","1.0","-51.2","8.9", 57226004L, 1),
- new osm_map_values(Navit._("Haiti")+"+"+Navit._("Republica Dominicana"),"-74.8","17.3","-68.2","20.1", 63826780L, 1),
+ new osm_map_values(Navit._("Haiti")+"+"+Navit._("Dominican Republic"),"-74.8","17.3","-68.2","20.1", 63826780L, 1),
new osm_map_values(Navit._("Jamaica"),"-78.6","17.4","-75.9","18.9", 53888545L, 1),
new osm_map_values(Navit._("Mexico"),"-117.6","14.1","-86.4","32.8", 258877491L, 1),
new osm_map_values(Navit._("Paraguay"),"-63.8","-28.1","-53.6","-18.8", 60539032L, 1),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2013-08-26 19:13:12
|
Revision: 5603
http://sourceforge.net/p/navit/code/5603
Author: mdankov
Date: 2013-08-26 19:13:09 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Add:port_android:Prepare to switch to gettext translations of Android specific strings.
Modified Paths:
--------------
trunk/navit/navit/android/src/org/navitproject/navit/Navit.java
trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
trunk/navit/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java
trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java
trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java
trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
trunk/navit/navit/android/src/org/navitproject/navit/NavitTextTranslations.java
Modified: trunk/navit/navit/android/src/org/navitproject/navit/Navit.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/Navit.java 2013-08-26 08:01:42 UTC (rev 5602)
+++ trunk/navit/navit/android/src/org/navitproject/navit/Navit.java 2013-08-26 19:13:09 UTC (rev 5603)
@@ -135,7 +135,7 @@
}
- public static String get_text(String in)
+ public static String _(String in)
{
return NavitTextTranslations.get_text(in);
}
@@ -588,7 +588,7 @@
case NavitAddressSearch_id :
if (resultCode == Activity.RESULT_OK) {
Bundle destination = data.getExtras();
- Toast.makeText( getApplicationContext(),getString(R.string.address_search_set_destination) + "\n" + destination.getString("q"), Toast.LENGTH_LONG).show(); //TRANS
+ Toast.makeText( getApplicationContext(),getString(R.string.address_search_set_destination) + "\n" + destination.getString(("q")), Toast.LENGTH_LONG).show(); //TRANS
Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());
msg.setData(destination);
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java 2013-08-26 08:01:42 UTC (rev 5602)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java 2013-08-26 19:13:09 UTC (rev 5603)
@@ -109,7 +109,7 @@
Bundle extras = getIntent().getExtras();
if ( extras != null )
{
- String search_string = extras.getString("search_string");
+ String search_string = extras.getString(("search_string"));
if (search_string != null) {
mPartialSearch = true;
mAddressString = search_string;
@@ -128,7 +128,7 @@
// address: label and text field
SharedPreferences settings = getSharedPreferences(Navit.NAVIT_PREFS, MODE_PRIVATE);
- mCountry = settings.getString("DefaultCountry", null);
+ mCountry = settings.getString(("DefaultCountry") , null);
if (mCountry == null) {
Locale defaultLocale = Locale.getDefault();
@@ -150,14 +150,14 @@
// address: label and text field
TextView addr_view = new TextView(this);
- addr_view.setText(Navit.get_text("Enter Destination")); // TRANS
+ addr_view.setText(Navit._("Enter Destination")); // TRANS
addr_view.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20f);
addr_view.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
addr_view.setPadding(4, 4, 4, 4);
// partial match checkbox
final CheckBox checkboxPartialMatch = new CheckBox(this);
- checkboxPartialMatch.setText(Navit.get_text("partial match")); // TRANS
+ checkboxPartialMatch.setText(Navit._("partial match")); // TRANS
checkboxPartialMatch.setChecked(last_address_partial_match);
checkboxPartialMatch.setGravity(Gravity.CENTER);
@@ -167,7 +167,7 @@
// search button
final Button btnSearch = new Button(this);
- btnSearch.setText(Navit.get_text("Search")); // TRANS
+ btnSearch.setText(Navit._("Search")); // TRANS
btnSearch.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
btnSearch.setGravity(Gravity.CENTER);
btnSearch.setOnClickListener(new OnClickListener() {
@@ -279,8 +279,8 @@
break;
}
- search_results_wait.setMessage(Navit.get_text("towns") + ":" + search_results_towns + " "
- + Navit.get_text("Streets") + ":" + search_results_streets + "/"
+ search_results_wait.setMessage(Navit._("Towns") + ":" + search_results_towns + " "
+ + Navit._("Streets") + ":" + search_results_streets + "/"
+ search_results_streets_hn);
search_results_wait.setProgress(Addresses_found.size() % (ADDRESS_RESULT_PROGRESS_MAX + 1));
@@ -334,7 +334,7 @@
protected Dialog onCreateDialog(int id) {
search_results_wait = new ProgressDialog(this);
search_results_wait.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
- search_results_wait.setTitle("loading search results");
+ search_results_wait.setTitle("Loading search results");
search_results_wait.setMessage("--");
search_results_wait.setCancelable(true);
search_results_wait.setProgress(0);
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java 2013-08-26 08:01:42 UTC (rev 5602)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java 2013-08-26 19:13:09 UTC (rev 5603)
@@ -227,7 +227,7 @@
bubble_paint.setTextSize((int) (20 / 1.5f * draw_factor));
bubble_paint.setStrokeWidth(3);
bubble_paint.setColor(Color.parseColor("#3b3131"));
- c.drawText(Navit.get_text("drive here"), this.bubble_001.x + dx + inner_dx,
+ c.drawText(Navit._("Route to here"), this.bubble_001.x + dx + inner_dx,
this.bubble_001.y + dy + inner_dy, bubble_paint);
}
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java 2013-08-26 08:01:42 UTC (rev 5602)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java 2013-08-26 19:13:09 UTC (rev 5603)
@@ -80,14 +80,14 @@
// change progressbar values
mapdownloader_dialog.setMax(msg.getData().getInt("value1"));
mapdownloader_dialog.setProgress(msg.getData().getInt("value2"));
- mapdownloader_dialog.setTitle(msg.getData().getString("title"));
- mapdownloader_dialog.setMessage(msg.getData().getString("text"));
+ mapdownloader_dialog.setTitle(msg.getData().getString(("title")));
+ mapdownloader_dialog.setMessage(msg.getData().getString(("text")));
break;
case MSG_TOAST :
- Toast.makeText(mActivity, msg.getData().getString("text"), Toast.LENGTH_SHORT).show();
+ Toast.makeText(mActivity, msg.getData().getString(("text")), Toast.LENGTH_SHORT).show();
break;
case MSG_TOAST_LONG :
- Toast.makeText(mActivity, msg.getData().getString("text"), Toast.LENGTH_LONG).show();
+ Toast.makeText(mActivity, msg.getData().getString(("text")), Toast.LENGTH_LONG).show();
break;
case MSG_START_MAP_DOWNLOAD:
{
@@ -137,7 +137,7 @@
mapdownloader_dialog.setOnDismissListener(onDismissListener);
// show license for OSM maps
Toast.makeText(mActivity.getApplicationContext(),
- Navit.get_text("Map data (c) OpenStreetMap contributors, CC-BY-SA"),
+ Navit._("Map data (c) OpenStreetMap contributors, ODBL"),
Toast.LENGTH_LONG).show(); //TRANS
return mapdownloader_dialog;
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java 2013-08-26 08:01:42 UTC (rev 5602)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java 2013-08-26 19:13:09 UTC (rev 5603)
@@ -126,7 +126,7 @@
// add already downloaded maps (group and empty child list
HashMap<String, String> downloaded_maps_hash = new HashMap<String, String>();
- downloaded_maps_hash.put("category_name", Navit.get_text("Downloaded Maps"));
+ downloaded_maps_hash.put("category_name", Navit._("Downloaded maps"));
resultGroups.add(downloaded_maps_hash);
downloaded_maps_childs = new ArrayList<HashMap<String, String>>();
resultChilds.add(downloaded_maps_childs);
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java 2013-08-26 08:01:42 UTC (rev 5602)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java 2013-08-26 19:13:09 UTC (rev 5603)
@@ -136,8 +136,8 @@
super.onCreateContextMenu(menu);
menu.setHeaderTitle("Position...");
- menu.add(1, 1, NONE, Navit.get_text("drive here")).setOnMenuItemClickListener(this);
-// menu.add(1, 2, NONE, Navit.get_text("Add to contacts")).setOnMenuItemClickListener(this);
+ menu.add(1, 1, NONE, Navit._("Route to here")).setOnMenuItemClickListener(this);
+// menu.add(1, 2, NONE, Navit._("Add to contacts")).setOnMenuItemClickListener(this);
}
public boolean onMenuItemClick(MenuItem item) {
@@ -731,7 +731,7 @@
case CLB_SET_DESTINATION:
String lat = Float.toString(msg.getData().getFloat("lat"));
String lon = Float.toString(msg.getData().getFloat("lon"));
- String q = msg.getData().getString("q");
+ String q = msg.getData().getString(("q"));
CallbackMessageChannel(3, lat + "#" + lon + "#" + q);
break;
case CLB_SET_DISPLAY_DESTINATION:
@@ -740,7 +740,7 @@
CallbackMessageChannel(4, "" + x + "#" + y);
break;
case CLB_CALL_CMD:
- String cmd = msg.getData().getString("cmd");
+ String cmd = msg.getData().getString(("cmd"));
CallbackMessageChannel(5, cmd);
break;
case CLB_BUTTON_UP:
@@ -752,14 +752,14 @@
case CLB_COUNTRY_CHOOSER:
break;
case CLB_LOAD_MAP:
- CallbackMessageChannel(6, msg.getData().getString("title"));
+ CallbackMessageChannel(6, msg.getData().getString(("title")));
break;
case CLB_DELETE_MAP:
- File toDelete = new File( msg.getData().getString("title"));
+ File toDelete = new File( msg.getData().getString(("title")));
toDelete.delete();
//fallthrough
case CLB_UNLOAD_MAP:
- CallbackMessageChannel(7, msg.getData().getString("title"));
+ CallbackMessageChannel(7, msg.getData().getString(("title")));
break;
}
}
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java 2013-08-26 08:01:42 UTC (rev 5602)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java 2013-08-26 19:13:09 UTC (rev 5603)
@@ -94,208 +94,208 @@
// define the maps here
//
public static final osm_map_values[] osm_maps = {
- new osm_map_values(Navit.get_text("Whole Planet"),"-180","-90","180","90", 7449814676L, 0),
- new osm_map_values(Navit.get_text("Africa"),"-30.89","-36.17","61.68","38.40", 280880799L, 0),
- new osm_map_values(Navit.get_text("Angola"),"11.4","-18.1","24.2","-5.3", 55850695L, 1),
- new osm_map_values(Navit.get_text("Burundi"),"28.9","-4.5","30.9","-2.2", 60694550L, 1),
- new osm_map_values(Navit.get_text("Canary Islands"),"-18.69","26.52","-12.79","29.99", 58904212L, 1),
- new osm_map_values(Navit.get_text("Democratic Republic of the Congo"),"11.7","-13.6","31.5","5.7", 70168822L, 1),
- new osm_map_values(Navit.get_text("Ethiopia"),"32.89","3.33","48.07","14.97", 68113437L, 1),
- new osm_map_values(Navit.get_text("Guinea"),"-15.47","7.12","-7.58","12.74", 57466702L, 1),
- new osm_map_values(Navit.get_text("Ivory Coast"),"-8.72","4.09","-2.43","10.80", 62652062L, 1),
- new osm_map_values(Navit.get_text("Kenya"),"33.8","-5.2","42.4","4.9", 64420106L, 1),
- new osm_map_values(Navit.get_text("Lesotho"),"26.9","-30.7","29.6","-28.4", 55533656L, 1),
- new osm_map_values(Navit.get_text("Liberia"),"-15.00","-0.73","-7.20","8.65", 55963569L, 1),
- new osm_map_values(Navit.get_text("Lybia"),"9.32","19.40","25.54","33.63", 63127225L, 1),
- new osm_map_values(Navit.get_text("Madagascar"),"42.25","-26.63","51.20","-11.31", 56681202L, 1),
- new osm_map_values(Navit.get_text("Nambia")+"+"+Navit.get_text("Botswana"),"11.4","-29.1","29.5","-16.9", 64357926L, 1),
- new osm_map_values(Navit.get_text("Reunion"),"55.2","-21.4","55.9","-20.9", 59487456L, 1),
- new osm_map_values(Navit.get_text("Rwanda"),"28.8","-2.9","30.9","-1.0", 60654274L, 1),
- new osm_map_values(Navit.get_text("South Africa")+"+"+Navit.get_text("Lesotho"),"15.93","-36.36","33.65","-22.08", 79904318L, 1),
- new osm_map_values(Navit.get_text("Tanzania"),"29.19","-11.87","40.74","-0.88", 65380211L, 1),
- new osm_map_values(Navit.get_text("Uganda"),"29.3","-1.6","35.1","4.3", 61521337L, 1),
- new osm_map_values(Navit.get_text("Asia"),"23.8","0.1","195.0","82.4", 1185692230L, 0),
- new osm_map_values(Navit.get_text("Azerbaijan"),"44.74","38.34","51.69","42.37", 64563990L, 1),
- new osm_map_values(Navit.get_text("China"),"67.3","5.3","135.0","54.5", 354889731L, 1),
- new osm_map_values(Navit.get_text("Cyprus"),"32.0","34.5","34.9","35.8", 62657503L, 1),
- new osm_map_values(Navit.get_text("India")+"+"+Navit.get_text("Nepal"),"67.9","5.5","89.6","36.0", 96930647L, 1),
- new osm_map_values(Navit.get_text("Indonesia"),"93.7","-17.3","155.5","7.6", 81860551L, 1),
- new osm_map_values(Navit.get_text("Iran"),"43.5","24.4","63.6","40.4", 79782055L, 1),
- new osm_map_values(Navit.get_text("Iraq"),"38.7","28.5","49.2","37.4", 64053119L, 1),
- new osm_map_values(Navit.get_text("Israel"),"33.99","29.8","35.95","33.4", 73981247L, 1),
- new osm_map_values(Navit.get_text("Japan")+"+"+Navit.get_text("Korea")+"+"+Navit.get_text("Taiwan"),"117.6","20.5","151.3","47.1", 451295345L, 1),
- new osm_map_values(Navit.get_text("Kazakhstan"),"46.44","40.89","87.36","55.45", 114949353L, 1),
- new osm_map_values(Navit.get_text("Kyrgyzstan"),"69.23","39.13","80.33","43.29", 62425757L, 1),
- new osm_map_values(Navit.get_text("Malasia")+"+"+Navit.get_text("Singapore"),"94.3","-5.9","108.6","6.8", 61142116L, 1),
- new osm_map_values(Navit.get_text("Mongolia"),"87.5","41.4","120.3","52.7", 66228736L, 1),
- new osm_map_values(Navit.get_text("Nambia")+"+"+Navit.get_text("Botswana"),"11.4","-29.1","29.5","-16.9", 64357926L, 1),
- new osm_map_values(Navit.get_text("Pakistan"),"60.83","23.28","77.89","37.15", 74060802L, 1),
- new osm_map_values(Navit.get_text("Philippines"),"115.58","4.47","127.85","21.60", 71601316L, 1),
- new osm_map_values(Navit.get_text("Saudi Arabia"),"33.2","16.1","55.9","33.5", 100651634L, 1),
- new osm_map_values(Navit.get_text("Thailand"),"97.5","5.7","105.2","19.7", 68260330L, 1),
- new osm_map_values(Navit.get_text("Turkey"),"25.1","35.8","46.4","42.8", 105200911L, 1),
- new osm_map_values(Navit.get_text("Turkmenistan"),"51.78","35.07","66.76","42.91", 62188003L, 1),
- new osm_map_values(Navit.get_text("UAE+Other"),"51.5","22.6","56.7","26.5", 61873090L, 1),
- new osm_map_values(Navit.get_text("Australia")+"+"+Navit.get_text("Oceania"),"89.84","-57.39","179.79","7.26", 185657003L, 0),
- new osm_map_values(Navit.get_text("Australia"),"110.5","-44.2","154.9","-9.2", 138812990L, 0),
- new osm_map_values(Navit.get_text("Tasmania"),"144.0","-45.1","155.3","-24.8", 109169592L, 1),
- new osm_map_values(Navit.get_text("Victoria")+"+"+Navit.get_text("New South Wales"),"140.7","-39.4","153.7","-26.9", 104820309L, 1),
- new osm_map_values(Navit.get_text("New Caledonia"),"157.85","-25.05","174.15","-16.85", 54512722L, 1),
- new osm_map_values(Navit.get_text("New Zealand"),"165.2","-47.6","179.1","-33.7", 68221081L, 1),
- new osm_map_values(Navit.get_text("Europe"),"-12.97","33.59","34.15","72.10", 3570653608L, 0),
- new osm_map_values(Navit.get_text("Western Europe"),"-17.6","34.5","42.9","70.9", 3700019849L, 1),
- new osm_map_values(Navit.get_text("Austria"),"9.4","46.32","17.21","49.1", 289080462L, 1),
- new osm_map_values(Navit.get_text("Azores"),"-31.62","36.63","-24.67","40.13", 54507108L, 1),
- new osm_map_values(Navit.get_text("BeNeLux"),"2.08","48.87","7.78","54.52", 656716695L, 1),
- new osm_map_values(Navit.get_text("Netherlands"),"3.07","50.75","7.23","53.73", 525336576L, 1),
- new osm_map_values(Navit.get_text("Denmark"),"7.65","54.32","15.58","58.07", 154275079L, 1),
- new osm_map_values(Navit.get_text("Faroe Islands"),"-7.8","61.3","-6.1","62.5", 54931474L, 1),
- new osm_map_values(Navit.get_text("France"),"-5.45","42.00","8.44","51.68", 1468741961L, 1),
- new osm_map_values(Navit.get_text("Alsace"),"6.79","47.27","8.48","49.17", 144023488L, 2),
- new osm_map_values(Navit.get_text("Aquitaine"),"-2.27","42.44","1.50","45.76", 186786072L, 2),
- new osm_map_values(Navit.get_text("Auvergne"),"2.01","44.57","4.54","46.85", 118942252L, 2),
- new osm_map_values(Navit.get_text("Basse-Normandie"),"-2.09","48.13","1.03","49.98", 111940365L, 2),
- new osm_map_values(Navit.get_text("Bourgogne"),"2.80","46.11","5.58","48.45", 114109115L, 2),
- new osm_map_values(Navit.get_text("Bretagne"),"-5.58","46.95","-0.96","48.99", 188689862L, 2),
- new osm_map_values(Navit.get_text("Centre"),"0.01","46.29","3.18","48.99", 208870488L, 2),
- new osm_map_values(Navit.get_text("Champagne-Ardenne"),"3.34","47.53","5.94","50.28", 112266252L, 2),
- new osm_map_values(Navit.get_text("Corse"),"8.12","41.32","9.95","43.28", 67997394L, 2),
- new osm_map_values(Navit.get_text("Franche-Comte"),"5.20","46.21","7.83","48.07", 131236689L, 2),
- new osm_map_values(Navit.get_text("Haute-Normandie"),"-0.15","48.62","1.85","50.18", 90484736L, 2),
- new osm_map_values(Navit.get_text("Ile-de-France"),"1.40","48.07","3.61","49.29", 152890366L, 2),
- new osm_map_values(Navit.get_text("Languedoc-Roussillon"),"1.53","42.25","4.89","45.02", 168413195L, 2),
- new osm_map_values(Navit.get_text("Limousin"),"0.58","44.87","2.66","46.50", 98422724L, 2),
- new osm_map_values(Navit.get_text("Lorraine"),"4.84","47.77","7.72","49.73", 137538540L, 2),
- new osm_map_values(Navit.get_text("Midi-Pyrenees"),"-0.37","42.18","3.50","45.10", 186740619L, 2),
- new osm_map_values(Navit.get_text("Nord-pas-de-Calais"),"1.42","49.92","4.49","51.31", 145320230L, 2),
- new osm_map_values(Navit.get_text("Pays-de-la-Loire"),"-2.88","46.20","0.97","48.62", 243736184L, 2),
- new osm_map_values(Navit.get_text("Picardie"),"1.25","48.79","4.31","50.43", 163238861L, 2),
- new osm_map_values(Navit.get_text("Poitou-Charentes"),"-1.69","45.04","1.26","47.23", 197886714L, 2),
- new osm_map_values(Navit.get_text("Provence-Alpes-Cote-d-Azur"),"4.21","42.91","7.99","45.18", 179863755L, 2),
- new osm_map_values(Navit.get_text("Rhone-Alpes"),"3.65","44.07","7.88","46.64", 201452039L, 2),
- new osm_map_values(Navit.get_text("Germany"),"5.18","46.84","15.47","55.64", 1187298374L, 1),
- new osm_map_values(Navit.get_text("Baden-Wuerttemberg"),"7.32","47.14","10.57","49.85", 247149038L, 2),
- new osm_map_values(Navit.get_text("Bayern"),"8.92","47.22","13.90","50.62", 306577202L, 2),
- new osm_map_values(Navit.get_text("Mittelfranken"),"9.86","48.78","11.65","49.84", 95916401L, 2),
- new osm_map_values(Navit.get_text("Niederbayern"),"11.55","47.75","14.12","49.42", 119427776L, 2),
- new osm_map_values(Navit.get_text("Oberbayern"),"10.67","47.05","13.57","49.14", 147630851L, 2),
- new osm_map_values(Navit.get_text("Oberfranken"),"10.31","49.54","12.49","50.95", 104963024L, 2),
- new osm_map_values(Navit.get_text("Oberpfalz"),"11.14","48.71","13.47","50.43", 112413336L, 2),
- new osm_map_values(Navit.get_text("Schwaben"),"9.27","47.10","11.36","49.09", 126836560L, 2),
- new osm_map_values(Navit.get_text("Unterfranken"),"8.59","49.16","10.93","50.67", 124601596L, 2),
- new osm_map_values(Navit.get_text("Berlin"),"13.03","52.28","13.81","52.73", 78189548L, 2),
- new osm_map_values(Navit.get_text("Brandenburg"),"11.17","51.30","14.83","53.63", 126821283L, 2),
- new osm_map_values(Navit.get_text("Bremen"),"8.43","52.96","9.04","53.66", 69427370L, 2),
- new osm_map_values(Navit.get_text("Hamburg"),"9.56","53.34","10.39","53.80", 76388380L, 2),
- new osm_map_values(Navit.get_text("Hessen"),"7.72","49.34","10.29","51.71", 155980870L, 2),
- new osm_map_values(Navit.get_text("Mecklenburg-Vorpommern"),"10.54","53.05","14.48","55.05", 92107050L, 2),
- new osm_map_values(Navit.get_text("Niedersachsen"),"6.40","51.24","11.69","54.22", 288712601L, 2),
- new osm_map_values(Navit.get_text("Nordrhein-westfalen"),"5.46","50.26","9.52","52.59", 335383638L, 2),
- new osm_map_values(Navit.get_text("Rheinland-Pfalz"),"6.06","48.91","8.56","51.00", 157909942L, 2),
- new osm_map_values(Navit.get_text("Saarland"),"6.30","49.06","7.46","49.69", 78579241L, 2),
- new osm_map_values(Navit.get_text("Sachsen-Anhalt"),"10.50","50.88","13.26","53.11", 115314663L, 2),
- new osm_map_values(Navit.get_text("Sachsen"),"11.82","50.11","15.10","51.73", 134182818L, 2),
- new osm_map_values(Navit.get_text("Schleswig-Holstein"),"7.41","53.30","11.98","55.20", 114865543L, 2),
- new osm_map_values(Navit.get_text("Thueringen"),"9.81","50.15","12.72","51.70", 112896293L, 2),
- new osm_map_values(Navit.get_text("Germany")+"+"+Navit.get_text("Austria")+"+"+Navit.get_text("Switzerland"),"3.4","44.5","18.6","55.1", 1763000779L, 1),
- new osm_map_values(Navit.get_text("Iceland"),"-25.3","62.8","-11.4","67.5", 58803839L, 1),
- new osm_map_values(Navit.get_text("Ireland"),"-11.17","51.25","-5.23","55.9", 74456575L, 1),
- new osm_map_values(Navit.get_text("Italy"),"6.52","36.38","18.96","47.19", 373215809L, 1),
- new osm_map_values(Navit.get_text("Spain")+"+"+Navit.get_text("Portugal"),"-11.04","34.87","4.62","44.41", 354839261L, 1),
- new osm_map_values(Navit.get_text("Mallorca"),"2.2","38.8","4.7","40.2", 66781797L, 2),
- new osm_map_values(Navit.get_text("Galicia"),"-10.0","41.7","-6.3","44.1", 69081612L, 2),
- new osm_map_values(Navit.get_text("Scandinavia"),"4.0","54.4","32.1","71.5", 386082513L, 1),
- new osm_map_values(Navit.get_text("Finland"),"18.6","59.2","32.3","70.3", 167464389L, 1),
- new osm_map_values(Navit.get_text("Denmark"),"7.49","54.33","13.05","57.88", 142017133L, 1),
- new osm_map_values(Navit.get_text("Switzerland"),"5.79","45.74","10.59","47.84", 197612725L, 1),
- new osm_map_values(Navit.get_text("UK"),"-9.7","49.6","2.2","61.2", 308044592L, 1),
- new osm_map_values(Navit.get_text("England"),"-7.80","48.93","2.41","56.14", 331085897L, 1),
- new osm_map_values(Navit.get_text("Buckinghamshire"),"-1.19","51.44","-0.43","52.25", 74619627L, 2),
- new osm_map_values(Navit.get_text("Cambridgeshire"),"-0.55","51.96","0.56","52.79", 71849188L, 2),
- new osm_map_values(Navit.get_text("Cumbria"),"-3.96","53.85","-2.11","55.24", 71699620L, 2),
- new osm_map_values(Navit.get_text("East_yorkshire_with_hull"),"-1.16","53.50","0.54","54.26", 68241870L, 2),
- new osm_map_values(Navit.get_text("Essex"),"-0.07","51.40","1.36","52.14", 82991499L, 2),
- new osm_map_values(Navit.get_text("Herefordshire"),"-3.19","51.78","-2.29","52.45", 66471962L, 2),
- new osm_map_values(Navit.get_text("Kent"),"-0.02","50.81","1.65","51.53", 75449128L, 2),
- new osm_map_values(Navit.get_text("Lancashire"),"-3.20","53.43","-2.00","54.29", 75096621L, 2),
- new osm_map_values(Navit.get_text("Leicestershire"),"-1.65","52.34","-0.61","53.03", 75492394L, 2),
- new osm_map_values(Navit.get_text("Norfolk"),"0.10","52.30","2.04","53.41", 71556838L, 2),
- new osm_map_values(Navit.get_text("Nottinghamshire"),"-1.39","52.73","-0.62","53.55", 72979826L, 2),
- new osm_map_values(Navit.get_text("Oxfordshire"),"-1.77","51.41","-0.82","52.22", 73351886L, 2),
- new osm_map_values(Navit.get_text("Shropshire"),"-3.29","52.26","-2.18","53.05", 69144272L, 2),
- new osm_map_values(Navit.get_text("Somerset"),"-3.89","50.77","-2.20","51.40", 72098176L, 2),
- new osm_map_values(Navit.get_text("South yorkshire"),"-1.88","53.25","-0.80","53.71", 72594920L, 2),
- new osm_map_values(Navit.get_text("Suffolk"),"0.29","51.88","1.81","52.60", 72985880L, 2),
- new osm_map_values(Navit.get_text("Surrey"),"-0.90","51.02","0.10","51.52", 79850137L, 2),
- new osm_map_values(Navit.get_text("Wiltshire"),"-2.41","50.90","-1.44","51.76", 71244578L, 2),
- new osm_map_values(Navit.get_text("Scotland"),"-8.13","54.49","-0.15","61.40", 102111248L, 2),
- new osm_map_values(Navit.get_text("Wales"),"-5.56","51.28","-2.60","53.60", 84860075L, 2),
- new osm_map_values(Navit.get_text("Albania"),"19.09","39.55","21.12","42.72", 71097966L, 1),
- new osm_map_values(Navit.get_text("Belarus"),"23.12","51.21","32.87","56.23", 100471644L, 1),
- new osm_map_values(Navit.get_text("Russia"),"27.9","41.5","190.4", "77.6", 508559360L, 1),
- new osm_map_values(Navit.get_text("Bulgaria"),"24.7","42.1","24.8","42.1", 62211433L, 1),
- new osm_map_values(Navit.get_text("Bosnia-Herzegovina"),"15.69","42.52","19.67","45.32", 75756822L, 1),
- new osm_map_values(Navit.get_text("Czech Republic"),"11.91","48.48","19.02","51.17", 288911729L, 1),
- new osm_map_values(Navit.get_text("Croatia"),"13.4","42.1","19.4","46.9", 118479986L, 1),
- new osm_map_values(Navit.get_text("Estonia"),"21.5","57.5","28.2","59.6", 86149958L, 1),
- new osm_map_values(Navit.get_text("Greece"),"28.9","37.8","29.0","37.8", 59191120L, 1),
- new osm_map_values(Navit.get_text("Crete"),"23.3","34.5","26.8","36.0", 61121443L, 1),
- new osm_map_values(Navit.get_text("Hungary"),"16.08","45.57","23.03","48.39", 129046944L, 1),
- new osm_map_values(Navit.get_text("Latvia"),"20.7","55.6","28.3","58.1", 81683354L, 1),
- new osm_map_values(Navit.get_text("Lithuania"),"20.9","53.8","26.9","56.5", 77228922L, 1),
- new osm_map_values(Navit.get_text("Poland"),"13.6","48.8","24.5","55.0", 331299544L, 1),
- new osm_map_values(Navit.get_text("Romania"),"20.3","43.5","29.9","48.4", 150011857L, 1),
- new osm_map_values(Navit.get_text("North America"),"-178.1","6.5","-10.4","84.0", 2738147321L, 0),
- new osm_map_values(Navit.get_text("Alaska"),"-179.5","49.5","-129","71.6", 72413728L, 1),
- new osm_map_values(Navit.get_text("Canada"),"-141.3","41.5","-52.2","70.2", 1125713287L, 1),
- new osm_map_values(Navit.get_text("Hawaii"),"-161.07","18.49","-154.45","22.85", 57463829L, 1),
- new osm_map_values(Navit.get_text("USA")+Navit.get_text(" (except Alaska and Hawaii)"),"-125.4","24.3","-66.5","49.3", 2356238167L, 1),
- new osm_map_values(Navit.get_text("Midwest"),"-104.11","35.92","-80.46","49.46", 663062321L, 2),
- new osm_map_values(Navit.get_text("Michigan"),"-90.47","41.64","-79.00","49.37", 207416918L, 2),
- new osm_map_values(Navit.get_text("Ohio"),"-84.87","38.05","-79.85","43.53", 143571732L, 2),
- new osm_map_values(Navit.get_text("Northeast"),"-80.58","38.72","-66.83","47.53", 517925445L, 2),
- new osm_map_values(Navit.get_text("Massachusetts"),"-73.56","40.78","-68.67","42.94", 159493455L, 2),
- new osm_map_values(Navit.get_text("Vermont"),"-73.49","42.68","-71.41","45.07", 74308439L, 2),
- new osm_map_values(Navit.get_text("Pacific"),"-180.05","15.87","-129.75","73.04", 78496182L, 2),
- new osm_map_values(Navit.get_text("South"),"-106.70","23.98","-71.46","40.70", 1135650708L, 2),
- new osm_map_values(Navit.get_text("Arkansas"),"-94.67","32.95","-89.59","36.60", 89637645L, 2),
- new osm_map_values(Navit.get_text("District of Columbia"),"-77.17","38.74","-76.86","39.05", 64042148L, 2),
- new osm_map_values(Navit.get_text("Florida"),"-88.75","23.63","-77.67","31.05", 118647388L, 2),
- new osm_map_values(Navit.get_text("Louisiana"),"-94.09","28.09","-88.62","33.07", 136435773L, 2),
- new osm_map_values(Navit.get_text("Maryland"),"-79.54","37.83","-74.99","40.22", 134152161L, 2),
- new osm_map_values(Navit.get_text("Mississippi"),"-91.71","29.99","-88.04","35.05", 100291749L, 2),
- new osm_map_values(Navit.get_text("Oklahoma"),"-103.41","33.56","-94.38","37.38", 106601625L, 2),
- new osm_map_values(Navit.get_text("Texas"),"-106.96","25.62","-92.97","36.58", 220587321L, 2),
- new osm_map_values(Navit.get_text("Virginia"),"-83.73","36.49","-74.25","39.52", 218627122L, 2),
- new osm_map_values(Navit.get_text("West Virginia"),"-82.70","37.15","-77.66","40.97", 133830267L, 2),
- new osm_map_values(Navit.get_text("West"),"-133.11","31.28","-101.99","49.51", 616041200L, 2),
- new osm_map_values(Navit.get_text("Arizona"),"-114.88","30.01","-108.99","37.06", 89434673L, 2),
- new osm_map_values(Navit.get_text("California"),"-125.94","32.43","-114.08","42.07", 303663259L, 2),
- new osm_map_values(Navit.get_text("Colorado"),"-109.11","36.52","-100.41","41.05", 132835514L, 2),
- new osm_map_values(Navit.get_text("Idaho"),"-117.30","41.93","-110.99","49.18", 97305030L, 2),
- new osm_map_values(Navit.get_text("Montana"),"-116.10","44.31","-102.64","49.74", 93935496L, 2),
- new osm_map_values(Navit.get_text("New Mexico"),"-109.10","26.98","-96.07","37.05", 185648327L, 2),
- new osm_map_values(Navit.get_text("Nevada"),"-120.2","35.0","-113.8","42.1", 138055868L, 2),
- new osm_map_values(Navit.get_text("Oregon"),"-124.8","41.8","-116.3","46.3", 103551459L, 2),
- new osm_map_values(Navit.get_text("Utah"),"-114.11","36.95","-108.99","42.05", 78249845L, 2),
- new osm_map_values(Navit.get_text("Washington State"),"-125.0","45.5","-116.9","49.0", 100601625L, 2),
- new osm_map_values(Navit.get_text("South+Middle America"),"-83.5","-56.3","-30.8","13.7", 204217202L, 0),
- new osm_map_values(Navit.get_text("Argentina"),"-73.9","-57.3","-51.6","-21.0", 105910515L, 1),
- new osm_map_values(Navit.get_text("Argentina")+"+"+Navit.get_text("Chile"),"-77.2","-56.3","-52.7","-16.1", 111585063L, 1),
- new osm_map_values(Navit.get_text("Bolivia"),"-70.5","-23.1","-57.3","-9.3", 59215113L, 1),
- new osm_map_values(Navit.get_text("Brazil"),"-71.4","-34.7","-32.8","5.4", 127279780L, 1),
- new osm_map_values(Navit.get_text("Chile"),"-81.77","-58.50","-65.46","-17.41", 84808355L, 1),
- new osm_map_values(Navit.get_text("Cuba"),"-85.3","19.6","-74.0","23.6", 57704852L, 1),
- new osm_map_values(Navit.get_text("Colombia"),"-79.1","-4.0","-66.7","12.6", 85701114L, 1),
- new osm_map_values(Navit.get_text("Ecuador"),"-82.6","-5.4","-74.4","2.3", 63453353L, 1),
- new osm_map_values(Navit.get_text("Guyana")+"+"+Navit.get_text("Suriname")+"+"+Navit.get_text("Guyane Francaise"),"-62.0","1.0","-51.2","8.9", 57226004L, 1),
- new osm_map_values(Navit.get_text("Haiti")+"+"+Navit.get_text("Republica Dominicana"),"-74.8","17.3","-68.2","20.1", 63826780L, 1),
- new osm_map_values(Navit.get_text("Jamaica"),"-78.6","17.4","-75.9","18.9", 53888545L, 1),
- new osm_map_values(Navit.get_text("Mexico"),"-117.6","14.1","-86.4","32.8", 258877491L, 1),
- new osm_map_values(Navit.get_text("Paraguay"),"-63.8","-28.1","-53.6","-18.8", 60539032L, 1),
- new osm_map_values(Navit.get_text("Peru"),"-82.4","-18.1","-67.5","0.4", 71286591L, 1),
- new osm_map_values(Navit.get_text("Uruguay"),"-59.2","-36.5","-51.7","-29.7", 64850903L, 1),
- new osm_map_values(Navit.get_text("Venezuela"),"-73.6","0.4","-59.7","12.8", 74521456L, 1)
+ new osm_map_values(Navit._("Whole Planet"),"-180","-90","180","90", 7449814676L, 0),
+ new osm_map_values(Navit._("Africa"),"-30.89","-36.17","61.68","38.40", 280880799L, 0),
+ new osm_map_values(Navit._("Angola"),"11.4","-18.1","24.2","-5.3", 55850695L, 1),
+ new osm_map_values(Navit._("Burundi"),"28.9","-4.5","30.9","-2.2", 60694550L, 1),
+ new osm_map_values(Navit._("Canary Islands"),"-18.69","26.52","-12.79","29.99", 58904212L, 1),
+ new osm_map_values(Navit._("Democratic Republic of the Congo"),"11.7","-13.6","31.5","5.7", 70168822L, 1),
+ new osm_map_values(Navit._("Ethiopia"),"32.89","3.33","48.07","14.97", 68113437L, 1),
+ new osm_map_values(Navit._("Guinea"),"-15.47","7.12","-7.58","12.74", 57466702L, 1),
+ new osm_map_values(Navit._("Ivory Coast"),"-8.72","4.09","-2.43","10.80", 62652062L, 1),
+ new osm_map_values(Navit._("Kenya"),"33.8","-5.2","42.4","4.9", 64420106L, 1),
+ new osm_map_values(Navit._("Lesotho"),"26.9","-30.7","29.6","-28.4", 55533656L, 1),
+ new osm_map_values(Navit._("Liberia"),"-15.00","-0.73","-7.20","8.65", 55963569L, 1),
+ new osm_map_values(Navit._("Lybia"),"9.32","19.40","25.54","33.63", 63127225L, 1),
+ new osm_map_values(Navit._("Madagascar"),"42.25","-26.63","51.20","-11.31", 56681202L, 1),
+ new osm_map_values(Navit._("Nambia")+"+"+Navit._("Botswana"),"11.4","-29.1","29.5","-16.9", 64357926L, 1),
+ new osm_map_values(Navit._("Reunion"),"55.2","-21.4","55.9","-20.9", 59487456L, 1),
+ new osm_map_values(Navit._("Rwanda"),"28.8","-2.9","30.9","-1.0", 60654274L, 1),
+ new osm_map_values(Navit._("South Africa")+"+"+Navit._("Lesotho"),"15.93","-36.36","33.65","-22.08", 79904318L, 1),
+ new osm_map_values(Navit._("Tanzania"),"29.19","-11.87","40.74","-0.88", 65380211L, 1),
+ new osm_map_values(Navit._("Uganda"),"29.3","-1.6","35.1","4.3", 61521337L, 1),
+ new osm_map_values(Navit._("Asia"),"23.8","0.1","195.0","82.4", 1185692230L, 0),
+ new osm_map_values(Navit._("Azerbaijan"),"44.74","38.34","51.69","42.37", 64563990L, 1),
+ new osm_map_values(Navit._("China"),"67.3","5.3","135.0","54.5", 354889731L, 1),
+ new osm_map_values(Navit._("Cyprus"),"32.0","34.5","34.9","35.8", 62657503L, 1),
+ new osm_map_values(Navit._("India")+"+"+Navit._("Nepal"),"67.9","5.5","89.6","36.0", 96930647L, 1),
+ new osm_map_values(Navit._("Indonesia"),"93.7","-17.3","155.5","7.6", 81860551L, 1),
+ new osm_map_values(Navit._("Iran"),"43.5","24.4","63.6","40.4", 79782055L, 1),
+ new osm_map_values(Navit._("Iraq"),"38.7","28.5","49.2","37.4", 64053119L, 1),
+ new osm_map_values(Navit._("Israel"),"33.99","29.8","35.95","33.4", 73981247L, 1),
+ new osm_map_values(Navit._("Japan")+"+"+Navit._("Korea")+"+"+Navit._("Taiwan"),"117.6","20.5","151.3","47.1", 451295345L, 1),
+ new osm_map_values(Navit._("Kazakhstan"),"46.44","40.89","87.36","55.45", 114949353L, 1),
+ new osm_map_values(Navit._("Kyrgyzstan"),"69.23","39.13","80.33","43.29", 62425757L, 1),
+ new osm_map_values(Navit._("Malasia")+"+"+Navit._("Singapore"),"94.3","-5.9","108.6","6.8", 61142116L, 1),
+ new osm_map_values(Navit._("Mongolia"),"87.5","41.4","120.3","52.7", 66228736L, 1),
+ new osm_map_values(Navit._("Nambia")+"+"+Navit._("Botswana"),"11.4","-29.1","29.5","-16.9", 64357926L, 1),
+ new osm_map_values(Navit._("Pakistan"),"60.83","23.28","77.89","37.15", 74060802L, 1),
+ new osm_map_values(Navit._("Philippines"),"115.58","4.47","127.85","21.60", 71601316L, 1),
+ new osm_map_values(Navit._("Saudi Arabia"),"33.2","16.1","55.9","33.5", 100651634L, 1),
+ new osm_map_values(Navit._("Thailand"),"97.5","5.7","105.2","19.7", 68260330L, 1),
+ new osm_map_values(Navit._("Turkey"),"25.1","35.8","46.4","42.8", 105200911L, 1),
+ new osm_map_values(Navit._("Turkmenistan"),"51.78","35.07","66.76","42.91", 62188003L, 1),
+ new osm_map_values(Navit._("UAE+Other"),"51.5","22.6","56.7","26.5", 61873090L, 1),
+ new osm_map_values(Navit._("Australia")+"+"+Navit._("Oceania"),"89.84","-57.39","179.79","7.26", 185657003L, 0),
+ new osm_map_values(Navit._("Australia"),"110.5","-44.2","154.9","-9.2", 138812990L, 0),
+ new osm_map_values(Navit._("Tasmania"),"144.0","-45.1","155.3","-24.8", 109169592L, 1),
+ new osm_map_values(Navit._("Victoria")+"+"+Navit._("New South Wales"),"140.7","-39.4","153.7","-26.9", 104820309L, 1),
+ new osm_map_values(Navit._("New Caledonia"),"157.85","-25.05","174.15","-16.85", 54512722L, 1),
+ new osm_map_values(Navit._("New Zealand"),"165.2","-47.6","179.1","-33.7", 68221081L, 1),
+ new osm_map_values(Navit._("Europe"),"-12.97","33.59","34.15","72.10", 3570653608L, 0),
+ new osm_map_values(Navit._("Western Europe"),"-17.6","34.5","42.9","70.9", 3700019849L, 1),
+ new osm_map_values(Navit._("Austria"),"9.4","46.32","17.21","49.1", 289080462L, 1),
+ new osm_map_values(Navit._("Azores"),"-31.62","36.63","-24.67","40.13", 54507108L, 1),
+ new osm_map_values(Navit._("BeNeLux"),"2.08","48.87","7.78","54.52", 656716695L, 1),
+ new osm_map_values(Navit._("Netherlands"),"3.07","50.75","7.23","53.73", 525336576L, 1),
+ new osm_map_values(Navit._("Denmark"),"7.65","54.32","15.58","58.07", 154275079L, 1),
+ new osm_map_values(Navit._("Faroe Islands"),"-7.8","61.3","-6.1","62.5", 54931474L, 1),
+ new osm_map_values(Navit._("France"),"-5.45","42.00","8.44","51.68", 1468741961L, 1),
+ new osm_map_values(Navit._("Alsace"),"6.79","47.27","8.48","49.17", 144023488L, 2),
+ new osm_map_values(Navit._("Aquitaine"),"-2.27","42.44","1.50","45.76", 186786072L, 2),
+ new osm_map_values(Navit._("Auvergne"),"2.01","44.57","4.54","46.85", 118942252L, 2),
+ new osm_map_values(Navit._("Basse-Normandie"),"-2.09","48.13","1.03","49.98", 111940365L, 2),
+ new osm_map_values(Navit._("Bourgogne"),"2.80","46.11","5.58","48.45", 114109115L, 2),
+ new osm_map_values(Navit._("Bretagne"),"-5.58","46.95","-0.96","48.99", 188689862L, 2),
+ new osm_map_values(Navit._("Centre"),"0.01","46.29","3.18","48.99", 208870488L, 2),
+ new osm_map_values(Navit._("Champagne-Ardenne"),"3.34","47.53","5.94","50.28", 112266252L, 2),
+ new osm_map_values(Navit._("Corse"),"8.12","41.32","9.95","43.28", 67997394L, 2),
+ new osm_map_values(Navit._("Franche-Comte"),"5.20","46.21","7.83","48.07", 131236689L, 2),
+ new osm_map_values(Navit._("Haute-Normandie"),"-0.15","48.62","1.85","50.18", 90484736L, 2),
+ new osm_map_values(Navit._("Ile-de-France"),"1.40","48.07","3.61","49.29", 152890366L, 2),
+ new osm_map_values(Navit._("Languedoc-Roussillon"),"1.53","42.25","4.89","45.02", 168413195L, 2),
+ new osm_map_values(Navit._("Limousin"),"0.58","44.87","2.66","46.50", 98422724L, 2),
+ new osm_map_values(Navit._("Lorraine"),"4.84","47.77","7.72","49.73", 137538540L, 2),
+ new osm_map_values(Navit._("Midi-Pyrenees"),"-0.37","42.18","3.50","45.10", 186740619L, 2),
+ new osm_map_values(Navit._("Nord-pas-de-Calais"),"1.42","49.92","4.49","51.31", 145320230L, 2),
+ new osm_map_values(Navit._("Pays-de-la-Loire"),"-2.88","46.20","0.97","48.62", 243736184L, 2),
+ new osm_map_values(Navit._("Picardie"),"1.25","48.79","4.31","50.43", 163238861L, 2),
+ new osm_map_values(Navit._("Poitou-Charentes"),"-1.69","45.04","1.26","47.23", 197886714L, 2),
+ new osm_map_values(Navit._("Provence-Alpes-Cote-d-Azur"),"4.21","42.91","7.99","45.18", 179863755L, 2),
+ new osm_map_values(Navit._("Rhone-Alpes"),"3.65","44.07","7.88","46.64", 201452039L, 2),
+ new osm_map_values(Navit._("Germany"),"5.18","46.84","15.47","55.64", 1187298374L, 1),
+ new osm_map_values(Navit._("Baden-Wuerttemberg"),"7.32","47.14","10.57","49.85", 247149038L, 2),
+ new osm_map_values(Navit._("Bayern"),"8.92","47.22","13.90","50.62", 306577202L, 2),
+ new osm_map_values(Navit._("Mittelfranken"),"9.86","48.78","11.65","49.84", 95916401L, 2),
+ new osm_map_values(Navit._("Niederbayern"),"11.55","47.75","14.12","49.42", 119427776L, 2),
+ new osm_map_values(Navit._("Oberbayern"),"10.67","47.05","13.57","49.14", 147630851L, 2),
+ new osm_map_values(Navit._("Oberfranken"),"10.31","49.54","12.49","50.95", 104963024L, 2),
+ new osm_map_values(Navit._("Oberpfalz"),"11.14","48.71","13.47","50.43", 112413336L, 2),
+ new osm_map_values(Navit._("Schwaben"),"9.27","47.10","11.36","49.09", 126836560L, 2),
+ new osm_map_values(Navit._("Unterfranken"),"8.59","49.16","10.93","50.67", 124601596L, 2),
+ new osm_map_values(Navit._("Berlin"),"13.03","52.28","13.81","52.73", 78189548L, 2),
+ new osm_map_values(Navit._("Brandenburg"),"11.17","51.30","14.83","53.63", 126821283L, 2),
+ new osm_map_values(Navit._("Bremen"),"8.43","52.96","9.04","53.66", 69427370L, 2),
+ new osm_map_values(Navit._("Hamburg"),"9.56","53.34","10.39","53.80", 76388380L, 2),
+ new osm_map_values(Navit._("Hessen"),"7.72","49.34","10.29","51.71", 155980870L, 2),
+ new osm_map_values(Navit._("Mecklenburg-Vorpommern"),"10.54","53.05","14.48","55.05", 92107050L, 2),
+ new osm_map_values(Navit._("Niedersachsen"),"6.40","51.24","11.69","54.22", 288712601L, 2),
+ new osm_map_values(Navit._("Nordrhein-westfalen"),"5.46","50.26","9.52","52.59", 335383638L, 2),
+ new osm_map_values(Navit._("Rheinland-Pfalz"),"6.06","48.91","8.56","51.00", 157909942L, 2),
+ new osm_map_values(Navit._("Saarland"),"6.30","49.06","7.46","49.69", 78579241L, 2),
+ new osm_map_values(Navit._("Sachsen-Anhalt"),"10.50","50.88","13.26","53.11", 115314663L, 2),
+ new osm_map_values(Navit._("Sachsen"),"11.82","50.11","15.10","51.73", 134182818L, 2),
+ new osm_map_values(Navit._("Schleswig-Holstein"),"7.41","53.30","11.98","55.20", 114865543L, 2),
+ new osm_map_values(Navit._("Thueringen"),"9.81","50.15","12.72","51.70", 112896293L, 2),
+ new osm_map_values(Navit._("Germany")+"+"+Navit._("Austria")+"+"+Navit._("Switzerland"),"3.4","44.5","18.6","55.1", 1763000779L, 1),
+ new osm_map_values(Navit._("Iceland"),"-25.3","62.8","-11.4","67.5", 58803839L, 1),
+ new osm_map_values(Navit._("Ireland"),"-11.17","51.25","-5.23","55.9", 74456575L, 1),
+ new osm_map_values(Navit._("Italy"),"6.52","36.38","18.96","47.19", 373215809L, 1),
+ new osm_map_values(Navit._("Spain")+"+"+Navit._("Portugal"),"-11.04","34.87","4.62","44.41", 354839261L, 1),
+ new osm_map_values(Navit._("Mallorca"),"2.2","38.8","4.7","40.2", 66781797L, 2),
+ new osm_map_values(Navit._("Galicia"),"-10.0","41.7","-6.3","44.1", 69081612L, 2),
+ new osm_map_values(Navit._("Scandinavia"),"4.0","54.4","32.1","71.5", 386082513L, 1),
+ new osm_map_values(Navit._("Finland"),"18.6","59.2","32.3","70.3", 167464389L, 1),
+ new osm_map_values(Navit._("Denmark"),"7.49","54.33","13.05","57.88", 142017133L, 1),
+ new osm_map_values(Navit._("Switzerland"),"5.79","45.74","10.59","47.84", 197612725L, 1),
+ new osm_map_values(Navit._("UK"),"-9.7","49.6","2.2","61.2", 308044592L, 1),
+ new osm_map_values(Navit._("England"),"-7.80","48.93","2.41","56.14", 331085897L, 1),
+ new osm_map_values(Navit._("Buckinghamshire"),"-1.19","51.44","-0.43","52.25", 74619627L, 2),
+ new osm_map_values(Navit._("Cambridgeshire"),"-0.55","51.96","0.56","52.79", 71849188L, 2),
+ new osm_map_values(Navit._("Cumbria"),"-3.96","53.85","-2.11","55.24", 71699620L, 2),
+ new osm_map_values(Navit._("East_yorkshire_with_hull"),"-1.16","53.50","0.54","54.26", 68241870L, 2),
+ new osm_map_values(Navit._("Essex"),"-0.07","51.40","1.36","52.14", 82991499L, 2),
+ new osm_map_values(Navit._("Herefordshire"),"-3.19","51.78","-2.29","52.45", 66471962L, 2),
+ new osm_map_values(Navit._("Kent"),"-0.02","50.81","1.65","51.53", 75449128L, 2),
+ new osm_map_values(Navit._("Lancashire"),"-3.20","53.43","-2.00","54.29", 75096621L, 2),
+ new osm_map_values(Navit._("Leicestershire"),"-1.65","52.34","-0.61","53.03", 75492394L, 2),
+ new osm_map_values(Navit._("Norfolk"),"0.10","52.30","2.04","53.41", 71556838L, 2),
+ new osm_map_values(Navit._("Nottinghamshire"),"-1.39","52.73","-0.62","53.55", 72979826L, 2),
+ new osm_map_values(Navit._("Oxfordshire"),"-1.77","51.41","-0.82","52.22", 73351886L, 2),
+ new osm_map_values(Navit._("Shropshire"),"-3.29","52.26","-2.18","53.05", 69144272L, 2),
+ new osm_map_values(Navit._("Somerset"),"-3.89","50.77","-2.20","51.40", 72098176L, 2),
+ new osm_map_values(Navit._("South yorkshire"),"-1.88","53.25","-0.80","53.71", 72594920L, 2),
+ new osm_map_values(Navit._("Suffolk"),"0.29","51.88","1.81","52.60", 72985880L, 2),
+ new osm_map_values(Navit._("Surrey"),"-0.90","51.02","0.10","51.52", 79850137L, 2),
+ new osm_map_values(Navit._("Wiltshire"),"-2.41","50.90","-1.44","51.76", 71244578L, 2),
+ new osm_map_values(Navit._("Scotland"),"-8.13","54.49","-0.15","61.40", 102111248L, 2),
+ new osm_map_values(Navit._("Wales"),"-5.56","51.28","-2.60","53.60", 84860075L, 2),
+ new osm_map_values(Navit._("Albania"),"19.09","39.55","21.12","42.72", 71097966L, 1),
+ new osm_map_values(Navit._("Belarus"),"23.12","51.21","32.87","56.23", 100471644L, 1),
+ new osm_map_values(Navit._("Russia"),"27.9","41.5","190.4", "77.6", 508559360L, 1),
+ new osm_map_values(Navit._("Bulgaria"),"24.7","42.1","24.8","42.1", 62211433L, 1),
+ new osm_map_values(Navit._("Bosnia-Herzegovina"),"15.69","42.52","19.67","45.32", 75756822L, 1),
+ new osm_map_values(Navit._("Czech Republic"),"11.91","48.48","19.02","51.17", 288911729L, 1),
+ new osm_map_values(Navit._("Croatia"),"13.4","42.1","19.4","46.9", 118479986L, 1),
+ new osm_map_values(Navit._("Estonia"),"21.5","57.5","28.2","59.6", 86149958L, 1),
+ new osm_map_values(Navit._("Greece"),"28.9","37.8","29.0","37.8", 59191120L, 1),
+ new osm_map_values(Navit._("Crete"),"23.3","34.5","26.8","36.0", 61121443L, 1),
+ new osm_map_values(Navit._("Hungary"),"16.08","45.57","23.03","48.39", 129046944L, 1),
+ new osm_map_values(Navit._("Latvia"),"20.7","55.6","28.3","58.1", 81683354L, 1),
+ new osm_map_values(Navit._("Lithuania"),"20.9","53.8","26.9","56.5", 77228922L, 1),
+ new osm_map_values(Navit._("Poland"),"13.6","48.8","24.5","55.0", 331299544L, 1),
+ new osm_map_values(Navit._("Romania"),"20.3","43.5","29.9","48.4", 150011857L, 1),
+ new osm_map_values(Navit._("North America"),"-178.1","6.5","-10.4","84.0", 2738147321L, 0),
+ new osm_map_values(Navit._("Alaska"),"-179.5","49.5","-129","71.6", 72413728L, 1),
+ new osm_map_values(Navit._("Canada"),"-141.3","41.5","-52.2","70.2", 1125713287L, 1),
+ new osm_map_values(Navit._("Hawaii"),"-161.07","18.49","-154.45","22.85", 57463829L, 1),
+ new osm_map_values(Navit._("USA")+Navit._(" (except Alaska and Hawaii)"),"-125.4","24.3","-66.5","49.3", 2356238167L, 1),
+ new osm_map_values(Navit._("Midwest"),"-104.11","35.92","-80.46","49.46", 663062321L, 2),
+ new osm_map_values(Navit._("Michigan"),"-90.47","41.64","-79.00","49.37", 207416918L, 2),
+ new osm_map_values(Navit._("Ohio"),"-84.87","38.05","-79.85","43.53", 143571732L, 2),
+ new osm_map_values(Navit._("Northeast"),"-80.58","38.72","-66.83","47.53", 517925445L, 2),
+ new osm_map_values(Navit._("Massachusetts"),"-73.56","40.78","-68.67","42.94", 159493455L, 2),
+ new osm_map_values(Navit._("Vermont"),"-73.49","42.68","-71.41","45.07", 74308439L, 2),
+ new osm_map_values(Navit._("Pacific"),"-180.05","15.87","-129.75","73.04", 78496182L, 2),
+ new osm_map_values(Navit._("South"),"-106.70","23.98","-71.46","40.70", 1135650708L, 2),
+ new osm_map_values(Navit._("Arkansas"),"-94.67","32.95","-89.59","36.60", 89637645L, 2),
+ new osm_map_values(Navit._("District of Columbia"),"-77.17","38.74","-76.86","39.05", 64042148L, 2),
+ new osm_map_values(Navit._("Florida"),"-88.75","23.63","-77.67","31.05", 118647388L, 2),
+ new osm_map_values(Navit._("Louisiana"),"-94.09","28.09","-88.62","33.07", 136435773L, 2),
+ new osm_map_values(Navit._("Maryland"),"-79.54","37.83","-74.99","40.22", 134152161L, 2),
+ new osm_map_values(Navit._("Mississippi"),"-91.71","29.99","-88.04","35.05", 100291749L, 2),
+ new osm_map_values(Navit._("Oklahoma"),"-103.41","33.56","-94.38","37.38", 106601625L, 2),
+ new osm_map_values(Navit._("Texas"),"-106.96","25.62","-92.97","36.58", 220587321L, 2),
+ new osm_map_values(Navit._("Virginia"),"-83.73","36.49","-74.25","39.52", 218627122L, 2),
+ new osm_map_values(Navit._("West Virginia"),"-82.70","37.15","-77.66","40.97", 133830267L, 2),
+ new osm_map_values(Navit._("West"),"-133.11","31.28","-101.99","49.51", 616041200L, 2),
+ new osm_map_values(Navit._("Arizona"),"-114.88","30.01","-108.99","37.06", 89434673L, 2),
+ new osm_map_values(Navit._("California"),"-125.94","32.43","-114.08","42.07", 303663259L, 2),
+ new osm_map_values(Navit._("Colorado"),"-109.11","36.52","-100.41","41.05", 132835514L, 2),
+ new osm_map_values(Navit._("Idaho"),"-117.30","41.93","-110.99","49.18", 97305030L, 2),
+ new osm_map_values(Navit._("Montana"),"-116.10","44.31","-102.64","49.74", 93935496L, 2),
+ new osm_map_values(Navit._("New Mexico"),"-109.10","26.98","-96.07","37.05", 185648327L, 2),
+ new osm_map_values(Navit._("Nevada"),"-120.2","35.0","-113.8","42.1", 138055868L, 2),
+ new osm_map_values(Navit._("Oregon"),"-124.8","41.8","-116.3","46.3", 103551459L, 2),
+ new osm_map_values(Navit._("Utah"),"-114.11","36.95","-108.99","42.05", 78249845L, 2),
+ new osm_map_values(Navit._("Washington State"),"-125.0","45.5","-116.9","49.0", 100601625L, 2),
+ new osm_map_values(Navit._("South+Middle America"),"-83.5","-56.3","-30.8","13.7", 204217202L, 0),
+ new osm_map_values(Navit._("Argentina"),"-73.9","-57.3","-51.6","-21.0", 105910515L, 1),
+ new osm_map_values(Navit._("Argentina")+"+"+Navit._("Chile"),"-77.2","-56.3","-52.7","-16.1", 111585063L, 1),
+ new osm_map_values(Navit._("Bolivia"),"-70.5","-23.1","-57.3","-9.3", 59215113L, 1),
+ new osm_map_values(Navit._("Brazil"),"-71.4","-34.7","-32.8","5.4", 127279780L, 1),
+ new osm_map_values(Navit._("Chile"),"-81.77","-58.50","-65.46","-17.41", 84808355L, 1),
+ new osm_map_values(Navit._("Cuba"),"-85.3","19.6","-74.0","23.6", 57704852L, 1),
+ new osm_map_values(Navit._("Colombia"),"-79.1","-4.0","-66.7","12.6", 85701114L, 1),
+ new osm_map_values(Navit._("Ecuador"),"-82.6","-5.4","-74.4","2.3", 63453353L, 1),
+ new osm_map_values(Navit._("Guyana")+"+"+Navit._("Suriname")+"+"+Navit._("Guyane Francaise"),"-62.0","1.0","-51.2","8.9", 57226004L, 1),
+ new osm_map_values(Navit._("Haiti")+"+"+Navit._("Republica Dominicana"),"-74.8","17.3","-68.2","20.1", 63826780L, 1),
+ new osm_map_values(Navit._("Jamaica"),"-78.6","17.4","-75.9","18.9", 53888545L, 1),
+ new osm_map_values(Navit._("Mexico"),"-117.6","14.1","-86.4","32.8", 258877491L, 1),
+ new osm_map_values(Navit._("Paraguay"),"-63.8","-28.1","-53.6","-18.8", 60539032L, 1),
+ new osm_map_values(Navit._("Peru"),"-82.4","-18.1","-67.5","0.4", 71286591L, 1),
+ new osm_map_values(Navit._("Uruguay"),"-59.2","-36.5","-51.7","-29.7", 64850903L, 1),
+ new osm_map_values(Navit._("Venezuela"),"-73.6","0.4","-59.7","12.8", 74521456L, 1)
};
public static final String MAP_FILENAME_PATH = Navit.MAP_FILENAME_PATH;
@@ -330,7 +330,7 @@
private static final int MAP_WRITE_FILE_BUFFER = 1024 * 64;
private static final int MAP_WRITE_MEM_BUFFER = 1024 * 64;
private static final int MAP_READ_FILE_BUFFER = 1024 * 64;
- private static final int UPDATE_PROGRESS_TIME_NS = 1000 * 1000000; // 1ns=10⁻⁹s
+ private static final int UPDATE_PROGRESS_TIME_NS = 1000 * 1000000; // 1ns=1E-9s
private static final int MAX_RETRIES = 5;
private static final String TAG = "NavitMapDownloader";
@@ -345,7 +345,7 @@
retry_counter = 0;
Log.v(TAG, "start download " + map_values.map_name);
- updateProgress(0, 20, Navit.get_text("downloading") + ": " + map_values.map_name);
+ updateProgress(0, 20, Navit._("downloading") + ": " + map_values.map_name);
boolean success;
do {
@@ -360,7 +360,7 @@
&& !stop_me);
if (success) {
- toast(map_values.map_name + " " + Navit.get_text("ready"));
+ toast(map_values.map_name + " " + Navit._("ready"));
Log.d(TAG, "success");
}
@@ -383,7 +383,7 @@
if (free_space < needed_bytes ) {
Log.e(TAG, "Not enough free space. Please free at least " + needed_bytes / 1024 /1024 + "Mb.");
- updateProgress(free_space, needed_bytes, Navit.get_text("Error downloading map!") + "\n" + Navit.get_text("Not enough free space"));
+ updateProgress(free_space, needed_bytes, Navit._("Error downloading map!") + "\n" + Navit._("Not enough free space"));
return false;
}
return true;
@@ -585,11 +585,11 @@
if (deleteMap()) {
enableRetry();
} else {
- updateProgress(already_read, real_size_bytes, Navit.get_text("Error downloading map!") + "\n"
- + Navit.get_text("Not enough free space"));
+ updateProgress(already_read, real_size_bytes, Navit._("Error downloading map!") + "\n"
+ + Navit._("Not enough free space"));
}
} else {
- updateProgress(already_read, real_size_bytes, Navit.get_text("Error writing map!"));
+ updateProgress(already_read, real_size_bytes, Navit._("Error writing map!"));
}
return false;
@@ -597,7 +597,7 @@
}
if (stop_me) {
- toast(Navit.get_text("Map download aborted!"));
+ toast(Navit._("Map download aborted!"));
} else if ( already_read < real_size_bytes ) {
Log.d(TAG, "Server send only " + already_read + " bytes of " + real_size_bytes);
enableRetry();
@@ -608,7 +608,7 @@
Log.d(TAG, "Error: " + e);
enableRetry();
- updateProgress(already_read, real_size_bytes, Navit.get_text("Error downloading map!"));
+ updateProgress(already_read, real_size_bytes, Navit._("Error downloading map!"));
}
return success;
@@ -650,9 +650,9 @@
eta_string = eta_seconds + " s";
}
String info =
- String.format("%s: %s\n %dMb / %dMb\n %.1f kb/s %s: %s", Navit.get_text("downloading")
+ String.format("%s: %s\n %dMb / %dMb\n %.1f kb/s %s: %s", Navit._("downloading")
, map_values.map_name, readBytes / 1024 / 1024, maxBytes / 1024 / 1024,
- per_second_overall / 1024f, Navit.get_text("ETA"), eta_string);
+ per_second_overall / 1024f, Navit._("ETA"), eta_string);
if (retry_counter > 0) {
info += "\n Retry " + retry_counter + "/" + MAX_RETRIES;
@@ -665,7 +665,7 @@
}
protected void updateProgress(long positionBytes, long maximumBytes, String infoText) {
- NavitDialogs.sendDialogMessage(NavitDialogs.MSG_PROGRESS_BAR, Navit.get_text("Mapdownload"), infoText
+ NavitDialogs.sendDialogMessage(NavitDialogs.MSG_PROGRESS_BAR, Navit._("Map download"), infoText
, NavitDialogs.DIALOG_MAPDOWNLOAD, (int) (maximumBytes / 1024),
(int) (positionBytes / 1024));
}
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitTextTranslations.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitTextTranslations.java 2013-08-26 08:01:42 UTC (rev 5602)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitTextTranslations.java 2013-08-26 19:13:09 UTC (rev 5603)
@@ -36,7 +36,7 @@
Log.e("NavitTextTranslations", "initializing translated text ...");
String k = null;
String[] v = null;
-
+/*
k = "exit navit";
v = new String[]{"en", "Exit Navit", "de", "Navit beenden", "nl", "Navit afsluiten", "fr","Quittez Navit"};
p(k, v);
@@ -61,15 +61,15 @@
v = new String[]{"en", "downloading"};
p(k, v);
- k = "Downloaded Maps";
- v = new String[]{"en", "Downloaded Maps", "de", "Heruntergeladene Karten", "nl", "Gedownloade kaarten", "fr","Cartes téléchargées" };
+ k = "Downloaded maps";
+ v = new String[]{"en", "Downloaded maps", "de", "Heruntergeladene Karten", "nl", "Gedownloade kaarten", "fr","Cartes téléchargées" };
p(k, v);
k = "ETA";
v = new String[]{"en", "ETA", "de", "fertig in"};
p(k, v);
- k = "Error downloading map!";
+ k = "Error downloading map";
v = new String[]{"en", "Error downloading map!", "de", "Fehler beim Kartendownload"};
p(k, v);
@@ -132,7 +132,7 @@
k = "towns";
v = new String[]{"en", "Towns", "de", "Städte"};
p(k, v);
-
+*/
Log.e("NavitTextTranslations", "... ready");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2013-08-26 08:01:47
|
Revision: 5602
http://sourceforge.net/p/navit/code/5602
Author: martin-s
Date: 2013-08-26 08:01:42 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Fix:map_binfile:Correctly use house number index if present
Modified Paths:
--------------
trunk/navit/navit/map/binfile/binfile.c
Modified: trunk/navit/navit/map/binfile/binfile.c
===================================================================
--- trunk/navit/navit/map/binfile/binfile.c 2013-08-26 07:20:00 UTC (rev 5601)
+++ trunk/navit/navit/map/binfile/binfile.c 2013-08-26 08:01:42 UTC (rev 5602)
@@ -2084,7 +2084,9 @@
msp->map=map;
msp->mr_item = map_rect_new_binfile(map, NULL);
msp->item = map_rect_get_item_byid_binfile(msp->mr_item, item->id_hi, item->id_lo);
- if (binmap_search_by_index(map, msp->item, &msp->mr) != 3) {
+ if (binmap_search_by_index(map, msp->item, &msp->mr))
+ msp->mode = 1;
+ else {
struct coord c;
if (item_coord_get(msp->item, &c, 1))
{
@@ -2096,9 +2098,9 @@
msp->parent_name=g_strdup(attr.u.str);
dbg(0,"pn=%s\n",msp->parent_name);
}
- map_rect_destroy_binfile(msp->mr_item);
- msp->mr_item=NULL;
}
+ map_rect_destroy_binfile(msp->mr_item);
+ msp->mr_item=NULL;
if (!msp->mr)
{
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2013-08-26 07:20:04
|
Revision: 5601
http://sourceforge.net/p/navit/code/5601
Author: martin-s
Date: 2013-08-26 07:20:00 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Fix:Core:Fix znear-clipping in 3d mode
Modified Paths:
--------------
trunk/navit/navit/transform.c
Modified: trunk/navit/navit/transform.c
===================================================================
--- trunk/navit/navit/transform.c 2013-08-25 12:19:45 UTC (rev 5600)
+++ trunk/navit/navit/transform.c 2013-08-26 07:20:00 UTC (rev 5601)
@@ -459,7 +459,7 @@
transform_z_clip(struct coord_3d c, struct coord_3d c_old, int zlimit)
{
struct coord_3d result;
- float clip_factor = (zlimit-c.z)/(c_old.z-c.z);
+ float clip_factor = ((float)zlimit-c.z)/(c_old.z-c.z);
dbg(3,"in (%d,%d,%d) - (%d,%d,%d)\n", c.x,c.y,c.z, c_old.x,c_old.y,c_old.z);
result.x=c.x+(c_old.x-c.x)*clip_factor;
result.y=c.y+(c_old.y-c.y)*clip_factor;
@@ -533,10 +533,12 @@
dbg(3,"count=%d\n", count);
for (i=0; i < count; i++) {
dbg(3, "input coord %d: (%d, %d)\n", i, input[i].x, input[i].y);
+#if 0 /* doesn't work as wanted */
if (i && input[i].x == input[0].x && input[i].y == input[0].y && result_idx && !width_result) {
result[result_idx++]=result[0];
continue;
}
+#endif
projected_coord = transform_correct_projection(t, required_projection, input[i]);
shifted_coord = transform_shift_by_center_and_scale(t, projected_coord);
rotated_coord = transform_rotate(t, shifted_coord);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2013-08-25 12:19:48
|
Revision: 5600
http://sourceforge.net/p/navit/code/5600
Author: mdankov
Date: 2013-08-25 12:19:45 +0000 (Sun, 25 Aug 2013)
Log Message:
-----------
Fix:core:Fix strings.xml coversion during autotools build.
Modified Paths:
--------------
trunk/navit/po/Makefile.am
Modified: trunk/navit/po/Makefile.am
===================================================================
--- trunk/navit/po/Makefile.am 2013-08-24 20:07:02 UTC (rev 5599)
+++ trunk/navit/po/Makefile.am 2013-08-25 12:19:45 UTC (rev 5600)
@@ -51,8 +51,8 @@
# Trick gettext to get translateable strings out of android/strings.xml
-$(top_builddir)/navit/strings.c: $(top_srcdir)/navit/android/res/values/strings.xml
- sed -e "s/\\\\'/'/g" -e 's%.*<string[^>]*name="\(.*\)">\(.*\)</string>%// Android resource: @strings/\1\n_("\2")%g' -e '\%^//%!d'<$(top_srcdir)/navit/android/res/values/strings.xml >$(top_builddir)/navit/strings.c
+$(top_builddir)/navit/strings.c: $(abs_top_srcdir)/navit/android/res/values/strings.xml
+ sed -e "s/\\\\'/'/g" -e 's%.*<string[^>]*name="\(.*\)">\(.*\)</string>%// Android resource: @strings/\1\n_("\2")%g' -e '\%^//%!d'<$(abs_top_srcdir)/navit/android/res/values/strings.xml >$(top_builddir)/navit/strings.c
@POFILES@: navit.pot
sed 's/^"Project-Id-Version:.*/"Project-Id-Version: $(PACKAGE_STRING)\\n"/' < $(top_srcdir)/po/$@.in | $(MSGMERGE) --no-fuzzy-matching --verbose -o $(top_builddir)/po/$@ - navit.pot
@@ -88,7 +88,7 @@
done
distclean-local:
- rm -f $(top_builddir)/navit/navit_shipped.glade $(top_builddir)/navit/navit_shipped.c
+ rm -f $(top_builddir)/navit/navit_shipped.glade $(top_builddir)/navit/navit_shipped.c $(top_builddir)/navit/strings.c
for n in $(CATALOGS) __DuMmY ; do \
if test "$$n" -a "$$n" != "__DuMmY" ; then \
l=`basename $$n .mo`; \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2013-08-24 20:07:09
|
Revision: 5599
http://sourceforge.net/p/navit/code/5599
Author: mdankov
Date: 2013-08-24 20:07:02 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
Add:port_android:Build localized Android string resources from gettext db.
Modified Paths:
--------------
trunk/navit/CMakeLists.txt
trunk/navit/navit/CMakeLists.txt
trunk/navit/navit/Makefile.am
trunk/navit/navit/android/CMakeLists.txt
trunk/navit/navit/android/res/values/strings.xml
Added Paths:
-----------
trunk/navit/cmake/strings_xml_parser.cmake
trunk/navit/navit/android/po2xml.xslt
trunk/navit/navit/android/res/values/strings-dont-translate.xml
Removed Paths:
-------------
trunk/navit/navit/android/res/values-de/
trunk/navit/navit/android/res/values-fr/
trunk/navit/navit/android/res/values-nl/
Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt 2013-08-24 19:40:32 UTC (rev 5598)
+++ trunk/navit/CMakeLists.txt 2013-08-24 20:07:02 UTC (rev 5599)
@@ -420,6 +420,14 @@
if (NOT SAXON_ERROR)
set (XSLT_PROCESSOR_OPTIONS -snone)
endif()
+ # additional parameter is passed to the stylesheet processor as transformation parameter
+ macro(compose_xslt_transform_command CMDVAR XSLT_FILE SRC_XML DEST_XML)
+ if(${XSLT_PROCESSOR} MATCHES "xsltproc")
+ set(${CMDVAR} COMMAND ${XSLT_PROCESSOR} ${XSLT_PROCESSOR_OPTIONS} ${XSLT_FILE} ${SRC_XML} >${DEST_XML})
+ else()
+ set(${CMDVAR} COMMAND ${XSLT_PROCESSOR} ${XSLT_PROCESSOR_OPTIONS} ${SRC_XML} ${XSLT_FILE} ${ARGN} >${DEST_XML})
+ endif()
+ endmacro()
else()
cfg_feature(XSL_PROCESSING "Saxon missing" FALSE)
endif(XSLT_PROCESSOR)
Added: trunk/navit/cmake/strings_xml_parser.cmake
===================================================================
--- trunk/navit/cmake/strings_xml_parser.cmake (rev 0)
+++ trunk/navit/cmake/strings_xml_parser.cmake 2013-08-24 20:07:02 UTC (rev 5599)
@@ -0,0 +1,10 @@
+file(STRINGS "${SRC}" TEXT_LINES REGEX "<string[ \t]+name=")
+file(WRITE ${DST} "// Strings from android/res/values/strings.xml\n\n")
+
+foreach (LINE ${TEXT_LINES})
+ string(REGEX REPLACE ".*<string[^>]+>(.*)</string>.*" "\\1" MSGID ${LINE})
+ string(REGEX REPLACE "\\\\'" "'" MSGID ${MSGID})
+ string(REGEX REPLACE ".*<string[^>]+name=\"([^>\"]+)\">.*</string>.*" "\\1" RESID ${LINE})
+ file(APPEND ${DST} "// Android resource: @strings/${RESID}\n_(\"${MSGID}\")\n")
+endforeach()
+
Modified: trunk/navit/navit/CMakeLists.txt
===================================================================
--- trunk/navit/navit/CMakeLists.txt 2013-08-24 19:40:32 UTC (rev 5598)
+++ trunk/navit/navit/CMakeLists.txt 2013-08-24 20:07:02 UTC (rev 5599)
@@ -123,14 +123,11 @@
if(XSL_PROCESSING AND XSLTS)
string(REPLACE "," ";" XSLTS "${XSLTS}")
foreach(tmp ${XSLTS})
- set (XSLT_FILE "${PROJECT_SOURCE_DIR}/navit/xslt/${tmp}.xslt")
+ set(XSLT_FILE "${PROJECT_SOURCE_DIR}/navit/xslt/${tmp}.xslt")
list(APPEND XSLT_FILES "${XSLT_FILE}")
list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E echo Applying ${tmp}.xslt)
- if(${XSLT_PROCESSOR} MATCHES "xsltproc")
- list(APPEND XSLT_COMMANDS COMMAND ${XSLT_PROCESSOR} ${XSLT_PROCESSOR_OPTIONS} ${XSLT_FILE} ${DEST_XML} > ${DEST_XML}.tmp)
- else()
- list(APPEND XSLT_COMMANDS COMMAND ${XSLT_PROCESSOR} ${XSLT_PROCESSOR_OPTIONS} ${DEST_XML} ${XSLT_FILE} ${ARGN} > ${DEST_XML}.tmp)
- endif()
+ compose_xslt_transform_command(CMD "${XSLT_FILE}" "${DEST_XML}" "${DEST_XML}.tmp" "${ARGN}")
+ list(APPEND XSLT_COMMANDS ${CMD})
list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E rename ${DEST_XML}.tmp ${DEST_XML})
endforeach()
endif()
Modified: trunk/navit/navit/Makefile.am
===================================================================
--- trunk/navit/navit/Makefile.am 2013-08-24 19:40:32 UTC (rev 5598)
+++ trunk/navit/navit/Makefile.am 2013-08-24 20:07:02 UTC (rev 5599)
@@ -126,6 +126,8 @@
cp .libs/*.so android/libs/armeabi/libnavit.so
for i in */*/.libs/*.so ; do sed 's&lib_data_data_org\.navitproject\.navit_lib_&/data/data/org.navitproject.navit/lib/lib&' <$$i >android/libs/armeabi/$$(basename $$i); done
+ for i in $(shell cd $(srcdir)/../po && echo ??_*.po.in ??.po.in); do echo Gnerating strings.xml from $$i ; mkdir -p $(builddir)/android/res/values-$$(echo $$i | sed -e s/\\.po\\.in// -e s/_/-r/) ; @SAXON@ $(srcdir)/android/res/values/strings.xml $(srcdir)/android/po2xml.xslt po_file=$(abs_top_srcdir)/po/$$i >$(builddir)/android/res/values-$$(echo $$i | sed -e s/\\.po\\.in// -e s/_/-r/)/strings.xml ; done
+
mkdir -p android/res/drawable-ldpi
mkdir -p android/res/drawable-mdpi
mkdir -p android/res/drawable-hdpi
Modified: trunk/navit/navit/android/CMakeLists.txt
===================================================================
--- trunk/navit/navit/android/CMakeLists.txt 2013-08-24 19:40:32 UTC (rev 5598)
+++ trunk/navit/navit/android/CMakeLists.txt 2013-08-24 20:07:02 UTC (rev 5599)
@@ -6,6 +6,25 @@
set(ANDROID_PERMISSIONS_EXPANDED "${ANDROID_PERMISSIONS_EXPANDED}<uses-permission\tandroid:name=\\\"android.permission.${PERMISSION}\\\"/>" )
endforeach()
+ # Generate Android string resource files from gettext .po.in files.
+ # Note: Android language resources should have two letter ISO 639-1 code, and, optionally, iso-3166-1-alpha-2 region code,
+ # so we skip all translation files which do not conform these requirements.
+ FILE(GLOB POIN_FILES1 RELATIVE ${CMAKE_SOURCE_DIR}/po "${CMAKE_SOURCE_DIR}/po/??.po.in")
+ FILE(GLOB POIN_FILES2 RELATIVE ${CMAKE_SOURCE_DIR}/po "${CMAKE_SOURCE_DIR}/po/??_??.po.in")
+ set(POIN_FILES ${POIN_FILES1} ${POIN_FILES2})
+ foreach (POIN_FILE ${POIN_FILES})
+ string(REPLACE ".po.in" "" LANG ${POIN_FILE})
+ string(REPLACE "_" "-r" LANG ${LANG})
+ set(LANG_RESOURCES ${LANG_RESOURCES} "${CMAKE_CURRENT_BINARY_DIR}/res/values-${LANG}/strings.xml")
+ compose_xslt_transform_command(TRANS "${CMAKE_CURRENT_SOURCE_DIR}/po2xml.xslt" "${CMAKE_CURRENT_SOURCE_DIR}/res/values/strings.xml" "${CMAKE_CURRENT_BINARY_DIR}/res/values-${LANG}/strings.xml" "po_file=${CMAKE_SOURCE_DIR}/po/${POIN_FILE}")
+ ADD_CUSTOM_COMMAND(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/res/values-${LANG}/strings.xml"
+ DEPENDS "${CMAKE_BINARY_DIR}/po/navit.pot" "${CMAKE_SOURCE_DIR}/po/${POIN_FILE}" "${CMAKE_CURRENT_SOURCE_DIR}/po2xml.xslt" "${CMAKE_CURRENT_SOURCE_DIR}/res/values/strings.xml"
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res/values-${LANG}
+ ${TRANS}
+ )
+ endforeach(POIN_FILE ${POIN_FILES})
+
add_custom_command (
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/AndroidManifest.xml
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.cmake
@@ -28,7 +47,7 @@
)
add_custom_target( android_resources
- DEPENDS build.xml ${MODULES_NAME} ${NAVIT_SUPPORT_LIBS}
+ DEPENDS build.xml ${MODULES_NAME} ${NAVIT_SUPPORT_LIBS} ${LANG_RESOURCES}
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res/raw/
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH}
COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/navit/libnavit.so ${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH}/
Added: trunk/navit/navit/android/po2xml.xslt
===================================================================
--- trunk/navit/navit/android/po2xml.xslt (rev 0)
+++ trunk/navit/navit/android/po2xml.xslt 2013-08-24 20:07:02 UTC (rev 5599)
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:po2xml="http://example.com/namespace" exclude-result-prefixes="po2xml">
+<xsl:param name="po_file"/>
+<xsl:output method="xml" indent="yes" encoding="utf-8"/>
+
+<xsl:function name="po2xml:escape">
+ <xsl:param name="str" />
+ <xsl:sequence select="replace($str,concat('(',codepoints-to-string(39),')'),'\\$1')" />
+</xsl:function>
+
+<xsl:template match="/">
+ <resources>
+ <xsl:variable name="r" select="." />
+ <xsl:for-each select="tokenize(replace(unparsed-text($po_file),'\r',''), '\n+\n')">
+ <xsl:analyze-string regex="(.*\n)?msgid "(.*)"\nmsgstr "(.*)"$" select="." flags="s">
+ <xsl:matching-substring>
+ <xsl:variable name="comment" select="replace(regex-group(1),'#','')" />
+ <xsl:variable name="msgid" select="po2xml:escape(replace(regex-group(2),'"\n"','','s'))" />
+ <xsl:variable name="msgstr" select="po2xml:escape(replace(regex-group(3),'"\n"','','s'))" />
+ <xsl:variable name="resname" select="$r/resources/string[text()=$msgid]/@name" />
+ <xsl:choose>
+ <xsl:when test="$msgid!='' and $msgstr!='' and $resname!=''">
+ <xsl:choose>
+ <xsl:when test="$comment!=''">
+ <xsl:comment select="$comment"/>
+ </xsl:when>
+ </xsl:choose>
+ <string>
+ <xsl:attribute name='name'><xsl:value-of select="$resname"/></xsl:attribute>
+ <xsl:value-of select="$msgstr"/>
+ </string>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:matching-substring>
+ </xsl:analyze-string>
+ </xsl:for-each>
+ </resources>
+</xsl:template>
+</xsl:transform>
+
Copied: trunk/navit/navit/android/res/values/strings-dont-translate.xml (from rev 5562, trunk/navit/navit/android/res/values/strings.xml)
===================================================================
--- trunk/navit/navit/android/res/values/strings-dont-translate.xml (rev 0)
+++ trunk/navit/navit/android/res/values/strings-dont-translate.xml 2013-08-24 20:07:02 UTC (rev 5599)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <!-- LANG=en -->
+ <!-- GENERIC -->
+ <string name="app_name">Navit</string>
+ <string name="map_data_copyright">© OpenStreetMap contributors</string>
+ <string name="url_wiki_android">http://wiki.navit-project.org/index.php/Navit_on_Android</string>
+ <string name="url_wiki_main">http://wiki.navit-project.org</string>
+
+ <!-- NOTIFICATION -->
+ <string name="notification_name">@string/app_name</string>
+
+ <!-- OPTIONS MENU -->
+ <string name="optionsmenu_address_search">@string/address_search_title</string>
+
+ <!-- Backup Restore -->
+ <string-array name="dialog_backup_restore_items">
+ <item >@string/backup</item>
+ <item >@string/restore</item>
+ </string-array>
+</resources>
+
Modified: trunk/navit/navit/android/res/values/strings.xml
===================================================================
--- trunk/navit/navit/android/res/values/strings.xml 2013-08-24 19:40:32 UTC (rev 5598)
+++ trunk/navit/navit/android/res/values/strings.xml 2013-08-24 20:07:02 UTC (rev 5599)
@@ -2,21 +2,16 @@
<resources>
<!-- LANG=en -->
<!-- GENERIC -->
- <string name="app_name">Navit</string>
- <string name="map_data_copyright">CC-BY-SA OpenStreetMap Project</string>
- <string name="url_wiki_android">http://wiki.navit-project.org/index.php/Navit_on_Android</string>
- <string name="url_wiki_main">http://wiki.navit-project.org</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<!-- NOTIFICATION -->
- <string name="notification_name">@string/app_name</string>
<string name="notification_ticker">Navit started</string>
<string name="notification_event_default">Navit running</string>
<!-- INITIAL INFOBOX -->
<string name="initial_info_box_title">Welcome to Navit</string>
- <string name="initial_info_box_message">Thank you for installing Navit!\n\nTo start, select \"Download maps\" from the menu to download a map. Note: The map filesize may be large (>50MB) - a wifi connection is recommended.\n\nMapdata: CC-BY-SA OpenStreetMap Project\n\nEnjoy Navit!</string>
+ <string name="initial_info_box_message">Thank you for installing Navit!\n\nTo start, select \"Download maps\" from the menu to download a map. Note: The map filesize may be large (>50MB) - a wifi connection is recommended.\n\nMapdata: (c) OpenStreetMap contributors\n\nEnjoy Navit!</string>
<string name="initial_info_box_OK">OK</string>
<string name="initial_info_box_more_info">More info</string>
@@ -26,7 +21,6 @@
<string name="optionsmenu_zoom_out">Zoom out</string>
<string name="optionsmenu_download_maps">Download maps</string>
<string name="optionsmenu_toggle_poi">Toggle POIs</string>
- <string name="optionsmenu_address_search">@string/address_search_title</string>
<string name="optionsmenu_exit_navit">Exit Navit</string>
<string name="optionsmenu_backup_restore">Backup / Restore</string>
@@ -51,7 +45,7 @@
<string name="address_enter_destination">Enter destination</string>
<string name="address_partial_match">Match partial address</string>
<string name="address_search_button">Search</string>
- <string name="address_search_searching">Searching#8230;</string>
+ <string name="address_search_searching">Searching...</string>
<string name="address_search_not_found">Address not found</string>
<string name="address_search_getting_results">Getting search results</string>
<string name="address_search_loading_results">Loading search results</string>
@@ -77,9 +71,5 @@
<string name="select_backup">Select backup</string>
<string name="backup">Backup</string>
<string name="restore">Restore</string>
- <string-array name="dialog_backup_restore_items">
- <item >@string/backup</item>
- <item >@string/restore</item>
- </string-array>
</resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2013-08-24 19:40:36
|
Revision: 5598
http://sourceforge.net/p/navit/code/5598
Author: mdankov
Date: 2013-08-24 19:40:32 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
Add:core:Update gettext db with translations pulled from Android string resources.
Modified Paths:
--------------
trunk/navit/po/CMakeLists.txt
trunk/navit/po/Makefile.am
trunk/navit/po/af.po.in
trunk/navit/po/ar.po.in
trunk/navit/po/ast.po.in
trunk/navit/po/bg.po.in
trunk/navit/po/ca.po.in
trunk/navit/po/cs.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_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/fi.po.in
trunk/navit/po/fo.po.in
trunk/navit/po/fr.po.in
trunk/navit/po/fr_CH.po.in
trunk/navit/po/gl.po.in
trunk/navit/po/he.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/lt.po.in
trunk/navit/po/lv.po.in
trunk/navit/po/mk.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/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/sk.po.in
trunk/navit/po/sl.po.in
trunk/navit/po/sr.po.in
trunk/navit/po/sv.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/CMakeLists.txt
===================================================================
--- trunk/navit/po/CMakeLists.txt 2013-08-24 18:24:59 UTC (rev 5597)
+++ trunk/navit/po/CMakeLists.txt 2013-08-24 19:40:32 UTC (rev 5598)
@@ -23,6 +23,7 @@
${PROJECT_SOURCE_DIR}/navit/gui/internal/gui_internal_widget.c
${PROJECT_SOURCE_DIR}/navit/osd/core/osd_core.c
${CMAKE_CURRENT_BINARY_DIR}/navit_shipped.c
+ ${CMAKE_CURRENT_BINARY_DIR}/strings_xml.c
)
if (XGETTEXT_GLADE)
list(APPEND POTFILES ${CMAKE_CURRENT_BINARY_DIR}/navit_shipped.glade)
@@ -44,7 +45,17 @@
-P ${PROJECT_SOURCE_DIR}/cmake/navit_xml_parser_glade.cmake
)
+# Trick gettext to get translateable strings out of android strings.xml
+
ADD_CUSTOM_COMMAND(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/strings_xml.c
+ DEPENDS ${PROJECT_SOURCE_DIR}/navit/android/res/values/strings.xml
+ COMMAND ${CMAKE_COMMAND} -D SRC=${PROJECT_SOURCE_DIR}/navit/android/res/values/strings.xml -D DST=${CMAKE_CURRENT_BINARY_DIR}/strings_xml.c
+ -P ${PROJECT_SOURCE_DIR}/cmake/strings_xml_parser.cmake
+)
+
+
+ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/navit.pot
DEPENDS ${POTFILES}
COMMAND ${XGETTEXT} --no-location --default-domain=navit_tmp --add-comments --keyword=_ --keyword=_n --keyword=navit_nls_gettext --keyword=navit_nls_ngettext:1,2 ${POTFILES}
Modified: trunk/navit/po/Makefile.am
===================================================================
--- trunk/navit/po/Makefile.am 2013-08-24 18:24:59 UTC (rev 5597)
+++ trunk/navit/po/Makefile.am 2013-08-24 19:40:32 UTC (rev 5598)
@@ -23,8 +23,9 @@
$(top_srcdir)/navit/gui/internal/gui_internal_search.c \
$(top_srcdir)/navit/gui/internal/gui_internal_widget.c \
$(top_srcdir)/navit/osd/core/osd_core.c \
- $(top_builddir)/navit/navit_shipped.c
-
+ $(top_builddir)/navit/navit_shipped.c \
+ $(top_builddir)/navit/strings.c
+
if XGETTEXT_GLADE
POTFILES += $(top_builddir)/navit/navit_shipped.glade
endif
@@ -48,6 +49,11 @@
$(top_builddir)/navit/navit_shipped.c: $(top_srcdir)/navit/navit_shipped.xml
sed -e 's/|//g' -e 's/^/|/' -e 's/$$/|/' -e 's/\(_("[^"]*")\)/| \1; |/g' -e 's/|[^|]*|//g' <$(top_srcdir)/navit/navit_shipped.xml >$(top_builddir)/navit/navit_shipped.c
+# Trick gettext to get translateable strings out of android/strings.xml
+
+$(top_builddir)/navit/strings.c: $(top_srcdir)/navit/android/res/values/strings.xml
+ sed -e "s/\\\\'/'/g" -e 's%.*<string[^>]*name="\(.*\)">\(.*\)</string>%// Android resource: @strings/\1\n_("\2")%g' -e '\%^//%!d'<$(top_srcdir)/navit/android/res/values/strings.xml >$(top_builddir)/navit/strings.c
+
@POFILES@: navit.pot
sed 's/^"Project-Id-Version:.*/"Project-Id-Version: $(PACKAGE_STRING)\\n"/' < $(top_srcdir)/po/$@.in | $(MSGMERGE) --no-fuzzy-matching --verbose -o $(top_builddir)/po/$@ - navit.pot
Modified: trunk/navit/po/af.po.in
===================================================================
--- trunk/navit/po/af.po.in 2013-08-24 18:24:59 UTC (rev 5597)
+++ trunk/navit/po/af.po.in 2013-08-24 19:40:32 UTC (rev 5598)
@@ -7,19 +7,18 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-30 19:57+0200\n"
+"POT-Creation-Date: 2013-08-24 22:34+0400\n"
"PO-Revision-Date: 2009-12-20 20:36+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Afrikaans <af...@li...>\n"
-"Language: af\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-#, c-format
msgid "Running from source directory\n"
msgstr "Loop vanaf bron gids\n"
@@ -252,6 +251,7 @@
msgid "then you have reached your destination."
msgstr "dan het jy jou bestemming bereik."
+#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posisie"
@@ -1306,7 +1306,6 @@
msgid "* Unknown, add is_in tags to those cities"
msgstr "* Onbekend, voeg is_in merkers by daai stede"
-#, c-format
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
@@ -1512,6 +1511,7 @@
msgid "NW"
msgstr "NW"
+#. Android resource: @strings/no
msgid "No"
msgstr "Nee"
@@ -1547,6 +1547,7 @@
msgid "Item type"
msgstr ""
+#. Android resource: @strings/address_search_streets
msgid "Streets"
msgstr "Strate"
@@ -1782,6 +1783,221 @@
msgid "Vehicle Position"
msgstr "Voertuig posisie"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
+msgstr ""
+
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
+msgstr ""
+
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
+msgstr ""
+
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
+msgstr ""
+
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
+msgstr ""
+
+#. Android resource: @strings/address_search_title
+msgid "Address search"
+msgstr ""
+
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
+msgstr ""
+
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
+msgstr ""
+
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
+msgstr ""
+
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
+msgstr ""
+
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
+msgstr ""
+
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
+msgstr ""
+
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
+msgstr ""
+
+#. Android resource: @strings/restoring
+msgid "Restoring..."
+msgstr ""
+
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
+msgstr ""
+
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
+msgstr ""
+
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
+msgstr ""
+
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
+msgstr ""
+
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
+msgstr ""
+
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
+msgstr ""
+
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
+msgstr ""
+
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
+msgstr ""
+
+#. Android resource: @strings/select_backup
+msgid "Select backup"
+msgstr ""
+
+#. Android resource: @strings/backup
+msgid "Backup"
+msgstr ""
+
+#. Android resource: @strings/restore
+msgid "Restore"
+msgstr ""
+
msgid "Main menu"
msgstr "Hoofkieslys"
Modified: trunk/navit/po/ar.po.in
===================================================================
--- trunk/navit/po/ar.po.in 2013-08-24 18:24:59 UTC (rev 5597)
+++ trunk/navit/po/ar.po.in 2013-08-24 19:40:32 UTC (rev 5598)
@@ -7,20 +7,19 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-30 19:57+0200\n"
+"POT-Creation-Date: 2013-08-24 22:34+0400\n"
"PO-Revision-Date: 2010-02-01 17:37+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Arabic <ar...@li...>\n"
-"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-#, c-format
msgid "Running from source directory\n"
msgstr "جاري التنفيذ من المجلد المصدر\n"
@@ -269,6 +268,7 @@
msgid "then you have reached your destination."
msgstr "و بعدها تكون قد وصلت إلى هدفك"
+#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "الموقع"
@@ -1323,7 +1323,6 @@
msgid "* Unknown, add is_in tags to those cities"
msgstr "* غير معروف، أضف تسميات is_in إلى تلك المدن"
-#, c-format
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
@@ -1529,6 +1528,7 @@
msgid "NW"
msgstr "ش. غ."
+#. Android resource: @strings/no
msgid "No"
msgstr "لا"
@@ -1564,6 +1564,7 @@
msgid "Item type"
msgstr ""
+#. Android resource: @strings/address_search_streets
msgid "Streets"
msgstr "الشوارع"
@@ -1799,6 +1800,221 @@
msgid "Vehicle Position"
msgstr "موقع وسيلة التنقل"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
+msgstr ""
+
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
+msgstr ""
+
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
+msgstr ""
+
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
+msgstr ""
+
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
+msgstr ""
+
+#. Android resource: @strings/address_search_title
+msgid "Address search"
+msgstr ""
+
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
+msgstr ""
+
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
+msgstr ""
+
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
+msgstr ""
+
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
+msgstr ""
+
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
+msgstr ""
+
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
+msgstr ""
+
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
+msgstr ""
+
+#. Android resource: @strings/restoring
+msgid "Restoring..."
+msgstr ""
+
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
+msgstr ""
+
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
+msgstr ""
+
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
+msgstr ""
+
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
+msgstr ""
+
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
+msgstr ""
+
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
+msgstr ""
+
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
+msgstr ""
+
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
+msgstr ""
+
+#. Android resource: @strings/select_backup
+msgid "Select backup"
+msgstr ""
+
+#. Android resource: @strings/backup
+msgid "Backup"
+msgstr ""
+
+#. Android resource: @strings/restore
+msgid "Restore"
+msgstr ""
+
msgid "Main menu"
msgstr "اللائحة الرئيسية"
Modified: trunk/navit/po/ast.po.in
===================================================================
--- trunk/navit/po/ast.po.in 2013-08-24 18:24:59 UTC (rev 5597)
+++ trunk/navit/po/ast.po.in 2013-08-24 19:40:32 UTC (rev 5598)
@@ -7,19 +7,18 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-30 19:57+0200\n"
+"POT-Creation-Date: 2013-08-24 22:34+0400\n"
"PO-Revision-Date: 2010-05-21 17:35+0000\n"
"Last-Translator: Xuacu Saturio <xua...@gm...>\n"
"Language-Team: Asturian <as...@li...>\n"
-"Language: ast\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-#, c-format
msgid "Running from source directory\n"
msgstr "Executando dende'l direutoriu fonte.\n"
@@ -252,6 +251,7 @@
msgid "then you have reached your destination."
msgstr "entós llegará al destín."
+#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posición"
@@ -1306,7 +1306,6 @@
msgid "* Unknown, add is_in tags to those cities"
msgstr "* Desconocíes, amestar etiquetes is_in a eses ciudaes"
-#, c-format
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
@@ -1512,6 +1511,7 @@
msgid "NW"
msgstr "NO"
+#. Android resource: @strings/no
msgid "No"
msgstr "Non"
@@ -1547,6 +1547,7 @@
msgid "Item type"
msgstr ""
+#. Android resource: @strings/address_search_streets
msgid "Streets"
msgstr "Cais"
@@ -1782,6 +1783,221 @@
msgid "Vehicle Position"
msgstr "Posición del vehículu"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
+msgstr ""
+
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
+msgstr ""
+
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
+msgstr ""
+
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
+msgstr ""
+
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
+msgstr ""
+
+#. Android resource: @strings/address_search_title
+msgid "Address search"
+msgstr ""
+
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
+msgstr ""
+
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
+msgstr ""
+
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
+msgstr ""
+
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
+msgstr ""
+
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
+msgstr ""
+
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
+msgstr ""
+
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
+msgstr ""
+
+#. Android resource: @strings/restoring
+msgid "Restoring..."
+msgstr ""
+
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
+msgstr ""
+
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
+msgstr ""
+
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
+msgstr ""
+
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
+msgstr ""
+
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
+msgstr ""
+
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
+msgstr ""
+
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
+msgstr ""
+
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
+msgstr ""
+
+#. Android resource: @strings/select_backup
+msgid "Select backup"
+msgstr ""
+
+#. Android resource: @strings/backup
+msgid "Backup"
+msgstr ""
+
+#. Android resource: @strings/restore
+msgid "Restore"
+msgstr ""
+
msgid "Main menu"
msgstr "Menú principal"
Modified: trunk/navit/po/bg.po.in
===================================================================
--- trunk/navit/po/bg.po.in 2013-08-24 18:24:59 UTC (rev 5597)
+++ trunk/navit/po/bg.po.in 2013-08-24 19:40:32 UTC (rev 5598)
@@ -7,19 +7,18 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-30 19:57+0200\n"
+"POT-Creation-Date: 2013-08-24 22:34+0400\n"
"PO-Revision-Date: 2009-12-20 20:36+0000\n"
"Last-Translator: Alex Stanev <al...@st...>\n"
"Language-Team: Bulgarian <bg...@li...>\n"
-"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-#, c-format
msgid "Running from source directory\n"
msgstr ""
@@ -252,6 +251,7 @@
msgid "then you have reached your destination."
msgstr "след това пристигате на местоназначението"
+#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Позиция"
@@ -1306,7 +1306,6 @@
msgid "* Unknown, add is_in tags to those cities"
msgstr ""
-#, c-format
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
@@ -1512,6 +1511,7 @@
msgid "NW"
msgstr "СЗ"
+#. Android resource: @strings/no
msgid "No"
msgstr ""
@@ -1547,6 +1547,7 @@
msgid "Item type"
msgstr ""
+#. Android resource: @strings/address_search_streets
msgid "Streets"
msgstr "Улици"
@@ -1782,6 +1783,221 @@
msgid "Vehicle Position"
msgstr "Позиция на автомобил"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
+msgstr ""
+
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
+msgstr ""
+
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
+msgstr ""
+
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
+msgstr ""
+
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
+msgstr ""
+
+#. Android resource: @strings/address_search_title
+msgid "Address search"
+msgstr ""
+
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
+msgstr ""
+
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
+msgstr ""
+
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
+msgstr ""
+
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
+msgstr ""
+
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
+msgstr ""
+
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
+msgstr ""
+
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
+msgstr ""
+
+#. Android resource: @strings/restoring
+msgid "Restoring..."
+msgstr ""
+
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
+msgstr ""
+
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
+msgstr ""
+
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
+msgstr ""
+
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
+msgstr ""
+
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
+msgstr ""
+
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
+msgstr ""
+
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
+msgstr ""
+
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
+msgstr ""
+
+#. Android resource: @strings/select_backup
+msgid "Select backup"
+msgstr ""
+
+#. Android resource: @strings/backup
+msgid "Backup"
+msgstr ""
+
+#. Android resource: @strings/restore
+msgid "Restore"
+msgstr ""
+
msgid "Main menu"
msgstr "Главно меню"
Modified: trunk/navit/po/ca.po.in
===================================================================
--- trunk/navit/po/ca.po.in 2013-08-24 18:24:59 UTC (rev 5597)
+++ trunk/navit/po/ca.po.in 2013-08-24 19:40:32 UTC (rev 5598)
@@ -7,19 +7,18 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-30 19:57+0200\n"
+"POT-Creation-Date: 2013-08-24 22:34+0400\n"
"PO-Revision-Date: 2010-05-18 09:31+0000\n"
"Last-Translator: KaZeR <Unknown>\n"
"Language-Team: Catalan <ca...@li...>\n"
-"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-#, c-format
msgid "Running from source directory\n"
msgstr "S'està executant des del directori arrel\n"
@@ -252,6 +251,7 @@
msgid "then you have reached your destination."
msgstr "aleshores heu arribat a destí"
+#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Posició"
@@ -1306,7 +1306,6 @@
msgid "* Unknown, add is_in tags to those cities"
msgstr "* Desconegut, afegiu etiquetes is_in a aquestes ciutats"
-#, c-format
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
@@ -1512,6 +1511,7 @@
msgid "NW"
msgstr "NO"
+#. Android resource: @strings/no
msgid "No"
msgstr "No"
@@ -1547,6 +1547,7 @@
msgid "Item type"
msgstr ""
+#. Android resource: @strings/address_search_streets
msgid "Streets"
msgstr "Carrers"
@@ -1782,6 +1783,221 @@
msgid "Vehicle Position"
msgstr "Posició del vehicle"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
+msgstr ""
+
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
+msgstr ""
+
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
+msgstr ""
+
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
+msgstr ""
+
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
+msgstr ""
+
+#. Android resource: @strings/address_search_title
+msgid "Address search"
+msgstr ""
+
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
+msgstr ""
+
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
+msgstr ""
+
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
+msgstr ""
+
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
+msgstr ""
+
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
+msgstr ""
+
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
+msgstr ""
+
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
+msgstr ""
+
+#. Android resource: @strings/restoring
+msgid "Restoring..."
+msgstr ""
+
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
+msgstr ""
+
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
+msgstr ""
+
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
+msgstr ""
+
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
+msgstr ""
+
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
+msgstr ""
+
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
+msgstr ""
+
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
+msgstr ""
+
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
+msgstr ""
+
+#. Android resource: @strings/select_backup
+msgid "Select backup"
+msgstr ""
+
+#. Android resource: @strings/backup
+msgid "Backup"
+msgstr ""
+
+#. Android resource: @strings/restore
+msgid "Restore"
+msgstr ""
+
msgid "Main menu"
msgstr "Menú principal"
Modified: trunk/navit/po/cs.po.in
===================================================================
--- trunk/navit/po/cs.po.in 2013-08-24 18:24:59 UTC (rev 5597)
+++ trunk/navit/po/cs.po.in 2013-08-24 19:40:32 UTC (rev 5598)
@@ -7,19 +7,18 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-30 19:57+0200\n"
+"POT-Creation-Date: 2013-08-24 22:34+0400\n"
"PO-Revision-Date: 2010-06-18 19:02+0000\n"
"Last-Translator: Vladimír Burian <vla...@em...>\n"
"Language-Team: Čeština\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-#, c-format
msgid "Running from source directory\n"
msgstr "Běží ze zdrojového adresáře\n"
@@ -256,6 +255,7 @@
msgid "then you have reached your destination."
msgstr "pak budete v cíli."
+#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Poloha"
@@ -1310,7 +1310,6 @@
msgid "* Unknown, add is_in tags to those cities"
msgstr "* Není známo, přidejte is_in atributy do těchto měst"
-#, c-format
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
@@ -1516,6 +1515,7 @@
msgid "NW"
msgstr "SZ"
+#. Android resource: @strings/no
msgid "No"
msgstr "Ne"
@@ -1551,6 +1551,7 @@
msgid "Item type"
msgstr ""
+#. Android resource: @strings/address_search_streets
msgid "Streets"
msgstr "Ulice"
@@ -1786,6 +1787,221 @@
msgid "Vehicle Position"
msgstr "Poloha vozidla"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
+msgstr ""
+
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
+msgstr ""
+
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
+msgstr ""
+
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
+msgstr ""
+
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
+msgstr ""
+
+#. Android resource: @strings/address_search_title
+msgid "Address search"
+msgstr ""
+
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
+msgstr ""
+
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
+msgstr ""
+
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
+msgstr ""
+
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
+msgstr ""
+
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
+msgstr ""
+
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
+msgstr ""
+
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
+msgstr ""
+
+#. Android resource: @strings/restoring
+msgid "Restoring..."
+msgstr ""
+
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
+msgstr ""
+
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
+msgstr ""
+
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
+msgstr ""
+
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
+msgstr ""
+
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
+msgstr ""
+
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
+msgstr ""
+
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
+msgstr ""
+
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
+msgstr ""
+
+#. Android resource: @strings/select_backup
+msgid "Select backup"
+msgstr ""
+
+#. Android resource: @strings/backup
+msgid "Backup"
+msgstr ""
+
+#. Android resource: @strings/restore
+msgid "Restore"
+msgstr ""
+
msgid "Main menu"
msgstr "Hlavní menu"
Modified: trunk/navit/po/da.po.in
===================================================================
--- trunk/navit/po/da.po.in 2013-08-24 18:24:59 UTC (rev 5597)
+++ trunk/navit/po/da.po.in 2013-08-24 19:40:32 UTC (rev 5598)
@@ -7,19 +7,18 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-30 19:57+0200\n"
+"POT-Creation-Date: 2013-08-24 22:34+0400\n"
"PO-Revision-Date: 2010-05-18 09:31+0000\n"
"Last-Translator: Lasse Luttermann <lut...@si...>\n"
"Language-Team: Glenn Sommer <gl...@gm...>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-#, c-format
msgid "Running from source directory\n"
msgstr "Kører fra kildekode mappen\n"
@@ -252,6 +251,7 @@
msgid "then you have reached your destination."
msgstr "og så ankommer du til din destination"
+#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Position"
@@ -1306,7 +1306,6 @@
msgid "* Unknown, add is_in tags to those cities"
msgstr "* Ukendt, tilføj is_in mærke til disse byer"
-#, c-format
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
@@ -1512,6 +1511,7 @@
msgid "NW"
msgstr "NV"
+#. Android resource: @strings/no
msgid "No"
msgstr "Nej"
@@ -1547,6 +1547,7 @@
msgid "Item type"
msgstr ""
+#. Android resource: @strings/address_search_streets
msgid "Streets"
msgstr "Gader"
@@ -1782,6 +1783,221 @@
msgid "Vehicle Position"
msgstr "Køretøjsposition"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
+msgstr ""
+
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
+msgstr ""
+
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
+msgstr ""
+
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
+msgstr ""
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
+msgstr ""
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr ""
+
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
+msgstr ""
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr ""
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr ""
+
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
+msgstr ""
+
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
+msgstr ""
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr ""
+
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
+msgstr ""
+
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
+msgstr ""
+
+#. Android resource: @strings/address_search_title
+msgid "Address search"
+msgstr ""
+
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
+msgstr ""
+
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
+msgstr ""
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr ""
+
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
+msgstr ""
+
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
+msgstr ""
+
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
+msgstr ""
+
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
+msgstr ""
+
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
+msgstr ""
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr ""
+
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
+msgstr ""
+
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
+msgstr ""
+
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
+msgstr ""
+
+#. Android resource: @strings/restoring
+msgid "Restoring..."
+msgstr ""
+
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
+msgstr ""
+
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
+msgstr ""
+
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
+msgstr ""
+
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
+msgstr ""
+
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
+msgstr ""
+
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
+msgstr ""
+
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
+msgstr ""
+
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
+msgstr ""
+
+#. Android resource: @strings/select_backup
+msgid "Select backup"
+msgstr ""
+
+#. Android resource: @strings/backup
+msgid "Backup"
+msgstr ""
+
+#. Android resource: @strings/restore
+msgid "Restore"
+msgstr ""
+
msgid "Main menu"
msgstr "Hovedmenu"
Modified: trunk/navit/po/de.po.in
===================================================================
--- trunk/navit/po/de.po.in 2013-08-24 18:24:59 UTC (rev 5597)
+++ trunk/navit/po/de.po.in 2013-08-24 19:40:32 UTC (rev 5598)
@@ -7,19 +7,18 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-30 19:57+0200\n"
+"POT-Creation-Date: 2013-08-24 22:34+0400\n"
"PO-Revision-Date: 2010-06-01 22:09+0000\n"
"Last-Translator: Achim Behrens <Unknown>\n"
"Language-Team: Martin Schaller <mar...@so...>\n"
-"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-#, c-format
msgid "Running from source directory\n"
msgstr "Aufruf aus Quellverzeichnis\n"
@@ -254,6 +253,7 @@
msgid "then you have reached your destination."
msgstr "dann haben Sie Ihr Ziel erreicht."
+#. Android resource: @strings/position_popup_title
msgid "Position"
msgstr "Position"
@@ -1310,7 +1310,6 @@
msgid "* Unknown, add is_in tags to those cities"
msgstr "*Unbekannt, füge Etikett \"ist in\" zu diesen Städten hinzu"
-#, c-format
msgid ""
"navit usage:\n"
"navit [options] [configfile]\n"
@@ -1527,6 +1526,7 @@
msgid "NW"
msgstr "NW"
+#. Android resource: @strings/no
msgid "No"
msgstr "Nein"
@@ -1562,6 +1562,7 @@
msgid "Item type"
msgstr "Elementtyp"
+#. Android resource: @strings/address_search_streets
msgid "Streets"
msgstr "Straßen"
@@ -1797,6 +1798,232 @@
msgid "Vehicle Position"
msgstr "Fahrzeugposition"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
+msgstr ""
+
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
+msgstr "Navit gestartet"
+
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
+msgstr "Navit läuft"
+
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
+msgstr "Willkommen bei Navit"
+
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
+msgstr ""
+"Vielen Dank für die Installation von Navit!\n"
+"\n"
+"Bitte zuerst im Menu \"Karten herunterladen\" auswählen und eine Karte für "
+"die gewünschte Region herunterladen. Die Kartendatei ist sehr groß, bitte "
+"Flatrate oder ähnliches aktivieren!\n"
+"\n"
+"Kartendaten: (c) OpenStreetMap contributors\n"
+"\n"
+"Viel Spaß mit Navit!"
+
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
+msgstr ""
+
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
+msgstr "Mehr Infos"
+
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
+msgstr "Vergrößern"
+
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
+msgstr "Verkleinern"
+
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
+msgstr "Karten herunterladen"
+
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
+msgstr "POI ein/aus"
+
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
+msgstr "Navit beenden"
+
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
+msgstr "Sichern / Wiederherstellen"
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr "Ziel setzen"
+
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
+msgstr "Diese Karte löschen?"
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr "Kartendownload"
+
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
+msgstr "Laden:"
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr "Fertig in"
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr "Fertig in"
+
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
+msgstr "Fehler beim Kartendownload"
+
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
+msgstr "Download der Karte abgebrochen"
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr "Nicht genug freier Speicher"
+
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
+msgstr "Position noch nicht bekannt."
+
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
+msgstr "Karten passend zur aktuellen Position"
+
+#. Android resource: @strings/address_search_title
+msgid "Address search"
+msgstr "Adresse suchen"
+
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
+msgstr "Ziel eingeben"
+
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
+msgstr "Ungefähr"
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr "Suche"
+
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
+msgstr "Suche läuft..."
+
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
+msgstr "Keine Adresse gefunden"
+
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
+msgstr "Abrufen von Suchergebnissen"
+
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
+msgstr "Lädt Suchergebnisse"
+
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
+msgstr "Suche liefert kein Ergebnis!"
+
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
+msgstr "Keine Eingabe"
+
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
+msgstr "Neues Fahrziel:"
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr "Städte"
+
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
+msgstr "Bitte auswählen"
+
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
+msgstr "Bitte eine SD Karte einlegen"
+
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
+msgstr "Sichern..."
+
+#. Android resource: @strings/restoring
+msgid "Restoring..."
+msgstr ""
+
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
+msgstr "Sicherungsverzeichnis konnte nicht erstellt werden"
+
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
+msgstr "Sicherung Fehlgeschlagen"
+
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
+msgstr "Keine Sicherung gefunden"
+
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
+msgstr "Fehler beim Wiederherstellen"
+
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
+msgstr "Sicherung erfolgreich"
+
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
+msgstr ""
+"Sicherung Erfolgreich\n"
+"Navit bitte neustarten"
+
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
+msgstr "Backup nicht gefunden"
+
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
+msgstr "Wiederherstellen fehlgeschlagen"
+
+#. Android resource: @strings/select_backup
+msgid "Select backup"
+msgstr "Backup auswählen"
+
+#. Android resource: @strings/backup
+msgid "Backup"
+msgstr "Sichern"
+
+#. Android resource: @strings/restore
+msgid "Restore"
+msgstr "Wiederherstellen"
+
msgid "Main menu"
msgstr "Hauptmenü"
Modified: trunk/navit/po/de_CH.po.in
===================================================================
--- trunk/navit/po/de_CH.po.in 2013-08-24 18:24:59 UTC (rev 5597)
+++ trunk/navit/po/de_CH.po.in 2013-08-24 19:40:32 UTC (rev 5598)
@@ -6,19 +6,18 @@
msgstr ""
"Project-Id-Version: navit 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-30 19:57+0200\n"
+"POT-Creation-Date: 2013-08-24 22:34+0400\n"
"PO-Revision-Date: 2010-05-18 08:49+0000\n"
"Last-Translator: \n"
"Language-Team: German (Switzerland) <de...@li...>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-#, c-format
msgid "Running from source directory\n"
msgstr ""
@@ -251,6 +250,7 @@
msgid "then y...
[truncated message content] |
|
From: <md...@us...> - 2013-08-24 18:25:02
|
Revision: 5597
http://sourceforge.net/p/navit/code/5597
Author: mdankov
Date: 2013-08-24 18:24:59 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
Add:port_android:Utilize existing gettext country name translations in Android map download dialog.
Modified Paths:
--------------
trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java 2013-08-24 07:17:05 UTC (rev 5596)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java 2013-08-24 18:24:59 UTC (rev 5597)
@@ -94,208 +94,208 @@
// define the maps here
//
public static final osm_map_values[] osm_maps = {
- new osm_map_values("Whole Planet","-180","-90","180","90", 7449814676L, 0),
- new osm_map_values("Africa","-30.89","-36.17","61.68","38.40", 280880799L, 0),
- new osm_map_values("Angola","11.4","-18.1","24.2","-5.3", 55850695L, 1),
- new osm_map_values("Burundi","28.9","-4.5","30.9","-2.2", 60694550L, 1),
- new osm_map_values("Canary Islands","-18.69","26.52","-12.79","29.99", 58904212L, 1),
- new osm_map_values("Democratic Republic of the Congo","11.7","-13.6","31.5","5.7", 70168822L, 1),
- new osm_map_values("Ethiopia","32.89","3.33","48.07","14.97", 68113437L, 1),
- new osm_map_values("Guinea","-15.47","7.12","-7.58","12.74", 57466702L, 1),
- new osm_map_values("Ivory Coast","-8.72","4.09","-2.43","10.80", 62652062L, 1),
- new osm_map_values("Kenya","33.8","-5.2","42.4","4.9", 64420106L, 1),
- new osm_map_values("Lesotho","26.9","-30.7","29.6","-28.4", 55533656L, 1),
- new osm_map_values("Liberia","-15.00","-0.73","-7.20","8.65", 55963569L, 1),
- new osm_map_values("Lybia","9.32","19.40","25.54","33.63", 63127225L, 1),
- new osm_map_values("Madagascar","42.25","-26.63","51.20","-11.31", 56681202L, 1),
- new osm_map_values("Nambia+Botswana","11.4","-29.1","29.5","-16.9", 64357926L, 1),
- new osm_map_values("Reunion","55.2","-21.4","55.9","-20.9", 59487456L, 1),
- new osm_map_values("Rwanda","28.8","-2.9","30.9","-1.0", 60654274L, 1),
- new osm_map_values("South Africa+Lesotho","15.93","-36.36","33.65","-22.08", 79904318L, 1),
- new osm_map_values("Tanzania","29.19","-11.87","40.74","-0.88", 65380211L, 1),
- new osm_map_values("Uganda","29.3","-1.6","35.1","4.3", 61521337L, 1),
- new osm_map_values("Asia","23.8","0.1","195.0","82.4", 1185692230L, 0),
- new osm_map_values("Azerbaijan","44.74","38.34","51.69","42.37", 64563990L, 1),
- new osm_map_values("China","67.3","5.3","135.0","54.5", 354889731L, 1),
- new osm_map_values("Cyprus","32.0","34.5","34.9","35.8", 62657503L, 1),
- new osm_map_values("India+Nepal","67.9","5.5","89.6","36.0", 96930647L, 1),
- new osm_map_values("Indonesia","93.7","-17.3","155.5","7.6", 81860551L, 1),
- new osm_map_values("Iran","43.5","24.4","63.6","40.4", 79782055L, 1),
- new osm_map_values("Iraq","38.7","28.5","49.2","37.4", 64053119L, 1),
- new osm_map_values("Israel","33.99","29.8","35.95","33.4", 73981247L, 1),
- new osm_map_values("Japan+Korea+Taiwan","117.6","20.5","151.3","47.1", 451295345L, 1),
- new osm_map_values("Kazakhstan","46.44","40.89","87.36","55.45", 114949353L, 1),
- new osm_map_values("Kyrgyzstan","69.23","39.13","80.33","43.29", 62425757L, 1),
- new osm_map_values("Malasia+Singapore","94.3","-5.9","108.6","6.8", 61142116L, 1),
- new osm_map_values("Mongolia","87.5","41.4","120.3","52.7", 66228736L, 1),
- new osm_map_values("Nambia+Botswana","11.4","-29.1","29.5","-16.9", 64357926L, 1),
- new osm_map_values("Pakistan","60.83","23.28","77.89","37.15", 74060802L, 1),
- new osm_map_values("Philippines","115.58","4.47","127.85","21.60", 71601316L, 1),
- new osm_map_values("Saudi Arabia","33.2","16.1","55.9","33.5", 100651634L, 1),
- new osm_map_values("Thailand","97.5","5.7","105.2","19.7", 68260330L, 1),
- new osm_map_values("Turkey","25.1","35.8","46.4","42.8", 105200911L, 1),
- new osm_map_values("Turkmenistan","51.78","35.07","66.76","42.91", 62188003L, 1),
- new osm_map_values("UAE+Other","51.5","22.6","56.7","26.5", 61873090L, 1),
- new osm_map_values("Australia+Oceania","89.84","-57.39","179.79","7.26", 185657003L, 0),
- new osm_map_values("Australia","110.5","-44.2","154.9","-9.2", 138812990L, 0),
- new osm_map_values("Tasmania","144.0","-45.1","155.3","-24.8", 109169592L, 1),
- new osm_map_values("Victoria+New South Wales","140.7","-39.4","153.7","-26.9", 104820309L, 1),
- new osm_map_values("New Caledonia","157.85","-25.05","174.15","-16.85", 54512722L, 1),
- new osm_map_values("New Zealand","165.2","-47.6","179.1","-33.7", 68221081L, 1),
- new osm_map_values("Europe","-12.97","33.59","34.15","72.10", 3570653608L, 0),
- new osm_map_values("Western Europe","-17.6","34.5","42.9","70.9", 3700019849L, 1),
- new osm_map_values("Austria","9.4","46.32","17.21","49.1", 289080462L, 1),
- new osm_map_values("Azores","-31.62","36.63","-24.67","40.13", 54507108L, 1),
- new osm_map_values("BeNeLux","2.08","48.87","7.78","54.52", 656716695L, 1),
- new osm_map_values("Netherlands","3.07","50.75","7.23","53.73", 525336576L, 1),
- new osm_map_values("Denmark","7.65","54.32","15.58","58.07", 154275079L, 1),
- new osm_map_values("Faroe Islands","-7.8","61.3","-6.1","62.5", 54931474L, 1),
- new osm_map_values("France","-5.45","42.00","8.44","51.68", 1468741961L, 1),
- new osm_map_values("Alsace","6.79","47.27","8.48","49.17", 144023488L, 2),
- new osm_map_values("Aquitaine","-2.27","42.44","1.50","45.76", 186786072L, 2),
- new osm_map_values("Auvergne","2.01","44.57","4.54","46.85", 118942252L, 2),
- new osm_map_values("Basse-Normandie","-2.09","48.13","1.03","49.98", 111940365L, 2),
- new osm_map_values("Bourgogne","2.80","46.11","5.58","48.45", 114109115L, 2),
- new osm_map_values("Bretagne","-5.58","46.95","-0.96","48.99", 188689862L, 2),
- new osm_map_values("Centre","0.01","46.29","3.18","48.99", 208870488L, 2),
- new osm_map_values("Champagne-Ardenne","3.34","47.53","5.94","50.28", 112266252L, 2),
- new osm_map_values("Corse","8.12","41.32","9.95","43.28", 67997394L, 2),
- new osm_map_values("Franche-Comte","5.20","46.21","7.83","48.07", 131236689L, 2),
- new osm_map_values("Haute-Normandie","-0.15","48.62","1.85","50.18", 90484736L, 2),
- new osm_map_values("Ile-de-France","1.40","48.07","3.61","49.29", 152890366L, 2),
- new osm_map_values("Languedoc-Roussillon","1.53","42.25","4.89","45.02", 168413195L, 2),
- new osm_map_values("Limousin","0.58","44.87","2.66","46.50", 98422724L, 2),
- new osm_map_values("Lorraine","4.84","47.77","7.72","49.73", 137538540L, 2),
- new osm_map_values("Midi-Pyrenees","-0.37","42.18","3.50","45.10", 186740619L, 2),
- new osm_map_values("Nord-pas-de-Calais","1.42","49.92","4.49","51.31", 145320230L, 2),
- new osm_map_values("Pays-de-la-Loire","-2.88","46.20","0.97","48.62", 243736184L, 2),
- new osm_map_values("Picardie","1.25","48.79","4.31","50.43", 163238861L, 2),
- new osm_map_values("Poitou-Charentes","-1.69","45.04","1.26","47.23", 197886714L, 2),
- new osm_map_values("Provence-Alpes-Cote-d-Azur","4.21","42.91","7.99","45.18", 179863755L, 2),
- new osm_map_values("Rhone-Alpes","3.65","44.07","7.88","46.64", 201452039L, 2),
- new osm_map_values("Germany","5.18","46.84","15.47","55.64", 1187298374L, 1),
- new osm_map_values("Baden-Wuerttemberg","7.32","47.14","10.57","49.85", 247149038L, 2),
- new osm_map_values("Bayern","8.92","47.22","13.90","50.62", 306577202L, 2),
- new osm_map_values("Mittelfranken","9.86","48.78","11.65","49.84", 95916401L, 2),
- new osm_map_values("Niederbayern","11.55","47.75","14.12","49.42", 119427776L, 2),
- new osm_map_values("Oberbayern","10.67","47.05","13.57","49.14", 147630851L, 2),
- new osm_map_values("Oberfranken","10.31","49.54","12.49","50.95", 104963024L, 2),
- new osm_map_values("Oberpfalz","11.14","48.71","13.47","50.43", 112413336L, 2),
- new osm_map_values("Schwaben","9.27","47.10","11.36","49.09", 126836560L, 2),
- new osm_map_values("Unterfranken","8.59","49.16","10.93","50.67", 124601596L, 2),
- new osm_map_values("Berlin","13.03","52.28","13.81","52.73", 78189548L, 2),
- new osm_map_values("Brandenburg","11.17","51.30","14.83","53.63", 126821283L, 2),
- new osm_map_values("Bremen","8.43","52.96","9.04","53.66", 69427370L, 2),
- new osm_map_values("Hamburg","9.56","53.34","10.39","53.80", 76388380L, 2),
- new osm_map_values("Hessen","7.72","49.34","10.29","51.71", 155980870L, 2),
- new osm_map_values("Mecklenburg-Vorpommern","10.54","53.05","14.48","55.05", 92107050L, 2),
- new osm_map_values("Niedersachsen","6.40","51.24","11.69","54.22", 288712601L, 2),
- new osm_map_values("Nordrhein-westfalen","5.46","50.26","9.52","52.59", 335383638L, 2),
- new osm_map_values("Rheinland-Pfalz","6.06","48.91","8.56","51.00", 157909942L, 2),
- new osm_map_values("Saarland","6.30","49.06","7.46","49.69", 78579241L, 2),
- new osm_map_values("Sachsen-Anhalt","10.50","50.88","13.26","53.11", 115314663L, 2),
- new osm_map_values("Sachsen","11.82","50.11","15.10","51.73", 134182818L, 2),
- new osm_map_values("Schleswig-Holstein","7.41","53.30","11.98","55.20", 114865543L, 2),
- new osm_map_values("Thueringen","9.81","50.15","12.72","51.70", 112896293L, 2),
- new osm_map_values("Germany+Austria+Switzerland","3.4","44.5","18.6","55.1", 1763000779L, 1),
- new osm_map_values("Iceland","-25.3","62.8","-11.4","67.5", 58803839L, 1),
- new osm_map_values("Ireland","-11.17","51.25","-5.23","55.9", 74456575L, 1),
- new osm_map_values("Italy","6.52","36.38","18.96","47.19", 373215809L, 1),
- new osm_map_values("Spain+Portugal","-11.04","34.87","4.62","44.41", 354839261L, 1),
- new osm_map_values("Mallorca","2.2","38.8","4.7","40.2", 66781797L, 2),
- new osm_map_values("Galicia","-10.0","41.7","-6.3","44.1", 69081612L, 2),
- new osm_map_values("Scandinavia","4.0","54.4","32.1","71.5", 386082513L, 1),
- new osm_map_values("Finland","18.6","59.2","32.3","70.3", 167464389L, 1),
- new osm_map_values("Denmark","7.49","54.33","13.05","57.88", 142017133L, 1),
- new osm_map_values("Switzerland","5.79","45.74","10.59","47.84", 197612725L, 1),
- new osm_map_values("UK","-9.7","49.6","2.2","61.2", 308044592L, 1),
- new osm_map_values("England","-7.80","48.93","2.41","56.14", 331085897L, 1),
- new osm_map_values("Buckinghamshire","-1.19","51.44","-0.43","52.25", 74619627L, 2),
- new osm_map_values("Cambridgeshire","-0.55","51.96","0.56","52.79", 71849188L, 2),
- new osm_map_values("Cumbria","-3.96","53.85","-2.11","55.24", 71699620L, 2),
- new osm_map_values("East_yorkshire_with_hull","-1.16","53.50","0.54","54.26", 68241870L, 2),
- new osm_map_values("Essex","-0.07","51.40","1.36","52.14", 82991499L, 2),
- new osm_map_values("Herefordshire","-3.19","51.78","-2.29","52.45", 66471962L, 2),
- new osm_map_values("Kent","-0.02","50.81","1.65","51.53", 75449128L, 2),
- new osm_map_values("Lancashire","-3.20","53.43","-2.00","54.29", 75096621L, 2),
- new osm_map_values("Leicestershire","-1.65","52.34","-0.61","53.03", 75492394L, 2),
- new osm_map_values("Norfolk","0.10","52.30","2.04","53.41", 71556838L, 2),
- new osm_map_values("Nottinghamshire","-1.39","52.73","-0.62","53.55", 72979826L, 2),
- new osm_map_values("Oxfordshire","-1.77","51.41","-0.82","52.22", 73351886L, 2),
- new osm_map_values("Shropshire","-3.29","52.26","-2.18","53.05", 69144272L, 2),
- new osm_map_values("Somerset","-3.89","50.77","-2.20","51.40", 72098176L, 2),
- new osm_map_values("South_yorkshire","-1.88","53.25","-0.80","53.71", 72594920L, 2),
- new osm_map_values("Suffolk","0.29","51.88","1.81","52.60", 72985880L, 2),
- new osm_map_values("Surrey","-0.90","51.02","0.10","51.52", 79850137L, 2),
- new osm_map_values("Wiltshire","-2.41","50.90","-1.44","51.76", 71244578L, 2),
- new osm_map_values("Scotland","-8.13","54.49","-0.15","61.40", 102111248L, 2),
- new osm_map_values("Wales","-5.56","51.28","-2.60","53.60", 84860075L, 2),
- new osm_map_values("Albania","19.09","39.55","21.12","42.72", 71097966L, 1),
- new osm_map_values("Belarus","23.12","51.21","32.87","56.23", 100471644L, 1),
- new osm_map_values("Russia","27.9","41.5","190.4", "77.6", 508559360L, 1),
- new osm_map_values("Bulgaria","24.7","42.1","24.8","42.1", 62211433L, 1),
- new osm_map_values("Bosnia-Herzegovina","15.69","42.52","19.67","45.32", 75756822L, 1),
- new osm_map_values("Czech Republic","11.91","48.48","19.02","51.17", 288911729L, 1),
- new osm_map_values("Croatia","13.4","42.1","19.4","46.9", 118479986L, 1),
- new osm_map_values("Estonia","21.5","57.5","28.2","59.6", 86149958L, 1),
- new osm_map_values("Greece","28.9","37.8","29.0","37.8", 59191120L, 1),
- new osm_map_values("Crete","23.3","34.5","26.8","36.0", 61121443L, 1),
- new osm_map_values("Hungary","16.08","45.57","23.03","48.39", 129046944L, 1),
- new osm_map_values("Latvia","20.7","55.6","28.3","58.1", 81683354L, 1),
- new osm_map_values("Lithuania","20.9","53.8","26.9","56.5", 77228922L, 1),
- new osm_map_values("Poland","13.6","48.8","24.5","55.0", 331299544L, 1),
- new osm_map_values("Romania","20.3","43.5","29.9","48.4", 150011857L, 1),
- new osm_map_values("North America","-178.1","6.5","-10.4","84.0", 2738147321L, 0),
- new osm_map_values("Alaska","-179.5","49.5","-129","71.6", 72413728L, 1),
- new osm_map_values("Canada","-141.3","41.5","-52.2","70.2", 1125713287L, 1),
- new osm_map_values("Hawaii","-161.07","18.49","-154.45","22.85", 57463829L, 1),
- new osm_map_values("USA (except Alaska and Hawaii)","-125.4","24.3","-66.5","49.3", 2356238167L, 1),
- new osm_map_values("Midwest","-104.11","35.92","-80.46","49.46", 663062321L, 2),
- new osm_map_values("Michigan","-90.47","41.64","-79.00","49.37", 207416918L, 2),
- new osm_map_values("Ohio","-84.87","38.05","-79.85","43.53", 143571732L, 2),
- new osm_map_values("Northeast","-80.58","38.72","-66.83","47.53", 517925445L, 2),
- new osm_map_values("Massachusetts","-73.56","40.78","-68.67","42.94", 159493455L, 2),
- new osm_map_values("Vermont","-73.49","42.68","-71.41","45.07", 74308439L, 2),
- new osm_map_values("Pacific","-180.05","15.87","-129.75","73.04", 78496182L, 2),
- new osm_map_values("South","-106.70","23.98","-71.46","40.70", 1135650708L, 2),
- new osm_map_values("Arkansas","-94.67","32.95","-89.59","36.60", 89637645L, 2),
- new osm_map_values("District of Columbia","-77.17","38.74","-76.86","39.05", 64042148L, 2),
- new osm_map_values("Florida","-88.75","23.63","-77.67","31.05", 118647388L, 2),
- new osm_map_values("Louisiana","-94.09","28.09","-88.62","33.07", 136435773L, 2),
- new osm_map_values("Maryland","-79.54","37.83","-74.99","40.22", 134152161L, 2),
- new osm_map_values("Mississippi","-91.71","29.99","-88.04","35.05", 100291749L, 2),
- new osm_map_values("Oklahoma","-103.41","33.56","-94.38","37.38", 106601625L, 2),
- new osm_map_values("Texas","-106.96","25.62","-92.97","36.58", 220587321L, 2),
- new osm_map_values("Virginia","-83.73","36.49","-74.25","39.52", 218627122L, 2),
- new osm_map_values("West Virginia","-82.70","37.15","-77.66","40.97", 133830267L, 2),
- new osm_map_values("West","-133.11","31.28","-101.99","49.51", 616041200L, 2),
- new osm_map_values("Arizona","-114.88","30.01","-108.99","37.06", 89434673L, 2),
- new osm_map_values("California","-125.94","32.43","-114.08","42.07", 303663259L, 2),
- new osm_map_values("Colorado","-109.11","36.52","-100.41","41.05", 132835514L, 2),
- new osm_map_values("Idaho","-117.30","41.93","-110.99","49.18", 97305030L, 2),
- new osm_map_values("Montana","-116.10","44.31","-102.64","49.74", 93935496L, 2),
- new osm_map_values("New Mexico","-109.10","26.98","-96.07","37.05", 185648327L, 2),
- new osm_map_values("Nevada","-120.2","35.0","-113.8","42.1", 138055868L, 2),
- new osm_map_values("Oregon","-124.8","41.8","-116.3","46.3", 103551459L, 2),
- new osm_map_values("Utah","-114.11","36.95","-108.99","42.05", 78249845L, 2),
- new osm_map_values("Washington State","-125.0","45.5","-116.9","49.0", 100601625L, 2),
- new osm_map_values("South+Middle America","-83.5","-56.3","-30.8","13.7", 204217202L, 0),
- new osm_map_values("Argentina","-73.9","-57.3","-51.6","-21.0", 105910515L, 1),
- new osm_map_values("Argentina+Chile","-77.2","-56.3","-52.7","-16.1", 111585063L, 1),
- new osm_map_values("Bolivia","-70.5","-23.1","-57.3","-9.3", 59215113L, 1),
- new osm_map_values("Brazil","-71.4","-34.7","-32.8","5.4", 127279780L, 1),
- new osm_map_values("Chile","-81.77","-58.50","-65.46","-17.41", 84808355L, 1),
- new osm_map_values("Cuba","-85.3","19.6","-74.0","23.6", 57704852L, 1),
- new osm_map_values("Colombia","-79.1","-4.0","-66.7","12.6", 85701114L, 1),
- new osm_map_values("Ecuador","-82.6","-5.4","-74.4","2.3", 63453353L, 1),
- new osm_map_values("Guyana+Suriname+Guyane Francaise","-62.0","1.0","-51.2","8.9", 57226004L, 1),
- new osm_map_values("Haiti+Republica Dominicana","-74.8","17.3","-68.2","20.1", 63826780L, 1),
- new osm_map_values("Jamaica","-78.6","17.4","-75.9","18.9", 53888545L, 1),
- new osm_map_values("Mexico","-117.6","14.1","-86.4","32.8", 258877491L, 1),
- new osm_map_values("Paraguay","-63.8","-28.1","-53.6","-18.8", 60539032L, 1),
- new osm_map_values("Peru","-82.4","-18.1","-67.5","0.4", 71286591L, 1),
- new osm_map_values("Uruguay","-59.2","-36.5","-51.7","-29.7", 64850903L, 1),
- new osm_map_values("Venezuela","-73.6","0.4","-59.7","12.8", 74521456L, 1)
+ new osm_map_values(Navit.get_text("Whole Planet"),"-180","-90","180","90", 7449814676L, 0),
+ new osm_map_values(Navit.get_text("Africa"),"-30.89","-36.17","61.68","38.40", 280880799L, 0),
+ new osm_map_values(Navit.get_text("Angola"),"11.4","-18.1","24.2","-5.3", 55850695L, 1),
+ new osm_map_values(Navit.get_text("Burundi"),"28.9","-4.5","30.9","-2.2", 60694550L, 1),
+ new osm_map_values(Navit.get_text("Canary Islands"),"-18.69","26.52","-12.79","29.99", 58904212L, 1),
+ new osm_map_values(Navit.get_text("Democratic Republic of the Congo"),"11.7","-13.6","31.5","5.7", 70168822L, 1),
+ new osm_map_values(Navit.get_text("Ethiopia"),"32.89","3.33","48.07","14.97", 68113437L, 1),
+ new osm_map_values(Navit.get_text("Guinea"),"-15.47","7.12","-7.58","12.74", 57466702L, 1),
+ new osm_map_values(Navit.get_text("Ivory Coast"),"-8.72","4.09","-2.43","10.80", 62652062L, 1),
+ new osm_map_values(Navit.get_text("Kenya"),"33.8","-5.2","42.4","4.9", 64420106L, 1),
+ new osm_map_values(Navit.get_text("Lesotho"),"26.9","-30.7","29.6","-28.4", 55533656L, 1),
+ new osm_map_values(Navit.get_text("Liberia"),"-15.00","-0.73","-7.20","8.65", 55963569L, 1),
+ new osm_map_values(Navit.get_text("Lybia"),"9.32","19.40","25.54","33.63", 63127225L, 1),
+ new osm_map_values(Navit.get_text("Madagascar"),"42.25","-26.63","51.20","-11.31", 56681202L, 1),
+ new osm_map_values(Navit.get_text("Nambia")+"+"+Navit.get_text("Botswana"),"11.4","-29.1","29.5","-16.9", 64357926L, 1),
+ new osm_map_values(Navit.get_text("Reunion"),"55.2","-21.4","55.9","-20.9", 59487456L, 1),
+ new osm_map_values(Navit.get_text("Rwanda"),"28.8","-2.9","30.9","-1.0", 60654274L, 1),
+ new osm_map_values(Navit.get_text("South Africa")+"+"+Navit.get_text("Lesotho"),"15.93","-36.36","33.65","-22.08", 79904318L, 1),
+ new osm_map_values(Navit.get_text("Tanzania"),"29.19","-11.87","40.74","-0.88", 65380211L, 1),
+ new osm_map_values(Navit.get_text("Uganda"),"29.3","-1.6","35.1","4.3", 61521337L, 1),
+ new osm_map_values(Navit.get_text("Asia"),"23.8","0.1","195.0","82.4", 1185692230L, 0),
+ new osm_map_values(Navit.get_text("Azerbaijan"),"44.74","38.34","51.69","42.37", 64563990L, 1),
+ new osm_map_values(Navit.get_text("China"),"67.3","5.3","135.0","54.5", 354889731L, 1),
+ new osm_map_values(Navit.get_text("Cyprus"),"32.0","34.5","34.9","35.8", 62657503L, 1),
+ new osm_map_values(Navit.get_text("India")+"+"+Navit.get_text("Nepal"),"67.9","5.5","89.6","36.0", 96930647L, 1),
+ new osm_map_values(Navit.get_text("Indonesia"),"93.7","-17.3","155.5","7.6", 81860551L, 1),
+ new osm_map_values(Navit.get_text("Iran"),"43.5","24.4","63.6","40.4", 79782055L, 1),
+ new osm_map_values(Navit.get_text("Iraq"),"38.7","28.5","49.2","37.4", 64053119L, 1),
+ new osm_map_values(Navit.get_text("Israel"),"33.99","29.8","35.95","33.4", 73981247L, 1),
+ new osm_map_values(Navit.get_text("Japan")+"+"+Navit.get_text("Korea")+"+"+Navit.get_text("Taiwan"),"117.6","20.5","151.3","47.1", 451295345L, 1),
+ new osm_map_values(Navit.get_text("Kazakhstan"),"46.44","40.89","87.36","55.45", 114949353L, 1),
+ new osm_map_values(Navit.get_text("Kyrgyzstan"),"69.23","39.13","80.33","43.29", 62425757L, 1),
+ new osm_map_values(Navit.get_text("Malasia")+"+"+Navit.get_text("Singapore"),"94.3","-5.9","108.6","6.8", 61142116L, 1),
+ new osm_map_values(Navit.get_text("Mongolia"),"87.5","41.4","120.3","52.7", 66228736L, 1),
+ new osm_map_values(Navit.get_text("Nambia")+"+"+Navit.get_text("Botswana"),"11.4","-29.1","29.5","-16.9", 64357926L, 1),
+ new osm_map_values(Navit.get_text("Pakistan"),"60.83","23.28","77.89","37.15", 74060802L, 1),
+ new osm_map_values(Navit.get_text("Philippines"),"115.58","4.47","127.85","21.60", 71601316L, 1),
+ new osm_map_values(Navit.get_text("Saudi Arabia"),"33.2","16.1","55.9","33.5", 100651634L, 1),
+ new osm_map_values(Navit.get_text("Thailand"),"97.5","5.7","105.2","19.7", 68260330L, 1),
+ new osm_map_values(Navit.get_text("Turkey"),"25.1","35.8","46.4","42.8", 105200911L, 1),
+ new osm_map_values(Navit.get_text("Turkmenistan"),"51.78","35.07","66.76","42.91", 62188003L, 1),
+ new osm_map_values(Navit.get_text("UAE+Other"),"51.5","22.6","56.7","26.5", 61873090L, 1),
+ new osm_map_values(Navit.get_text("Australia")+"+"+Navit.get_text("Oceania"),"89.84","-57.39","179.79","7.26", 185657003L, 0),
+ new osm_map_values(Navit.get_text("Australia"),"110.5","-44.2","154.9","-9.2", 138812990L, 0),
+ new osm_map_values(Navit.get_text("Tasmania"),"144.0","-45.1","155.3","-24.8", 109169592L, 1),
+ new osm_map_values(Navit.get_text("Victoria")+"+"+Navit.get_text("New South Wales"),"140.7","-39.4","153.7","-26.9", 104820309L, 1),
+ new osm_map_values(Navit.get_text("New Caledonia"),"157.85","-25.05","174.15","-16.85", 54512722L, 1),
+ new osm_map_values(Navit.get_text("New Zealand"),"165.2","-47.6","179.1","-33.7", 68221081L, 1),
+ new osm_map_values(Navit.get_text("Europe"),"-12.97","33.59","34.15","72.10", 3570653608L, 0),
+ new osm_map_values(Navit.get_text("Western Europe"),"-17.6","34.5","42.9","70.9", 3700019849L, 1),
+ new osm_map_values(Navit.get_text("Austria"),"9.4","46.32","17.21","49.1", 289080462L, 1),
+ new osm_map_values(Navit.get_text("Azores"),"-31.62","36.63","-24.67","40.13", 54507108L, 1),
+ new osm_map_values(Navit.get_text("BeNeLux"),"2.08","48.87","7.78","54.52", 656716695L, 1),
+ new osm_map_values(Navit.get_text("Netherlands"),"3.07","50.75","7.23","53.73", 525336576L, 1),
+ new osm_map_values(Navit.get_text("Denmark"),"7.65","54.32","15.58","58.07", 154275079L, 1),
+ new osm_map_values(Navit.get_text("Faroe Islands"),"-7.8","61.3","-6.1","62.5", 54931474L, 1),
+ new osm_map_values(Navit.get_text("France"),"-5.45","42.00","8.44","51.68", 1468741961L, 1),
+ new osm_map_values(Navit.get_text("Alsace"),"6.79","47.27","8.48","49.17", 144023488L, 2),
+ new osm_map_values(Navit.get_text("Aquitaine"),"-2.27","42.44","1.50","45.76", 186786072L, 2),
+ new osm_map_values(Navit.get_text("Auvergne"),"2.01","44.57","4.54","46.85", 118942252L, 2),
+ new osm_map_values(Navit.get_text("Basse-Normandie"),"-2.09","48.13","1.03","49.98", 111940365L, 2),
+ new osm_map_values(Navit.get_text("Bourgogne"),"2.80","46.11","5.58","48.45", 114109115L, 2),
+ new osm_map_values(Navit.get_text("Bretagne"),"-5.58","46.95","-0.96","48.99", 188689862L, 2),
+ new osm_map_values(Navit.get_text("Centre"),"0.01","46.29","3.18","48.99", 208870488L, 2),
+ new osm_map_values(Navit.get_text("Champagne-Ardenne"),"3.34","47.53","5.94","50.28", 112266252L, 2),
+ new osm_map_values(Navit.get_text("Corse"),"8.12","41.32","9.95","43.28", 67997394L, 2),
+ new osm_map_values(Navit.get_text("Franche-Comte"),"5.20","46.21","7.83","48.07", 131236689L, 2),
+ new osm_map_values(Navit.get_text("Haute-Normandie"),"-0.15","48.62","1.85","50.18", 90484736L, 2),
+ new osm_map_values(Navit.get_text("Ile-de-France"),"1.40","48.07","3.61","49.29", 152890366L, 2),
+ new osm_map_values(Navit.get_text("Languedoc-Roussillon"),"1.53","42.25","4.89","45.02", 168413195L, 2),
+ new osm_map_values(Navit.get_text("Limousin"),"0.58","44.87","2.66","46.50", 98422724L, 2),
+ new osm_map_values(Navit.get_text("Lorraine"),"4.84","47.77","7.72","49.73", 137538540L, 2),
+ new osm_map_values(Navit.get_text("Midi-Pyrenees"),"-0.37","42.18","3.50","45.10", 186740619L, 2),
+ new osm_map_values(Navit.get_text("Nord-pas-de-Calais"),"1.42","49.92","4.49","51.31", 145320230L, 2),
+ new osm_map_values(Navit.get_text("Pays-de-la-Loire"),"-2.88","46.20","0.97","48.62", 243736184L, 2),
+ new osm_map_values(Navit.get_text("Picardie"),"1.25","48.79","4.31","50.43", 163238861L, 2),
+ new osm_map_values(Navit.get_text("Poitou-Charentes"),"-1.69","45.04","1.26","47.23", 197886714L, 2),
+ new osm_map_values(Navit.get_text("Provence-Alpes-Cote-d-Azur"),"4.21","42.91","7.99","45.18", 179863755L, 2),
+ new osm_map_values(Navit.get_text("Rhone-Alpes"),"3.65","44.07","7.88","46.64", 201452039L, 2),
+ new osm_map_values(Navit.get_text("Germany"),"5.18","46.84","15.47","55.64", 1187298374L, 1),
+ new osm_map_values(Navit.get_text("Baden-Wuerttemberg"),"7.32","47.14","10.57","49.85", 247149038L, 2),
+ new osm_map_values(Navit.get_text("Bayern"),"8.92","47.22","13.90","50.62", 306577202L, 2),
+ new osm_map_values(Navit.get_text("Mittelfranken"),"9.86","48.78","11.65","49.84", 95916401L, 2),
+ new osm_map_values(Navit.get_text("Niederbayern"),"11.55","47.75","14.12","49.42", 119427776L, 2),
+ new osm_map_values(Navit.get_text("Oberbayern"),"10.67","47.05","13.57","49.14", 147630851L, 2),
+ new osm_map_values(Navit.get_text("Oberfranken"),"10.31","49.54","12.49","50.95", 104963024L, 2),
+ new osm_map_values(Navit.get_text("Oberpfalz"),"11.14","48.71","13.47","50.43", 112413336L, 2),
+ new osm_map_values(Navit.get_text("Schwaben"),"9.27","47.10","11.36","49.09", 126836560L, 2),
+ new osm_map_values(Navit.get_text("Unterfranken"),"8.59","49.16","10.93","50.67", 124601596L, 2),
+ new osm_map_values(Navit.get_text("Berlin"),"13.03","52.28","13.81","52.73", 78189548L, 2),
+ new osm_map_values(Navit.get_text("Brandenburg"),"11.17","51.30","14.83","53.63", 126821283L, 2),
+ new osm_map_values(Navit.get_text("Bremen"),"8.43","52.96","9.04","53.66", 69427370L, 2),
+ new osm_map_values(Navit.get_text("Hamburg"),"9.56","53.34","10.39","53.80", 76388380L, 2),
+ new osm_map_values(Navit.get_text("Hessen"),"7.72","49.34","10.29","51.71", 155980870L, 2),
+ new osm_map_values(Navit.get_text("Mecklenburg-Vorpommern"),"10.54","53.05","14.48","55.05", 92107050L, 2),
+ new osm_map_values(Navit.get_text("Niedersachsen"),"6.40","51.24","11.69","54.22", 288712601L, 2),
+ new osm_map_values(Navit.get_text("Nordrhein-westfalen"),"5.46","50.26","9.52","52.59", 335383638L, 2),
+ new osm_map_values(Navit.get_text("Rheinland-Pfalz"),"6.06","48.91","8.56","51.00", 157909942L, 2),
+ new osm_map_values(Navit.get_text("Saarland"),"6.30","49.06","7.46","49.69", 78579241L, 2),
+ new osm_map_values(Navit.get_text("Sachsen-Anhalt"),"10.50","50.88","13.26","53.11", 115314663L, 2),
+ new osm_map_values(Navit.get_text("Sachsen"),"11.82","50.11","15.10","51.73", 134182818L, 2),
+ new osm_map_values(Navit.get_text("Schleswig-Holstein"),"7.41","53.30","11.98","55.20", 114865543L, 2),
+ new osm_map_values(Navit.get_text("Thueringen"),"9.81","50.15","12.72","51.70", 112896293L, 2),
+ new osm_map_values(Navit.get_text("Germany")+"+"+Navit.get_text("Austria")+"+"+Navit.get_text("Switzerland"),"3.4","44.5","18.6","55.1", 1763000779L, 1),
+ new osm_map_values(Navit.get_text("Iceland"),"-25.3","62.8","-11.4","67.5", 58803839L, 1),
+ new osm_map_values(Navit.get_text("Ireland"),"-11.17","51.25","-5.23","55.9", 74456575L, 1),
+ new osm_map_values(Navit.get_text("Italy"),"6.52","36.38","18.96","47.19", 373215809L, 1),
+ new osm_map_values(Navit.get_text("Spain")+"+"+Navit.get_text("Portugal"),"-11.04","34.87","4.62","44.41", 354839261L, 1),
+ new osm_map_values(Navit.get_text("Mallorca"),"2.2","38.8","4.7","40.2", 66781797L, 2),
+ new osm_map_values(Navit.get_text("Galicia"),"-10.0","41.7","-6.3","44.1", 69081612L, 2),
+ new osm_map_values(Navit.get_text("Scandinavia"),"4.0","54.4","32.1","71.5", 386082513L, 1),
+ new osm_map_values(Navit.get_text("Finland"),"18.6","59.2","32.3","70.3", 167464389L, 1),
+ new osm_map_values(Navit.get_text("Denmark"),"7.49","54.33","13.05","57.88", 142017133L, 1),
+ new osm_map_values(Navit.get_text("Switzerland"),"5.79","45.74","10.59","47.84", 197612725L, 1),
+ new osm_map_values(Navit.get_text("UK"),"-9.7","49.6","2.2","61.2", 308044592L, 1),
+ new osm_map_values(Navit.get_text("England"),"-7.80","48.93","2.41","56.14", 331085897L, 1),
+ new osm_map_values(Navit.get_text("Buckinghamshire"),"-1.19","51.44","-0.43","52.25", 74619627L, 2),
+ new osm_map_values(Navit.get_text("Cambridgeshire"),"-0.55","51.96","0.56","52.79", 71849188L, 2),
+ new osm_map_values(Navit.get_text("Cumbria"),"-3.96","53.85","-2.11","55.24", 71699620L, 2),
+ new osm_map_values(Navit.get_text("East_yorkshire_with_hull"),"-1.16","53.50","0.54","54.26", 68241870L, 2),
+ new osm_map_values(Navit.get_text("Essex"),"-0.07","51.40","1.36","52.14", 82991499L, 2),
+ new osm_map_values(Navit.get_text("Herefordshire"),"-3.19","51.78","-2.29","52.45", 66471962L, 2),
+ new osm_map_values(Navit.get_text("Kent"),"-0.02","50.81","1.65","51.53", 75449128L, 2),
+ new osm_map_values(Navit.get_text("Lancashire"),"-3.20","53.43","-2.00","54.29", 75096621L, 2),
+ new osm_map_values(Navit.get_text("Leicestershire"),"-1.65","52.34","-0.61","53.03", 75492394L, 2),
+ new osm_map_values(Navit.get_text("Norfolk"),"0.10","52.30","2.04","53.41", 71556838L, 2),
+ new osm_map_values(Navit.get_text("Nottinghamshire"),"-1.39","52.73","-0.62","53.55", 72979826L, 2),
+ new osm_map_values(Navit.get_text("Oxfordshire"),"-1.77","51.41","-0.82","52.22", 73351886L, 2),
+ new osm_map_values(Navit.get_text("Shropshire"),"-3.29","52.26","-2.18","53.05", 69144272L, 2),
+ new osm_map_values(Navit.get_text("Somerset"),"-3.89","50.77","-2.20","51.40", 72098176L, 2),
+ new osm_map_values(Navit.get_text("South yorkshire"),"-1.88","53.25","-0.80","53.71", 72594920L, 2),
+ new osm_map_values(Navit.get_text("Suffolk"),"0.29","51.88","1.81","52.60", 72985880L, 2),
+ new osm_map_values(Navit.get_text("Surrey"),"-0.90","51.02","0.10","51.52", 79850137L, 2),
+ new osm_map_values(Navit.get_text("Wiltshire"),"-2.41","50.90","-1.44","51.76", 71244578L, 2),
+ new osm_map_values(Navit.get_text("Scotland"),"-8.13","54.49","-0.15","61.40", 102111248L, 2),
+ new osm_map_values(Navit.get_text("Wales"),"-5.56","51.28","-2.60","53.60", 84860075L, 2),
+ new osm_map_values(Navit.get_text("Albania"),"19.09","39.55","21.12","42.72", 71097966L, 1),
+ new osm_map_values(Navit.get_text("Belarus"),"23.12","51.21","32.87","56.23", 100471644L, 1),
+ new osm_map_values(Navit.get_text("Russia"),"27.9","41.5","190.4", "77.6", 508559360L, 1),
+ new osm_map_values(Navit.get_text("Bulgaria"),"24.7","42.1","24.8","42.1", 62211433L, 1),
+ new osm_map_values(Navit.get_text("Bosnia-Herzegovina"),"15.69","42.52","19.67","45.32", 75756822L, 1),
+ new osm_map_values(Navit.get_text("Czech Republic"),"11.91","48.48","19.02","51.17", 288911729L, 1),
+ new osm_map_values(Navit.get_text("Croatia"),"13.4","42.1","19.4","46.9", 118479986L, 1),
+ new osm_map_values(Navit.get_text("Estonia"),"21.5","57.5","28.2","59.6", 86149958L, 1),
+ new osm_map_values(Navit.get_text("Greece"),"28.9","37.8","29.0","37.8", 59191120L, 1),
+ new osm_map_values(Navit.get_text("Crete"),"23.3","34.5","26.8","36.0", 61121443L, 1),
+ new osm_map_values(Navit.get_text("Hungary"),"16.08","45.57","23.03","48.39", 129046944L, 1),
+ new osm_map_values(Navit.get_text("Latvia"),"20.7","55.6","28.3","58.1", 81683354L, 1),
+ new osm_map_values(Navit.get_text("Lithuania"),"20.9","53.8","26.9","56.5", 77228922L, 1),
+ new osm_map_values(Navit.get_text("Poland"),"13.6","48.8","24.5","55.0", 331299544L, 1),
+ new osm_map_values(Navit.get_text("Romania"),"20.3","43.5","29.9","48.4", 150011857L, 1),
+ new osm_map_values(Navit.get_text("North America"),"-178.1","6.5","-10.4","84.0", 2738147321L, 0),
+ new osm_map_values(Navit.get_text("Alaska"),"-179.5","49.5","-129","71.6", 72413728L, 1),
+ new osm_map_values(Navit.get_text("Canada"),"-141.3","41.5","-52.2","70.2", 1125713287L, 1),
+ new osm_map_values(Navit.get_text("Hawaii"),"-161.07","18.49","-154.45","22.85", 57463829L, 1),
+ new osm_map_values(Navit.get_text("USA")+Navit.get_text(" (except Alaska and Hawaii)"),"-125.4","24.3","-66.5","49.3", 2356238167L, 1),
+ new osm_map_values(Navit.get_text("Midwest"),"-104.11","35.92","-80.46","49.46", 663062321L, 2),
+ new osm_map_values(Navit.get_text("Michigan"),"-90.47","41.64","-79.00","49.37", 207416918L, 2),
+ new osm_map_values(Navit.get_text("Ohio"),"-84.87","38.05","-79.85","43.53", 143571732L, 2),
+ new osm_map_values(Navit.get_text("Northeast"),"-80.58","38.72","-66.83","47.53", 517925445L, 2),
+ new osm_map_values(Navit.get_text("Massachusetts"),"-73.56","40.78","-68.67","42.94", 159493455L, 2),
+ new osm_map_values(Navit.get_text("Vermont"),"-73.49","42.68","-71.41","45.07", 74308439L, 2),
+ new osm_map_values(Navit.get_text("Pacific"),"-180.05","15.87","-129.75","73.04", 78496182L, 2),
+ new osm_map_values(Navit.get_text("South"),"-106.70","23.98","-71.46","40.70", 1135650708L, 2),
+ new osm_map_values(Navit.get_text("Arkansas"),"-94.67","32.95","-89.59","36.60", 89637645L, 2),
+ new osm_map_values(Navit.get_text("District of Columbia"),"-77.17","38.74","-76.86","39.05", 64042148L, 2),
+ new osm_map_values(Navit.get_text("Florida"),"-88.75","23.63","-77.67","31.05", 118647388L, 2),
+ new osm_map_values(Navit.get_text("Louisiana"),"-94.09","28.09","-88.62","33.07", 136435773L, 2),
+ new osm_map_values(Navit.get_text("Maryland"),"-79.54","37.83","-74.99","40.22", 134152161L, 2),
+ new osm_map_values(Navit.get_text("Mississippi"),"-91.71","29.99","-88.04","35.05", 100291749L, 2),
+ new osm_map_values(Navit.get_text("Oklahoma"),"-103.41","33.56","-94.38","37.38", 106601625L, 2),
+ new osm_map_values(Navit.get_text("Texas"),"-106.96","25.62","-92.97","36.58", 220587321L, 2),
+ new osm_map_values(Navit.get_text("Virginia"),"-83.73","36.49","-74.25","39.52", 218627122L, 2),
+ new osm_map_values(Navit.get_text("West Virginia"),"-82.70","37.15","-77.66","40.97", 133830267L, 2),
+ new osm_map_values(Navit.get_text("West"),"-133.11","31.28","-101.99","49.51", 616041200L, 2),
+ new osm_map_values(Navit.get_text("Arizona"),"-114.88","30.01","-108.99","37.06", 89434673L, 2),
+ new osm_map_values(Navit.get_text("California"),"-125.94","32.43","-114.08","42.07", 303663259L, 2),
+ new osm_map_values(Navit.get_text("Colorado"),"-109.11","36.52","-100.41","41.05", 132835514L, 2),
+ new osm_map_values(Navit.get_text("Idaho"),"-117.30","41.93","-110.99","49.18", 97305030L, 2),
+ new osm_map_values(Navit.get_text("Montana"),"-116.10","44.31","-102.64","49.74", 93935496L, 2),
+ new osm_map_values(Navit.get_text("New Mexico"),"-109.10","26.98","-96.07","37.05", 185648327L, 2),
+ new osm_map_values(Navit.get_text("Nevada"),"-120.2","35.0","-113.8","42.1", 138055868L, 2),
+ new osm_map_values(Navit.get_text("Oregon"),"-124.8","41.8","-116.3","46.3", 103551459L, 2),
+ new osm_map_values(Navit.get_text("Utah"),"-114.11","36.95","-108.99","42.05", 78249845L, 2),
+ new osm_map_values(Navit.get_text("Washington State"),"-125.0","45.5","-116.9","49.0", 100601625L, 2),
+ new osm_map_values(Navit.get_text("South+Middle America"),"-83.5","-56.3","-30.8","13.7", 204217202L, 0),
+ new osm_map_values(Navit.get_text("Argentina"),"-73.9","-57.3","-51.6","-21.0", 105910515L, 1),
+ new osm_map_values(Navit.get_text("Argentina")+"+"+Navit.get_text("Chile"),"-77.2","-56.3","-52.7","-16.1", 111585063L, 1),
+ new osm_map_values(Navit.get_text("Bolivia"),"-70.5","-23.1","-57.3","-9.3", 59215113L, 1),
+ new osm_map_values(Navit.get_text("Brazil"),"-71.4","-34.7","-32.8","5.4", 127279780L, 1),
+ new osm_map_values(Navit.get_text("Chile"),"-81.77","-58.50","-65.46","-17.41", 84808355L, 1),
+ new osm_map_values(Navit.get_text("Cuba"),"-85.3","19.6","-74.0","23.6", 57704852L, 1),
+ new osm_map_values(Navit.get_text("Colombia"),"-79.1","-4.0","-66.7","12.6", 85701114L, 1),
+ new osm_map_values(Navit.get_text("Ecuador"),"-82.6","-5.4","-74.4","2.3", 63453353L, 1),
+ new osm_map_values(Navit.get_text("Guyana")+"+"+Navit.get_text("Suriname")+"+"+Navit.get_text("Guyane Francaise"),"-62.0","1.0","-51.2","8.9", 57226004L, 1),
+ new osm_map_values(Navit.get_text("Haiti")+"+"+Navit.get_text("Republica Dominicana"),"-74.8","17.3","-68.2","20.1", 63826780L, 1),
+ new osm_map_values(Navit.get_text("Jamaica"),"-78.6","17.4","-75.9","18.9", 53888545L, 1),
+ new osm_map_values(Navit.get_text("Mexico"),"-117.6","14.1","-86.4","32.8", 258877491L, 1),
+ new osm_map_values(Navit.get_text("Paraguay"),"-63.8","-28.1","-53.6","-18.8", 60539032L, 1),
+ new osm_map_values(Navit.get_text("Peru"),"-82.4","-18.1","-67.5","0.4", 71286591L, 1),
+ new osm_map_values(Navit.get_text("Uruguay"),"-59.2","-36.5","-51.7","-29.7", 64850903L, 1),
+ new osm_map_values(Navit.get_text("Venezuela"),"-73.6","0.4","-59.7","12.8", 74521456L, 1)
};
public static final String MAP_FILENAME_PATH = Navit.MAP_FILENAME_PATH;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2013-08-24 07:17:07
|
Revision: 5596
http://sourceforge.net/p/navit/code/5596
Author: martin-s
Date: 2013-08-24 07:17:05 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
Add:vehicle_gpsd_dbus:Option to ignore identical timestamps due to low floating point resolution in dbus-monitor
Modified Paths:
--------------
trunk/navit/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c
Modified: trunk/navit/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c
===================================================================
--- trunk/navit/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c 2013-08-24 07:12:16 UTC (rev 5595)
+++ trunk/navit/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c 2013-08-24 07:17:05 UTC (rev 5596)
@@ -39,6 +39,7 @@
struct vehicle_priv {
char *source;
char *address;
+ int flags;
struct callback_list *cbl;
DBusConnection *connection;
double time, track, speed, altitude;
@@ -92,7 +93,7 @@
priv->speed=speed;
if (!isnan(altitude))
priv->altitude=altitude;
- if (time != priv->time) {
+ if (time != priv->time || (priv->flags & 1)) {
priv->time=time;
priv->fix_time=time;
callback_list_call_attr_0(priv->cbl, attr_position_coord_geo);
@@ -199,6 +200,9 @@
vehicle_gpsd_dbus_open(priv);
}
return 1;
+ case attr_flags:
+ priv->flags=attr->u.num;
+ return 1;
default:
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2013-08-24 07:12:18
|
Revision: 5595
http://sourceforge.net/p/navit/code/5595
Author: martin-s
Date: 2013-08-24 07:12:16 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
Fix:Core:Draw line endpoints in correct width
Modified Paths:
--------------
trunk/navit/navit/graphics.c
Modified: trunk/navit/navit/graphics.c
===================================================================
--- trunk/navit/navit/graphics.c 2013-08-24 07:10:58 UTC (rev 5594)
+++ trunk/navit/navit/graphics.c 2013-08-24 07:12:16 UTC (rev 5595)
@@ -1465,6 +1465,10 @@
struct draw_polyline_shape *shape=&ctx->shape;
struct draw_polyline_shape *prev=&ctx->prev_shape;
+#if 0
+ dbg(0,"enter %d,%d - %d,%d %d\n",pnt[0].x,pnt[0].y,pnt[1].x,pnt[1].y,wi);
+#endif
+
*prev=*shape;
if (prev->wi != wi && prev->l) {
prev->wi=wi;
@@ -1597,6 +1601,13 @@
struct draw_polyline_context ctx;
int i=0;
int max_circle_points=20;
+ if (count < 2)
+ return;
+#if 0
+ dbg(0,"count=%d\n",count);
+ for (i = 0 ; i < count ; i++)
+ dbg(0,"%d,%d width %d\n",pnt[i].x,pnt[i].y,width[i]);
+#endif
ctx.shape.l=0;
ctx.res=g_alloca(sizeof(struct point)*maxpoints);
i=0;
@@ -1613,6 +1624,7 @@
draw_begin(&ctx,&pnt[i]);
}
}
+ draw_shape(&ctx, &pnt[count-2], *width++);
ctx.prev_shape=ctx.shape;
draw_end(&ctx,&pnt[count-1]);
ctx.res[ctx.npos]=ctx.res[ctx.ppos-1];
@@ -1978,6 +1990,7 @@
struct element *e=dc->e;
struct graphics_image *img=dc->img;
struct point p;
+ struct coord *c;
char *path;
while (di) {
@@ -1994,10 +2007,23 @@
count=limit_count(di->c, count);
if (dc->type == type_poly_water_tiled)
mindist=0;
+ c=di->c;
+#if 0
+ if (dc->e->type == element_polygon) {
+ int max=1000;
+ int offset=5600;
+ c+=offset;
+ count-=offset;
+ if (count < 0)
+ count=0;
+ if (count > max)
+ count=max;
+ }
+#endif
if (dc->e->type == element_polyline)
- count=transform(dc->trans, dc->pro, di->c, pa, count, mindist, e->u.polyline.width, width);
+ count=transform(dc->trans, dc->pro, c, pa, count, mindist, e->u.polyline.width, width);
else
- count=transform(dc->trans, dc->pro, di->c, pa, count, mindist, 0, NULL);
+ count=transform(dc->trans, dc->pro, c, pa, count, mindist, 0, NULL);
switch (e->type) {
case element_polygon:
graphics_draw_polygon_clipped(gra, gc, pa, count);
@@ -2373,6 +2399,9 @@
count=item_coord_get_within_selection(item, ca, item->type < type_line ? 1: max, displaylist->sel);
if (! count)
continue;
+#if 0
+ dbg(0,"%s 0x%x 0x%x\n",item_to_name(item->type), item->id_hi, item->id_lo);
+#endif
if (displaylist->dc.pro != pro)
transform_from_to_count(ca, displaylist->dc.pro, ca, pro, count);
if (count == max) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2013-08-24 07:11:01
|
Revision: 5594
http://sourceforge.net/p/navit/code/5594
Author: martin-s
Date: 2013-08-24 07:10:58 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
Fix:Core:Correctly clip multi polygons
Modified Paths:
--------------
trunk/navit/navit/transform.c
Modified: trunk/navit/navit/transform.c
===================================================================
--- trunk/navit/navit/transform.c 2013-08-24 07:10:00 UTC (rev 5593)
+++ trunk/navit/navit/transform.c 2013-08-24 07:10:58 UTC (rev 5594)
@@ -460,6 +460,7 @@
{
struct coord_3d result;
float clip_factor = (zlimit-c.z)/(c_old.z-c.z);
+ dbg(3,"in (%d,%d,%d) - (%d,%d,%d)\n", c.x,c.y,c.z, c_old.x,c_old.y,c_old.z);
result.x=c.x+(c_old.x-c.x)*clip_factor;
result.y=c.y+(c_old.y-c.y)*clip_factor;
result.z=zlimit;
@@ -471,6 +472,9 @@
transform_project_onto_view_plane(struct transformation *t, struct coord_3d c)
{
struct point result;
+#if 0
+ dbg(0,"z=%d\n",c.z);
+#endif
result.x = (long long)c.x*t->xscale/c.z;
result.y = (long long)c.y*t->yscale/c.z;
return result;
@@ -529,6 +533,10 @@
dbg(3,"count=%d\n", count);
for (i=0; i < count; i++) {
dbg(3, "input coord %d: (%d, %d)\n", i, input[i].x, input[i].y);
+ if (i && input[i].x == input[0].x && input[i].y == input[0].y && result_idx && !width_result) {
+ result[result_idx++]=result[0];
+ continue;
+ }
projected_coord = transform_correct_projection(t, required_projection, input[i]);
shifted_coord = transform_shift_by_center_and_scale(t, projected_coord);
rotated_coord = transform_rotate(t, shifted_coord);
@@ -541,6 +549,9 @@
} else if (clip_result.skip_coord){
continue;
}
+#if 0
+ clip_result.clipped_coord.z=2000000;
+#endif
screen_point = transform_project_onto_view_plane(t, clip_result.clipped_coord);
} else {
screen_point.x = rotated_coord.x>>POST_SHIFT;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2013-08-24 07:10:04
|
Revision: 5593
http://sourceforge.net/p/navit/code/5593
Author: martin-s
Date: 2013-08-24 07:10:00 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
Fix:Core:Correctly calculate linewidth in 3d mode
Modified Paths:
--------------
trunk/navit/navit/transform.c
Modified: trunk/navit/navit/transform.c
===================================================================
--- trunk/navit/navit/transform.c 2013-08-23 18:26:35 UTC (rev 5592)
+++ trunk/navit/navit/transform.c 2013-08-24 07:10:00 UTC (rev 5593)
@@ -558,9 +558,10 @@
}
result[result_idx]=screen_point;
if (width_result) {
- if (t->ddd)
- width_result[result_idx]=width*t->wscale/rotated_coord.z;
- else
+ if (t->ddd) {
+ dbg(3,"width %d * %d / %d\n",width,t->wscale,clip_result.clipped_coord.z);
+ width_result[result_idx]=width*t->wscale/clip_result.clipped_coord.z;
+ } else
width_result[result_idx]=width;
}
result_idx_last=result_idx;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2013-08-23 18:26:39
|
Revision: 5592
http://sourceforge.net/p/navit/code/5592
Author: martin-s
Date: 2013-08-23 18:26:35 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
Add:gui_internal:Show item id with attributes
Modified Paths:
--------------
trunk/navit/navit/gui/internal/gui_internal.c
Modified: trunk/navit/navit/gui/internal/gui_internal.c
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal.c 2013-08-23 18:10:39 UTC (rev 5591)
+++ trunk/navit/navit/gui/internal/gui_internal.c 2013-08-23 18:26:35 UTC (rev 5592)
@@ -860,6 +860,12 @@
wb->datai=count++;
g_free(text);
}
+ text=g_strdup_printf("%s:0x%x,0x%x", "ID", item->id_hi, item->id_lo);
+ gui_internal_widget_append(w,
+ wb=gui_internal_button_new(this, text,
+ NULL, gravity_left_center|orientation_horizontal|flags_fill));
+ wb->name=text;
+ wb->item=wm->item;
}
map_rect_destroy(mr);
gui_internal_menu_render(this);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2013-08-23 18:10:41
|
Revision: 5591
http://sourceforge.net/p/navit/code/5591
Author: martin-s
Date: 2013-08-23 18:10:39 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
Add:map_filter:Allow filtering by id
Modified Paths:
--------------
trunk/navit/navit/map/filter/filter.c
Modified: trunk/navit/navit/map/filter/filter.c
===================================================================
--- trunk/navit/navit/map/filter/filter.c 2013-08-22 21:58:47 UTC (rev 5590)
+++ trunk/navit/navit/map/filter/filter.c 2013-08-23 18:10:39 UTC (rev 5591)
@@ -83,7 +83,12 @@
}
if (old && entry && entry->cond_attr != attr_none) {
struct attr attr;
- if (!item_attr_get(item, entry->cond_attr, &attr)) {
+ if (entry->cond_attr == attr_id) {
+ char idstr[64];
+ sprintf(idstr,"0x%x 0x%x",item->id_hi,item->id_lo);
+ if (strcmp(entry->cond_str, idstr))
+ old=NULL;
+ } else if (!item_attr_get(item, entry->cond_attr, &attr)) {
old=NULL;
} else {
char *wildcard=strchr(entry->cond_str,'*');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-22 21:58:53
|
Revision: 5590
http://sourceforge.net/p/navit/code/5590
Author: sleske
Date: 2013-08-22 21:58:47 +0000 (Thu, 22 Aug 2013)
Log Message:
-----------
Fix:core:Handle <layer> without name or with invalid ref=.
Modified Paths:
--------------
trunk/navit/navit/layout.c
Modified: trunk/navit/navit/layout.c
===================================================================
--- trunk/navit/navit/layout.c 2013-08-22 21:58:34 UTC (rev 5589)
+++ trunk/navit/navit/layout.c 2013-08-22 21:58:47 UTC (rev 5590)
@@ -245,6 +245,10 @@
navit_object_unref((struct navit_object *)l->ref);
l->ref=NULL;
obj=(struct navit_object *)l->navit;
+ if (obj==NULL){
+ dbg(0, "Invalid layer reference '%s': Only layers inside a layout can use references.\n", attr->u.str);
+ return 0;
+ }
iter=obj->func->iter_new(obj);
while (obj->func->get_attr(obj, attr_layer, &layer, iter)) {
if (!strcmp(layer.u.layer->name, attr->u.str)) {
@@ -252,6 +256,9 @@
break;
}
}
+ if (l->ref==NULL){
+ dbg(0, "Ignoring reference to unknown layer '%s' in layer '%s'.\n", attr->u.str, l->name);
+ }
obj->func->iter_destroy(iter);
default:
return 0;
@@ -273,6 +280,11 @@
for (;*attrs; attrs++) {
layer_set_attr_do(l, *attrs, 1);
}
+ if (l->name==NULL){
+ dbg(0, "Ignoring layer without name.\n");
+ g_free(l);
+ return NULL;
+ }
return l;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-22 21:58:37
|
Revision: 5589
http://sourceforge.net/p/navit/code/5589
Author: sleske
Date: 2013-08-22 21:58:34 +0000 (Thu, 22 Aug 2013)
Log Message:
-----------
Fix:core:Build with -Wstrict-prototypes, fix warnings.
Modified Paths:
--------------
trunk/navit/CMakeLists.txt
trunk/navit/navit/callback.c
Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt 2013-08-21 22:22:32 UTC (rev 5588)
+++ trunk/navit/CMakeLists.txt 2013-08-22 21:58:34 UTC (rev 5589)
@@ -266,6 +266,8 @@
endif(QT_FOUND)
if(GTK2_FOUND)
+ # Include gtk.h with "SYSTEM" to avoid GCC compiler warning for gtkitemfactory.h.
+ include_directories(SYSTEM ${GTK2_GTK_INCLUDE_DIR})
include_directories(${GTK2_INCLUDE_DIRS})
set(HAVE_GTK2 1)
set_with_reason(gui/gtk "GTK libs found" TRUE ${GTK2_LIBRARIES})
@@ -642,7 +644,7 @@
# -Wno-sign-compare: We currently just use int almost everywhere.
# Unclear if it's really worth correcting.
if(CMAKE_COMPILER_IS_GNUCC OR CCMAKE_COMPILER_IS_GNUCXX)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes ")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes -Wstrict-prototypes ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-sign-compare ")
endif()
Modified: trunk/navit/navit/callback.c
===================================================================
--- trunk/navit/navit/callback.c 2013-08-21 22:22:32 UTC (rev 5588)
+++ trunk/navit/navit/callback.c 2013-08-22 21:58:34 UTC (rev 5589)
@@ -24,7 +24,9 @@
#include "callback.h"
struct callback {
- void (*func)();
+ /* func has variable number of arguments, not (void),
+ * but we must declare something... */
+ void (*func)(void);
int pcount;
enum attr_type type;
void *p[0];
@@ -157,28 +159,36 @@
pf[i+cb->pcount]=p[i];
switch (cb->pcount+pcount) {
case 8:
- cb->func(pf[0],pf[1],pf[2],pf[3],pf[4],pf[5],pf[6],pf[7]);
+ ((int (*)(void*,void*,void*,void*,void*,void*,void*,void*))cb->func)(
+ pf[0],pf[1],pf[2],pf[3],pf[4],pf[5],pf[6],pf[7]);
break;
case 7:
- cb->func(pf[0],pf[1],pf[2],pf[3],pf[4],pf[5],pf[6]);
+ ((int (*)(void*,void*,void*,void*,void*,void*,void*))cb->func)(
+ pf[0],pf[1],pf[2],pf[3],pf[4],pf[5],pf[6]);
break;
case 6:
- cb->func(pf[0],pf[1],pf[2],pf[3],pf[4],pf[5]);
+ ((int (*)(void*,void*,void*,void*,void*,void*))cb->func)(
+ pf[0],pf[1],pf[2],pf[3],pf[4],pf[5]);
break;
case 5:
- cb->func(pf[0],pf[1],pf[2],pf[3],pf[4]);
+ ((int (*)(void*,void*,void*,void*,void*))cb->func)(
+ pf[0],pf[1],pf[2],pf[3],pf[4]);
break;
case 4:
- cb->func(pf[0],pf[1],pf[2],pf[3]);
+ ((int (*)(void*,void*,void*,void*))cb->func)(
+ pf[0],pf[1],pf[2],pf[3]);
break;
case 3:
- cb->func(pf[0],pf[1],pf[2]);
+ ((int (*)(void*,void*,void*))cb->func)(
+ pf[0],pf[1],pf[2]);
break;
case 2:
- cb->func(pf[0],pf[1]);
+ ((int (*)(void*,void*))cb->func)(
+ pf[0],pf[1]);
break;
case 1:
- cb->func(pf[0]);
+ ((int (*)(void*))cb->func)(
+ pf[0]);
break;
case 0:
cb->func();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-21 22:22:35
|
Revision: 5588
http://sourceforge.net/p/navit/code/5588
Author: sleske
Date: 2013-08-21 22:22:32 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
Fix:core:Add -Wextra (with some warnings disabled), fix warning.
Modified Paths:
--------------
trunk/navit/CMakeLists.txt
trunk/navit/navit/search.c
Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt 2013-08-21 22:22:18 UTC (rev 5587)
+++ trunk/navit/CMakeLists.txt 2013-08-21 22:22:32 UTC (rev 5588)
@@ -634,9 +634,16 @@
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+# Compile with -Wall -Wextra. We need all the help we can get from the compiler :-).
+# Disabled warnings:
+# -Wno-missing-field-initializers: Used a lot, does not seem problematic.
+# -Wno-unused-parameter: Unfortunately occurs frequently because of
+# functions implementing the interface of a plugin.
+# -Wno-sign-compare: We currently just use int almost everywhere.
+# Unclear if it's really worth correcting.
if(CMAKE_COMPILER_IS_GNUCC OR CCMAKE_COMPILER_IS_GNUCXX)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wmissing-prototypes ")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wcast-align -Wpointer-arith ")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes ")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-sign-compare ")
endif()
if (EXTRA_DEFINES)
Modified: trunk/navit/navit/search.c
===================================================================
--- trunk/navit/navit/search.c 2013-08-21 22:22:18 UTC (rev 5587)
+++ trunk/navit/navit/search.c 2013-08-21 22:22:32 UTC (rev 5588)
@@ -331,7 +331,7 @@
tmp=this_->address_results;
while (tmp) {
struct search_list_result *slr=tmp->data;
- if (slr->country);
+ if (slr->country)
search_list_country_destroy(slr->country);
if (slr->town)
search_list_town_destroy(slr->town);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-21 22:22:24
|
Revision: 5587
http://sourceforge.net/p/navit/code/5587
Author: sleske
Date: 2013-08-21 22:22:18 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
Fix:graphics_opengl:Fix prototypes.
Modified Paths:
--------------
trunk/navit/navit/graphics/opengl/graphics_opengl.c
Modified: trunk/navit/navit/graphics/opengl/graphics_opengl.c
===================================================================
--- trunk/navit/navit/graphics/opengl/graphics_opengl.c 2013-08-21 22:22:03 UTC (rev 5586)
+++ trunk/navit/navit/graphics/opengl/graphics_opengl.c 2013-08-21 22:22:18 UTC (rev 5587)
@@ -213,7 +213,7 @@
#endif
static void motion_notify_do(struct graphics_priv *priv, int x, int y);
static void resize_callback_do(struct graphics_priv *priv, int w, int h);
-static void glut_close();
+static void glut_close(void);
#ifdef USE_OPENGLES2
const char vertex_src [] =
@@ -1105,7 +1105,7 @@
}
static void
-handle_mouse_queue()
+handle_mouse_queue(void)
{
#ifdef USE_OPENGLES
#else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-21 22:22:08
|
Revision: 5586
http://sourceforge.net/p/navit/code/5586
Author: sleske
Date: 2013-08-21 22:22:03 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
Fix:core:Build with -Wcast-align -Wmissing-prototypes, -Wpointer-arith, fix corresponding warnings.
Modified Paths:
--------------
trunk/navit/CMakeLists.txt
trunk/navit/navit/command.c
trunk/navit/navit/geom.c
trunk/navit/navit/graphics/opengl/graphics_opengl.c
trunk/navit/navit/gui/internal/gui_internal_poi.c
trunk/navit/navit/layout.c
trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c
trunk/navit/navit/maptool/osm.c
trunk/navit/navit/maptool/osm_relations.c
trunk/navit/navit/navit_nls.c
trunk/navit/navit/navit_nls.h
trunk/navit/navit/osd/core/osd_core.c
trunk/navit/navit/osd.c
trunk/navit/navit/profile_option.c
trunk/navit/navit/roadprofile.c
trunk/navit/navit/script.c
trunk/navit/navit/vehicleprofile.c
Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/CMakeLists.txt 2013-08-21 22:22:03 UTC (rev 5586)
@@ -634,7 +634,11 @@
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-add_definitions("-Wall")
+if(CMAKE_COMPILER_IS_GNUCC OR CCMAKE_COMPILER_IS_GNUCXX)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wmissing-prototypes ")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wcast-align -Wpointer-arith ")
+endif()
+
if (EXTRA_DEFINES)
add_definitions("${EXTRA_DEFINES}")
endif(EXTRA_DEFINES)
Modified: trunk/navit/navit/command.c
===================================================================
--- trunk/navit/navit/command.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/command.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -1191,7 +1191,7 @@
return 0;
}
-int
+static int
command_evaluate_single(struct context *ctx)
{
struct result res={{0,},},tmp={{0,},};
Modified: trunk/navit/navit/geom.c
===================================================================
--- trunk/navit/navit/geom.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/geom.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -400,7 +400,7 @@
return 0;
}
-int
+static int
clipcode(struct coord *p, struct rect *r)
{
int code=0;
Modified: trunk/navit/navit/graphics/opengl/graphics_opengl.c
===================================================================
--- trunk/navit/navit/graphics/opengl/graphics_opengl.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/graphics/opengl/graphics_opengl.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -195,7 +195,7 @@
#else
/* prototypes */
void APIENTRY tessBeginCB(GLenum which);
-void APIENTRY tessEndCB();
+void APIENTRY tessEndCB(void);
void APIENTRY tessErrorCB(GLenum errorCode);
void APIENTRY tessVertexCB(const GLvoid * data);
void APIENTRY tessVertexCB2(const GLvoid * data);
@@ -756,7 +756,7 @@
void APIENTRY
-tessEndCB()
+tessEndCB(void)
{
dbg(1, "glEnd();\n");
draw_array(graphics_priv_root, tess_array, tess_count, tess_type);
Modified: trunk/navit/navit/gui/internal/gui_internal_poi.c
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal_poi.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/gui/internal/gui_internal_poi.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -291,7 +291,7 @@
* @return Pointer to new widget.
*/
-void
+static void
format_dist(int dist, char *distbuf)
{
if (dist > 10000)
Modified: trunk/navit/navit/layout.c
===================================================================
--- trunk/navit/navit/layout.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/layout.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -60,16 +60,6 @@
return l;
}
-void
-layout_destroy(struct layout *layout)
-{
- attr_list_free(layout->attrs);
- g_free(layout->font);
- g_free(layout->dayname);
- g_free(layout->nightname);
- g_free(layout);
-}
-
struct attr_iter {
GList *last;
};
@@ -327,7 +317,7 @@
return layer_set_attr_do(layer, attr, 0);
}
-void
+static void
layer_destroy(struct layer *layer)
{
attr_list_free(layer->attrs);
Modified: trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c
===================================================================
--- trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -2016,7 +2016,7 @@
/* TODO: expose/use this function if desc->message_init==NULL
(which occurs for old code, and may be useful for certain
programatic techniques for generating descriptors). */
-void
+static void
protobuf_c_message_init_generic (const ProtobufCMessageDescriptor *desc,
ProtobufCMessage *message)
{
Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/maptool/osm.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -91,7 +91,7 @@
static int attr_mapping_rel2poly_place_count;
static int attr_longest_match(struct attr_mapping **mapping, int mapping_count, enum item_type *types, int types_count);
-static void attr_longest_match_clear();
+static void attr_longest_match_clear(void);
enum attr_strings {
Modified: trunk/navit/navit/maptool/osm_relations.c
===================================================================
--- trunk/navit/navit/maptool/osm_relations.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/maptool/osm_relations.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -152,7 +152,7 @@
}
}
-void
+static void
relations_destroy_func(void *key, GList *l, void *data)
{
GList *ll=l;
Modified: trunk/navit/navit/navit_nls.c
===================================================================
--- trunk/navit/navit/navit_nls.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/navit_nls.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -1,6 +1,7 @@
#include "config.h"
#include "debug.h"
#include <glib.h>
+#include <navit_nls.h>
#include <stdlib.h>
#ifdef HAVE_API_WIN32_CE
#include "libc.h"
Modified: trunk/navit/navit/navit_nls.h
===================================================================
--- trunk/navit/navit/navit_nls.h 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/navit_nls.h 2013-08-21 22:22:03 UTC (rev 5586)
@@ -1,7 +1,7 @@
#ifndef __NAVIT_NLS_H__
char *navit_nls_add_textdomain(const char *package, const char *dir);
-char *navit_nls_remove_textdomain(const char *package);
+void navit_nls_remove_textdomain(const char *package);
const char *navit_nls_gettext(const char *msgid);
const char *navit_nls_ngettext(const char *msgid, const char *msgid_plural, unsigned long int n);
void navit_nls_main_init(void);
Modified: trunk/navit/navit/osd/core/osd_core.c
===================================================================
--- trunk/navit/navit/osd/core/osd_core.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/osd/core/osd_core.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -1481,7 +1481,7 @@
osd_button_draw(opc,nav);
}
-char *
+static char *
osd_button_icon_path(struct osd_button *this_, char *src)
{
if (!this_->src_dir)
@@ -3058,7 +3058,7 @@
}
-int
+static int
osd_text_set_attr(struct osd_priv_common *opc, struct attr* attr)
{
struct osd_text *this_ = (struct osd_text *)opc->data;
Modified: trunk/navit/navit/osd.c
===================================================================
--- trunk/navit/navit/osd.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/osd.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -102,7 +102,7 @@
return navit_object_set_attr((struct navit_object *)osd, attr);
}
-void
+static void
osd_destroy(struct osd *osd)
{
if (osd && osd->meth.destroy) {
Modified: trunk/navit/navit/profile_option.c
===================================================================
--- trunk/navit/navit/profile_option.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/profile_option.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -27,7 +27,7 @@
NAVIT_OBJECT
};
-struct profile_option *
+static struct profile_option *
profile_option_new(struct attr *parent, struct attr **attrs)
{
struct profile_option *po=g_new0(struct profile_option, 1);
@@ -38,7 +38,7 @@
return po;
}
-void
+static void
profile_option_destroy(struct profile_option *po)
{
attr_list_free(po->attrs);
Modified: trunk/navit/navit/roadprofile.c
===================================================================
--- trunk/navit/navit/roadprofile.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/roadprofile.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -96,7 +96,7 @@
g_free(iter);
}
-struct roadprofile *
+static struct roadprofile *
roadprofile_dup(struct roadprofile *this_)
{
struct roadprofile *ret=g_new(struct roadprofile, 1);
@@ -106,7 +106,7 @@
return ret;
}
-void
+static void
roadprofile_destroy(struct roadprofile *this_)
{
attr_list_free(this_->attrs);
Modified: trunk/navit/navit/script.c
===================================================================
--- trunk/navit/navit/script.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/script.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -67,7 +67,7 @@
}
}
-struct script *
+static struct script *
script_new(struct attr *parent, struct attr **attrs)
{
struct script *scr=g_new0(struct script, 1);
@@ -83,7 +83,7 @@
return scr;
}
-void
+static void
script_destroy(struct script *scr)
{
dbg(0,"enter %p\n",scr);
Modified: trunk/navit/navit/vehicleprofile.c
===================================================================
--- trunk/navit/navit/vehicleprofile.c 2013-08-20 12:16:41 UTC (rev 5585)
+++ trunk/navit/navit/vehicleprofile.c 2013-08-21 22:22:03 UTC (rev 5586)
@@ -295,7 +295,7 @@
return this_->name;
}
-void
+static void
vehicleprofile_init(struct vehicleprofile *this_)
{
vehicleprofile_update(this_);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wog...@us...> - 2013-08-20 12:16:45
|
Revision: 5585
http://sourceforge.net/p/navit/code/5585
Author: woglinde
Date: 2013-08-20 12:16:41 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
Fix:font/freetype:cleanup fontconfig memory at exit
Modified Paths:
--------------
trunk/navit/navit/font/freetype/font_freetype.c
Modified: trunk/navit/navit/font/freetype/font_freetype.c
===================================================================
--- trunk/navit/navit/font/freetype/font_freetype.c 2013-08-20 11:22:56 UTC (rev 5584)
+++ trunk/navit/navit/font/freetype/font_freetype.c 2013-08-20 12:16:41 UTC (rev 5585)
@@ -779,6 +779,9 @@
static void
font_freetype_destroy(void) {
if (!library_deinit) {
+#ifdef HAVE_FONTCONFIG
+ FcFini();
+#endif
#if USE_CACHING
FTC_Manager_Done(manager);
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-19 19:59:12
|
Revision: 5583
http://sourceforge.net/p/navit/code/5583
Author: sleske
Date: 2013-08-19 19:59:09 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
Fix:maptoo:Use %zu for size_t.
Modified Paths:
--------------
trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c
Modified: trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c
===================================================================
--- trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c 2013-08-19 19:57:18 UTC (rev 5582)
+++ trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c 2013-08-19 19:59:09 UTC (rev 5583)
@@ -1330,7 +1330,7 @@
buffer->append (buffer, rv, scratch);
tmp = pack_buffer_packed_payload (field, count, array, buffer);
if (tmp != payload_len){
- fprintf (stderr, "Unexpected payload length: %zd (expected: %zd). Aborting.\n", tmp, payload_len);
+ fprintf (stderr, "Unexpected payload length: %zu (expected: %zu). Aborting.\n", tmp, payload_len);
abort ();
}
return rv + payload_len;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-19 19:57:23
|
Revision: 5582
http://sourceforge.net/p/navit/code/5582
Author: sleske
Date: 2013-08-19 19:57:18 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
Fix:maptool:Fix warning by turning assert into runtime check.|If there's a problem, we want to know about it.
Modified Paths:
--------------
trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c
Modified: trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c
===================================================================
--- trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c 2013-08-19 19:57:08 UTC (rev 5581)
+++ trunk/navit/navit/maptool/google/protobuf-c/protobuf-c.c 2013-08-19 19:57:18 UTC (rev 5582)
@@ -1329,7 +1329,10 @@
rv += uint32_pack (payload_len, scratch + rv);
buffer->append (buffer, rv, scratch);
tmp = pack_buffer_packed_payload (field, count, array, buffer);
- assert (tmp == payload_len);
+ if (tmp != payload_len){
+ fprintf (stderr, "Unexpected payload length: %zd (expected: %zd). Aborting.\n", tmp, payload_len);
+ abort ();
+ }
return rv + payload_len;
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sl...@us...> - 2013-08-19 19:57:10
|
Revision: 5581
http://sourceforge.net/p/navit/code/5581
Author: sleske
Date: 2013-08-19 19:57:08 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
Fix:core:Silence verbose logging from vehicleprofile.c.
Modified Paths:
--------------
trunk/navit/navit/vehicleprofile.c
Modified: trunk/navit/navit/vehicleprofile.c
===================================================================
--- trunk/navit/navit/vehicleprofile.c 2013-08-19 19:56:58 UTC (rev 5580)
+++ trunk/navit/navit/vehicleprofile.c 2013-08-19 19:57:08 UTC (rev 5581)
@@ -184,7 +184,7 @@
vehicleprofile_debug_roadprofile(gpointer key, gpointer value, gpointer user_data)
{
struct roadprofile *rp=value;
- dbg(0,"type %s avg %d weight %d max %d\n",item_to_name((int)(long)key),rp->speed,rp->route_weight,rp->maxspeed);
+ dbg(3,"type %s avg %d weight %d max %d\n",item_to_name((int)(long)key),rp->speed,rp->route_weight,rp->maxspeed);
}
static void
@@ -192,7 +192,7 @@
{
struct attr_iter *iter=vehicleprofile_attr_iter_new();
struct attr profile_option;
- dbg(0,"enter\n");
+ dbg(3,"enter\n");
vehicleprofile_clear(this_);
vehicleprofile_apply_attrs(this_, (struct navit_object *)this_, 0);
while (vehicleprofile_get_attr(this_, attr_profile_option, &profile_option, iter)) {
@@ -200,13 +200,13 @@
if (!profile_option.u.navit_object->func->get_attr(profile_option.u.navit_object, attr_active, &active, NULL))
active.u.num=0;
if (profile_option.u.navit_object->func->get_attr(profile_option.u.navit_object, attr_name, &name, NULL))
- dbg(0,"%p %s %ld\n",profile_option.u.navit_object,name.u.str,active.u.num);
+ dbg(3,"%p %s %ld\n",profile_option.u.navit_object,name.u.str,active.u.num);
if (active.u.num)
vehicleprofile_apply_attrs(this_, profile_option.u.navit_object, 1);
}
vehicleprofile_attr_iter_destroy(iter);
- dbg(0,"result l %d w %d h %d wg %d awg %d pen %d\n",this_->length,this_->width,this_->height,this_->weight,this_->axle_weight,this_->through_traffic_penalty);
- dbg(0,"m %d fwd 0x%x rev 0x%x flags 0x%x max %d stsp %d stdst %d dg %d\n",this_->mode,this_->flags_forward_mask,this_->flags_reverse_mask, this_->flags, this_->maxspeed_handling, this_->static_speed, this_->static_distance, this_->dangerous_goods);
+ dbg(3,"result l %d w %d h %d wg %d awg %d pen %d\n",this_->length,this_->width,this_->height,this_->weight,this_->axle_weight,this_->through_traffic_penalty);
+ dbg(3,"m %d fwd 0x%x rev 0x%x flags 0x%x max %d stsp %d stdst %d dg %d\n",this_->mode,this_->flags_forward_mask,this_->flags_reverse_mask, this_->flags, this_->maxspeed_handling, this_->static_speed, this_->static_distance, this_->dangerous_goods);
g_hash_table_foreach(this_->roadprofile_hash, vehicleprofile_debug_roadprofile, NULL);
}
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.
