merge: update to newest master

This commit is contained in:
FineFindus
2023-01-05 19:45:03 +01:00
19 changed files with 109 additions and 107 deletions

View File

@@ -37,7 +37,7 @@
<string name="sk_lists_with_user">Lists with %s</string>
<string name="sk_settings_always_reveal_content_warnings">Always reveal content warnings</string>
<string name="sk_disable_marquee">Disable scrolling text in title bars</string>
<string name="sk_disable_dividers">Disable toot dividers</string>
<string name="sk_disable_dividers">Disable post dividers</string>
<string name="sk_relocate_publish_button">Relocate publish button</string>
<string name="sk_settings_contribute">Contribute to Moshidon</string>
<string name="sk_settings_show_federated_timeline">Show federated timeline</string>
@@ -138,4 +138,5 @@
<!-- accessibility labels-->
<string name="poll_option_add">Add new poll option</string>
<string name="sk_disable_relocate_publish_button_to_enable_customization">Disable "Relocate publish button" to allow customization</string>
</resources>