Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-03-09 09:26:38 +01:00
commit 61a40afddd
2 changed files with 2 additions and 2 deletions

View file

@ -19,7 +19,7 @@
<Button
android:id="@+id/recents"
style="?attr/dashboardGeneralButtonStyle"
android:text="@string/recents" />
android:text="@string/shared_string_history" />
</LinearLayout>
<View
android:layout_width="match_parent"

View file

@ -20,7 +20,7 @@
<Button
android:id="@+id/recents"
style="?attr/dashboardGeneralButtonStyle"
android:text="@string/recents" />
android:text="@string/shared_string_history" />
</LinearLayout>
<View