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

Commit 4e9eae1b authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents a42122f8 5fe9e3d9
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<!--
/* //device/apps/common/assets/res/any/strings.xml
**
@@ -921,7 +920,7 @@
    <string name="kg_login_password_hint">ئىم</string>
    <string name="kg_login_submit_button">تىزىمغا كىر</string>
    <string name="kg_login_invalid_input">ئىشلەتكۈچى ئاتى ۋە ياكى ئىم خاتا.</string>
    <string name="kg_login_account_recovery_hint">ئىشلەتكۈچى ئاتىڭىز ياكى ئىمنى ئۇنۇتتىڭىزمۇ؟\n\"<b>"google.com/accounts/recovery"</b>\" زىيارەت قىلىڭ.</string>
    <string name="kg_login_account_recovery_hint">ئىشلەتكۈچى ئاتىڭىز ياكى ئىمنى ئۇنۇتتىڭىزمۇ؟\n\"<b>\"google.com/accounts/recovery\"</b>\" زىيارەت قىلىڭ.</string>
    <string name="kg_login_checking_password">ھېساباتنى تەكشۈرۈۋاتىدۇ…</string>
    <string name="kg_failed_attempts_now_wiping" product="tablet">سىز تاختا كومپيۇتېر قۇلۇپىنى ئېچىشنى <xliff:g id="NUMBER">%d</xliff:g> قېتىم خاتا سىنىدىڭىز. تاختا كومپيۇتېر زاۋۇتتىن چىققان ھالەتكە ئەسلىگە قايتىدۇ، </string>
    <string name="kg_failed_attempts_now_wiping" product="default">سىز تېلېفون قۇلۇپىنى ئېچىشنى <xliff:g id="NUMBER">%d</xliff:g> قېتىم خاتا سىنىدىڭىز. تېلېفون زاۋۇتتىن چىققان ھالەتكە ئەسلىگە قايتىدۇ، </string>
+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@
    <string name="accessibility_dpad_right">Cursor rechts</string>
    <string name="screen_pinning_description_no_navbar">Met scherm vastzetten wordt het beeldscherm vergrendeld op één weergave.\n\nBlijf de Terug-knop aanraken om het scherm los te maken.</string>
    <string name="screen_pinning_toast_no_navbar">Houd de Terug-knop ingedrukt om dit scherm te ontgrendelen</string>
    <string name="nav_bar_layout_inverse">Omgekeerde lay-out</string>
    <string name="accessibility_quick_settings_location_battery_saving">Locatiemelding: accubesparing.</string>
    <string name="accessibility_quick_settings_location_gps_only">Locatiemelding: alleen apparaat.</string>
    <string name="accessibility_quick_settings_location_high_accuracy">Locatiemelding: grote nauwkeurigheid.</string>
+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ import java.util.Objects;
                accountEvictor = new Evictor();
            }
            accountEvictor.add(k);
            mAccountEvictors.put(k.account, tokenEvictor);
            mAccountEvictors.put(k.account, accountEvictor);

            // Only cache the token once we can remove it directly or by account.
            put(k, v);