Commit 90a6a6ce authored by Thomas's avatar Thomas
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents a9744843 27641128

app/src/main/res/values-cs/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ 
    <string name="set_sensitive_content">Vždy označovat média jako citlivá</string>

    <string name="gnu_instance">Instance GNU</string>

    <string name="set_forward_tags">V odpovědích přeposílat tagy</string>

    <string name="set_long_press_media">K uložení média dlouze stlačte</string>

    <string name="set_long_press_media">Dlouhým stlačením uložit médium</string>

    <string name="add_tags">Spravovat tagy</string>

    <string name="display_name">Zobrazované jméno</string>

    <string name="label_emoji">Emoji</string>
@@ -992,4 +992,7 @@ 
    <string name="filter_languages">Filtrovat jazyky</string>

    <string name="show_privates">Ukázat přímé zprávy</string>

    <string name="translate_in">Překládat v</string>

    <string name="proxy_protocol_socks">SOCKS</string>

    <string name="proxy_protocol">Protokol</string>

    <string name="proxy_protocol_http">HTTP</string>

</resources>
 
 No newline at end of file

app/src/main/res/values-de/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -981,6 +981,9 @@ 
    <string name="poll_type_multiple">Mehrfach-Auswahl (Multiple Choice)</string>

    <string name="action_change_subscribed_language">Ausgewählte Sprachen ändern</string>

    <string name="filter_languages">Sprachen filtern</string>

    <string name="show_privates">Zeige Direkt-Nachrichten</string>

    <string name="show_privates">Direkt-Nachrichten anzeigen</string>

    <string name="translate_in">Übersetzen in</string>

    <string name="proxy_protocol">Protokoll</string>

    <string name="proxy_protocol_http">HTTP</string>

    <string name="proxy_protocol_socks">SOCKS</string>

</resources>
 
 No newline at end of file

app/src/main/res/values-fr/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -959,7 +959,7 @@ 
    <string name="set_pixelfed_presentation">Présentation de Pixelfed pour les médias</string>

    <string name="set_display_quote_indication">Afficher le bouton « Citer »</string>

    <string name="set_display_reaction_indication">Afficher les boutons « Réactions »</string>

    <string name="set_post_format">Format de publication</string>

    <string name="set_post_format">Format du message</string>

    <string name="exclude_visibility">Exclure la visibilité</string>

    <string name="set_remote_profile_title">Profils distants</string>

    <string name="set_display_local_only">Afficher le bouton « Local uniquement »</string>
@@ -980,4 +980,7 @@ 
    <string name="boost_original_date">Afficher la date originale pour les boosts</string>

    <string name="set_disable_release_notes">Désactiver les notes de version</string>

    <string name="set_maths_support">Écrire une formule</string>

    <string name="proxy_protocol">Protocole</string>

    <string name="proxy_protocol_http">HTTP</string>

    <string name="proxy_protocol_socks">SOCKS</string>

</resources>
 
 No newline at end of file

app/src/main/res/values-gl/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -977,4 +977,7 @@ 
    <string name="poll_type_multiple">Varias opcións</string>

    <string name="action_change_subscribed_language">Cambiar susbscrición a idiomas</string>

    <string name="translate_in">Traducir ao</string>

    <string name="proxy_protocol_http">HTTP</string>

    <string name="proxy_protocol">Protocolo</string>

    <string name="proxy_protocol_socks">SOCKS</string>

</resources>
 
 No newline at end of file

app/src/main/res/values-nl/strings.xml

+11 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ 
    <string name="saving">Opslaan…</string>

    <string name="image_saved">Afbeelding succesvol opgeslagen!</string>

    <string name="save_image_failed">Opslaan van afbeelding mislukt</string>

    <string name="add_poll_item">Een pollkeuze toevoegen</string>

    <string name="add_poll_item">Een keuze toevoegen</string>

    <string name="mute_conversation">Gesprek negeren</string>

    <string name="unmute_conversation">Gesprek niet meer negeren</string>

    <string name="toast_unmute_conversation">Het gesprek wordt niet meer genegeerd!</string>
@@ -977,4 +977,14 @@ 
    <string name="hide_single_media_with_card">Verberg afbeelding als er een link preview is</string>

    <string name="set_maths_support">Schrijf formule</string>

    <string name="poll_type_single">Eén keus</string>

    <string name="show_privates">Toon directe berichten</string>

    <string name="formula">Formule</string>

    <string name="maths_format">Wiskundig formaat</string>

    <string name="proxy_protocol">Protocol</string>

    <string name="proxy_protocol_http">HTTP</string>

    <string name="proxy_protocol_socks">SOCKS</string>

    <string name="filter_languages">Filter talen</string>

    <string name="translate_in">Vertaal in</string>

    <string name="poll_type_multiple">Meedere keuzes</string>

    <string name="action_change_subscribed_language">Wijzig geabonneerde talen</string>

</resources>
 
 No newline at end of file