diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-07 23:08:57 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-07 23:08:57 +0200 |
| commit | 409fdd8596f217e6f4101064342273268425edfb (patch) | |
| tree | f3a50eb54c0e88bce33e34347f6dfe325917e089 /res/values-fr/strings.xml | |
| parent | 449c2a544b48a2b9adf0df094eb1ac0d49531ebe (diff) | |
| parent | 5fe3f207d407543b13652c4a3c31bf8f9f9690a5 (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'res/values-fr/strings.xml')
| -rw-r--r-- | res/values-fr/strings.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 3f5f66b5..df9ab3f5 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -102,9 +102,6 @@ <string name="pref_conference_notifications_summary">Toujours notifier l\'arrivée d\'un message provenant d\'une conférence.</string> <string name="pref_notification_grace_period">Période sans notification</string> <string name="pref_notification_grace_period_summary">Désactiver momentanément les notifications après l\'arrivée d\'une copie carbone.</string> - <string name="pref_ui_options">Options d\'affichage</string> - <string name="pref_conference_name">Nom de la conférence</string> - <string name="pref_conference_name_summary">Identifier la conférence par son sujet</string> <string name="pref_advanced_options">Options avancées</string> <string name="pref_never_send_crash">Ne jamais envoyer de rapports d\'erreurs</string> <string name="pref_never_send_crash_summary">En envoyant des logs vous aidez au développement de Conversations.</string> @@ -170,7 +167,6 @@ <string name="contact_status_offline">Hors-ligne</string> <string name="muc_details_conference">Conférence</string> <string name="muc_details_other_members">Autres membres</string> - <string name="share_with_active_conversations">Conversations actives</string> <string name="server_info_carbon_messages">Copies carbone</string> <string name="server_info_stream_management">Gestion des flux</string> <string name="missing_public_keys">Aucune annonce de clef publique</string> |