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

Commit 03812c93 authored by Bill Yi's avatar Bill Yi
Browse files

Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release 

Change-Id: I120adda515fd4891b6b9b68e93cef5555951bacc
parents a3d10620 c645a99a

AndroidManifest.xml

+23 −4
Original line number Diff line number Diff line
@@ -467,6 +467,20 @@ 
                android:value="com.android.settings.TetherSettings" />

        </activity>



        <activity

            android:name="Settings$WifiTetherSettingsActivity"

            android:label="@string/wifi_hotspot_checkbox_text"

            android:icon="@drawable/ic_wifi_tethering"

            android:parentActivityName="Settings">

            <intent-filter>

                <action android:name="com.android.settings.WIFI_TETHER_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.wifi.tether.WifiTetherSettings" />

        </activity>





        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name=".TetherSettings"

                  android:label="@string/tether_settings_title_all"
@@ -3300,10 +3314,15 @@ 
        </provider>



        <receiver

            android:name=".slices.SliceBroadcastReceiver" >

            <intent-filter>

                <action android:name="com.android.settings.slice.action.WIFI_CHANGED"/>

            </intent-filter>

            android:name=".slices.SliceBroadcastReceiver"

            android:exported="false">

        </receiver>



        <receiver

            android:name=".slices.SliceRelayReceiver"

            android:permission="android.permission.MANAGE_SLICE_PERMISSIONS"

            android:exported="true">



        </receiver>



        <!-- Couldn't be triggered from outside of settings. Statsd can trigger it because we send

res/values-af/arrays.xml

+0 −6
Original line number Diff line number Diff line
@@ -121,12 +121,6 @@ 
    <item msgid="3079489731769553856">"TTLS"</item>

    <item msgid="35269224158638258">"PWD"</item>

  </string-array>

    <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->

    <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->

    <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->

    <!-- no translation found for wifi_ap_band_summary_full:1 (311895158827229479) -->

    <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->

    <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->

  <string-array name="wifi_p2p_wps_setup">

    <item msgid="5085064298144493867">"Druk knoppie"</item>

    <item msgid="1624323946324499595">"PIN van eweknietoestel"</item>

res/values-af/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -856,6 +856,7 @@ 
    <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Outo"</string>

    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 GHz-band"</string>

    <string name="wifi_ap_choose_5G" msgid="8813128641914385634">"5,0 GHz-band"</string>

    <string name="wifi_ap_prefer_5G" msgid="2501070491623803139">"5,0 GHz-band verkies"</string>

    <string name="wifi_ap_2G" msgid="8378132945192979364">"2,4 GHz"</string>

    <string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>

    <string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Kies minstens een band vir Wi-Fi-warmkol:"</string>
@@ -1067,7 +1068,7 @@ 
    <string name="color_mode_option_natural" msgid="5013837483986772758">"Natuurlik"</string>

    <string name="color_mode_option_boosted" msgid="8588223970257287524">"Gemaksimeer"</string>

    <string name="color_mode_option_saturated" msgid="4569683960058798843">"Intens"</string>

    <string name="color_mode_option_automatic" msgid="8781254568140509331">"Outomaties"</string>

    <string name="color_mode_option_automatic" msgid="7996505473528529568">"Aanpasbaar"</string>

    <string name="color_mode_summary_natural" msgid="6624188642920403099">"Gebruik net akkurate kleure"</string>

    <string name="color_mode_summary_automatic" msgid="4669516973360709431">"Verstel tussen helder en akkurate kleure"</string>

    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Wissel oriëntasie outomaties wanneer tablet gedraai word"</string>
@@ -3163,7 +3164,7 @@ 
    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Gedemp, maar laat <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> en <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> toe"</string>

    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Gedemp, maar laat <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> en <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> toe"</string>

    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Boodskappe, geleenthede en onthounotas"</string>

    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Boodskappe, onthounotas en geleenthede sal gedemp word wanneer Moenie Steur Nie aan is, met die uitsondering van die items wat jy hierbo toelaat. Jy kan boodskapinstellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik."</string>

    <string name="zen_msg_event_reminder_footer" msgid="4376930591019535192">"Boodskappe, onthounotas en geleenthede sal gedemp word wanneer Moenie Steur Nie aan is, met die uitsondering van die items wat jy hierbo toelaat. Jy kan boodskapinstellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik."</string>

    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Klaar"</string>

    <string name="zen_onboarding_settings" msgid="9046451821239946868">"Instellings"</string>

    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Geen visuele elemente of klank van kennisgewings af nie"</string>
@@ -4151,4 +4152,5 @@ 
    <string name="pref_title_network_details" msgid="7186418845727358964">"Netwerkbesonderhede"</string>

    <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Programme op jou foon kan jou toestelnaam sien. Ander mense sal dit dalk ook kan sien wanneer jy aan Bluetooth-toestelle koppel of \'n Wi-Fi-warmkol opstel."</string>

    <string name="devices_title" msgid="7701726109334110391">"Toestelle"</string>

    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Verstek"</string>

</resources>

res/values-am/arrays.xml

+0 −6
Original line number Diff line number Diff line
@@ -121,12 +121,6 @@ 
    <item msgid="3079489731769553856">"TTLS"</item>

    <item msgid="35269224158638258">"PWD"</item>

  </string-array>

    <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->

    <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->

    <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->

    <!-- no translation found for wifi_ap_band_summary_full:1 (311895158827229479) -->

    <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->

    <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->

  <string-array name="wifi_p2p_wps_setup">

    <item msgid="5085064298144493867">"አዝራር ተጫን"</item>

    <item msgid="1624323946324499595">"ፒን ከአቻ መሣሪያ"</item>

res/values-am/strings.xml

+5 −3
Original line number Diff line number Diff line
@@ -856,6 +856,7 @@ 
    <string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ራስ-ሰር"</string>

    <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 ጊሄዝ ባንድ"</string>

    <string name="wifi_ap_choose_5G" msgid="8813128641914385634">"5.0 ጊኸ ባንድ"</string>

    <string name="wifi_ap_prefer_5G" msgid="2501070491623803139">"5.0 ጊኸዝ ባንድ ይመረጣል"</string>

    <string name="wifi_ap_2G" msgid="8378132945192979364">"2.4 ጊኸ"</string>

    <string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 ጊኸ"</string>

    <string name="wifi_ap_band_select_one" msgid="3476254666116431650">"ለWi-Fi መገናኛ ነጥብ ቢያንስ አንድ ሞገድ ይምረጡ፦"</string>
@@ -1067,7 +1068,7 @@ 
    <string name="color_mode_option_natural" msgid="5013837483986772758">"ተፈጥሯዊ"</string>

    <string name="color_mode_option_boosted" msgid="8588223970257287524">"ተጨምሯል"</string>

    <string name="color_mode_option_saturated" msgid="4569683960058798843">"ቀለም የሞላ"</string>

    <string name="color_mode_option_automatic" msgid="8781254568140509331">"ራስ-ሰር"</string>

    <string name="color_mode_option_automatic" msgid="7996505473528529568">"ተለማማጅ"</string>

    <string name="color_mode_summary_natural" msgid="6624188642920403099">"ትክክለኛ ቀለማትን ብቻ ተጠቀም"</string>

    <string name="color_mode_summary_automatic" msgid="4669516973360709431">"በግልጽ እና ትክክለኛ ቀለማት መካከል ያስተካክሉ"</string>

    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ጡባዊ ሲሽከረከርየገፅ አቀማመጥ በራስሰርቀይር"</string>
@@ -1183,7 +1184,7 @@ 
    <string name="sim_change_data_title" msgid="294357201685244532">"የውሂብ ሲም ይቀየር?"</string>

    <string name="sim_change_data_message" msgid="5854582807996717811">"ለተንቀሳቃሽ ስልክ ውሂብ በ<xliff:g id="OLD_SIM">%2$s</xliff:g> ፈንታ <xliff:g id="NEW_SIM">%1$s</xliff:g>ን ይጠቀሙ?"</string>

    <string name="sim_preferred_title" msgid="5567909634636045268">"ተመራጩ ሲም ይዘመን?"</string>

    <string name="sim_preferred_message" msgid="8466930554330635780">"<xliff:g id="NEW_SIM">%1$s</xliff:g> በእርስዎ መሣሪያ ላይ ያለው ብቸኛ ሲም ነው። ይህን ሲም ለተንቀሳቃሽ ስልክ ውሂብ፣ ጥሪዎች እና የኤስኤምኤስ መልእክቶች መጠቀም ይፈልጋሉ?"</string>

    <string name="sim_preferred_message" msgid="8466930554330635780">"<xliff:g id="NEW_SIM">%1$s</xliff:g> በእርስዎ መሣሪያ ላይ ያለው ብቸኛ ሲም ነው። ይህን ሲም ለተንቀሳቃሽ ስልክ ውሂብ፣ ጥሪዎች እና የኤስኤምኤስ መልዕክቶች መጠቀም ይፈልጋሉ?"</string>

    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ልክ ያልሆነ የሲም ኮድ። አሁን መሳሪያዎን ለማስከፈት ድምጸ ተያያዥ ሞደምዎን ማግኘት አለብዎ።"</string>

    <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">

      <item quantity="one">ልክ ያልሆነ የሲም ፒን ኮድ፣ <xliff:g id="NUMBER_1">%d</xliff:g> ሙከራዎች ይቀርዎታል።</item>
@@ -3163,7 +3164,7 @@ 
    <string name="zen_sound_two_allowed" msgid="980491120444358550">"ድምጸ-ከል ተደርጎበታል፣ ነገር ግን <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>ን እና <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>ን ፍቀድ"</string>

    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ድምጸ-ከል ተደርጎበታል፣ ነገር ግን <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>ን፣ <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>ን እና <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>ን ፍቀድ"</string>

    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"መልዕክቶች፣ ክስተቶች እና አስታዋሾች"</string>

    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"አትረብሽ ሲበራ ከላይ ከሚፈቅዷቸው ንጥሎች በስተቀር መልዕክቶች፣ አስታዋሾች እና ክስተቶች ድምጸ-ከል ይደረግባቸዋል። የእርስዎ ጓደኛዎች፣ ቤተሰብ እና ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ የመልዕክት ቅንብሮችን ማስተካከል ይችላሉ።"</string>

    <string name="zen_msg_event_reminder_footer" msgid="4376930591019535192">"አትረብሽ ሲበራ ከላይ ከሚፈቅዷቸው ንጥሎች በስተቀር መልዕክቶች፣ አስታዋሾች እና ክስተቶች ድምጸ-ከል ይደረግባቸዋል። የእርስዎ ጓደኛዎች፣ ቤተሰብ እና ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ የመልዕክት ቅንብሮችን ማስተካከል ይችላሉ።"</string>

    <string name="zen_onboarding_ok" msgid="6131211000824433013">"ተከናውኗል"</string>

    <string name="zen_onboarding_settings" msgid="9046451821239946868">"ቅንብሮች"</string>

    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"ማሳወቂያዎች ላይ ምንም ምስሎች ወይም ድምጽ የለም"</string>
@@ -4151,4 +4152,5 @@ 
    <string name="pref_title_network_details" msgid="7186418845727358964">"የአውታረ መረብ ዝርዝሮች"</string>

    <string name="about_phone_device_name_warning" msgid="8885670415541365348">"የእርስዎ መሣሪያ በእርስዎ ስልክ ላይ ላሉ መተግበሪያዎች የሚታይ ነው። ወድ ብሉቱዝ መሣሪያዎች ሲያገኙ ወይም የWi-Fi መገናኛ ነጥብን ሲያቀናብሩ በተጨማሪ በሌሎች ሰዎች የሚታይ ይሆናል።"</string>

    <string name="devices_title" msgid="7701726109334110391">"መሣሪያዎች"</string>

    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ነባሪ"</string>

</resources>