Commit aedb81d0 authored by Thomas's avatar Thomas
Browse files

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

parents f9c3393c 2df6ae0c
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@
    <string name="favourite_remove">Supprimer ce message des favoris \?</string>
    <string name="reblog_add">Partager ce message \?</string>
    <string name="reblog_remove">Annuler le partage de ce message \?</string>
    <string name="more_action_1">Ignorer</string>
    <string name="more_action_1">Masquer</string>
    <string name="more_action_2">Bloquer</string>
    <string name="more_action_3">Signaler</string>
    <string name="more_action_4">Supprimer</string>
@@ -766,4 +766,5 @@
    <string name="fetch_notifications">Récupération des notifications</string>
    <string name="set_display_counters">Afficher des compteurs</string>
    <string name="set_display_counters_description">Affichera une bulle avec un compteur dans les onglets des fils pour les nouveaux messages</string>
    <string name="view_the_original_message">Ouvrir le message d\'origine</string>
</resources>
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
@@ -757,4 +757,5 @@
    <string name="fetch_notifications">Recùpera sas notìficas</string>
    <string name="set_display_counters">Ammustra sos contadores</string>
    <string name="set_display_counters_description">At a ammustrare unu contadore a abbajolu in is lìnias de tempus de sas istangas pro is messàgios noos</string>
    <string name="view_the_original_message">Aberi su messàgiu originale</string>
</resources>
 No newline at end of file