Merge branch 'master' of https://github.com/osmandapp/Osmand

OsmAnd/res/layout/map_context_menu_fragment.xml

@@ -16,7 +16,7 @@
         <LinearLayout
             android:id="@+id/context_menu_top_shadow"
             android:layout_width="match_parent"
-            android:layout_height="20dp"
+            android:layout_height="@dimen/context_menu_top_shadow_h"
             android:orientation="horizontal">
 
         </LinearLayout>
@@ -32,22 +32,22 @@
                 android:id="@+id/context_menu_top_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
+                android:layout_marginBottom="@dimen/context_menu_first_line_bottom_margin"
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
                 <LinearLayout
                     android:id="@+id/context_menu_icon_layout"
-                    android:layout_width="42dp"
+                    android:layout_width="52dp"
                     android:layout_height="match_parent">
 
                     <ImageView
                         android:id="@+id/context_menu_icon_view"
-                        android:layout_width="@dimen/standard_icon_size"
-                        android:layout_height="@dimen/standard_icon_size"
+                        android:layout_width="@dimen/map_widget_icon"
+                        android:layout_height="@dimen/map_widget_icon"
                         android:layout_marginLeft="16dp"
                         android:layout_marginStart="12dp"
-                        android:layout_marginTop="17dp"
+                        android:layout_marginTop="@dimen/context_menu_icon_top_padding"
                         android:src="@drawable/ic_action_building_number"/>
 
                 </LinearLayout>
@@ -60,13 +60,13 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="30dp"
+                        android:layout_marginLeft="20dp"
                         android:orientation="horizontal">
 
                         <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="14dp"
+                            android:layout_marginTop="@dimen/context_menu_first_line_top_margin"
                             android:layout_weight="1">
 
                             <TextView
@@ -85,7 +85,7 @@
                             android:id="@+id/context_menu_close_btn_layout"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
-                            android:minWidth="76dp"
+                            android:minWidth="@dimen/context_menu_top_right_button_min_width"
                             android:orientation="horizontal">
 
                             <Button
@@ -94,8 +94,8 @@
                                 android:layout_height="wrap_content"
                                 android:background="?android:selectableItemBackground"
                                 android:gravity="center"
-                                android:paddingLeft="10dp"
-                                android:paddingRight="10dp"
+                                android:paddingLeft="@dimen/context_menu_button_padding_x"
+                                android:paddingRight="@dimen/context_menu_button_padding_x"
                                 android:text="@string/shared_string_others"
                                 android:textColor="?attr/contextMenuButtonColor"
                                 android:textSize="@dimen/default_desc_text_size"/>
@@ -107,8 +107,8 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="30dp"
-                        android:layout_marginTop="4dp"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginTop="@dimen/context_menu_second_line_top_margin"
                         android:orientation="horizontal">
 
                         <LinearLayout
@@ -136,7 +136,7 @@
                                 android:id="@+id/compass_layout"
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
-                                android:minWidth="76dp"
+                                android:minWidth="@dimen/context_menu_top_right_button_min_width"
                                 android:orientation="horizontal">
 
                                 <ImageView
@@ -170,10 +170,10 @@
                 android:id="@+id/title_button_container"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="-16dp"
+                android:layout_marginTop="@dimen/context_menu_buttons_top_margin"
                 android:clickable="true"
                 android:orientation="horizontal"
-                android:paddingBottom="4dp"
+                android:paddingBottom="@dimen/context_menu_buttons_padding_bottom"
                 android:paddingLeft="62dp"
                 android:paddingRight="2dp"
                 android:visibility="gone"
@@ -185,8 +185,8 @@
                     android:layout_height="wrap_content"
                     android:background="?android:selectableItemBackground"
                     android:gravity="left|center_vertical"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
+                    android:paddingLeft="@dimen/context_menu_button_padding_x"
+                    android:paddingRight="@dimen/context_menu_button_padding_x"
                     android:text="@string/recording_context_menu_play"
                     android:textColor="?attr/contextMenuButtonColor"
                     android:textSize="@dimen/default_desc_text_size"/>
@@ -209,8 +209,8 @@
                     android:background="?android:selectableItemBackground"
                     android:drawableLeft="@drawable/ic_action_delete_dark"
                     android:gravity="center"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
+                    android:paddingLeft="@dimen/context_menu_button_padding_x"
+                    android:paddingRight="@dimen/context_menu_button_padding_x"
                     android:text="@string/shared_string_delete"
                     android:textColor="?attr/contextMenuButtonColor"
                     android:textSize="@dimen/default_desc_text_size"/>
@@ -221,12 +221,12 @@
                 android:id="@+id/title_progress_container"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="-16dp"
+                android:layout_marginTop="@dimen/context_menu_buttons_top_margin"
                 android:clickable="true"
                 android:gravity="center_vertical"
-                android:minHeight="52dp"
+                android:minHeight="@dimen/context_menu_progress_min_height"
                 android:orientation="horizontal"
-                android:paddingBottom="4dp"
+                android:paddingBottom="@dimen/context_menu_buttons_padding_bottom"
                 android:paddingLeft="72dp"
                 android:paddingRight="2dp"
                 android:visibility="gone"
@@ -264,12 +264,12 @@
 
                     <ImageView
                         android:id="@+id/progressButton"
-                        android:layout_width="44dp"
-                        android:layout_height="44dp"
+                        android:layout_width="@dimen/context_menu_progress_cancel_button_size"
+                        android:layout_height="@dimen/context_menu_progress_cancel_button_size"
                         android:layout_gravity="center_vertical"
                         android:background="?android:selectableItemBackground"
                         android:scaleType="center"
-                        tools:src="@drawable/ic_action_remove_dark"/>
+                        tools:src="@drawable/map_action_cancel"/>
 
                 </LinearLayout>
 
@@ -285,7 +285,7 @@
                 android:id="@+id/context_menu_buttons"
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
-                android:layout_height="54dp">
+                android:layout_height="@dimen/context_menu_action_buttons_h">
 
                 <ImageButton
                     android:id="@+id/context_menu_fav_button"
@@ -295,7 +295,7 @@
                     android:layout_weight="1"
                     android:background="?attr/dashboard_button"
                     android:scaleType="center"
-                    android:src="@drawable/ic_action_fav_dark"/>
+                    android:src="@drawable/map_action_fav_dark"/>
 
                 <View
                     android:layout_width="1dp"
@@ -310,7 +310,7 @@
                     android:layout_weight="1"
                     android:background="?attr/dashboard_button"
                     android:scaleType="center"
-                    android:src="@drawable/map_action_waypoints"/>
+                    android:src="@drawable/map_action_flag_dark"/>
 
                 <View
                     android:layout_width="1dp"
@@ -325,7 +325,7 @@
                     android:layout_weight="1"
                     android:background="?attr/dashboard_button"
                     android:scaleType="center"
-                    android:src="@drawable/abc_ic_menu_share_mtrl_alpha"/>
+                    android:src="@drawable/map_action_gshare_dark"/>
 
                 <View
                     android:layout_width="1dp"
@@ -340,7 +340,7 @@
                     android:layout_weight="1"
                     android:background="?attr/dashboard_button"
                     android:scaleType="center"
-                    android:src="@drawable/ic_overflow_menu_white"/>
+                    android:src="@drawable/map_overflow_menu_white"/>
 
             </LinearLayout>
 
@@ -382,7 +382,7 @@
             android:layout_width="@dimen/fab_size_with_shadow"
             android:layout_height="@dimen/fab_size_with_shadow"
             android:layout_gravity="right"
-            android:layout_marginRight="12dp"
+            android:layout_marginRight="@dimen/fab_margin_right"
             android:background="@drawable/fab_background_style"
             android:scaleType="center"
             android:src="@drawable/map_directions"/>

OsmAnd/res/values-de/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
 	<string name="regions">Regionen</string>
 	<string name="region_maps">Regionsweite Karten</string>
 	<string name="world_maps">Weltweite Karten</string>
@@ -2137,4 +2138,52 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="feedback">Feedback</string>
     <string name="contact_us">Kontakt</string>
     <string name="map_legend">Kartenlegende</string>
-    </resources>
+    <string name="access_from_map_description">Plaziert einen Dashboard-Knopf auf dem Bildschirm</string>
+    <string name="show_on_start_description">\"Aus\" startet direkt die Kartenansicht.</string>
+    <string name="copied_to_clipboard">in die Zwischenablage kopiert</string>
+    <string name="release_2_2">" • Neue Kontext-bezogene Benutzeroberfläche bei Auswahl von Orten auf der Karte und anderen Ansichten\n\n • Kartenansicht wird nun direkt gestartet, außer bei Auswahl von \'Zeige Dashboard bei App-Start\'\n\n • Auswahl der anzuzeigenden Elemente im Dashboard möglich\n\n • Zum Herunterladen von Kartendateien können nun Regionen direkt durch Tippen auf der Weltkarte ausgewählt werden\n\n • Die POI-Suche ermöglicht nun speziellere Abfragen\n\n • Verbesserungen beim Editieren von POI- und OSM-Objekten\n\n • Oberfläche und Struktur zum Herunterladen der Karten wurden überarbeitet\n\n und mehr ... "</string>
+    <string name="osm_save_offline">offline speichern</string>
+    <string name="osm_edit_modified_poi">geänderter OSM-POI</string>
+    <string name="osm_edit_deleted_poi">OSM-POI löschen</string>
+    <string name="context_menu_item_open_note">Offene OSM-Notiz</string>
+    <string name="osm_edit_reopened_note">Wiedereröffnete OSM-Notiz</string>
+    <string name="osm_edit_commented_note">Kommentierte OSM-Notiz</string>
+    <string name="osm_edit_removed_note">Gelöschte OSM-Notiz</string>
+	<string name="osm_edit_created_note">Erstellte OSM-Notiz</string>
+	<string name="osn_bug_name">OSM-Notiz (Note)</string>
+	<string name="osn_add_dialog_title">Notiz erstellen</string>
+	<string name="osn_comment_dialog_title">Kommentar hinzufügen</string>
+	<string name="osn_reopen_dialog_title">Notiz wieder öffnen</string>
+	<string name="osn_close_dialog_title">Notiz schließen</string>
+	<string name="osn_add_dialog_success">Notiz erfolgreich erstellt</string>
+	<string name="osn_add_dialog_error">Fehler aufgetreten: Notiz wurde nicht erstellt</string>
+	<string name="osn_close_dialog_success">Notiz wurde erfolgreich geschlossen</string>
+	<string name="osn_close_dialog_error">Fehler aufgetreten: Notiz wurde nicht geschlossen</string>
+	<string name="context_menu_item_delete_waypoint">GPX-Wegpunkt löschen?</string>
+    <string name="context_menu_item_edit_waypoint">GPX-Wegpunkt bearbeiten</string>
+    <string name="lang_fy">Friesisch</string>
+    <string name="lang_als">Albanisch (Tosk)</string>
+    <string name="poi_dialog_reopen">Wieder öffnen</string>
+	<string name="tab_title_basic">Basis</string>
+	<string name="tab_title_advanced">Fortgeschritten</string>
+	<string name="contact_info">Kontakt-Informationen</string>
+	<string name="poi_dialog_poi_type">Art-des POI</string>
+	<string name="number_of_rows_in_dash">Anzahl der Zeilen im Dashboard %1$s</string>
+	<string name="downloads_left_template">%1$s Downloads übrig</string>
+	<string name="downloading_number_of_files">Herunterladen - %1$d Datei</string>
+    <string name="show_free_version_banner">Zeige das Banner der freien Version</string>
+    <string name="activate_seamarks_plugin">Bitte das Seezeichen-Plugin aktivieren</string>
+    <string name="activate_srtm_plugin">Bitte das SRTM-Plugin aktivieren</string>
+    <string name="get_full_version">Vollversion</string>
+    <string name="confirm_download_roadmaps">Soll die reine Straßenkarte wirklich heruntergeladen werden, obwohl die vollständige Karte vorhanden ist?</string>
+    <string name="value_downloaded_from_max">%1$.1f von %2$.1f MB</string>
+    <string name="update_all">Alles aktualisieren (%1$s MB)</string>
+    <string name="free_downloads_used">Verbrauchte freie Downloads</string>
+    <string name="enter_country_name">Name des Landes eingeben</string>
+    <string name="save_poi_without_poi_type_message">Soll der POI wirklich ohne Art des POI gespeichert werden?</string>
+    <string name="poi_context_menu_modify_osm_change">OSM-Änderung bearbeiten</string>
+    <string name="use_dashboard_btn">Dashboard immer starten</string>
+    <string name="use_drawer_btn">Kartenansicht immer starten</string>
+    <string name="dashboard_or_drawer_title">Neue Auswahl des Startvorgangs</string>
+    <string name="dashboard_or_drawer_description">Es ist nun auswählbar, ob beim Start der App gleich die Kartenansicht oder das Dashboard angezeigt wird. (Jederzeit in den Dashboard-Einstellungen änderbar)</string>
+</resources>

OsmAnd/res/values-es/strings.xml

@@ -99,7 +99,7 @@
     <string name="gpx_navigation">Ruta GPX</string>
     <string name="poi_query_by_name_matches_categories">Encontradas varias categorías PDI que responden a la consulta:</string>
     <string name="data_to_search_poi_not_available">Los datos locales para buscar PDI no están presentes.</string>
-    <string name="poi_filter_by_name">Búsqueda por nombre</string>
+    <string name="poi_filter_by_name">Buscar por nombre</string>
     <string name="old_poi_file_should_be_deleted">El archivo de datos del PDI \'%1$s\' es redundante y puede ser borrado.</string>
     <string name="update_poi_file_not_found">El archivo local para guardar cambios de PDIs no fue encontrado ni pudo ser creado.</string>
     <string name="button_upgrade_osmandplus">Actualizar a OsmAnd+</string>
@@ -724,7 +724,7 @@
     <string name="route_roundabout">Rotonda: Tome la %1$dª salida hacia</string>
     <string name="route_kl">Manténgase a la izquierda y continúe</string>
     <string name="route_kr">Manténgase a la derecha y continúe</string>
-    <string name="asap">ASAP</string>
+    <string name="asap">Lo antes posible</string>
     <string name="gpxup_public">Público</string>
     <string name="gpxup_identifiable">Identificable</string>
     <string name="gpxup_trackable">Trazable</string>
@@ -1564,7 +1564,7 @@
     <string name="osmo_use_https">Utilizar HTTPS</string>
     <string name="home_button">Inicio</string>
     <string name="map_update">Actualizaciones disponibles para %1$s mapa(s)</string>
-    <string name="search_for">Búsqueda por</string>
+    <string name="search_for">Buscar por</string>
     <string name="shared_string_show_all">Mostrar todo</string>
     <string name="coordinates">Coordenadas</string>
     <string name="use_opengl_render">Utilizar renderizado OpenGL</string>

OsmAnd/res/values-large/sizes.xml

@@ -41,6 +41,25 @@
 	
 
 	<dimen name="map_widget_icon_margin">6dp</dimen>
+
+
+	<!-- ContextMenu -->
+	<dimen name="context_menu_top_shadow_h">30dp</dimen>
+	<dimen name="context_menu_icon_top_padding">25dp</dimen>
+	<dimen name="context_menu_first_line_top_margin">21dp</dimen>
+	<dimen name="context_menu_first_line_bottom_margin">24dp</dimen>
+	<dimen name="context_menu_second_line_top_margin">6dp</dimen>
+	<dimen name="context_menu_top_right_button_min_width">114dp</dimen>
+	<dimen name="context_menu_button_padding_x">15dp</dimen>
+	<dimen name="context_menu_buttons_top_margin">-24dp</dimen>
+	<dimen name="context_menu_buttons_padding_bottom">6dp</dimen>
+	<dimen name="context_menu_progress_min_height">78dp</dimen>
+	<dimen name="context_menu_progress_cancel_button_size">66dp</dimen>
+	<dimen name="context_menu_action_buttons_h">80dp</dimen>
+
+	<dimen name="fab_size_with_shadow">90dp</dimen>
+	<dimen name="fab_margin_right">18dp</dimen>
+
 	<!-- General -->
 	
 	<dimen name="list_item_height">65dp</dimen>

OsmAnd/res/values-sc/phrases.xml

@@ -1707,4 +1707,5 @@
 	<string name="poi_vending_cigarettes">Sigaretas</string>
 	<string name="poi_fireworks">Butega de fogos de artifìtziu</string>
 
-</resources>
+<string name="poi_craft_electronics">Acontzadura de eletrodomèsticos</string>
+	</resources>

OsmAnd/res/values-sc/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
     <string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
     <string name="voice_pref_title">Boghe</string>
     <string name="misc_pref_title">Mistura</string>
@@ -2017,8 +2018,10 @@
     <string name="rendering_attr_currentTrackColor_description">Colore GPX</string>
     <string name="rendering_attr_currentTrackWidth_description">Largària GPX</string>
     <string name="rendering_attr_roadStyle_description">Istile pro sas istradas</string>
-    <string name="dashboard_or_drawer_title">Optziones noas de cumintzu</string>
-    <string name="dashboard_or_drawer_description">Podes isseberare sa mègius manera de allumìngiu de s\'aplicatzione, cun sa mapa o su pannellu de controllu. As a pòdere cambiare s’issebera tua prus a tardu in sas impostatziones.</string>
-    <string name="use_dashboard_btn">Lassa sas impostatziones atuales</string>
-    <string name="use_drawer_btn">Ammustra sa mapa a s’allumìngiu</string>
+    <string name="dashboard_or_drawer_title">Issèbera noa de allumìngiu</string>
+    <string name="dashboard_or_drawer_description">Como podes isseberare sa mègius manera de allumìngiu de s\'aplicatzione, deretamente dae sa mapa o cun su pannellu de controllu in antis. As a pòdere semper cambiare s’issèbera tua prus a tardu in sas impostatziones de su pannellu.</string>
+    <string name="use_dashboard_btn">Ammustra semper su pannellu de controllu</string>
+    <string name="use_drawer_btn">Ammustra semper sa mapa</string>
+    <string name="access_from_map_description">Pone unu butone pro su pannellu de controllu in s’ischermu de sa mapa</string>
+    <string name="access_from_map">Intra dae sa mapa</string>
     </resources>