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

Commit 73fd3983 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents ebe43787 3e30d223

res/layout/grant_permissions.xml

+11 −11
Original line number Original line Diff line number Diff line
@@ -63,52 +63,52 @@ 
                <Space

                <Space

                    style="@style/PermissionGrantButtonBarSpace"/>

                    style="@style/PermissionGrantButtonBarSpace"/>





                <Button

                <com.android.permissioncontroller.permission.ui.widget.SecureButton

                    android:id="@+id/permission_allow_button"

                    android:id="@+id/permission_allow_button"

                    android:text="@string/grant_dialog_button_allow"

                    android:text="@string/grant_dialog_button_allow"

                    style="@style/PermissionGrantButtonAllow" />

                    style="@style/PermissionGrantButtonAllow" />





                <Button

                <com.android.permissioncontroller.permission.ui.widget.SecureButton

                    android:id="@+id/permission_allow_always_button"

                    android:id="@+id/permission_allow_always_button"

                    android:text="@string/grant_dialog_button_allow_always"

                    android:text="@string/grant_dialog_button_allow_always"

                    style="@style/PermissionGrantButtonAllowAlways" />

                    style="@style/PermissionGrantButtonAllowAlways" />





                <Button

                <com.android.permissioncontroller.permission.ui.widget.SecureButton

                    android:id="@+id/permission_allow_foreground_only_button"

                    android:id="@+id/permission_allow_foreground_only_button"

                    android:text="@string/grant_dialog_button_allow_foreground"

                    android:text="@string/grant_dialog_button_allow_foreground"

                    style="@style/PermissionGrantButtonAllowForeground" />

                    style="@style/PermissionGrantButtonAllowForeground" />





                <Button

                <com.android.permissioncontroller.permission.ui.widget.SecureButton

                    android:id="@+id/permission_allow_one_time_button"

                    android:id="@+id/permission_allow_one_time_button"

                    android:text="@string/grant_dialog_button_allow_one_time"

                    android:text="@string/grant_dialog_button_allow_one_time"

                    style="@style/PermissionGrantButtonAllowOneTime" />

                    style="@style/PermissionGrantButtonAllowOneTime" />





                <Button

                <com.android.permissioncontroller.permission.ui.widget.SecureButton

                    android:id="@+id/permission_deny_button"

                    android:id="@+id/permission_deny_button"

                    android:text="@string/grant_dialog_button_deny"

                    android:text="@string/grant_dialog_button_deny"

                    style="@style/PermissionGrantButtonDeny" />

                    style="@style/PermissionGrantButtonDeny" />





                <Button

                <com.android.permissioncontroller.permission.ui.widget.SecureButton

                    android:id="@+id/permission_deny_and_dont_ask_again_button"

                    android:id="@+id/permission_deny_and_dont_ask_again_button"

                    android:text="@string/grant_dialog_button_deny"

                    android:text="@string/grant_dialog_button_deny"

                    style="@style/PermissionGrantButtonDeny" />

                    style="@style/PermissionGrantButtonDeny" />





                <Button

                <com.android.permissioncontroller.permission.ui.widget.SecureButton

                    android:id="@+id/permission_no_upgrade_button"

                    android:id="@+id/permission_no_upgrade_button"

                    android:text="@string/grant_dialog_button_no_upgrade"

                    android:text="@string/grant_dialog_button_no_upgrade"

                    style="@style/PermissionGrantButtonNoUpgrade" />

                    style="@style/PermissionGrantButtonNoUpgrade" />





                <Button

                <com.android.permissioncontroller.permission.ui.widget.SecureButton

                    android:id="@+id/permission_no_upgrade_and_dont_ask_again_button"

                    android:id="@+id/permission_no_upgrade_and_dont_ask_again_button"

                    android:text="@string/grant_dialog_button_no_upgrade"

                    android:text="@string/grant_dialog_button_no_upgrade"

                    style="@style/PermissionGrantButtonNoUpgrade" />

                    style="@style/PermissionGrantButtonNoUpgrade" />





                <Button

                <com.android.permissioncontroller.permission.ui.widget.SecureButton

                    android:id="@+id/permission_no_upgrade_one_time_button"

                    android:id="@+id/permission_no_upgrade_one_time_button"

                    android:text="@string/grant_dialog_button_no_upgrade_one_time"

                    android:text="@string/grant_dialog_button_no_upgrade_one_time"

                    style="@style/PermissionGrantButtonNoUpgrade" />

                    style="@style/PermissionGrantButtonNoUpgrade" />





                <Button

                <com.android.permissioncontroller.permission.ui.widget.SecureButton

                    android:id="@+id/permission_no_upgrade_one_time_and_dont_ask_again_button"

                    android:id="@+id/permission_no_upgrade_one_time_and_dont_ask_again_button"

                    android:text="@string/grant_dialog_button_no_upgrade_one_time"

                    android:text="@string/grant_dialog_button_no_upgrade_one_time"

                    style="@style/PermissionGrantButtonNoUpgrade" />

                    style="@style/PermissionGrantButtonNoUpgrade" />

res/values-ast-rES/strings.xml

0 → 100644
+77 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2007 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     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:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="ok">D\'acuerdu</string>

    <string name="back">Atrás</string>

    <string name="app_not_found_dlg_title">Nun s\'atopó l\'aplicación</string>

    <string name="grant_dialog_button_more_info">Más información</string>

    <string name="current_permission_template">        <xliff:g id="current_permission_index" example="1">%1$s</xliff:g> de

        <xliff:g id="permission_count" example="2">%2$s</xliff:g></string>

    <string name="app_permissions_breadcrumb">Aplicaciones</string>

    <string-array name="background_access_chooser_dialog_choices">

        <item>@string/permission_access_always</item>

        <item>@string/permission_access_only_foreground</item>

        <item>@string/permission_access_never</item>

    </string-array>

    <plurals name="days">

        <item quantity="one">1 day</item>

        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> díes</item>

    </plurals>

    <plurals name="hours">

        <item quantity="one">1 hora</item>

        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> hores</item>

    </plurals>

    <plurals name="minutes">

        <item quantity="one">1 minutu</item>

        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> minutos</item>

    </plurals>

    <plurals name="seconds">

        <item quantity="one">1 segundu</item>

        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> segundos</item>

    </plurals>

    <string name="unused_permissions_subtitle_two"><xliff:g id="perm_name" example="Location">%1$s</xliff:g> y <xliff:g id="perm_name" example="Contacts">%2$s</xliff:g></string>

    <string name="unused_permissions_subtitle_many"><xliff:g id="perm_name" example="Location">%1$s</xliff:g>, <xliff:g id="perm_name" example="Contacts">%2$s</xliff:g>, y <xliff:g id="number_of_permissions" example="4">%3$s</xliff:g> más</string>

    <string name="permission_subtitle_media_only">Multimedia</string>

    <string name="permission_subtitle_all_files">Tolos ficheros</string>

    <string name="ongoing_usage_dialog_ok">Entendílo</string>

    <string name="permgroup_list_microphone_and_camera">Micrófonu y cámara</string>

    <string name="permgrouprequest_contacts">¿Quies permitir que

        &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; acceda a los contautos?</string>

    <string name="permgrouprequest_location">¿Quies permitir que

        &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; acceda a la llocalización d\u2019esti preséu?</string>

    <string name="permgrouprequest_calendar">¿Quies permitir que

        &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; acceda al calendariu?</string>

    <string name="permgrouprequest_sms">¿Quies permitir que

        &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; unvie y vea los mensaxes SMS?</string>

    <string name="permgrouprequest_storage">¿Quies permitir que

        &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; acceda a los ficheros del preséu?</string>

    <string name="permgrouprequest_microphone">¿Quies permitir que

        &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; grabe audiu?</string>

    <string name="permgrouprequest_activityRecognition">¿Quies permitir que

        &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; acceda a la to actividá física?</string>

    <string name="permgrouprequest_camera">¿Quies permitir que

        &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; faiga semeyes y grabe videu?</string>

    <string name="permgrouprequest_calllog">¿Quies permitir que

        &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; acceda al rexistru de llamaes del teléfonu?</string>

    <string name="permgrouprequest_phone">¿Quies permitir que

        &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; faiga y xestione llamaes de teléfonu?</string>

    <string name="permgrouprequest_sensors">¿Quies permitir que

        &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; acceda a los datos del sensor de los tos signos vitales?</string>

    <string name="fg_capabilities_sound_trigger">Dalgunes opciones nun tán disponibles porque esta aplicación tien de detectar soníu</string>

    <string name="fg_capabilities_assistant">Dalgunes opciones nun tán disponibles porque esta aplicación ye l\'asistente dixital predetermináu</string>

    <string name="fg_capabilities_voice_interaction">Dalgunes opciones nun tán disponibles porque esta aplicación úsase pa la entrada de voz</string>

    <string name="fg_capabilities_carrier">Dalgunes opciones nun tán disponibles porque la operadora xestiona esta aplicación</string>

</resources>

res/values-cy/strings.xml

+166 −4

File changed.

Preview size limit exceeded, changes collapsed.

res/values-fr-rCA/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -382,7 +382,7 @@ 
    <string name="adjust_user_sensitive_per_app_header" msgid="1372152438971168364">"Mettre en avant l\'utilisation pour les éléments suivants"</string>

    <string name="adjust_user_sensitive_per_app_header" msgid="1372152438971168364">"Mettre en avant l\'utilisation pour les éléments suivants"</string>

    <string name="assistant_record_audio_user_sensitive_title" msgid="5382972366928946381">"Afficher la détection des déclencheurs de l\'Assistant"</string>

    <string name="assistant_record_audio_user_sensitive_title" msgid="5382972366928946381">"Afficher la détection des déclencheurs de l\'Assistant"</string>

    <string name="assistant_record_audio_user_sensitive_summary" msgid="6852572549436960848">"Afficher l\'icône dans la barre d\'état lorsque le microphone est utilisé pour activer l\'assistant vocal"</string>

    <string name="assistant_record_audio_user_sensitive_summary" msgid="6852572549436960848">"Afficher l\'icône dans la barre d\'état lorsque le microphone est utilisé pour activer l\'assistant vocal"</string>

    <string name="permgrouprequest_storage_isolated" msgid="1019696034804170865">"Autoriser « <xliff:g id="APP_NAME">%1$s</xliff:g> » à accéder aux photos et aux médias de votre appareil?"</string>

    <string name="permgrouprequest_storage_isolated" msgid="1019696034804170865">"Autoriser <xliff:g id="APP_NAME">%1$s</xliff:g> à accéder aux photos et aux médias de votre appareil?"</string>

    <string name="permgrouprequest_contacts" msgid="1493445560009228831">"Autoriser &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; à accéder à vos contacts?"</string>

    <string name="permgrouprequest_contacts" msgid="1493445560009228831">"Autoriser &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; à accéder à vos contacts?"</string>

    <string name="permgrouprequest_location" msgid="4367626296074714965">"Autoriser &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; à accéder à la position de cet appareil?"</string>

    <string name="permgrouprequest_location" msgid="4367626296074714965">"Autoriser &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; à accéder à la position de cet appareil?"</string>

    <string name="permgrouprequestdetail_location" msgid="4985222951894409507">"L\'application aura uniquement accès à la position lorsque vous l\'utilisez"</string>

    <string name="permgrouprequestdetail_location" msgid="4985222951894409507">"L\'application aura uniquement accès à la position lorsque vous l\'utilisez"</string>

res/values-gd/strings.xml

0 → 100644
+456 −0

File added.

Preview size limit exceeded, changes collapsed.