Commit 65b353da authored by Thomas's avatar Thomas
Browse files

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

parents b3e2af6e e1ddb2cd
Loading
Loading
Loading
Loading
+18 −0
Original line number Diff line number Diff line
@@ -825,4 +825,22 @@
    <string name="restart_the_app_theme">Vous devez redémarrer l\'application pour appliquer les changements.</string>
    <string name="toast_feature_not_supported">Votre instance ne semble pas supporter cette fonctionnalité !</string>
    <string name="set_language_picker">Permet de réduire la liste des langues dans le sélecteur lors de la composition d\'un message.</string>
    <string name="mark_unresolved">Marquer comme non résolu</string>
    <string name="joined">Inscrit</string>
    <string name="account_rejected">Compte rejeté</string>
    <string name="account_undisabled">Compte non activé</string>
    <string name="account_disabled">Compte désactivé</string>
    <string name="notif_display_updates">Mises à jour</string>
    <string name="context_home_list">Accueil et listes</string>
    <string name="title">Titre</string>
    <string name="keyword_or_phrase">Mot-clé ou expression</string>
    <string name="add_keyword">Ajouter le mot-clé</string>
    <string name="show_anyway">Afficher quand même</string>
    <string name="filtered_by">Filtré : %1$s</string>
    <string name="notif_update">A édité un message</string>
    <string name="account_warned">Compte averti</string>
    <string name="watch_trends_for_instance">Voir les tendances pour cette instance</string>
    <string name="hide_with_warning">Masquer avec un avertissement</string>
    <string name="hide_completely">Masquer complètement</string>
    <string name="delete_keyword">Supprimer le mot-clé</string>
</resources>
 No newline at end of file
+13 −0
Original line number Diff line number Diff line
@@ -838,4 +838,17 @@
    <string name="watch_trends_for_instance">Bu sunucu için trendleri izle</string>
    <string name="notif_update">Bir mesaj düzenlendi</string>
    <string name="notif_display_updates">Güncellemeler</string>
    <string name="hide_with_warning">Bir uyarı ile gizle</string>
    <string name="hide_completely">Tamamen gizle</string>
    <string name="hide_with_warning_description">Filtrelenen içeriği, filtrenin başlığını belirten bir uyarının arkasına gizle</string>
    <string name="hide_completely_description">Filtrelenen içeriği tamamen gizleyerek yokmuş gibi davran</string>
    <string name="context_home_list">Ana sayfa ve listeler</string>
    <string name="title">Başlık</string>
    <string name="delete_keyword">Anahtar sözcüğü sil</string>
    <string name="add_keyword">Anahtar sözcük ekle</string>
    <string name="show_anyway">Yine de göster</string>
    <string name="filtered_by">Filtrelendi: %1$s</string>
    <string name="filter_action">Filtre eylemi</string>
    <string name="filter_action_explanations">Bir gönderi filtreyle eşleştiğinde hangi eylemin gerçekleştirileceğini seçin</string>
    <string name="keyword_or_phrase">Anahtar sözcük veya ifade</string>
</resources>
 No newline at end of file
+6 −110

File changed.

Preview size limit exceeded, changes collapsed.