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

Commit 24c76821 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 QPR2 to AOSP main 

Bug: 319669529
Merged-In: Ibe3499c903c861fddba60acddda2ff563654a2ba
Change-Id: I798ac42bd0fb3d14281c643d01ead239c8a269c1
parents 564ad175 b630ec9b

tools/recovery_l10n/res/values-as/strings.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

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

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

    <string name="recovery_installing" msgid="2013591905463558223">"আপডেইট ইনষ্টল কৰি থকা হৈছে"</string>

    <string name="recovery_installing" msgid="2013591905463558223">"আপডে’ট ইনষ্টল কৰি থকা হৈছে"</string>

    <string name="recovery_erasing" msgid="7334826894904037088">"মচি থকা হৈছে"</string>

    <string name="recovery_no_command" msgid="4465476568623024327">"কোনো আদেশ নাই"</string>

    <string name="recovery_error" msgid="5748178989622716736">"ত্ৰুটি!"</string>

    <string name="recovery_installing_security" msgid="9184031299717114342">"সুৰক্ষা আপডেইট ইনষ্টল কৰি থকা হৈছে"</string>

    <string name="recovery_installing_security" msgid="9184031299717114342">"সুৰক্ষা আপডে’ট ইনষ্টল কৰি থকা হৈছে"</string>

    <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"Android ছিষ্টেম ল\'ড কৰিব নোৱাৰি। আপোনাৰ ডেটাত কিবা আসোঁৱাহ থকা যেন লাগিছে। আপুনি যদি এই বাৰ্তাটো পায়েই থাকে, আপুনি নিজৰ ডিভাইচটো ফেক্টৰী ডেটা ৰিছেট কৰি সেইটোত থকা ব্যৱহাৰকাৰীৰ আটাইবোৰ ডেটা মচিব লগা হ\'ব পাৰে।"</string>

    <string name="recovery_try_again" msgid="7168248750158873496">"আকৌ চেষ্টা কৰক"</string>

    <string name="recovery_factory_data_reset" msgid="7321351565602894783">"ফেক্টৰী ডেটা ৰিছেট"</string>

tools/recovery_l10n/res/values-pt-rPT/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ 
    <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"Não é possível carregar o sistema Android. Os seus dados podem estar danificados. Se continuar a receber esta mensagem, pode ter de efetuar uma reposição de dados de fábrica e apagar todos os dados do utilizador armazenados neste dispositivo."</string>

    <string name="recovery_try_again" msgid="7168248750158873496">"Tentar novamente"</string>

    <string name="recovery_factory_data_reset" msgid="7321351565602894783">"Reposição de dados de fábrica"</string>

    <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Pretende limpar todos os dados do utilizador?\n\n NÃO É POSSÍVEL ANULAR ESTA AÇÃO."</string>

    <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Quer limpar todos os dados do utilizador?\n\n NÃO É POSSÍVEL ANULAR ESTA AÇÃO."</string>

    <string name="recovery_cancel_wipe_data" msgid="66987687653647384">"Cancelar"</string>

</resources>

tools/recovery_l10n/res/values-zh-rHK/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
    <string name="recovery_no_command" msgid="4465476568623024327">"沒有指令"</string>

    <string name="recovery_error" msgid="5748178989622716736">"錯誤！"</string>

    <string name="recovery_installing_security" msgid="9184031299717114342">"正在安裝安全性更新"</string>

    <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"無法載入 Android 系統。您的資料可能已損壞。如您繼續收到此訊息，則可能需要將裝置回復原廠設定，並清除儲存在裝置上的所有使用者資料。"</string>

    <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"無法載入 Android 系統。你的資料可能已損壞。如你繼續收到此訊息，則可能需要將裝置回復原廠設定，並清除儲存在裝置上的所有使用者資料。"</string>

    <string name="recovery_try_again" msgid="7168248750158873496">"再試一次"</string>

    <string name="recovery_factory_data_reset" msgid="7321351565602894783">"回復原廠設定"</string>

    <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"要清除所有使用者資料嗎？\n\n這項操作無法復原！"</string>