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

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

Browse Source 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/res/values-pl-rPL/strings_sk.xml
#	mastodon/src/main/res/values-ru-rRU/strings_sk.xml
#	metadata/ru/full_description.txt
This commit is contained in:
LucasGGamerM
2023-08-24 08:17:57 -03:00
parent 3db74fb958 40a033d692
commit afc401c1f2
65 changed files with 2604 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
mastodon/src/main/res/values-nl-rNL/strings_sk.xml
View File

@@ -255,12 +255,12 @@
<string name="sk_quoting_user">Quoting %s</string>
<string name="sk_settings_reply_visibility">Zichtbaarheid reactie</string>
<string name="sk_settings_reply_visibility_all">Alle reacties</string>
<string name="sk_settings_auto_reveal_anyone">iedereen</string>
<string name="sk_settings_auto_reveal_author">auteur</string>
<string name="sk_settings_auto_reveal_nobody">niemand</string>
<string name="sk_settings_prefix_replies_never">niemand</string>
<string name="sk_settings_prefix_replies_always">iedereen</string>
<string name="sk_settings_auto_reveal_equal_spoilers">Toon dezelfde CW\'s in reacties van</string>
<string name="sk_settings_auto_reveal_anyone">Reacties van iedereen</string>
<string name="sk_settings_auto_reveal_author">Reacties van dezelfde auteur</string>
<string name="sk_settings_auto_reveal_nobody">Nooit</string>
<string name="sk_settings_prefix_replies_never">Nooit</string>
<string name="sk_settings_prefix_replies_always">Als reactie op iemand</string>
<string name="sk_settings_auto_reveal_equal_spoilers">Dezelfde CW\'s automatisch tonen in reacties</string>
<string name="sk_settings_allow_remote_loading">Laad informatie van remote instances (servers)</string>
<string name="sk_no_remote_info_hint">remote info niet beschikbaar</string>
<string name="sk_settings_allow_remote_loading_explanation">Probeer meer accurate informatie te krijgen van volgers, favorieten en boosts, door informatie te laden van de originele instance (server).</string>
@@ -277,4 +277,37 @@
<string name="sk_advanced_options_show">Toon geavanceerde opties</string>
<string name="sk_open_in_app">Open in app</string>
<string name="sk_advanced_options_hide">Verberg geavanceerde opties</string>
<string name="sk_settings_emoji_reactions">Gebruik emoji reacties</string>
<plurals name="sk_users_reacted_with">
<item quantity="one">Eén persoon reageerde met %2$s</item>
<item quantity="other">%1$,d personen reageerden met %2$s</item>
</plurals>
<string name="sk_duration_minutes_30">30 minuten</string>
<string name="sk_duration_minutes_5">5 minuten</string>
<string name="sk_duration_indefinite">Onbepaald</string>
<string name="sk_mute_label">Duur</string>
<string name="sk_enter_emoji_hint">Type om te reageren met een emoji</string>
<string name="sk_duration_days_7">7 dagen</string>
<string name="sk_duration_days_3">3 dagen</string>
<string name="sk_duration_days_1">1 dag</string>
<string name="sk_duration_hours_6">6 uur</string>
<string name="sk_duration_hours_1">1 uur</string>
<string name="sk_button_react">Reageer met emoji</string>
<string name="sk_again_for_system_keyboard">Tik nogmaals voor systeem toetsenbord</string>
<string name="sk_settings_emoji_reactions_in_lists">Toon emoji reacties in tijdlijnen</string>
<string name="sk_external_share_title">Deel met account</string>
<string name="sk_content_type_html">HTML</string>
<string name="sk_content_type_plain">Alleen tekst</string>
<string name="sk_content_type_unspecified">Niet gespecificeerd</string>
<string name="sk_settings_default_content_type">Standaard formaat</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_tab_notifications">Meldingen</string>
<string name="sk_tab_search">Zoek</string>
<string name="sk_tab_home">Home</string>
<string name="sk_external_share_or_open_title">Deel of open met account</string>
<string name="sk_instance_info_unavailable">Instance informatie tijdelijk niet beschikbaar</string>
<string name="sk_settings_show_labels_in_navigation_bar">Toon tab labels op navigatiebalk</string>
<string name="sk_tab_profile">Profiel</string>
</resources>