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/fragments/SettingsFragment.java
#	mastodon/src/main/res/layout/fragment_compose.xml
This commit is contained in:
LucasGGamerM
2023-05-23 19:30:52 -03:00
parent 0b0775a86e f6f08d176c
commit 65c158391f
22 changed files with 519 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -275,4 +275,15 @@
<string name="sk_show_thread">Show thread</string>
<string name="sk_compact_reblog_reply_line">Compact boost/reply line</string>
<string name="sk_settings_confirm_before_reblog">Confirm before boosting</string>
<string name="sk_content_type">Content type</string>
<string name="sk_content_type_unspecified">Not specified</string>
<string name="sk_content_type_plain">Plain text</string>
<string name="sk_content_type_html">HTML</string>
<string name="sk_content_type_markdown">Markdown</string>
<string name="sk_content_type_bbcode">BBCode</string>
<string name="sk_content_type_mfm">MFM</string>
<string name="sk_settings_content_types">Enable post formatting</string>
<string name="sk_settings_content_types_explanation">Allows setting a content type like Markdown when creating a post. Keep in mind that not all instances support this.</string>
<string name="sk_settings_default_content_type">Default content type</string>
<string name="sk_settings_default_content_type_explanation">This lets you have a content type be pre-selected when creating new posts, overriding the value set in “Posting preferences”.</string>
</resources>