diff options
| author | Christian S <christian@pix-art.de> | 2015-08-26 20:03:02 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-08-26 20:03:02 +0200 |
| commit | 85e35b3a75804203f226219abcfc86582892fb30 (patch) | |
| tree | ceb391c2b3f7cf098c0dff988e02dd4be941ac5d /src/main/res/values-fr | |
| parent | dfe58eaf341efe988f80faf5dc888900d28aa37a (diff) | |
| parent | 0f0054ef8629a285726a9190a297a43f91494af4 (diff) | |
Merge branch 'siacs-master' into development
Diffstat (limited to 'src/main/res/values-fr')
| -rw-r--r-- | src/main/res/values-fr/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index d8849b46f..167a6d8d3 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -76,7 +76,6 @@ <string name="delete_messages">Supprimer les messages</string> <string name="also_end_conversation">Terminer plus tard cette conversation</string> <string name="choose_presence">Choisir le status de présence</string> - <string name="send_plain_text_message">Envoyer un message</string> <string name="send_otr_message">Envoyer un message sécurisé par OTR</string> <string name="send_pgp_message">Envoyer un message sécurisé par OpenPGP</string> <string name="your_nick_has_been_changed">Votre identifiant a été changé</string> @@ -147,7 +146,6 @@ <string name="account_status_regis_not_sup">Le serveur ne permet pas l\'enregistrement</string> <string name="account_status_security_error">Erreur de sécurité</string> <string name="account_status_incompatible_server">Serveur incompatible</string> - <string name="encryption_choice_none">Texte clair</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> <string name="mgmt_account_edit">Modifier le compte</string> |