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

15
mastodon/src/main/res/values-de-rDE/strings_sk.xml
View File

@@ -329,10 +329,23 @@
<string name="sk_hashtag_timeline_local_only_switch">Nur lokale Beiträge anzeigen\?</string>
<string name="sk_add_timeline_tag_error_empty">Hashtag darf nicht leer sein</string>
<string name="sk_advanced_options_hide">Erweiterte Optionen ausblenden</string>
<string name="sk_search_fediverse">Fediverse durchsuchen</string>
<string name="sk_search_fediverse">Fediverse durchsuchen</string>
<string name="sk_switch_timeline">Timeline wechseln</string>
<string name="sk_settings_instance">Instanz</string>
<string name="sk_disable_pill_shaped_active_indicator">Pillen-förmigen Indikator für aktiven Tab deaktivieren</string>
<string name="sk_settings_true_black">Stockfinster-Modus</string>
<string name="sk_gif_badge">GIF</string>
<string name="sk_settings_unifiedpush">UnifiedPush verwenden</string>
<string name="sk_settings_unifiedpush_no_distributor">Kein Verteiler gefunden</string>
<string name="sk_settings_unifiedpush_no_distributor_body">Damit UnifiedPush-Benachrichtigungen funktionieren, muss ein Verteiler installiert sein. Mehr Informationen auf https://unifiedpush.org</string>
<string name="sk_settings_display_pronouns_in_timelines">Pronomen in der Timeline anzeigen</string>
<string name="sk_settings_continues_playback">Tonwiedergabe überlagern</string>
<string name="sk_settings_continues_playback_summary">Musik im Hintergrund nicht pausieren, wenn in der App Medien abgespielt werden</string>
<string name="sk_settings_unifiedpush_choose">Verteiler auswählen</string>
<string name="sk_settings_display_pronouns_in_threads">Pronomen in Threads anzeigen</string>
<string name="sk_settings_display_pronouns_in_user_listings">Pronomen in User-Auflistungen anzeigen</string>
<string name="sk_tab_home">Start</string>
<string name="sk_tab_search">Suche</string>
<string name="sk_tab_notifications">Benachrichtigungen</string>
<string name="sk_tab_profile">Profil</string>
</resources>