merged with main

osmandapp · Aug 21, 2015 · da30886 · da30886
2 parents 1bfc3c2 + 784ab56
commit da30886
Show file tree

Hide file tree

Showing 50 changed files with 326 additions and 143 deletions.
diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
@@ -66,15 +66,16 @@ public static void main(String[] args) throws IOException {
 		// test cases show info
 		if(args.length == 1 && "test".equals(args[0])) {
 			in.inspector(new String[]{
-				"-vpoi",
-//				"-vmap", "-vmapobjects",  //	"-vmapcoordinates", 
+//				"-vpoi",
+				"-vmap", "-vmapobjects", // "-vmapcoordinates", 
 //				"-vrouting",
 //				"-vaddress", "-vcities","-vstreetgroups", 
 //				"-vstreets", "-vbuildings", "-vintersections", 
 //				"-zoom=15",
 //				"-bbox=1.74,51.17,1.75,51.16",
 //				"-vstats",
-				"/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf"
+				"/Users/victorshcherb/osmand/temp/Germany_bremen_europe_15_08_00.obf"
+//				"/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf"
 //				"/Users/victorshcherb/osmand/maps/Map.obf"
 //				"/Users/victorshcherb/osmand/temp/Czech-republic_jihovychod_europe_2.road.obf"
 					});
@@ -813,6 +814,7 @@ public boolean publish(BinaryMapDataObject obj) {
 								} catch (IOException e) {
 									throw new RuntimeException(e);
 								}
+//							} else if(obj.getId() >> 1 == 205743436l) {
 							} else {
 								printMapDetails(obj, b, vInfo.vmapCoordinates);
 								println(b.toString());

diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
@@ -301,8 +301,8 @@ repositories {
 dependencies {
 	compile project(path: ":OsmAnd-java", configuration: "android")
 	compile project(":eclipse-compile:design")
-	compile project(":cardview")
-	compile project(":recyclerview")
+	compile project(":eclipse-compile:cardview")
+//	compile project(":eclipse-compile:recyclerview")
 	compile fileTree(
 			dir: "libs",
 			include: ["*.jar"],
@@ -312,12 +312,13 @@ dependencies {
 					"OsmAndCore_android.jar",
 					"OsmAndCore_wrapper.jar"])
 	// compile "com.github.ksoichiro:android-observablescrollview:1.5.0"
-//	 compile "com.android.support:appcompat-v7:22.2.1"
+	//	 compile "com.android.support:appcompat-v7:22.2.1"
 	// compile "com.github.shell-software:fab:1.0.5"
+	//	compile 'com.android.support:design:22.2.1'
 	legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
 	qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
 	qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
 	qtcoreCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
 	qtcoreCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
-//	compile 'com.android.support:design:22.2.1'
+
 }
diff --git a/OsmAnd/project.properties b/OsmAnd/project.properties
@@ -14,3 +14,4 @@ target=android-21
 dex.force.jumbo=true
 android.library.reference.1=../eclipse-compile/appcompat
 android.library.reference.2=../eclipse-compile/design
+android.library.reference.3=../eclipse-compile/cardview
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
@@ -2058,4 +2058,10 @@
     <string name="we_really_care_about_your_opinion">Нас вельмі цікавіць ваша меркаваньне і нам важна пачуць вас.</string>
 	<string name="rendering_value_boldOutline_name">Тлусты абрыс</string>
     <string name="traffic_warning_hazard">Небясьпека</string>
-    </resources>
+    <string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Аўтаномныя мапы\nі навігацыя</string>
+<string name="dahboard_options_dialog_title">Опцыі Панэлі кіраваньня</string>
+	<string name="shared_string_card_was_hidden">Картка схавана</string>
+	<string name="shared_string_undo">Вярнуць</string>
+	<string name="shared_string_skip">Прапусьціць</string>
+	</resources>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
@@ -1031,4 +1031,20 @@
 	<string name="poi_recycling_waste">Rebuig (bosses de negres)</string>
 	<string name="poi_recycling_paper_packaging">Embalatge de paper</string>
 	<string name="poi_recycling_tetrapak">Tetra Pak</string>
+	<string name="poi_recycling_hydrargyrum">Mercuri</string>
+	<string name="poi_recycling_foil">Paper d\'alumini</string>
+	<string name="poi_recycling_styrofoam">Poliestirè extrudit</string>
+	<string name="poi_recycling_hardcore">Runa</string>
+	<string name="poi_recycling_chipboard">Aglomerat</string>
+	<string name="poi_recycling_plasterboard">Plaques de guix</string>
+	<string name="poi_recycling_diapers">Bolquers</string>
+	<string name="poi_supervised_yes">Supervisat</string>
+	<string name="poi_supervised_no">No supervisat</string>
+	<string name="poi_crossing_traffic_signals">Encreuament senyalitzat</string>
+	<string name="poi_crossing_uncontrolled">Encreuament no controlat</string>
+	<string name="poi_crossing_unmarked">Encreuament no senyalitzat</string>
+
+	<string name="poi_recycling_cardboard">Cartró d\'embalar</string>
+	<string name="poi_recycling_beverage_cartons">Envasos de cartró de begudes</string>
+	<string name="poi_recycling_sheet_metal">Xapa metàl·lica</string>
 	</resources>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
@@ -2089,4 +2089,10 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="we_really_care_about_your_opinion">"Valorem molt la vostra opinió i és important per nosaltres  disposar dels vostres comentaris."</string>
 	<string name="rendering_value_boldOutline_name">Contorn destacat</string>
     <string name="traffic_warning_hazard">Perill informat</string>
-    </resources>
+    <string name="dahboard_options_dialog_title">Opcions del tauler</string>
+	<string name="shared_string_card_was_hidden">La tarja era amagada</string>
+	<string name="shared_string_undo">Desfés</string>
+	<string name="shared_string_skip">Omet</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Mapes fora de línia\n&amp; Navegació</string>
+</resources>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
@@ -2103,4 +2103,10 @@
     <string name="we_really_care_about_your_opinion">Vi er meget interesseret i din mening, og det er vigtigt for os at høre fra dig.</string>
 	<string name="rendering_value_boldOutline_name">Fed kontur</string>
     <string name="traffic_warning_hazard">Fare</string>
-    </resources>
+    <string name="dahboard_options_dialog_title">Betjeningspanel indstillinger</string>
+	<string name="shared_string_card_was_hidden">Kortet blev skjult</string>
+	<string name="shared_string_undo">FORTRYD</string>
+	<string name="shared_string_skip">Spring over</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Offline kort\n&amp; navigation</string>
+</resources>
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -1040,4 +1040,5 @@
 
 	<string name="poi_recycling_cardboard">Cartón</string>
 	<string name="poi_recycling_hardcore">Escombros</string>
+	<string name="poi_recycling_chipboard">Conglomerado</string>
 	</resources>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2018,4 +2018,10 @@
     <string name="we_really_care_about_your_opinion">Nos interesa mucho y es importante oír su opinión.</string>
 	<string name="rendering_value_boldOutline_name">Borde remarcado</string>
     <string name="traffic_warning_hazard">Advertencia de riesgo</string>
-    </resources>
+    <string name="dahboard_options_dialog_title">Opciones del panel</string>
+	<string name="shared_string_card_was_hidden">La tarjeta estaba oculta</string>
+	<string name="shared_string_undo">Deshacer</string>
+	<string name="shared_string_skip">Omitir</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Mapas y navegación sin conexión</string>
+</resources>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
@@ -1043,4 +1043,5 @@
 	<string name="poi_crossing_unmarked">Desmarcado</string>
 
 	<string name="poi_recycling_hardcore">Escombros</string>
+	<string name="poi_recycling_chipboard">Aglomerado</string>
 	</resources>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
@@ -2156,4 +2156,10 @@
     <string name="we_really_care_about_your_opinion">Nos interesa mucho y es importante para nosotros oír su opinión.</string>
 	<string name="rendering_value_boldOutline_name">Borde remarcado</string>
     <string name="traffic_warning_hazard">Advertencia de riesgo</string>
-    </resources>
+    <string name="dahboard_options_dialog_title">Opciones del panel</string>
+	<string name="shared_string_card_was_hidden">La tarjeta estaba oculta</string>
+	<string name="shared_string_undo">Deshacer</string>
+	<string name="shared_string_skip">Omitir</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Mapas y navegación fuera de línea</string>
+</resources>
diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml
@@ -1549,11 +1549,24 @@
     <string name="route_descr_destination">Odredište</string>
     <string name="download_wikipedia_maps">Wikipedia</string>
     <string name="close_changeset">Zatvori promjene</string>
-	<string name="lang_pms"/>
+	<string name="lang_pms">Pijemonte</string>
     <string name="storage_directory_default">Unutarnja memorija</string>
     <string name="confirm_usage_speed_cameras">U mnogim zemljama (Njemačka, Francuska, Italija, i druge) Korištenje upozorenja za nadolazeće uređaje za mjerenje brzine nije dopušteno zakonom. OsmAnd ne preuzima nikakvu odgovornost ako kršite zakon. Molimo kliknite da samo ako ste sigurni da želite koristiti ovu značajku.</string>
 	<string name="osmand_parking_overdue">zakasnio</string>
 	<string name="osmo_plugin_name">OsMo (OSM Monitoring)</string>
 	<string name="watch">Prikaži</string>
 	<string name="download_tab_local">Lokalno</string>
-	</resources>
+	<string name="traffic_warning_hazard">Opasnost</string>
+    <string name="no_updates_available">Nema dostupnih ažuriranja</string>
+    <string name="rendering_value_default13_name">Zadano (13)</string>
+	<string name="rendering_value_defaultTranslucentCyan_name">Zadana (svijetlo plava)</string>
+    <string name="rendering_value_walkingRoutesOSMC_name">Bojanje prema OSMC</string>
+    <string name="application_dir_change_warning3">Želite li da OsmAnd kopira svoje podatke na novo odredište?</string>
+    <string name="specified_directiory_not_writeable">Karte se ne mogu stvoriti u navedenoj mapi</string>
+    <string name="rendering_attr_OSMMapperAssistant_name">OSM asistent za mapiranje</string>
+	<string name="record_plugin_name">Bilježenje putovanja</string>
+	<string name="rendering_attr_roadStyle_name">Stil ceste</string>
+    <string name="points">Točke</string>
+	<string name="rendering_value_highContrastRoads_name">Visoki kontrast ceste</string>
+	<string name="routing_attr_no_new_routing_description">Nemojte koristiti pravila usmjeravanje uvedena u v1.9</string>
+    </resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
@@ -2139,4 +2139,11 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="we_really_care_about_your_opinion">Ci teniamo molto alla tua opinione, è molto importante avere un tuo rimando.</string>
 	<string name="rendering_value_boldOutline_name">Contorno in grassetto</string>
     <string name="traffic_warning_hazard">Pericolo</string>
+    <string name="dahboard_options_dialog_title">Opzioni pannello di controllo</string>
+	<string name="shared_string_card_was_hidden">La carta era nascosta</string>
+	<string name="shared_string_undo">Annulla azione</string>
+	<string name="shared_string_skip">Salta</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Mappe offline &amp; Navigazione</string>
+<string name="lang_new">Newa / Bhasa del Nepal</string>
     </resources>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
@@ -1115,7 +1115,7 @@ POIの更新は利用できません</string>
 	<string name="local_openstreetmap_delete">変更を削除する</string>
 	<string name="local_openstreetmap_descr_title">非同期OSMの編集:</string>
 	<string name="local_openstreetmap_settings">保存済みOSM POIとバグ</string>
-	<string name="animate_routing_route_not_calculated">まず、ルートを検索して下さい</string>
+	<string name="animate_routing_route_not_calculated">最初にルートを検索して下さい</string>
     <string name="animate_routing_route">"計算されたルートを使用してシミュレーション "</string>
     <string name="animate_routing_gpx">GPXファイルに保存された経路を使用してシミュレーション</string>
     <string name="shared_string_remember_my_choice">選択を記憶</string>
@@ -1694,7 +1694,7 @@ POIの更新は利用できません</string>
 	<string name="keep_informing_descr">ナビゲーション指示を繰り返す間隔の設定</string>
     <string name="arrival_distance">目的地周辺でのアナウンスタイミング</string>
     <string name="arrival_distance_descr">どのタイミングで目的地周辺のアナウンスをするか設定</string>
-    <string name="osmo_plugin_description">"このプラグインはOsMoと呼ばれる高度なライブモニタリング機能を提供します、http://osmo.mobiを参照して下さい。\n\n参加しているグループ全てのデバイス経路をリアルタイムで追跡することが出来るので、互いにコミュニケーションを取ることができます。期間を限定した追跡、または永続的な追跡のためにさまざまなオプションが付属しています。\n\n匿名のグループは簡単に作成できますが、指定された数日間いくつかの機能が制限されており、その場合遠隔操作は出来ずグループ管理者は存在しません。完全な機能のグループはウェブサイト上で別に作成する必要があり、登録ユーザーのみがそれらにアクセスすることができます。 "</string>
+    <string name="osmo_plugin_description">"このプラグインはOsMoと呼ばれる高度なライブモニタリング機能を提供します、http://osmo.mobiを参照して下さい。\n\n参加しているグループ全てのデバイス経路をリアルタイムで追跡することが出来るので、互いにコミュニケーションを取ることができます。期間を限定した追跡、または恒久的な追跡のためにさまざまなオプションが付属しています。\n\n匿名のグループは簡単に作成できますが、指定された数日間いくつかの機能が制限されており、その場合遠隔操作は出来ずグループ管理者は存在しません。完全な機能のグループはウェブサイト上で別に作成する必要があり、登録ユーザーのみがそれらにアクセスすることができます。 "</string>
     <string name="osmo_plugin_name">OsMo(OSMモニタリング)</string>
    	<string name="always_center_position_on_map">位置を常に中央表示</string>
     <string name="voice_pref_title">音声</string>
@@ -2115,4 +2115,14 @@ POIの更新は利用できません</string>
 	<string name="user_hates_app_get_feedback_long">このアプリの変更して欲しい箇所を教えて下さい。</string>
 <string name="rendering_value_walkingRoutesScopeOSMC_name">ルート範囲に応じてカラー変更</string>
     <string name="rendering_value_walkingRoutesOSMC_name">OSMCに応じてカラー変更</string>
-    </resources>
+    <string name="traffic_warning_hazard">通行注意</string>
+    <string name="rendering_value_boldOutline_name">太線</string>
+    <string name="no_updates_available">更新はありません</string>
+    <string name="download_live_updates">ライブ更新</string>
+	<string name="we_really_care_about_your_opinion">私達は常にユーザーを気に掛け、個々の意見を参考にすることを重要視しています。</string>
+	<string name="failed_to_upload">アップロードに失敗しました</string>
+	<string name="delete_change">変更を削除します</string>
+	<string name="successfully_uploaded_pattern">正常にアップロードされました {0}/{1}</string>
+	<string name="try_again">再試行</string>
+	<string name="error_message_pattern">エラー: {0}</string>
+</resources>