Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efee319b authored by Nishith Khanna's avatar Nishith Khanna
Browse files

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

Make strings.xml and cm_strings.xml same as upstream so as to avoid conflicts when merging upstream changes
parent 2b8894f0

res/values-de/strings.xml

+82 −79

File changed.

Preview size limit exceeded, changes collapsed.

res/values-es/strings.xml

+9 −6
Original line number Diff line number Diff line 
<?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");
@@ -12,7 +12,10 @@ 
     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>
@@ -252,7 +255,7 @@ 
    <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>

res/values-fr/strings.xml

+30 −28
Original line number Diff line number Diff line 
<?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");
@@ -12,7 +12,10 @@ 
     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">"Vous devez lui attribuer un autre nom"</string>

    <string name="add_folder_name_error" msgid="6014615052491406810">"Vous devez ajouter un nom de dossier"</string>

    <string name="files_label" msgid="771781190045103748">"Fichiers"</string>
@@ -46,14 +49,14 @@ 
    <string name="menu_inspect" msgid="7279855349299446224">"Obtenir les informations"</string>

    <string name="menu_show_hidden_files" msgid="5140676344684492769">"Afficher les fichiers masqués"</string>

    <string name="menu_hide_hidden_files" msgid="5654495713350153702">"Ne pas afficher les fichiers masqués"</string>

    <string name="menu_view_in_owner" msgid="7228948660557554770">Afficher dans <xliff:g id="source" example="Google Drive">%1$s</xliff:g></string>

    <string name="menu_view_in_owner" msgid="7228948660557554770">"Afficher dans <xliff:g id="SOURCE">%1$s</xliff:g>"</string>

    <string name="menu_new_window" msgid="2947837751796109126">"Nouvelle fenêtre"</string>

    <string name="menu_cut_to_clipboard" msgid="2878752142015026229">"Couper"</string>

    <string name="menu_copy_to_clipboard" msgid="5064081159073330776">"Copier"</string>

    <string name="menu_paste_from_clipboard" msgid="360947260414135827">"Coller"</string>

    <string name="menu_paste_into_folder" msgid="8000644546983240101">"Coller dans le dossier"</string>

    <string name="menu_advanced_show" msgid="7558626506462906726">"Aff. mémoire stockage interne"</string>

    <string name="menu_advanced_hide" msgid="6488381508009246334">Masquer mém. stock. int.</string>

    <string name="menu_advanced_hide" msgid="6488381508009246334">"Masquer mém. stock. int."</string>

    <string name="button_select" msgid="240863497069321364">"Sélectionner"</string>

    <string name="button_copy" msgid="8219059853840996027">"Copier"</string>

    <string name="button_compress" msgid="8951561310857223966">"Compresser"</string>
@@ -69,7 +72,7 @@ 
    <string name="sort_dimension_summary" msgid="7724534446881397860">"Résumé"</string>

    <string name="sort_dimension_file_type" msgid="5779709622922085381">"Type"</string>

    <string name="sort_dimension_size" msgid="2190547351159472884">"Taille"</string>

    <string name="sort_dimension_date" msgid="4231005651895254033">Dernière modif.</string>

    <string name="sort_dimension_date" msgid="4231005651895254033">"Dernière modif."</string>

    <string name="sort_dimension_name_ascending" msgid="3715725253270614742">"Nom de fichier (de A à Z)"</string>

    <string name="sort_dimension_file_type_ascending" msgid="3466973933402894292">"Type (de A à Z)"</string>

    <string name="sort_dimension_size_ascending" msgid="2617359017800057762">"Taille (moins volumineux d\'abord)"</string>
@@ -79,11 +82,11 @@ 
    <string name="sort_dimension_size_descending" msgid="2367030017597348938">"Taille (plus volumineux d\'abord)"</string>

    <string name="sort_dimension_date_descending" msgid="5466839955763127113">"Date de modification (plus récents d\'abord)"</string>

    <string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Trier par"</string>

    <string name="sort_dimension_button_title" msgid="1898606989130896126">Triés par <xliff:g id="label" example="File name (A to Z)">%s</xliff:g></string>

    <string name="sort_dimension_button_title" msgid="1898606989130896126">"Triés par <xliff:g id="LABEL">%s</xliff:g>"</string>

    <string name="directory_items" msgid="6645621978998614003">"Nombre d\'éléments"</string>

    <string name="sort_direction_ascending" msgid="5882787683763248102">"Croissant"</string>

    <string name="sort_direction_descending" msgid="1729187589765894076">"Décroissant"</string>

    <string name="open_external_app" msgid="7107920381038980086">Ouvrir <xliff:g id="appName" example="Drive">%1$s</xliff:g></string>

    <string name="open_external_app" msgid="7107920381038980086">"Ouvrir <xliff:g id="APPNAME">%1$s</xliff:g>"</string>

    <string name="drawer_open" msgid="8071673398187261741">"Afficher les répertoires racines"</string>

    <string name="drawer_close" msgid="4263880768630848848">"Masquer les répertoires racines"</string>

    <string name="save_error" msgid="8631128801982095782">"Échec de l\'enregistrement du document"</string>
@@ -102,7 +105,7 @@ 
    <string name="cross_profile_action_not_allowed_title" msgid="6611281348716476478">"Cette opération n\'est pas autorisée"</string>

    <string name="cross_profile_action_not_allowed_message" msgid="7331275433061690947">"Pour en savoir plus, contactez ce dernier"</string>

    <string name="root_recent" msgid="1080156975424341623">"Récents"</string>

    <string name="root_available_bytes" msgid="8269870862691408864"><xliff:g id="size" example="3GB">%1$s</xliff:g> disponible(s)</string>

    <string name="root_available_bytes" msgid="8269870862691408864">"<xliff:g id="SIZE">%1$s</xliff:g> disponible(s)"</string>

    <string name="root_type_service" msgid="6521366147466512289">"Services de stockage"</string>

    <string name="root_type_shortcut" msgid="6059343175525442279">"Raccourcis"</string>

    <string name="root_type_device" msgid="1713604128005476585">"Appareils"</string>
@@ -112,15 +115,15 @@ 
    <string name="toast_no_application" msgid="7555319548595113121">"Impossible d\'ouvrir le fichier"</string>

    <string name="toast_view_in_archives_unsupported" msgid="1923221390170964845">"Impossible d\'ouvrir un fichier dans une archive"</string>

    <string name="toast_failed_delete" msgid="3453846588205817591">"Impossible de supprimer certains documents"</string>

    <string name="toast_share_over_limit" msgid="5805442886537093015">Impossible de partager plus de \u0020<xliff:g id="count" example="1">%1$d</xliff:g> fichiers</string>

    <string name="toast_share_over_limit" msgid="5805442886537093015">"Impossible de partager plus de <xliff:g id="COUNT">%1$d</xliff:g> fichiers"</string>

    <string name="toast_action_not_allowed" msgid="1329382474450572415">"Action interdite"</string>

    <string name="share_via" msgid="8725082736005677161">"Partager via"</string>

    <string name="copy_notification_title" msgid="52256435625098456">Copie en cours</string>

    <string name="copy_notification_title" msgid="52256435625098456">"Copie de fichiers…"</string>

    <string name="compress_notification_title" msgid="6830195148113751021">"Compression de fichiers"</string>

    <string name="extract_notification_title" msgid="5067393961754430469">"Extraction des fichiers"</string>

    <string name="move_notification_title" msgid="3173424987049347605">Déplacement en cours</string>

    <string name="delete_notification_title" msgid="2512757431856830792">Suppression en cours</string>

    <string name="copy_remaining" msgid="5390517377265177727">Temps restant :<xliff:g id="duration" example="3 minutes">%s</xliff:g></string>

    <string name="move_notification_title" msgid="3173424987049347605">"Déplacement de fichiers…"</string>

    <string name="delete_notification_title" msgid="2512757431856830792">"Suppression des fichiers…"</string>

    <string name="copy_remaining" msgid="5390517377265177727">"Temps restant : <xliff:g id="DURATION">%s</xliff:g>"</string>

    <plurals name="copy_begin" formatted="false" msgid="151184708996738192">

      <item quantity="one">Copie de <xliff:g id="COUNT_1">%1$d</xliff:g> élément…</item>

      <item quantity="many">Copie de <xliff:g id="COUNT_1">%1$d</xliff:g> éléments…</item>
@@ -152,8 +155,7 @@ 
    <string name="extract_preparing" msgid="4796626960061745796">"Préparation..."</string>

    <string name="move_preparing" msgid="6504239656430530761">"Préparation..."</string>

    <string name="delete_preparing" msgid="7339349837842802508">"Préparation..."</string>

    <string name="delete_progress" msgid="2627631054702306423"><xliff:g id="count" example="3">%1$d</xliff:g> /

\n<xliff:g id="totalCount" example="5">%2$d</xliff:g></string>

    <string name="delete_progress" msgid="2627631054702306423">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="TOTALCOUNT">%2$d</xliff:g>"</string>

    <plurals name="copy_error_notification_title" formatted="false" msgid="3188432450429390963">

      <item quantity="one">Impossible de copier <xliff:g id="COUNT_1">%1$d</xliff:g> élément</item>

      <item quantity="many">Impossible de copier <xliff:g id="COUNT_1">%1$d</xliff:g> éléments</item>
@@ -174,7 +176,7 @@ 
      <item quantity="many">Impossible de supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> éléments</item>

      <item quantity="other">Impossible de supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> éléments</item>

    </plurals>

    <string name="notification_touch_for_details" msgid="2385563502445129570">Appuyez pour afficher plus d\'informations</string>

    <string name="notification_touch_for_details" msgid="2385563502445129570">"Appuyez pour afficher plus d\'informations."</string>

    <string name="close" msgid="905969391788869975">"Fermer"</string>

    <plurals name="copy_failure_alert_content" formatted="false" msgid="5570549471912990536">

      <item quantity="one">Ce fichier n\'a pas été copié : <xliff:g id="LIST_1">%1$s</xliff:g></item>
@@ -253,7 +255,7 @@ 
    <string name="name_conflict" msgid="28407269328862986">"Il existe déjà un fichier portant ce nom."</string>

    <string name="authentication_required" msgid="8030880723643436099">"Pour afficher cet annuaire, connectez-vous à <xliff:g id="NAME">%1$s</xliff:g>"</string>

    <string name="cant_display_content" msgid="8633226333229417237">"Impossible d\'afficher le contenu"</string>

    <string name="sign_in" msgid="6253762676723505592">Se connecter</string>

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

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

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

    <string name="continue_in_background" msgid="1974214559047793331">"Continuer en arrière-plan"</string>
@@ -265,10 +267,10 @@ 
    <string name="root_info_header_recent" msgid="5654901877295332262">"Fichiers récents"</string>

    <string name="root_info_header_global_search" msgid="4904078222280496152">"Fichiers"</string>

    <string name="root_info_header_downloads" msgid="8848161246921154115">"Fichiers dans le dossier \"Téléchargements\""</string>

    <string name="root_info_header_storage" msgid="2989014130584927442">Fichiers sur <xliff:g id="device" example="Pixel">%1$s</xliff:g></string>

    <string name="root_info_header_folder" msgid="5851172222368049864">Fichiers dans <xliff:g id="folder" example="DCIM">%1$s</xliff:g></string>

    <string name="root_info_header_app" msgid="2125422047558420885">Fichiers provenant de <xliff:g id="label" example="Drive">%1$s</xliff:g></string>

    <string name="root_info_header_app_with_summary" msgid="3223302581236069702">Fichiers provenant de <xliff:g id="label" example="Drive">%1$s</xliff:g> / <xliff:g id="summary" example="example@com">%2$s</xliff:g></string>

    <string name="root_info_header_storage" msgid="2989014130584927442">"Fichiers sur <xliff:g id="DEVICE">%1$s</xliff:g>"</string>

    <string name="root_info_header_folder" msgid="5851172222368049864">"Fichiers dans <xliff:g id="FOLDER">%1$s</xliff:g>"</string>

    <string name="root_info_header_app" msgid="2125422047558420885">"Fichiers provenant de <xliff:g id="LABEL">%1$s</xliff:g>"</string>

    <string name="root_info_header_app_with_summary" msgid="3223302581236069702">"Fichiers provenant de <xliff:g id="LABEL">%1$s</xliff:g>/<xliff:g id="SUMMARY">%2$s</xliff:g>"</string>

    <string name="root_info_header_image_recent" msgid="7494373563753926014">"Images récentes"</string>

    <string name="root_info_header_image_global_search" msgid="7307009823489854697">"Images"</string>

    <string name="root_info_header_image_downloads" msgid="7072252612657612307">"Images dans le dossier \"Téléchargements\""</string>
@@ -280,16 +282,16 @@ 
    <string name="chip_title_audio" msgid="1032801828748235436">"Audio"</string>

    <string name="chip_title_videos" msgid="7011260091979776447">"Vidéos"</string>

    <string name="chip_title_documents" msgid="7432457563000753983">"Documents"</string>

    <string name="chip_title_large_files" msgid="7740269190493883980">Fichiers volumineux</string>

    <string name="chip_title_large_files" msgid="7740269190493883980">"Fichiers volumineux"</string>

    <string name="chip_title_from_this_week" msgid="4961536405220379672">"Cette semaine"</string>

    <string name="input_hint_new_folder" msgid="479672411219725677">"Nom du dossier"</string>

    <string name="input_hint_rename" msgid="8390711744270994452">"Nouveau nom"</string>

    <string name="preview_file" msgid="4056622696305432343">"Prévisualiser le fichier <xliff:g id="FILENAME">%1$s</xliff:g>"</string>

    <string name="preview_work_file" msgid="4495643735563487273">"Prévisualiser le fichier professionnel <xliff:g id="FILENAME">%1$s</xliff:g>"</string>

    <string name="apps_row_title" msgid="3340490016663092925">Parcourir les fichiers dans d\'autres applications</string>

    <string name="apps_row_title" msgid="3340490016663092925">"Parcourir les fichiers dans d\'autres applications"</string>

    <string name="anonymous_application" msgid="7633027057951625862">"Anonyme"</string>

    <string name="open_tree_button" msgid="6402871398424497776">"Utiliser ce dossier"</string>

    <string name="open_tree_dialog_title" msgid="6339509533852318569">Autoriser <xliff:g id="appName" example="Drive">%1$s</xliff:g> à accéder aux fichiers dans <xliff:g id="directory" example="DCIM">%2$s</xliff:g> \?</string>

    <string name="open_tree_dialog_title" msgid="6339509533852318569">"Autoriser <xliff:g id="APPNAME">%1$s</xliff:g> à accéder aux fichiers dans <xliff:g id="DIRECTORY">%2$s</xliff:g> ?"</string>

    <string name="open_tree_dialog_message" msgid="4120695398430659628">"<xliff:g id="APPNAME">%1$s</xliff:g> pourra ainsi accéder aux contenus qui sont ou seront enregistrés dans <xliff:g id="DIRECTORY">%2$s</xliff:g>."</string>

    <string name="directory_blocked_header_title" msgid="1164584889578740066">"Impossible d\'utiliser ce dossier"</string>

    <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"Pour protéger votre vie privée, choisissez un autre dossier"</string>
@@ -299,7 +301,7 @@ 
    <string name="personal_tab" msgid="3878576287868528503">"Personnel"</string>

    <string name="work_tab" msgid="7265359366883747413">"Professionnel"</string>

    <string name="a11y_work" msgid="7504431382825242153">"Pro"</string>

    <string name="drag_from_another_app" msgid="8310249276199969905">Vous ne pouvez pas déplacer de fichiers depuis une autre application.</string>

    <string name="drag_from_another_app" msgid="8310249276199969905">"Vous ne pouvez pas déplacer de fichiers depuis une autre application."</string>

    <string name="grid_mode_showing" msgid="2803166871485028508">"Affichage en mode grille."</string>

    <string name="list_mode_showing" msgid="1225413902295895166">"Affichage en mode liste."</string>

</resources>

res/values-it/strings.xml

+45 −42

File changed.

Preview size limit exceeded, changes collapsed.

res/values-nl/strings.xml

+56 −53
Original line number Diff line number Diff line 
<?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");
@@ -12,7 +12,10 @@ 
     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">"Je moet deze naam wijzigen"</string>

    <string name="add_folder_name_error" msgid="6014615052491406810">"Je moet een mapnaam toevoegen"</string>

    <string name="files_label" msgid="771781190045103748">"Bestanden"</string>
@@ -26,13 +29,13 @@ 
    <string name="menu_create_dir" msgid="2413624798689091042">"Nieuwe map"</string>

    <string name="menu_grid" msgid="1453636521731880680">"Rasterweergave"</string>

    <string name="menu_list" msgid="6714267452146410402">"Lijstweergave"</string>

    <string name="menu_search" msgid="1876699106790719849">Zoeken</string>

    <string name="menu_search" msgid="1876699106790719849">"Zoeken"</string>

    <string name="menu_settings" msgid="6520844520117939047">"Instellingen voor opslag"</string>

    <string name="menu_open" msgid="9092138100049759315">"Openen"</string>

    <string name="menu_open_with" msgid="5507647065467520229">"Openen met"</string>

    <string name="menu_open_in_new_window" msgid="6686563636123311276">"Openen in nieuw venster"</string>

    <string name="menu_save" msgid="5195367497138965168">"Opslaan"</string>

    <string name="menu_share" msgid="4307140947108068356">Delen</string>

    <string name="menu_share" msgid="4307140947108068356">"Delen"</string>

    <string name="menu_delete" msgid="1022254131543256626">"Verwijderen"</string>

    <string name="menu_select_all" msgid="7600576812185570403">"Alles selecteren"</string>

    <string name="menu_deselect_all" msgid="7729916068862742979">"Alles deselecteren"</string>
@@ -165,7 +168,7 @@ 
      <item quantity="one">Kan <xliff:g id="COUNT_0">%1$d</xliff:g> item niet verwijderen</item>

    </plurals>

    <string name="notification_touch_for_details" msgid="2385563502445129570">"Tik om details te bekijken"</string>

    <string name="close" msgid="905969391788869975">Sluiten</string>

    <string name="close" msgid="905969391788869975">"Sluiten"</string>

    <plurals name="copy_failure_alert_content" formatted="false" msgid="5570549471912990536">

      <item quantity="other">Deze bestanden zijn niet gekopieerd: <xliff:g id="LIST_1">%1$s</xliff:g></item>

      <item quantity="one">Dit bestand is niet gekopieerd: <xliff:g id="LIST_0">%1$s</xliff:g></item>
@@ -231,7 +234,7 @@ 
    <string name="name_conflict" msgid="28407269328862986">"Er bestaat al een bestand met deze naam."</string>

    <string name="authentication_required" msgid="8030880723643436099">"Log in bij <xliff:g id="NAME">%1$s</xliff:g> om deze directory te bekijken"</string>

    <string name="cant_display_content" msgid="8633226333229417237">"Kan content niet bekijken"</string>

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

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

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

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

    <string name="continue_in_background" msgid="1974214559047793331">"Doorgaan op de achtergrond"</string>