Make strings.xml and cm_strings.xml same as upstream so as to avoid conflicts...

<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="UTF-8"?>

<!--  Copyright (C) 2013 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");

     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:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

 -->

<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="missing_rename_error" msgid="9098952207447981103">"Tienes que cambiar el nombre"</string>

    <string name="add_folder_name_error" msgid="6014615052491406810">"Tienes que dar un nombre a la carpeta"</string>

    <string name="files_label" msgid="771781190045103748">"Archivos"</string>

    <string name="name_conflict" msgid="28407269328862986">"Ya existe un archivo con este nombre."</string>

    <string name="authentication_required" msgid="8030880723643436099">"Para ver este directorio, inicia sesión en <xliff:g id="NAME">%1$s</xliff:g>"</string>

    <string name="cant_display_content" msgid="8633226333229417237">"No se ha podido mostrar el contenido"</string>

    <string name="sign_in" msgid="6253762676723505592">Acceder</string>

    <string name="sign_in" msgid="6253762676723505592">"Iniciar sesión"</string>

    <string name="new_archive_file_name" msgid="1604650338077249838">"archivo<xliff:g id="EXTENSION">%s</xliff:g>"</string>

    <string name="overwrite_file_confirmation_message" msgid="2496109652768222716">"¿Sobrescribir <xliff:g id="NAME">%1$s</xliff:g>?"</string>

    <string name="continue_in_background" msgid="1974214559047793331">"Continuar en segundo plano"</string>