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

Commit cc39262a authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents 52b9d81f 21ad0543
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -79,6 +79,6 @@
    <string name="status_bar_camera">Kamera</string>
    <string name="status_bar_location">Standort</string>
    <string name="status_bar_microphone">Mikrofon</string>
    <string name="screen_pinning_description_no_navbar">Der Bildschirm wird solange angezeigt, bis Sie die Fixierung aufheben. Berühren und halten Sie \"Zurück\", wenn Sie die Fixierung aufheben möchten.</string>
    <string name="screen_pinning_description_no_navbar">Der Bildschirm wird solange angezeigt, bis du die Fixierung aufhebst. Berühre und halte \"Zurück\", wenn du die Fixierung aufheben möchtest.</string>
    <string name="screen_pinning_toast_no_navbar">Um die Fixierung dieses Bildschirms aufzuheben, \"Zurück\" berühren und halten</string>
</resources>
+2 −2
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="global_action_restart_system">Система</string>
    <string name="global_action_restart_recovery">Режим восстановления</string>
    <string name="global_action_restart_recovery">Recovery</string>
    <string name="global_action_restart_bootloader">Загрузчик</string>
    <string name="global_action_restart_download">Режим обновления ПО</string>
    <string name="global_action_restart_fastboot">Fastbootd</string>
    <string name="global_action_restart_progress">Перезагрузка\u2026</string>
    <string name="global_action_restart_recovery_progress">Перезапуск в режим восстановления\u2026</string>
    <string name="global_action_restart_recovery_progress">Перезапуск в Recovery\u2026</string>
    <string name="global_action_restart_bootloader_progress">Перезапуск в режим загрузчика\u2026</string>
    <string name="global_action_restart_download_progress">Перезапуск в режим загрузки\u2026</string>
    <string name="global_action_restart_fastboot_progress">Перезапуск в режим fastbootd\u2026</string>
+3 −3
Original line number Diff line number Diff line
@@ -70,10 +70,10 @@
    <string name="vpn_credentials_password">Geslo</string>
    <string name="vpn_credentials_dialog_connect">Poveži</string>
    <string name="quick_settings_aod_label">Stalni prikaz</string>
    <string name="quick_settings_aod_off_powersave_label">Stalni prikaz izklopljen\nVarčevanje z energijo akumulatorja</string>
    <string name="quick_settings_aod_off_powersave_label">Stalni prikaz izklopljen\nVarčevanje z energijo baterije</string>
    <string name="quick_settings_powershare_label">Wireless PowerShare</string>
    <string name="quick_settings_powershare_off_powersave_label">Wireless PowerShare izklopljen\nVarčevanje z energijo akumulatorja</string>
    <string name="quick_settings_powershare_off_low_battery_label">Wireless PowerShare izklopljen\nRaven napolnjenosti akumulatorja prenizka</string>
    <string name="quick_settings_powershare_off_powersave_label">Wireless PowerShare izklopljen\nVarčevanje z energijo baterije</string>
    <string name="quick_settings_powershare_off_low_battery_label">Wireless PowerShare izklopljen\nRaven napolnjenosti baterije prenizka</string>
    <string name="quick_settings_powershare_enabled_label">Wireless PowerShare je omogočen</string>
    <string name="status_bar_battery">Akumulator</string>
    <string name="status_bar_camera">Fotoaparat</string>