aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-gl/strings.xml
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-gl/strings.xml
parent173ade9d7bd6fb757b4234acfaadeb127af93cac (diff)
parent63c4e1b7b583c8c6f42241f08bca70bd0f979362 (diff)
Merge branch 'master' of https://github.com/kriztan/Pix-Art-Messenger
Diffstat (limited to 'src/main/res/values-gl/strings.xml')
-rw-r--r--src/main/res/values-gl/strings.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 73703c783..1101b6a81 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -256,8 +256,6 @@
<string name="pref_use_indicate_received_summary">As mensaxes recibidas marcaránse cun sinal verde si este está admitido</string>
<string name="pref_use_send_button_to_indicate_status_summary">Boton de enviar de cor para indicar o estado do contacto</string>
<string name="pref_expert_options_other">Outro</string>
- <string name="pref_autojoin">Unirse automaticamente ás conversas en grupo</string>
- <string name="pref_autojoin_summary">Respecta a marca de autoentrada nos marcadores da conversa en grupo</string>
<string name="toast_message_otr_fingerprint">Copiouse a pegada dixital OTR ao portapapeis!</string>
<string name="toast_message_omemo_fingerprint">Copiouse a pegada dixital OMEMO ao portapapeis!</string>
<string name="conference_banned">Vostede non pode acceder a esta conversa en grupo</string>