Merge branch 'master' into go-to-top-of-page-button

This commit is contained in:
Docile-Alligator
2021-09-23 20:02:10 +08:00
committed by GitHub
16 changed files with 141 additions and 109 deletions

View File

@@ -58,4 +58,10 @@
android:orderInCategory="9"
android:title="@string/action_share"
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_wiki_activity"
android:orderInCategory="10"
android:title="@string/action_go_to_wiki"
app:showAsAction="never" />
</menu>

View File

@@ -1190,6 +1190,8 @@
<string name="app_lock_timeout_6_hours">6 hours</string>
<string name="app_lock_timeout_12_hours">12 hours</string>
<string name="app_lock_timeout_24_hours">24 hours</string>
<string name="go_to_top">Go To Top</string>
<string name="action_go_to_wiki">Go to Wiki</string>
</resources>