aboutsummaryrefslogtreecommitdiffstats
path: root/res/values-fr
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-09-07 17:13:10 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-09-07 17:13:10 +0200
commit5fe3f207d407543b13652c4a3c31bf8f9f9690a5 (patch)
treefcc6f60fbb916c1191cb7f93c5c1736f6d416ac3 /res/values-fr
parent90947597e5a89e2adc6c75d52c8458ee153ee163 (diff)
parentf4d86ecff38b4c9d8df97999fe3e252eb9a165af (diff)
Merge pull request #426 from betheg/remove_strings
deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.
Diffstat (limited to 'res/values-fr')
-rw-r--r--res/values-fr/strings.xml4
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>