Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-01-08 20:30:07 +01:00
commit 8332ced223
2 changed files with 4 additions and 4 deletions

View file

@ -92,7 +92,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:text="@string/shared_string_action_name"
android:text="@string/shared_string_name"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size"/>
@ -107,7 +107,7 @@
android:inputType="text"
android:textColor="?android:textColorPrimary"
android:textColorHint="?android:textColorSecondary"
tools:text="@string/shared_string_name"/>
tools:text="@string/shared_string_action_name"/>
</LinearLayout>

View file

@ -92,7 +92,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:text="@string/shared_string_action_name"
android:text="@string/shared_string_name"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size"/>
@ -107,7 +107,7 @@
android:inputType="text"
android:textColor="?android:textColorPrimary"
android:textColorHint="?android:textColorSecondary"
tools:text="@string/shared_string_name"/>
tools:text="@string/shared_string_action_name"/>
</LinearLayout>