aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-gl
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res/values-gl')
-rw-r--r--src/main/res/values-gl/strings.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 0a414b9e..54079f4e 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -57,7 +57,12 @@
<string name="pref_xmpp_resource">Recurso</string>
<string name="pref_xmpp_resource_summary">O nome que identifica o cliente que estás a empregar</string>
<string name="pref_accept_files">Aceptar arquivos</string>
+<<<<<<< HEAD
+ <string name="pref_accept_files_size_summary">De forma automática aceptar arquivos menores de…</string>
+ <string name="pref_notification_settings">Axustes de notificación</string>
+=======
<string name="pref_accept_files_summary">De forma automática aceptar arquivos menores de…</string>
+>>>>>>> 1.10.0
<string name="pref_notifications">Notificacións</string>
<string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string>
<string name="pref_vibrate">Tremer</string>