aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-ca
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-01-03 23:15:53 +0100
committerChristian Schneppe <christian@pix-art.de>2019-01-03 23:15:53 +0100
commitcbd372c6721e9ca8c55d09490c97801f0485f3f6 (patch)
tree6955baebfd78ef19ce7530d09eeabde0ee01e14a /src/main/res/values-ca
parent173ade9d7bd6fb757b4234acfaadeb127af93cac (diff)
parent63c4e1b7b583c8c6f42241f08bca70bd0f979362 (diff)
Merge branch 'master' of https://github.com/kriztan/Pix-Art-Messenger
Diffstat (limited to 'src/main/res/values-ca')
-rw-r--r--src/main/res/values-ca/strings.xml2
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 0b8f62855..7eff38c6f 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -256,8 +256,6 @@
<string name="pref_use_indicate_received_summary">Els missatges rebuts seràn marcats amb uns ticks verds si ho admet</string>
<string name="pref_use_send_button_to_indicate_status_summary">Pintar el botó d\'enviament per indicar l\'estatus del contacte</string>
<string name="pref_expert_options_other">Altres</string>
- <string name="pref_autojoin">Uniu-vos automàticament als xats de grup</string>
- <string name="pref_autojoin_summary">Respecta l\'indicador d\'autoentrada als marcadors de xat de grup</string>
<string name="toast_message_otr_fingerprint">Empremta digital OTR copiada al portapapers</string>
<string name="toast_message_omemo_fingerprint">S\'ha copiat l\'empremta digital d\'OMEMO al porta-retalls.</string>
<string name="conference_banned">Estàs prohibit en aquest xat de grup</string>