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-ca | |
| parent | dfe58eaf341efe988f80faf5dc888900d28aa37a (diff) | |
| parent | 0f0054ef8629a285726a9190a297a43f91494af4 (diff) | |
Merge branch 'siacs-master' into development
Diffstat (limited to 'src/main/res/values-ca')
| -rw-r--r-- | src/main/res/values-ca/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 643ff62fb..cfb2a8f34 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -76,7 +76,6 @@ <string name="delete_messages">Esborrar missatges</string> <string name="also_end_conversation">Finalitzar aquesta conversa més tard</string> <string name="choose_presence">Selecciona recurs del contacte</string> - <string name="send_plain_text_message">Enviar missatge de text</string> <string name="send_otr_message">Enviar missatge xifrat amb OTR</string> <string name="send_pgp_message">Enviar missatge xifrat amb OpenPGP</string> <string name="your_nick_has_been_changed">El teu sobrenom s\'ha modificat</string> @@ -147,7 +146,6 @@ <string name="account_status_regis_not_sup">El servidor no admet el registre</string> <string name="account_status_security_error">Error de seguretat</string> <string name="account_status_incompatible_server">Servidor incompatible</string> - <string name="encryption_choice_none">Text pla</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> <string name="mgmt_account_edit">Edita compte</string> |