mirror of
https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git
synced 2025-10-05 21:39:50 +02:00
Merge branch 'master' into go-to-top-of-page-button
This commit is contained in:
@@ -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>
|
||||
|
@@ -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>
|
||||
|
Reference in New Issue
Block a user