editando desde gl-translation

app/src/main/res/values-gl/strings-about.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 1º modificación en github-->
+<!-- editado con nano -->
 <resources>
   <string name="about_activity__title_about_app">Sobre</string>
   <string name="about_activity__title_about_license">Licenza</string>

app/src/main/res/values-gl/strings-preferences.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- actualizado en github -->
+<!-- Editado con nano -->
 <resources>
   <!-- Key Names (Untranslatable) -->
   <!-- Operability -->
@@ -33,7 +33,7 @@
   <string name="pref_title__language">Idioma</string>
   <string name="language_system">Idioma do sistema</string>
   <!-- Font size -->
-  <string name="pref_desc__font_size">Estableza o tamaño do texto na VistaWeb</string>
+  <string name="pref_desc__font_size">Estableza o tamaño do texto na Vista Web</string>
   <string name="pref_title__font_size">Tamaño do texto</string>
   <string name="font_size_normal">Normal</string>
   <string name="font_size_large">Grande</string>

app/src/main/res/values-gl/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- actualiza galego (gl) -->
 <resources>
   <!-- Application -->
   <string name="reload">Actualizar</string>
@@ -50,8 +49,13 @@
   <string name="action_exit_app">Saír do app</string>
   <string name="action_toggle_desktop_page">Vista móbil/escritorio</string>
   <string name="action_share_dotdotdot">Compartir&#8230;</string>
+<<<<<<< HEAD
   <string name="search_alert_tag">Etiquetas</string>
   <string name="search_alert_people">Persoas</string>
+=======
+  <string name="search_alert_tag">etiquetas</string>
+  <string name="search_alert_people">persoas</string>
+>>>>>>> gl-translation
   <string name="search_alert_bypeople_validate_needsomedata">Por favor engada un nome</string>
   <string name="context_menu_share_link">Compartir ligazón</string>
   <string name="context_menu_save_image">Gardar imaxe</string>