Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-03-23 15:41:27 +01:00
commit 31ce11818e

View file

@ -119,7 +119,7 @@
android:id="@+id/btnApply" android:id="@+id/btnApply"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="56dp" android:layout_height="56dp"
android:text="Apply" android:text="@string/shared_string_apply"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"