diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-04-04 05:03:54 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2022-04-04 05:03:54 -0700 |
| commit | ddce5b4d3e9ce83205de20e2635e9b87324265b8 (patch) | |
| tree | 351797171f816a32ee8ce0d879713549378f7950 | |
| parent | 9db5cf7b786686c4c8b440da50d4ccc4225f2fb5 (diff) | |
| parent | cc390eae9a6cd55e177040115ab8a58dc01cd948 (diff) | |
Merge cc390eae9a6cd55e177040115ab8a58dc01cd948 on remote branch
Change-Id: Icba80f5fdea5e3d53802d6464e2e7799ff75c246
| -rw-r--r-- | minadbd/minadbd.cpp | 1 | ||||
| -rw-r--r-- | tools/recovery_l10n/res/values-as/strings.xml | 4 | ||||
| -rw-r--r-- | tools/recovery_l10n/res/values-te/strings.xml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/minadbd/minadbd.cpp b/minadbd/minadbd.cpp index 7b82faa0..1df342c8 100644 --- a/minadbd/minadbd.cpp +++ b/minadbd/minadbd.cpp @@ -64,6 +64,7 @@ int main(int argc, char** argv) { // We can't require authentication for sideloading. http://b/22025550. auth_required = false; + socket_access_allowed = false; init_transport_registration(); usb_init(); diff --git a/tools/recovery_l10n/res/values-as/strings.xml b/tools/recovery_l10n/res/values-as/strings.xml index 33a204d0..d956b9a3 100644 --- a/tools/recovery_l10n/res/values-as/strings.xml +++ b/tools/recovery_l10n/res/values-as/strings.xml @@ -6,9 +6,9 @@ <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> + <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"ব্যৱহাৰকাৰীৰ আটাইবোৰ ডেটা মচিবনে?\n\n এইটো কৰাৰ পাছত আনডু কৰিব নোৱাৰি!"</string> <string name="recovery_cancel_wipe_data" msgid="66987687653647384">"বাতিল কৰক"</string> </resources> diff --git a/tools/recovery_l10n/res/values-te/strings.xml b/tools/recovery_l10n/res/values-te/strings.xml index 32a9c641..ecea4329 100644 --- a/tools/recovery_l10n/res/values-te/strings.xml +++ b/tools/recovery_l10n/res/values-te/strings.xml @@ -5,7 +5,7 @@ <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> |