Add:Android:more translation of strings, some fixes, catch xhdpi density

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

6 files changed, 188 insertions, 56 deletions

diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index e5b04df43..c35115f49 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -341,7 +341,7 @@ public class Navit extends Activity implements Handler.Callback
 		infobox.setView(message);

 

 		//TRANS

-		infobox.setPositiveButton("Ok", new DialogInterface.OnClickListener()

+		infobox.setPositiveButton(Navit.get_text("Ok"), new DialogInterface.OnClickListener()

 		{

 			public void onClick(DialogInterface arg0, int arg1)

 			{

@@ -437,6 +437,17 @@ public class Navit extends Activity implements Handler.Callback
 				Log.e("Navit", "Failed to extract navit.xml for ldpi device(s)");

 			}

 		}

+		// xhdpi display

+		else if (Navit.metrics.densityDpi == 320)

+		{

+			Log.e("Navit", "found xhdpi device, this is not fully supported!!");

+			Log.e("Navit", "using hdpi values");

+			my_display_density = "hdpi";

+			if (!extractRes("navithdpi", NAVIT_DATA_DIR + "/share/navit.xml"))

+			{

+				Log.e("Navit", "Failed to extract navit.xml for xhdpi device(s)");

+			}

+		}

 		else

 		{

 			/* default, meaning we just dont know what display this is */

@@ -734,7 +745,7 @@ public class Navit extends Activity implements Handler.Callback
 		if (Navit_last_address_search_string.equals(""))

 		{

 			// empty search string entered

-			Toast.makeText(getApplicationContext(), "No address found", Toast.LENGTH_LONG).show(); //TRANS

+			Toast.makeText(getApplicationContext(), Navit.get_text("No address found"), Toast.LENGTH_LONG).show(); //TRANS

 		}

 		else

 		{

@@ -836,7 +847,7 @@ public class Navit extends Activity implements Handler.Callback
 			case 6 :

 				// ok startup address search activity

 				Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);

-				search_intent.putExtra("title", "Enter: City and Street"); //TRANS

+				search_intent.putExtra("title", Navit.get_text("Enter: City and Street")); //TRANS

 				search_intent.putExtra("address_string", Navit_last_address_search_string);

 				String pm_temp = "0";

 				if (Navit_last_address_partial_match)

@@ -957,7 +968,7 @@ public class Navit extends Activity implements Handler.Callback
 							if (addr.equals(""))

 							{

 								// empty search string entered

-								Toast.makeText(getApplicationContext(), "No search string entered",

+								Toast.makeText(getApplicationContext(), Navit.get_text("No search string entered"),

 										Toast.LENGTH_LONG).show(); //TRANS

 							}

 							else

@@ -1004,7 +1015,7 @@ public class Navit extends Activity implements Handler.Callback
 							Toast

 									.makeText(

 											getApplicationContext(),

-											"setting destination to\n"

+											Navit.get_text("setting destination to")+"\n"

 													+ Navit.NavitAddressResultList_foundItems

 															.get(destination_id).addr, Toast.LENGTH_LONG).show(); //TRANS

 

@@ -1073,8 +1084,8 @@ public class Navit extends Activity implements Handler.Callback
 					b.putInt("dialog_num", this.dialog_num);

 					b.putInt("max", Navit.ADDRESS_RESULTS_DIALOG_MAX);

 					b.putInt("cur", this.spinner_current_value % (Navit.ADDRESS_RESULTS_DIALOG_MAX + 1));

-					b.putString("title", "getting search results"); //TRANS

-					b.putString("text", "searching ..."); //TRANS

+					b.putString("title", Navit.get_text("getting search results")); //TRANS

+					b.putString("text", Navit.get_text("searching ...")); //TRANS

 					msg.setData(b);

 					mHandler.sendMessage(msg);

 					try

@@ -1123,8 +1134,8 @@ public class Navit extends Activity implements Handler.Callback
 			b.putInt("dialog_num", this.my_dialog_num);

 			b.putInt("max", Navit.ADDRESS_RESULTS_DIALOG_MAX);

 			b.putInt("cur", 0);

-			b.putString("title", "getting search results"); //TRANS

-			b.putString("text", "searching ..."); //TRANS

+			b.putString("title", Navit.get_text("getting search results")); //TRANS

+			b.putString("text", Navit.get_text("searching ...")); //TRANS

 			msg.setData(b);

 			mHandler.sendMessage(msg);

 

@@ -1148,12 +1159,11 @@ public class Navit extends Activity implements Handler.Callback
 			}

 			else

 			{

-				//Toast.makeText(getApplicationContext(), "No Results found!", Toast.LENGTH_LONG).show();

 				// not results found, show toast

 				msg = mHandler.obtainMessage();

 				b = new Bundle();

 				msg.what = 3;

-				b.putString("text", "No Results found!"); //TRANS

+				b.putString("text", Navit.get_text("No Results found!")); //TRANS

 				msg.setData(b);

 				mHandler.sendMessage(msg);

 			}

@@ -1349,7 +1359,7 @@ public class Navit extends Activity implements Handler.Callback
 				progressThread_pri.start();

 				// show license for OSM maps

 				Toast.makeText(getApplicationContext(),

-						"Map data (c) OpenStreetMap contributors, CC-BY-SA", Toast.LENGTH_LONG).show(); //TRANS

+						Navit.get_text("Map data (c) OpenStreetMap contributors, CC-BY-SA"), Toast.LENGTH_LONG).show(); //TRANS

 				return mapdownloader_dialog_pri;

 			case Navit.MAPDOWNLOAD_SEC_DIALOG :

 				mapdownloader_dialog_sec = new ProgressDialog(this);

@@ -1376,7 +1386,7 @@ public class Navit extends Activity implements Handler.Callback
 				progressThread_sec.start();

 				// show license for OSM maps

 				Toast.makeText(getApplicationContext(),

-						"Map data (c) OpenStreetMap contributors, CC-BY-SA", Toast.LENGTH_LONG).show(); //TRANS

+						Navit.get_text("Map data (c) OpenStreetMap contributors, CC-BY-SA"), Toast.LENGTH_LONG).show(); //TRANS

 				return mapdownloader_dialog_sec;

 		}

 		// should never get here!!

@@ -1420,7 +1430,7 @@ public class Navit extends Activity implements Handler.Callback
 	private void executeSearch(String search)

 	{

 		Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);

-		search_intent.putExtra("title", "Enter: City and Street"); //TRANS

+		search_intent.putExtra("title", Navit.get_text("Enter: City and Street")); //TRANS

 		search_intent.putExtra("address_string", search);

 		String pm_temp = "0";

 		if (Navit_last_address_partial_match)

diff --git a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
index 9769b38fa..6de3d0825 100644
--- a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
+++ b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
@@ -1,3 +1,22 @@
+/**

+ * Navit, a modular navigation system.

+ * Copyright (C) 2005-2008 Navit Team

+ *

+ * This program is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU General Public License

+ * version 2 as published by the Free Software Foundation.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the

+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

+ * Boston, MA  02110-1301, USA.

+ */

+

 package org.navitproject.navit;

 

 

@@ -46,7 +65,7 @@ public class NavitAddressSearchActivity extends Activity
 

 		// partial match checkbox

 		pm_checkbox = new CheckBox(this);

-		pm_checkbox.setText("partial match"); //TRANS

+		pm_checkbox.setText(Navit.get_text("partial match")); //TRANS

 		pm_checkbox.setChecked(false);

 		pm_checkbox.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,

 				LayoutParams.WRAP_CONTENT));

@@ -55,7 +74,7 @@ public class NavitAddressSearchActivity extends Activity
 

 		// search button

 		final Button btnSearch = new Button(this);

-		btnSearch.setText("Search"); //TRANS

+		btnSearch.setText(Navit.get_text("Search")); //TRANS

 		btnSearch.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,

 				LayoutParams.WRAP_CONTENT));

 		btnSearch.setGravity(Gravity.CENTER);

diff --git a/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java b/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java
index 160aeced2..4a9e09b50 100644
--- a/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java
+++ b/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java
@@ -357,7 +357,7 @@ public class NavitAndroidOverlay extends ImageView
 			bubble_paint.setTextSize((int) (20 / 1.5f * draw_factor));

 			bubble_paint.setStrokeWidth(3);

 			bubble_paint.setColor(Color.parseColor("#3b3131"));

-			c.drawText(NavitTextTranslations.NAVIT_JAVA_OVERLAY_BUBBLE_DRIVEHERE, this.bubble_001.x + dx + inner_dx,

+			c.drawText(Navit.get_text("drive 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/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index 1d3a91765..9a93aee1a 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -1263,8 +1263,8 @@ public class NavitGraphics
 		b.putInt("max", Navit.ADDRESS_RESULTS_DIALOG_MAX);
 		b.putInt("cur", Navit.NavitAddressResultList_foundItems.size()
 				% (Navit.ADDRESS_RESULTS_DIALOG_MAX + 1));
-		b.putString("title", "loading search results"); //TRANS
-		b.putString("text", "towns:" + Navit.search_results_towns + " " + Navit.get_text("Streets")
+		b.putString("title", Navit.get_text("loading search results")); //TRANS
+		b.putString("text", Navit.get_text("towns")+":" + Navit.search_results_towns + " " + Navit.get_text("Streets")
 				+ ":" + (int) (Navit.search_results_streets + Navit.search_results_streets_hn));
 		Navit.msg_to_msg_handler(b, 10); //TRANS
 	}
diff --git a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index fb7c9b810..b80f4933e 100644
--- a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -207,6 +207,11 @@ public class NavitMapDownloader
 																										"22.6", "56.7",

 																										"26.5", 57419510L,

 																										false, 2);

+	static final osm_map_values	Australia2										= new osm_map_values(

+																										"Australia", "110.5",

+																										"-44.2", "154.9",

+																										"-9.2", 128502185L,

+																										true, 3);

 	static final osm_map_values	Australia										= new osm_map_values(

 																										"Australia", "110.5",

 																										"-44.2", "154.9",

@@ -415,17 +420,17 @@ public class NavitMapDownloader
 																										"Nevada", "-120.2",

 																										"35.0", "-113.8",

 																										"42.1", 136754975L,

-																										false, 0);

+																										false, 5);

 	static final osm_map_values	Oregon											= new osm_map_values(

 																										"Oregon", "-124.8",

 																										"41.8", "-116.3",

 																										"46.3", 101627308L,

-																										false, 0);

+																										false, 5);

 	static final osm_map_values	Washington_State								= new osm_map_values(

 																										"Washington State",

 																										"-125.0", "45.5",

 																										"-116.9", "49.0",

-																										98178877L, false, 0);

+																										98178877L, false, 5);

 	static final osm_map_values	South_Middle_America							= new osm_map_values(

 																										"South+Middle America",

 																										"-83.5", "-56.3",

@@ -435,72 +440,72 @@ public class NavitMapDownloader
 																										"Argentina", "-73.9",

 																										"-57.3", "-51.6",

 																										"-21.0", 87516152L,

-																										false, 0);

+																										false, 6);

 	static final osm_map_values	Argentina_Chile								= new osm_map_values(

 																										"Argentina+Chile",

 																										"-77.2", "-56.3",

 																										"-52.7", "-16.1",

-																										91976696L, false, 0);

+																										91976696L, false, 6);

 	static final osm_map_values	Bolivia											= new osm_map_values(

 																										"Bolivia", "-70.5",

 																										"-23.1", "-57.3",

 																										"-9.3", 58242168L,

-																										false, 0);

+																										false, 6);

 	static final osm_map_values	Brazil											= new osm_map_values(

 																										"Brazil", "-71.4",

 																										"-34.7", "-32.8",

 																										"5.4", 105527899L,

-																										false, 0);

+																										false, 6);

 	static final osm_map_values	Cuba												= new osm_map_values(

 																										"Cuba", "-85.3",

 																										"19.6", "-74.0",

 																										"23.6", 56608942L,

-																										false, 0);

+																										false, 6);

 	static final osm_map_values	Colombia											= new osm_map_values(

 																										"Colombia", "-79.1",

 																										"-4.0", "-66.7",

 																										"12.6", 78658454L,

-																										false, 0);

+																										false, 6);

 	static final osm_map_values	Ecuador											= new osm_map_values(

 																										"Ecuador", "-82.6",

 																										"-5.4", "-74.4",

 																										"2.3", 61501914L,

-																										false, 0);

+																										false, 6);

 	static final osm_map_values	Guyana_Suriname_Guyane_Francaise			= new osm_map_values(

 																										"Guyana+Suriname+Guyane Francaise",

 																										"-62.0", "1.0",

 																										"-51.2", "8.9",

-																										57040689L, false, 0);

+																										57040689L, false, 6);

 	static final osm_map_values	Haiti_Republica_Dominicana					= new osm_map_values(

 																										"Haiti+Republica Dominicana",

 																										"-74.8", "17.3",

 																										"-68.2", "20.1",

-																										63528584L, false, 0);

+																										63528584L, false, 6);

 	static final osm_map_values	Jamaica											= new osm_map_values(

 																										"Jamaica", "-78.6",

 																										"17.4", "-75.9",

 																										"18.9", 53958307L,

-																										false, 0);

+																										false, 6);

 	static final osm_map_values	Mexico											= new osm_map_values(

 																										"Mexico", "-117.6",

 																										"14.1", "-86.4",

 																										"32.8", 251108617L,

-																										false, 0);

+																										false, 6);

 	static final osm_map_values	Paraguay											= new osm_map_values(

 																										"Paraguay", "-63.8",

 																										"-28.1", "-53.6",

 																										"-18.8", 57188715L,

-																										false, 0);

+																										false, 6);

 	static final osm_map_values	Peru												= new osm_map_values(

 																										"Peru", "-82.4",

 																										"-18.1", "-67.5",

 																										"0.4", 65421441L,

-																										false, 0);

+																										false, 6);

 	static final osm_map_values	Uruguay											= new osm_map_values(

 																										"Uruguay", "-59.2",

 																										"-36.5", "-51.7",

 																										"-29.7", 63542225L,

-																										false, 0);

+																										false, 6);

 	static final osm_map_values	Venezuela										= new osm_map_values(

 																										"Venezuela", "-73.6",

 																										"0.4", "-59.7",

@@ -511,7 +516,7 @@ public class NavitMapDownloader
 			Whole_Planet, Africa, Angola, Burundi, Democratic_Republic_of_the_Congo, Kenya, Lesotho,

 			Madagascar, Nambia_Botswana, Reunion, Rwanda, South_Africa, Uganda, Asia, China, Cyprus,

 			India_Nepal, Indonesia, Iran, Iraq, Israel, Japan_Korea_Taiwan, Malasia_Singapore,

-			Mongolia, Nambia_Botswana, Thailand, Turkey, UAE_Other, Australia, Tasmania,

+			Mongolia, Nambia_Botswana, Thailand, Turkey, UAE_Other, Australia2, Australia, Tasmania,

 			Victoria_New_South_Wales, New_Zealand, Europe, Western_Europe, Austria, BeNeLux,

 			Faroe_Islands, France, Germany, Bavaria, Saxonia, Germany_Austria_Switzerland, Iceland,

 			Ireland, Italy, Spain_Portugal, Mallorca, Galicia, Scandinavia, Finland, Denmark,

@@ -521,7 +526,6 @@ public class NavitMapDownloader
 			Argentina, Argentina_Chile, Bolivia, Brazil, Cuba, Colombia, Ecuador,

 			Guyana_Suriname_Guyane_Francaise, Haiti_Republica_Dominicana, Jamaica, Mexico, Paraguay,

 			Peru, Uruguay, Venezuela													};

-	//public static String[]			OSM_MAP_NAME_LIST								= null;

 

 	public static String[]			OSM_MAP_NAME_LIST_inkl_SIZE_ESTIMATE	= null;

 

@@ -530,8 +534,8 @@ public class NavitMapDownloader
 	private static Boolean			already_inited									= false;

 

 	public Boolean						stop_me											= false;

-	static final int					SOCKET_CONNECT_TIMEOUT						= 6000;

-	static final int					SOCKET_READ_TIMEOUT							= 6000;

+	static final int					SOCKET_CONNECT_TIMEOUT						= 25000;							// 25 secs.

+	static final int					SOCKET_READ_TIMEOUT							= 15000;							// 15 secs.

 	static final int					MAP_WRITE_FILE_BUFFER						= 1024 * 64;

 	static final int					MAP_WRITE_MEM_BUFFER							= 1024 * 64;

 	static final int					MAP_READ_FILE_BUFFER							= 1024 * 64;

@@ -724,8 +728,8 @@ public class NavitMapDownloader
 		b.putInt("max", 20); // use a dummy number here

 		b.putInt("cur", 0);

 		b.putInt("dialog_num", my_dialog_num);

-		b.putString("title", "Mapdownload"); //TRANS

-		b.putString("text", "downloading: " + map_values.map_name); //TRANS

+		b.putString("title", Navit.get_text("Mapdownload")); //TRANS

+		b.putString("text", Navit.get_text("downloading") + ": " + map_values.map_name); //TRANS

 		msg.setData(b);

 		handler.sendMessage(msg);

 		try

@@ -822,7 +826,7 @@ public class NavitMapDownloader
 					b.putInt("max", (int) (map_values.est_size_bytes / 1024));

 					b.putInt("cur", (int) (already_read / 1024));

 					b.putInt("dialog_num", my_dialog_num);

-					b.putString("title", "Map download"); //TRANS

+					b.putString("title", Navit.get_text("Mapdownload")); //TRANS

 					per_second_overall = (float) already_read

 							/ (float) ((System.currentTimeMillis() - start_timestamp) / 1000);

 					kbytes_per_second = formatter.format((per_second_overall / 1024f));

@@ -836,10 +840,12 @@ public class NavitMapDownloader
 					{

 						eta_string = eta_seconds + " s";

 					}

-					b.putString("text", "downloading: " + map_values.map_name + "\n" + " "

-							+ (int) (already_read / 1024f / 1024f) + "Mb / "

-							+ (int) (map_values.est_size_bytes / 1024f / 1024f) + "Mb" + "\n" + " "

-							+ kbytes_per_second + "kb/s" + " ETA: " + eta_string); //TRANS

+					b

+							.putString("text", Navit.get_text("downloading") + ": " + map_values.map_name

+									+ "\n" + " " + (int) (already_read / 1024f / 1024f) + "Mb / "

+									+ (int) (map_values.est_size_bytes / 1024f / 1024f) + "Mb" + "\n" + " "

+									+ kbytes_per_second + "kb/s" + " " + Navit.get_text("ETA") + ": "

+									+ eta_string); //TRANS

 					msg.setData(b);

 					handler.sendMessage(msg);

 				}

@@ -866,7 +872,7 @@ public class NavitMapDownloader
 			b = new Bundle();

 			msg.what = 2;

 			b.putInt("dialog_num", my_dialog_num);

-			b.putString("text", "Error downloading map!"); //TRANS

+			b.putString("text", Navit.get_text("Error downloading map!")); //TRANS

 			msg.setData(b);

 			handler.sendMessage(msg);

 

@@ -879,7 +885,7 @@ public class NavitMapDownloader
 			b = new Bundle();

 			msg.what = 2;

 			b.putInt("dialog_num", my_dialog_num);

-			b.putString("text", "Error downloading map!"); //TRANS

+			b.putString("text", Navit.get_text("Error downloading map!")); //TRANS

 			msg.setData(b);

 			handler.sendMessage(msg);

 

@@ -893,8 +899,8 @@ public class NavitMapDownloader
 		b.putInt("max", (int) (map_values.est_size_bytes / 1024));

 		b.putInt("cur", (int) (map_values.est_size_bytes / 1024));

 		b.putInt("dialog_num", my_dialog_num);

-		b.putString("title", "Mapdownload"); //TRANS

-		b.putString("text", map_values.map_name + " ready"); //TRANS

+		b.putString("title", Navit.get_text("Mapdownload")); //TRANS

+		b.putString("text", map_values.map_name + " "+Navit.get_text("ready")); //TRANS

 		msg.setData(b);

 		handler.sendMessage(msg);

 

diff --git a/navit/android/src/org/navitproject/navit/NavitTextTranslations.java b/navit/android/src/org/navitproject/navit/NavitTextTranslations.java
index 433f69143..c738c869c 100644
--- a/navit/android/src/org/navitproject/navit/NavitTextTranslations.java
+++ b/navit/android/src/org/navitproject/navit/NavitTextTranslations.java
@@ -1,3 +1,22 @@
+/**

+ * Navit, a modular navigation system.

+ * Copyright (C) 2005-2008 Navit Team

+ *

+ * This program is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU General Public License

+ * version 2 as published by the Free Software Foundation.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the

+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

+ * Boston, MA  02110-1301, USA.

+ */

+

 package org.navitproject.navit;

 

 import java.util.HashMap;

@@ -198,6 +217,7 @@ public class NavitTextTranslations
 		String k = null;

 		String[] v = null;

 

+

 		k = "exit navit";

 		v = new String[]{"en", "Exit Navit", "de", "Navit beenden", "nl", "Navit afsluiten", "fr",

 				"Quittez Navit"};

@@ -216,6 +236,83 @@ public class NavitTextTranslations
 				"Cherchez adresse"};

 		p(k, v);

 

+		k = "Mapdownload";

+		v = new String[]{"en", "Mapdownload", "de", "Kartendownload"};

+		p(k, v);

+

+		k = "downloading";

+		v = new String[]{"en", "downloading"};

+		p(k, v);

+

+		k = "ETA";

+		v = new String[]{"en", "ETA", "de", "fertig in"};

+		p(k, v);

+

+		k = "Error downloading map!";

+		v = new String[]{"en", "Error downloading map!", "de", "Fehler beim Kartendownload"};

+		p(k, v);

+

+		k = "ready";

+		v = new String[]{"en", "ready", "de", "fertig"};

+		p(k, v);

+

+		k = "Ok";

+		v = new String[]{"en", "Ok"};

+		p(k, v);

+

+		k = "No address found";

+		v = new String[]{"en", "No address found", "de", "Keine Adresse gefunden"};

+		p(k, v);

+

+		k = "Enter: City and Street";

+		v = new String[]{"en", "Enter: City and Street", "de", "Stadt und Straße:"};

+		p(k, v);

+

+		k = "No search string entered";

+		v = new String[]{"en", "No search string entered", "de", "Keine Eingabe"};

+		p(k, v);

+

+		k = "setting destination to";

+		v = new String[]{"en", "setting destination to", "de", "neues Fahrziel"};

+		p(k, v);

+

+		k = "getting search results";

+		v = new String[]{"en", "getting search results", "de", "lade Suchergebnisse"};

+		p(k, v);

+

+		k = "searching ...";

+		v = new String[]{"en", "searching ...", "de", "Suche läuft ..."};

+		p(k, v);

+

+		k = "No Results found!";

+		v = new String[]{"en", "No Results found!", "de", "Suche liefert kein Ergebnis!"};

+		p(k, v);

+

+		k = "Map data (c) OpenStreetMap contributors, CC-BY-SA";

+		v = new String[]{"en", "Map data (c) OpenStreetMap contributors, CC-BY-SA"};

+		p(k, v);

+

+		k = "partial match";

+		v = new String[]{"en", "partial match", "de", "ungefähr"};

+		p(k, v);

+

+		k = "Search";

+		v = new String[]{"en", "Search", "de", "suchen"};

+		p(k, v);

+

+		k = "drive here";

+		v = new String[]{"en", "drive here", "de", "Ziel setzen"};

+		p(k, v);

+

+		k = "loading search results";

+		v = new String[]{"en", "loading search results", "de", "lade Suchergebnisse"};

+		p(k, v);

+

+		k = "towns";

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

+		p(k, v);

+

+

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

 	}

 

@@ -242,7 +339,7 @@ public class NavitTextTranslations
 	{

 		String out = null;

 

-		Log.e("NavitTextTranslations", "lookup L:" + main_language + " T:" + in);

+		//Log.e("NavitTextTranslations", "lookup L:" + main_language + " T:" + in);

 		try

 		{

 			out = Navit_text_lookup.get(in).get(main_language);

@@ -250,21 +347,21 @@ public class NavitTextTranslations
 		catch (Exception e)

 		{

 			// most likely there is not translation yet

-			Log.e("NavitTextTranslations", "lookup: exception");

+			//Log.e("NavitTextTranslations", "lookup: exception");

 			out = null;

 		}

 

 		if (out == null)

 		{

 			// always return a string for output (use fallback language)

-			Log.e("NavitTextTranslations", "using default language");

+			//Log.e("NavitTextTranslations", "using default language");

 			try

 			{

 				out = Navit_text_lookup.get(in).get(fallback_language);

 			}

 			catch (Exception e)

 			{

-				Log.e("NavitTextTranslations", "using default language: exception");

+				//Log.e("NavitTextTranslations", "using default language: exception");

 				// most likely there is not translation yet

 				out = null;

 			}

@@ -274,7 +371,7 @@ public class NavitTextTranslations
 		{

 			// if we still dont have any text, use the ".mo" file and call the c-function gettext(in)

 			out = NavitGraphics.getLocalizedString(in);

-			Log.e("NavitTextTranslations", "return the value from gettext() = " + out);

+			//Log.e("NavitTextTranslations", "return the value from gettext() = " + out);

 		}

 		return out;

 	}