owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'megalodon_main/main'

Browse Source 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
This commit is contained in:
LucasGGamerM
2023-10-12 21:25:16 -03:00
parent 1e7e4810f1 50e313cff0
commit 07d2ad749e
15 changed files with 198 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/res/values/strings_sk.xml
View File

@@ -51,6 +51,7 @@
<string name="sk_notification_type_status">Posts</string>
<string name="sk_notification_type_posts">Post notifications</string>
<string name="sk_settings_color_palette">Color palette</string>
<string name="sk_settings_color_palette_default">Default (%s)</string>
<string name="sk_color_palette_material3">System</string>
<string name="sk_color_palette_pink">Pink</string>
<string name="sk_color_palette_purple">Purple</string>
@@ -409,4 +410,5 @@
<string name="sk_settings_like_icon">Use heart as favorite icon</string>
<string name="sk_recently_used">Recently used</string>
<string name="sk_settings_underlined_links">Underlined links</string>
<string name="sk_set_as_default">Set as default</string>
</resources>