Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-01-12 07:14:09 +01:00
commit 103fe644da
3 changed files with 7 additions and 7 deletions

View file

@ -30,7 +30,7 @@
android:id="@+id/textDscrHint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/quick_action_map_style_descr"
android:text="@string/quick_action_page_list_descr"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size" />

View file

@ -2524,7 +2524,7 @@ If you need help with OsmAnd application, please contact our support team: suppo
<string name="quick_action_gpx_category_descr">Select an optional category</string>
<string name="quick_action_poi_list">POI list</string>
<string name="quick_action_sh_poi_descr">You can add one or more POI categories to display on the map.</string>
<string name="quick_action_map_style_descr">Tapping the action button will page the map style through the list below.</string>
<string name="quick_action_page_list_descr">Tapping the action button will page through the list below.</string>
<string name="quick_action_map_style_action">Add a map style</string>
<string name="quick_action_empty_param_error">Parameters should not be empty</string>
<string name="quick_action_map_styles">Map styles</string>

View file

@ -2076,7 +2076,7 @@ public class QuickActionFactory {
@Override
protected int getDiscrHint() {
return R.string.quick_action_map_style_descr;
return R.string.quick_action_page_list_descr;
}
@Override
@ -2253,7 +2253,7 @@ public class QuickActionFactory {
@Override
protected int getDiscrHint() {
return R.string.quick_action_map_overlay_descr;
return R.string.quick_action_page_list_descr;
}
@Override
@ -2387,7 +2387,7 @@ public class QuickActionFactory {
@Override
protected int getDiscrHint() {
return R.string.quick_action_map_underlay_descr;
return R.string.quick_action_page_list_descr;
}
@Override
@ -2524,7 +2524,7 @@ public class QuickActionFactory {
@Override
protected int getDiscrHint() {
return R.string.quick_action_map_source_descr;
return R.string.quick_action_page_list_descr;
}
@Override
@ -2637,7 +2637,7 @@ public class QuickActionFactory {
TextView dscrHint = (TextView) view.findViewById(R.id.textDscrHint);
Button addBtn = (Button) view.findViewById(R.id.btnAdd);
dscrTitle.setText(getDiscrTitle());
dscrTitle.setText(getDiscrTitle() + ":");
dscrHint.setText(getDiscrHint());
addBtn.setText(getAddBtnText());
addBtn.setOnClickListener(getOnAddBtnClickListener(activity, adapter));