Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-02-21 17:48:35 +01:00
commit b79ed8185f
19 changed files with 318 additions and 102 deletions

View file

@ -2,12 +2,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/action_settings"
app:showAsAction="never"
android:title="@string/settings"/>
<item android:id="@+id/action_report_error"
app:showAsAction="never"
android:title="@string/report_error" />
</menu>