Add:port_android:Prepare to switch to gettext translations of Android specific strings.

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

8 files changed, 243 insertions, 243 deletions

diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index 97c36f71..20723b0a 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -135,7 +135,7 @@ public class Navit extends Activity
 	}

 

 

-	public static String get_text(String in)

+	public static String _(String in)

 	{

 		return NavitTextTranslations.get_text(in);

 	}

@@ -588,7 +588,7 @@ public class Navit extends Activity
 		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);

diff --git a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
index 0644f4b0..f4f661ea 100644
--- a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
+++ b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
@@ -109,7 +109,7 @@ public class NavitAddressSearchActivity extends Activity {
 		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 @@ public class NavitAddressSearchActivity extends Activity {
 

 		// 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 @@ public class NavitAddressSearchActivity extends Activity {
 

 		// 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 @@ public class NavitAddressSearchActivity extends Activity {
 

 		// 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 @@ public class NavitAddressSearchActivity extends Activity {
 			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 @@ public class NavitAddressSearchActivity extends Activity {
 	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);

diff --git a/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java b/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java
index a961474b..1db76dca 100644
--- a/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java
+++ b/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java
@@ -227,7 +227,7 @@ public class NavitAndroidOverlay extends ImageView implements Runnable
 			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);

 

 		}

diff --git a/navit/android/src/org/navitproject/navit/NavitDialogs.java b/navit/android/src/org/navitproject/navit/NavitDialogs.java
index 22bb8ca3..a997eb5b 100644
--- a/navit/android/src/org/navitproject/navit/NavitDialogs.java
+++ b/navit/android/src/org/navitproject/navit/NavitDialogs.java
@@ -80,14 +80,14 @@ public class NavitDialogs extends Handler{
 			// 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 @@ public class NavitDialogs extends Handler{
 				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;
 				
diff --git a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
index d303f6d2..3a6cc692 100644
--- a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
+++ b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
@@ -126,7 +126,7 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
 

 		// 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);

diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index 650ee5cb..ad0280ee 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -136,8 +136,8 @@ public class NavitGraphics
 			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 @@ public class NavitGraphics
 				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 @@ public class NavitGraphics
 					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 @@ public class NavitGraphics
 				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;
 				}
 			}
diff --git a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index aab3dcfa..3a267d0a 100644
--- a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -94,208 +94,208 @@ public class NavitMapDownloader extends Thread
 	// 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 @@ public class NavitMapDownloader extends Thread
 	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 @@ public class NavitMapDownloader extends Thread
 		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 @@ public class NavitMapDownloader extends Thread
 				&& !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 @@ public class NavitMapDownloader extends Thread
 

 		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 @@ public class NavitMapDownloader extends Thread
 						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 @@ public class NavitMapDownloader extends Thread
 			}

 

 			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 @@ public class NavitMapDownloader extends Thread
 			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 @@ public class NavitMapDownloader extends Thread
 				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 @@ public class NavitMapDownloader extends Thread
 	}

 	

 	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));

 	}

diff --git a/navit/android/src/org/navitproject/navit/NavitTextTranslations.java b/navit/android/src/org/navitproject/navit/NavitTextTranslations.java
index af406c05..93aa5fe7 100644
--- a/navit/android/src/org/navitproject/navit/NavitTextTranslations.java
+++ b/navit/android/src/org/navitproject/navit/NavitTextTranslations.java
@@ -36,7 +36,7 @@ public class NavitTextTranslations
 		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 @@ public class NavitTextTranslations
 		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 @@ public class NavitTextTranslations
 		k = "towns";

 		v = new String[]{"en", "Towns", "de", "Städte"};

 		p(k, v);

-

+*/

 		Log.e("NavitTextTranslations", "... ready");

 	}