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

Commit e75bd777 authored by Amit Kumar's avatar Amit Kumar
Browse files

Merge branch 'v1-pie' of...

Merge branch 'v1-pie' of https://gitlab.e.foundation/e/os/android_packages_apps_Settings into v1-pie

Change-Id: I544a7ee9afc11eea066e67ae54647ab9eb3dc50b
parents 21a1e4e6 345153ae
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -3394,7 +3394,7 @@
                <action android:name="android.settings.MICROG_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <intent-filter android:priority="6">
            <intent-filter>
                <action android:name="com.android.settings.action.SETTINGS" />
            </intent-filter>
            <meta-data android:name="com.android.settings.category"
+9 −0
Original line number Diff line number Diff line
@@ -188,4 +188,13 @@
    <string name="high_touch_sensitivity_summary">Verhoog skerm sensitiwiteit, sodat dit kan gebruik word met die dra van handskoene</string>
    <string name="touchscreen_hovering_title">Raakskerm swewing</string>
    <string name="touchscreen_hovering_summary">Laat toe om bo die sekrm te sweef soos \'n muis in die web blaaiers, Remote desktops, ens</string>
    <string name="app_notification_sound_timeout_title">Minimum tyd tussen kennisgewingklanke</string>
    <string name="app_notification_sound_timeout_summary_template">Laat geluide of vibrasie nie meer as een keer elke <xliff:g id="duration">%1$s </xliff:g> toe</string>
    <string name="app_notification_sound_timeout_value_none">Geen beperkings</string>
    <string name="app_notification_sound_timeout_value_10_seconds">10 sekondes</string>
    <string name="app_notification_sound_timeout_value_30_seconds">30 sekondes</string>
    <string name="app_notification_sound_timeout_value_1_minute">1 minuut</string>
    <string name="app_notification_sound_timeout_value_5_minutes">5 minute</string>
    <string name="app_notification_sound_timeout_value_15_minutes">10 minute</string>
    <string name="app_notification_sound_timeout_value_30_minutes">30 minute</string>
</resources>
+9 −0
Original line number Diff line number Diff line
@@ -299,4 +299,13 @@
    <string name="open_lockscreen_tuner">تغيير الاختصارات</string>
    <string name="location_mode_battery_saving_title">وضع توفير البطارية</string>
    <string name="location_mode_battery_saving_summary">إستخدام فقط شبكات WiFi أو بلوتوث أو الجوّال لتحديد الموقع (أقل دقة)</string>
    <string name="app_notification_sound_timeout_title">الحد الأدنى من الوقت بين أصوات الإشعار</string>
    <string name="app_notification_sound_timeout_summary_template">السماح بالصوت أو الاهتزاز ليس لأكثر من مرة واحدة كل <xliff:g id="duration">%1$s </xliff:g></string>
    <string name="app_notification_sound_timeout_value_none">لا توجد قيود</string>
    <string name="app_notification_sound_timeout_value_10_seconds">10 ثوان</string>
    <string name="app_notification_sound_timeout_value_30_seconds">30 ثانية</string>
    <string name="app_notification_sound_timeout_value_1_minute">دقيقة واحدة</string>
    <string name="app_notification_sound_timeout_value_5_minutes">5 دقائق</string>
    <string name="app_notification_sound_timeout_value_15_minutes">10 دقائق</string>
    <string name="app_notification_sound_timeout_value_30_minutes">30 دقيقة</string>
</resources>
+9 −0
Original line number Diff line number Diff line
@@ -292,4 +292,13 @@
    <string name="touchscreen_hovering_summary">Permite eslizase pela pantalla como un mur en navegadores, escritorios remotos, etc.</string>
    <string name="directly_show_lock">Desbloquéu direutu</string>
    <string name="directly_show_lock_summary">Omitir l\'esbarie pa destorgar la pantalla y entamar darréu la introducción de la clave</string>
    <string name="app_notification_sound_timeout_title">Tiempu mínimo ente soníos d\'avisu</string>
    <string name="app_notification_sound_timeout_summary_template">Permite soníos o vibración namái una vegada cada <xliff:g id="duration">%1$s</xliff:g></string>
    <string name="app_notification_sound_timeout_value_none">Ensin torgues</string>
    <string name="app_notification_sound_timeout_value_10_seconds">10 segundos</string>
    <string name="app_notification_sound_timeout_value_30_seconds">30 segundos</string>
    <string name="app_notification_sound_timeout_value_1_minute">1 minutu</string>
    <string name="app_notification_sound_timeout_value_5_minutes">5 minutos</string>
    <string name="app_notification_sound_timeout_value_15_minutes">10 minutos</string>
    <string name="app_notification_sound_timeout_value_30_minutes">30 minutos</string>
</resources>
+9 −0
Original line number Diff line number Diff line
@@ -295,4 +295,13 @@
    <string name="open_lockscreen_tuner">Qısayolları dəyişdir</string>
    <string name="location_mode_battery_saving_title">Batereyaya qənaət rejimi</string>
    <string name="location_mode_battery_saving_summary">Yeri müəyyənləşdirmək üçün yalnız Wi\u2011Fi, Bluetooth və ya hüceyrəvi şəbəkələri istifadə edin (daha az dəqiqlik)</string>
    <string name="app_notification_sound_timeout_title">Bildiriş səsləri arası ən az vaxt</string>
    <string name="app_notification_sound_timeout_summary_template">Bir dəfədən çox olmayaraq hər <xliff:g id="duration">%1$s</xliff:g> də bir titrəmə və ya səsə icazə ver</string>
    <string name="app_notification_sound_timeout_value_none">Məhdudiyyət yoxdur</string>
    <string name="app_notification_sound_timeout_value_10_seconds">10 saniyə</string>
    <string name="app_notification_sound_timeout_value_30_seconds">30 saniyə</string>
    <string name="app_notification_sound_timeout_value_1_minute">1 dəqiqə</string>
    <string name="app_notification_sound_timeout_value_5_minutes">5 dəqiqə</string>
    <string name="app_notification_sound_timeout_value_15_minutes">10 dəqiqə</string>
    <string name="app_notification_sound_timeout_value_30_minutes">30 dəqiqə</string>
</resources>
Loading