Browser: ES translations

- Move CM additions to new file
- Restore AOSP strings

Change-Id: I34d60c7871dc1209fdab23ca00d7bbce9d5731b5

2 files changed, 28 insertions, 15 deletions

diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
new file mode 100644
index 0000000..cf918c4
--- /dev/null
+++ b/res/values-es/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="contextmenu_openlink_incognito_newwindow">Abrir en pestaña de incógnito</string>
+    <string name="contextmenu_openlink_incognito_newwindow_background">Abrir en pestaña de incógnito en segundo plano</string>
+    <string name="pref_content_ua">Agente de usuario</string>
+    <string name="pref_content_ua_summary">Elige un agente de usuario</string>
+    <string name="pref_lab_webgl">WebGL</string>
+    <string name="pref_lab_webgl_summary">Habilitar WebGL</string>
+    <string name="pref_lab_websockets">WebSockets</string>
+    <string name="pref_lab_websockets_summary">Habilitar WebSockets</string>
+    <string name="accessibility_button_homescreen">Pantalla de inicio</string>
+</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5eec925..4f68788 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -365,7 +365,7 @@
     <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Siguiente"</string>
     <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Anterior"</string>
     <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Cancelar"</string>
-    <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Aceptar"</string>
+    <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Ok"</string>
     <string name="import_bookmarks_dialog_add" msgid="1743359725294101189">"Añadir marcadores a la cuenta de Google"</string>
     <string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Añadir tus marcadores de Android a marcadores de <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
     <string name="menu_share_url" msgid="5851814357333739700">"Compartir"</string>
@@ -398,18 +398,4 @@
     <string name="accessibility_state_frozen" msgid="8041539250447035570">"Página guardada"</string>
     <string name="accessibility_transition_navscreen" msgid="2734915619351519547">"Administración de pestañas"</string>
     <string name="accessibility_button_bookmarks_folder_up" msgid="9179389954714270505">"Carpeta anterior"</string>
-
-    <!-- CYANOGENMOD ADDITIONS START -->
-
-    <string name="contextmenu_openlink_incognito_newwindow">Abrir en pestaña de incógnito</string>
-    <string name="contextmenu_openlink_incognito_newwindow_background">Abrir en pestaña de incógnito en segundo plano</string>
-    <string name="pref_content_ua">Agente de usuario</string>
-    <string name="pref_content_ua_summary">Elige un agente de usuario</string>
-    <string name="pref_lab_webgl">WebGL</string>
-    <string name="pref_lab_webgl_summary">Habilitar WebGL</string>
-    <string name="pref_lab_websockets">WebSockets</string>
-    <string name="pref_lab_websockets_summary">Habilitar WebSockets</string>
-    <string name="accessibility_button_homescreen">Pantalla de inicio</string>
-
-    <!-- CYANOGENMOD ADDITIONS END -->
 </resources>