diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 2883c88e7d..10f70f32ba 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -617,7 +617,7 @@
   navigaci pro dlouhé vzdálenosti (experimentální)</string>
   <string name="osmand_routing_experimental">Offline navigace je
   experimentální a funguje jen pro vzdálenosti do 20
-  km.\nPak se navigace automaticky přepne na online Cloudmade.</string>
+  km.\nPak se navigace automaticky přepne na online CloudMade.</string>
   <string name="specified_dir_doesnt_exist">Nemohu najít zadaný adresář.</string>
   <string name="application_dir">Adresář pro data</string>
   <string name="application_dir_change_warning">Změna adresáře pro
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index ec4e4cdbbb..ae2447a253 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -355,7 +355,7 @@
 <string name="version_index_is_not_supported">La version \'\'{0}\'\' de l\'index n\'est pas supporté</string>
 <string name="use_osmand_routing_service">Navigation hors-ligne OsmAnd</string>
 <string name="use_osmand_routing_service_descr">Utiliser la navigation hors-ligne pour les longues distances (expérimental)</string>
-<string name="osmand_routing_experimental">La navigation hors-ligne OsmAnd est une fonction expérimentale ne fonctionnant pas pour une distance de plus de 20 km.\n Le service utilise alors automatiquement le service en-ligne Cloudmade.</string>
+<string name="osmand_routing_experimental">La navigation hors-ligne OsmAnd est une fonction expérimentale ne fonctionnant pas pour une distance de plus de 20 km.\n Le service utilise alors automatiquement le service en-ligne CloudMade.</string>
 <string name="specified_dir_doesnt_exist">Le répertoire spécifié est introuvable.</string>
 <string name="application_dir">Répertoire de stockage</string>
 <string name="application_dir_change_warning">Le changement du répertoire de stockage ne déplacera pas vos données. Vous devrez alors le faire vous même ! Faites-le à vos risques et périls ! Continuer quand même ?</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 37c813eb5f..4ed81f2dbd 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -390,7 +390,7 @@
 
 	<string name="use_osmand_routing_service">Routing OsmAnd</string>
 	<string name="use_osmand_routing_service_descr">Usa il routing OsmAnd offline per lunghe distanze (sperimentale)</string>
-	<string name="osmand_routing_experimental">Il routing offline di OsmAnd è sperimentale e non funziona per distanze superiori ai 20 km.\n Il servizio routing viene cambiato temporaneo tramite Cloudmade online.</string>
+	<string name="osmand_routing_experimental">Il routing offline di OsmAnd è sperimentale e non funziona per distanze superiori ai 20 km.\n Il servizio routing viene cambiato temporaneo tramite CloudMade online.</string>
 	<string name="specified_dir_doesnt_exist">Impossibile trovare la directory specificata.</string>
 	<string name="application_dir">Cartella deposito</string>
 	<string name="application_dir_change_warning">Il cambiamento della cartella non sposterà nè eliminerà i dati. Dovrà essere fatto manualmente al di fuori di OsmAnd. Continuare?</string>
diff --git a/OsmAnd/res/values-jp/strings.xml b/OsmAnd/res/values-jp/strings.xml
index d6413cdb76..b809fbb41c 100644
--- a/OsmAnd/res/values-jp/strings.xml
+++ b/OsmAnd/res/values-jp/strings.xml
@@ -260,7 +260,7 @@ OSMコミュニティはこの問題をいち早く修正することができ
 OsmAndを使用(実験版)</string>
      <string name="osmand_routing_experimental">OsmAndオフライン経路案内は実験的な機能であり
 20km以上の距離では動作しません。
-\n 経路案内サービスはオンラインのCloudmadeに自動的に切り替わります。</string>
+\n 経路案内サービスはオンラインのCloudMadeに自動的に切り替わります。</string>
      <string name="specified_dir_doesnt_exist">指定されたディレクトリが見つかりません。</string>
      <string name="application_dir">記憶領域のディレクトリ</string>
      <string name="application_dir_change_warning">領域のディレクトリ変更は
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 19e2428954..2243a0d8f6 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -336,7 +336,7 @@
 
 <string name="use_osmand_routing_service">OsmAnd routing</string>
 <string name="use_osmand_routing_service_descr">Użyj routingu offline dla długich tras (funkcjonalność eksperymentalna)</string>
-<string name="osmand_routing_experimental">Routing offline OsmAnd-a jest funcją eksperymentalną i nie działa dobrze dla odległości większych niż 20km.\n Usługa routująca jest automatycznie przełączana do Cloudmade (online).</string>
+<string name="osmand_routing_experimental">Routing offline OsmAnd-a jest funcją eksperymentalną i nie działa dobrze dla odległości większych niż 20km.\n Usługa routująca jest automatycznie przełączana do CloudMade (online).</string>
 <string name="specified_dir_doesnt_exist">Can not find specified directory.</string>
 <string name="application_dir">Storage directory</string>
 <string name="application_dir_change_warning">Changing the storage directory will not move or delete the data. This must be performed separately and outside OsmAnd. Continue anyway?</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index a94c160daf..bff7f55d73 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -324,7 +324,7 @@
 	
 	<string name="use_osmand_routing_service">OsmAnd offline навигация</string>
 	<string name="use_osmand_routing_service_descr">Использовать offline навигацию на длинные расстояние (экспериментально)</string>
-	<string name="osmand_routing_experimental">OsmAnd offline навигация является экспериментальной и не работает на расстояния более 20 километров.\n В этом случае автоматически переключается на Cloudmade.</string>
+	<string name="osmand_routing_experimental">OsmAnd offline навигация является экспериментальной и не работает на расстояния более 20 километров.\n В этом случае автоматически переключается на CloudMade.</string>
 	<string name="specified_dir_doesnt_exist">Невозможно найти указанную директорию.</string>
 	<string name="application_dir">Директория приложения</string>
 	<string name="application_dir_change_warning">Изменение директории не переносит файлы автоматически. Вы должны это сделать самостоятельно. Продолжить?</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 4a79c60913..464fda1d74 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -380,7 +380,7 @@
 	
 <string name="use_osmand_routing_service">OsmAnd offline rutovanie</string>
 <string name="use_osmand_routing_service_descr">Použitie offline rutovania na dlhé vzdialenosti (experimentálne) namiesto CloudMade</string>
-<string name="osmand_routing_experimental">OsmAnd offline rutovanie je experimentálna funkcia a nefunguje na vzdialenosť väčšiu ako 20 km.\n Rutovacia služba je dočasne prepnutá na online Cloudmade.</string>
+<string name="osmand_routing_experimental">OsmAnd offline rutovanie je experimentálna funkcia a nefunguje na vzdialenosť väčšiu ako 20 km.\n Rutovacia služba je dočasne prepnutá na online CloudMade.</string>
 <string name="specified_dir_doesnt_exist">Nedá sa nájsť určený adresár.</string>
 <string name="application_dir">Úložiskový adresár</string>
 <string name="application_dir_change_warning">Zmena úložiskového adresára nepresunie alebo nezmaže dát. Musíte to urobiť sami! Robíte to na vlastné riziko! Napriek tomu pokračovať?</string>
diff --git a/OsmAnd/res/values-vi/strings.xml b/OsmAnd/res/values-vi/strings.xml
index a4f13e1dab..4ad2f03774 100644
--- a/OsmAnd/res/values-vi/strings.xml
+++ b/OsmAnd/res/values-vi/strings.xml
@@ -332,7 +332,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 	<string name="use_osmand_routing_service">Tìm đường OsmAnd</string>
 	<string name="use_osmand_routing_service_descr">Sử dụng tính năng tìm đường Offline với khoảng cách dài(đang thử nghiệm)</string>
 	<string name="osmand_routing_experimental">Tìm đường Offline trên OsmAnd là tính năng thử nghiệm và
-	nó không thể chạy được với khoảng cách trên 20km. Dịch vụ tìm được sẽ tự động chuyển sang dùng Cloudmade.</string>
+	nó không thể chạy được với khoảng cách trên 20km. Dịch vụ tìm được sẽ tự động chuyển sang dùng CloudMade.</string>
 	<string name="specified_dir_doesnt_exist">Không tìm thấy thư mục.</string>
 	<string name="application_dir">Thư mục lưu trữ</string>
 	<string name="application_dir_change_warning">Việc thay đổi thư mục lưu trữ sẽ không di dời hay xóa dữ liệu. Thao tác này phải được tiến hành ngoài ứng dụng OsmAnd</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 14ab778b08..cdf203e14d 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -415,7 +415,7 @@
 
 	<string name="use_osmand_routing_service">OsmAnd routing</string>
 	<string name="use_osmand_routing_service_descr">Use OsmAnd offline routing for long distances (experimental) instead of fallback to CloudMade</string>
-	<string name="osmand_routing_experimental">OsmAnd offline routing is an experimental feature and it doesn\'t work for distances of more than about 20 km.\n Routing service is temporarily switched to online Cloudmade.</string>
+	<string name="osmand_routing_experimental">OsmAnd offline routing is an experimental feature and it doesn\'t work for distances of more than about 20 km.\n Routing service is temporarily switched to online CloudMade.</string>
 	<string name="specified_dir_doesnt_exist">Can not find specified directory.</string>
 	<string name="application_dir">Storage directory</string>
 	<string name="application_dir_change_warning">Changing the storage directory will not move or delete the data. This must be performed separately and outside OsmAnd. Continue anyway?</string>
diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
index cf6ad028fb..fb3e9c3b7e 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
@@ -462,8 +462,8 @@ public class RoutingHelper {
 		if (serviceToUse == RouteService.OSMAND && !settings.USE_OSMAND_ROUTING_SERVICE_ALWAYS.get()) {
 			double distance = MapUtils.getDistance(end, start.getLatitude(), start.getLongitude());
 			if (distance > DISTANCE_TO_USE_OSMAND_ROUTER) {
-				// display notification in sync with other routing error messages below
-				if (System.currentTimeMillis() - lastTimeEvaluatedRoute > evalWaitInterval) {
+				// display 'temporarily switched to CloudMade' message only once per error wait period
+				if (evalWaitInterval = 3000) {
 					showMessage(context.getString(R.string.osmand_routing_experimental), Toast.LENGTH_LONG);
 				}
 				serviceToUse = RouteService.CLOUDMADE;