Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-03-13 22:41:05 +01:00
commit 239610b446
7 changed files with 13 additions and 5 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/bottom_sheet_list_item_height" android:layout_height="@dimen/bottom_sheet_list_item_height"
xmlns:osmand="http://schemas.android.com/apk/res-auto"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:minHeight="@dimen/bottom_sheet_list_item_height" android:minHeight="@dimen/bottom_sheet_list_item_height"
android:paddingEnd="@dimen/content_padding" android:paddingEnd="@dimen/content_padding"
@ -29,13 +30,16 @@
tools:text="Berlin trip" tools:text="Berlin trip"
android:textAppearance="@style/TextAppearance.ListItemTitle"/> android:textAppearance="@style/TextAppearance.ListItemTitle"/>
<TextView <net.osmand.plus.widgets.TextViewEx
android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
android:layout_marginStart="@dimen/bottom_sheet_content_margin"
android:id="@+id/number_count_text" android:id="@+id/number_count_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
android:layout_marginStart="@dimen/bottom_sheet_content_margin"
android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
tools:text="25" android:textColor="?attr/color_dialog_buttons"
android:textAppearance="@style/TextAppearance.ListItemTitle"/> android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="25"/>
</LinearLayout> </LinearLayout>

View file

@ -3741,4 +3741,6 @@
<string name="poi_whitewater_rapid_name">Название речного порога</string> <string name="poi_whitewater_rapid_name">Название речного порога</string>
<string name="poi_outpost">Пункт выдачи заказов</string>
</resources> </resources>

View file

@ -3761,4 +3761,6 @@
<string name="poi_whitewater_rapid_name">Name of the river rapids</string> <string name="poi_whitewater_rapid_name">Name of the river rapids</string>
<string name="poi_outpost">Shop's delivery point</string>
</resources> </resources>