Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-01-08 19:33:13 +01:00
commit a5097d7a96
4 changed files with 6 additions and 5 deletions

View file

@ -16,7 +16,7 @@
android:layout_height="wrap_content"
android:padding="16dp"
android:layout_gravity="center"
android:text="@string/quick_action_favorite_dialog"
android:text="@string/quick_action_interim_dialog"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
android:layout_weight="1"

View file

@ -16,7 +16,7 @@
android:layout_height="wrap_content"
android:padding="16dp"
android:layout_gravity="center"
android:text="@string/quick_action_favorite_dialog"
android:text="@string/quick_action_interim_dialog"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
android:layout_weight="1"

View file

@ -16,7 +16,7 @@
android:layout_height="wrap_content"
android:padding="16dp"
android:layout_gravity="center"
android:text="@string/quick_action_gpx_dialog"
android:text="@string/quick_action_interim_dialog"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
android:layout_weight="1"

View file

@ -2498,9 +2498,10 @@ If you need help with OsmAnd application, please contact our support team: suppo
<string name="quick_action_add_poi_descr">Tapping the action button will add a POI to the specified location.</string>
<string name="quick_action_navigation_voice_descr">Tapping the action button will disable or enable voice guidance during navigation.</string>
<string name="quick_action_add_parking_descr">Tapping the action button will add a parking place to the specified location.</string>
<string name="quick_action_favorite_dialog">Show the favorite dialog</string>
<!-- string name="quick_action_favorite_dialog">Show the favorite dialog</string -->
<string name="quick_action_interim_dialog">Show an interim dialog</string>
<string name="quick_action_add_poi_dialog">Show the add POI dialog</string>
<string name="quick_action_gpx_dialog">Show the GPX waypoint dialog</string>
<!-- string name="quick_action_gpx_dialog">Show the GPX waypoint dialog</string -->
<string name="favorite_autofill_toast_text">" is saved to "</string>
<string name="favorite_empty_place_name">Place</string>
<string name="quick_action_duplicates">Specified quick action name already in use, was changed to %1$s to avoid duplication.</string>