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

Unverified Commit 0d050d3a authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-12.1.0_r7' into staging/lineage-19.1_merge-android-12.1.0_r7 

Android 12.1.0 Release 7 (SQ3A.220605.009.A1)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYp57OgAKCRDorT+BmrEO
# eE3fAJ4nPjRQgxshsrtkzZb9bfoDtfDJbwCeL0ViHzZOdv6xpSEkH99it3Ng1Uw=
# =huSb
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun  7 01:10:02 2022 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1182 signatures in the past
#      7 months.  Encrypted 4 messages in the past 4 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Bill Yi
# Via Automerger Merge Worker (9) and others
* tag 'android-12.1.0_r7':
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE

Change-Id: I1d647495b5e3244831c05b18bc86606fe290ef41
parents 2761d5f6 b83afd88

res/values-it/strings.xml

+22 −22
Original line number Diff line number Diff line
@@ -125,24 +125,24 @@ 
    <string name="delete_notification_title" msgid="2512757431856830792">"Eliminazione dei file"</string>

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

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

      <item quantity="one">Copying <xliff:g id="COUNT_1">%1$d</xliff:g> items.</item>

      <item quantity="other">Copia di <xliff:g id="COUNT_1">%1$d</xliff:g> elementi.</item>

      <item quantity="one">Copia di <xliff:g id="COUNT_0">%1$d</xliff:g> elemento.</item>

    </plurals>

    <plurals name="compress_begin" formatted="false" msgid="3534158317098678895">

      <item quantity="one">Compressing <xliff:g id="COUNT_1">%1$d</xliff:g> files.</item>

      <item quantity="other">Compressione di <xliff:g id="COUNT_1">%1$d</xliff:g> file in corso.</item>

      <item quantity="one">Compressione di <xliff:g id="COUNT_0">%1$d</xliff:g> file in corso.</item>

    </plurals>

    <plurals name="extract_begin" formatted="false" msgid="1006380679562903749">

      <item quantity="one">Extracting <xliff:g id="COUNT_1">%1$d</xliff:g> files.</item>

      <item quantity="other">Estrazione di <xliff:g id="COUNT_1">%1$d</xliff:g> file in corso.</item>

      <item quantity="one">Estrazione di <xliff:g id="COUNT_0">%1$d</xliff:g> file in corso.</item>

    </plurals>

    <plurals name="move_begin" formatted="false" msgid="1464229874265756956">

      <item quantity="one">Moving <xliff:g id="COUNT_1">%1$d</xliff:g> items.</item>

      <item quantity="other">Spostamento di <xliff:g id="COUNT_1">%1$d</xliff:g> elementi.</item>

      <item quantity="one">Spostamento di <xliff:g id="COUNT_0">%1$d</xliff:g> elemento.</item>

    </plurals>

    <plurals name="deleting" formatted="false" msgid="1729138001178158901">

      <item quantity="one">Deleting <xliff:g id="COUNT_1">%1$d</xliff:g> items.</item>

      <item quantity="other">Eliminazione di <xliff:g id="COUNT_1">%1$d</xliff:g> elementi.</item>

      <item quantity="one">Eliminazione di <xliff:g id="COUNT_0">%1$d</xliff:g> elemento.</item>

    </plurals>

    <string name="undo" msgid="2902438994196400565">"Annulla"</string>

    <string name="copy_preparing" msgid="4759516490222449324">"Preparazione…"</string>
@@ -152,50 +152,50 @@ 
    <string name="delete_preparing" msgid="7339349837842802508">"Preparazione…"</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">Couldn’t copy <xliff:g id="COUNT_1">%1$d</xliff:g> items</item>

      <item quantity="other">Copia di <xliff:g id="COUNT_1">%1$d</xliff:g> elementi non riuscita</item>

      <item quantity="one">Copia di <xliff:g id="COUNT_0">%1$d</xliff:g> elemento non riuscita</item>

    </plurals>

    <plurals name="compress_error_notification_title" formatted="false" msgid="3043630066678213644">

      <item quantity="one">Couldn’t compress <xliff:g id="COUNT_1">%1$d</xliff:g> files</item>

      <item quantity="other">Impossibile comprimere <xliff:g id="COUNT_1">%1$d</xliff:g> file</item>

      <item quantity="one">Impossibile comprimere <xliff:g id="COUNT_0">%1$d</xliff:g> file</item>

    </plurals>

    <plurals name="move_error_notification_title" formatted="false" msgid="2185736082411854754">

      <item quantity="one">Couldn’t move <xliff:g id="COUNT_1">%1$d</xliff:g> items</item>

      <item quantity="other">Spostamento di <xliff:g id="COUNT_1">%1$d</xliff:g> elementi non riuscito</item>

      <item quantity="one">Spostamento di <xliff:g id="COUNT_0">%1$d</xliff:g> elemento non riuscito</item>

    </plurals>

    <plurals name="delete_error_notification_title" formatted="false" msgid="7568122018481625267">

      <item quantity="one">Couldn’t delete <xliff:g id="COUNT_1">%1$d</xliff:g> items</item>

      <item quantity="other">Eliminazione di <xliff:g id="COUNT_1">%1$d</xliff:g> elementi non riuscita</item>

      <item quantity="one">Eliminazione di <xliff:g id="COUNT_0">%1$d</xliff:g> elemento non riuscita</item>

    </plurals>

    <string name="notification_touch_for_details" msgid="2385563502445129570">"Tocca per vedere i dettagli"</string>

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

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

      <item quantity="one">These files weren’t copied: <xliff:g id="LIST_1">%1$s</xliff:g></item>

      <item quantity="other">I seguenti file non sono stati copiati: <xliff:g id="LIST_1">%1$s</xliff:g></item>

      <item quantity="one">Il seguente file non è stato copiato: <xliff:g id="LIST_0">%1$s</xliff:g></item>

    </plurals>

    <plurals name="compress_failure_alert_content" formatted="false" msgid="5760632881868842400">

      <item quantity="one">These files weren’t compressed: <xliff:g id="LIST_1">%1$s</xliff:g></item>

      <item quantity="other">I seguenti file non sono stati compressi: <xliff:g id="LIST_1">%1$s</xliff:g></item>

      <item quantity="one">Il seguente file non è stato compresso: <xliff:g id="LIST_0">%1$s</xliff:g></item>

    </plurals>

    <plurals name="extract_failure_alert_content" formatted="false" msgid="7572748127571720803">

      <item quantity="one">These files weren’t extracted: <xliff:g id="LIST_1">%1$s</xliff:g></item>

      <item quantity="other">I seguenti file non sono stati estratti: <xliff:g id="LIST_1">%1$s</xliff:g></item>

      <item quantity="one">Il seguente file non è stato estratto: <xliff:g id="LIST_0">%1$s</xliff:g></item>

    </plurals>

    <plurals name="move_failure_alert_content" formatted="false" msgid="2747390342670799196">

      <item quantity="one">These files weren’t moved: <xliff:g id="LIST_1">%1$s</xliff:g></item>

      <item quantity="other">I seguenti file non sono stati spostati: <xliff:g id="LIST_1">%1$s</xliff:g></item>

      <item quantity="one">Il seguente file non è stato spostato: <xliff:g id="LIST_0">%1$s</xliff:g></item>

    </plurals>

    <plurals name="delete_failure_alert_content" formatted="false" msgid="6122372614839711711">

      <item quantity="one">These files weren’t deleted: <xliff:g id="LIST_1">%1$s</xliff:g></item>

      <item quantity="other">I seguenti file non sono stati eliminati: <xliff:g id="LIST_1">%1$s</xliff:g></item>

      <item quantity="one">Il seguente file non è stato eliminato: <xliff:g id="LIST_0">%1$s</xliff:g></item>

    </plurals>

    <plurals name="copy_converted_warning_content" formatted="false" msgid="7433742181712126588">

      <item quantity="one">These files were converted to another format: <xliff:g id="LIST_1">%1$s</xliff:g></item>

      <item quantity="other">I seguenti file sono stati convertiti in un altro formato: <xliff:g id="LIST_1">%1$s</xliff:g></item>

      <item quantity="one">Il seguente file è stato convertito in un altro formato: <xliff:g id="LIST_0">%1$s</xliff:g></item>

    </plurals>

    <plurals name="clipboard_files_clipped" formatted="false" msgid="4847061634862926902">

      <item quantity="one">Copied <xliff:g id="COUNT_1">%1$d</xliff:g> items to clipboard.</item>

      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementi copiati negli appunti.</item>

      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento copiato negli appunti.</item>

    </plurals>

    <string name="file_operation_rejected" msgid="4301554203329008794">"Operazione sul file non supportata."</string>

    <string name="file_operation_error" msgid="2234357335716533795">"Operazione sul file non riuscita."</string>
@@ -208,26 +208,26 @@ 
    <string name="allow" msgid="1275746941353040309">"Consenti"</string>

    <string name="deny" msgid="5127201668078153379">"Rifiuta"</string>

    <plurals name="elements_selected" formatted="false" msgid="4448165978637163692">

      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item>

      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementi selezionati</item>

      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento selezionato</item>

    </plurals>

    <plurals name="elements_dragged" formatted="false" msgid="5932571296037626279">

      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> items</item>

      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementi</item>

      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento</item>

    </plurals>

    <string name="delete_filename_confirmation_message" msgid="8338069763240613258">"Eliminare \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>

    <string name="delete_foldername_confirmation_message" msgid="9084085260877704140">"Eliminare la cartella \"<xliff:g id="NAME">%1$s</xliff:g>\" e i relativi contenuti?"</string>

    <plurals name="delete_files_confirmation_message" formatted="false" msgid="4866664063250034142">

      <item quantity="one">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> files?</item>

      <item quantity="other">Eliminare <xliff:g id="COUNT_1">%1$d</xliff:g> file?</item>

      <item quantity="one">Eliminare <xliff:g id="COUNT_0">%1$d</xliff:g> file?</item>

    </plurals>

    <plurals name="delete_folders_confirmation_message" formatted="false" msgid="1028946402799686388">

      <item quantity="one">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> folders and their contents?</item>

      <item quantity="other">Eliminare <xliff:g id="COUNT_1">%1$d</xliff:g> cartelle e i relativi contenuti?</item>

      <item quantity="one">Eliminare <xliff:g id="COUNT_0">%1$d</xliff:g> cartella e i relativi contenuti?</item>

    </plurals>

    <plurals name="delete_items_confirmation_message" formatted="false" msgid="7285090426511028179">

      <item quantity="one">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> items?</item>

      <item quantity="other">Eliminare <xliff:g id="COUNT_1">%1$d</xliff:g> elementi?</item>

      <item quantity="one">Eliminare <xliff:g id="COUNT_0">%1$d</xliff:g> elemento?</item>

    </plurals>

    <string name="images_shortcut_label" msgid="2545168016070493574">"Immagini"</string>

    <string name="archive_loading_failed" msgid="7243436722828766996">"Impossibile aprire il file di archivio per la navigazione. Il file è corrotto o in un formato non supportato."</string>
@@ -239,8 +239,8 @@ 
    <string name="overwrite_file_confirmation_message" msgid="2496109652768222716">"Sovrascrivere <xliff:g id="NAME">%1$s</xliff:g>?"</string>

    <string name="continue_in_background" msgid="1974214559047793331">"Continua in background"</string>

    <plurals name="selected_count" formatted="false" msgid="7555250236512981129">

      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item>

      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementi selezionati</item>

      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento selezionato</item>

    </plurals>

    <string name="root_info_header_recent" msgid="5654901877295332262">"File recenti"</string>

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

res/values-nl/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ 
    <string name="archive_loading_failed" msgid="7243436722828766996">"Archief kan niet worden geopend voor browsen. Het bestand is mogelijk beschadigd of heeft een niet-ondersteunde indeling."</string>

    <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 weergeven"</string>

    <string name="cant_display_content" msgid="8633226333229417237">"Kan content niet bekijken"</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>

res/values-or/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
    <string name="menu_grid" msgid="1453636521731880680">"ଗ୍ରୀଡ୍‍ ଭ୍ୟୁ"</string>

    <string name="menu_list" msgid="6714267452146410402">"ତାଲିକା ଭ୍ୟୁ"</string>

    <string name="menu_search" msgid="1876699106790719849">"ସନ୍ଧାନ କରନ୍ତୁ"</string>

    <string name="menu_settings" msgid="6520844520117939047">"ଷ୍ଟୋରେଜ୍‌ ସେଟିଂସ୍"</string>

    <string name="menu_settings" msgid="6520844520117939047">"ଷ୍ଟୋରେଜ ସେଟିଂସ"</string>

    <string name="menu_open" msgid="9092138100049759315">"ଖୋଲନ୍ତୁ"</string>

    <string name="menu_open_with" msgid="5507647065467520229">"ଏଥିରେ ଖୋଲନ୍ତୁ"</string>

    <string name="menu_open_in_new_window" msgid="6686563636123311276">"ନୂଆ ୱିଣ୍ଡୋରେ ଖୋଲନ୍ତୁ"</string>

res/values-pt-rBR/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
    <string name="menu_select_all" msgid="7600576812185570403">"Selecionar tudo"</string>

    <string name="menu_deselect_all" msgid="7729916068862742979">"Desmarcar tudo"</string>

    <string name="menu_select" msgid="1366061076507142387">"Selecionar"</string>

    <string name="menu_sort" msgid="3362419226163725275">"Classificar por…"</string>

    <string name="menu_sort" msgid="3362419226163725275">"Ordenar por…"</string>

    <string name="menu_copy" msgid="7404820171352314754">"Copiar para..."</string>

    <string name="menu_move" msgid="2310760789561129882">"Mover para…"</string>

    <string name="menu_compress" msgid="37539111904724188">"Compactar"</string>
@@ -81,7 +81,7 @@ 
    <string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"Tipo (Z a A)"</string>

    <string name="sort_dimension_size_descending" msgid="2367030017597348938">"Tamanho (maior primeiro)"</string>

    <string name="sort_dimension_date_descending" msgid="5466839955763127113">"Modificado (mais recente primeiro)"</string>

    <string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Classificar por"</string>

    <string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Ordenar por"</string>

    <string name="sort_dimension_button_title" msgid="1898606989130896126">"Classificado por <xliff:g id="LABEL">%s</xliff:g>"</string>

    <string name="directory_items" msgid="6645621978998614003">"Número de itens"</string>

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

res/values-pt-rPT/strings.xml

+22 −22

File changed.

Preview size limit exceeded, changes collapsed.