Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-01-08 19:40:31 +01:00
commit 9fa9589bee
2 changed files with 2 additions and 2 deletions

View file

@ -61,7 +61,7 @@
android:textColor="@color/color_white"
android:textColorHint="@color/white_80_transparent"
android:textSize="@dimen/default_list_text_size_large"
android:hint="@string/quick_action_name_hint"
android:hint="@string/shared_string_action_name"
android:maxLines="1"
android:layout_marginLeft="-4dp"
android:layout_marginRight="16dp"

View file

@ -2488,7 +2488,7 @@ If you need help with OsmAnd application, please contact our support team: suppo
<string name="quick_favorites_show_favorites_dialog">Show favorites dialog</string>
<string name="quick_favorites_name_preset">Name preset</string>
<!-- string name="quick_favorites_name_descr">Leave the field blank and OsmAnd will use the address or place name</string -->
<string name="quick_action_name_hint">Action name</string>
<!-- string name="quick_action_name_hint">Action name</string -->
<string name="quick_action_add_marker_descr">Tapping the action button will add a marker to the specified location.</string>
<string name="quick_action_add_gpx_descr">Tapping the action button will add a GPX waypiont to the specified location.</string>
<string name="quick_action_take_audio_note_descr">Tapping the action button will add an audio note to the specified location.</string>