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

Commit f17258c6 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'eclair' of git://github.com/thiasB/android_frameworks_base into eclair

parents f715dbd1 86c82225
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -125,8 +125,9 @@
    <string name="power_off" msgid="4266614107412865048">"Ausschalten"</string>
    <string name="reboot_system">Neu starten</string>
    <string name="shutdown_progress" msgid="2281079257329981203">"Herunterfahren..."</string>
    <string name="reboot_progress">Ihr Telefon wird neu gestartet\u2026</string>
    <string name="reboot_progress">Neu starten...</string>
    <string name="shutdown_confirm" msgid="649792175242821353">"Ihr Telefon wird heruntergefahren."</string>
    <string name="reboot_confirm">Ihr Telefon wird neu gestartet.</string>
    <string name="no_recent_tasks" msgid="279702952298056674">"Keine neuen Anwendungen."</string>
    <string name="global_actions" msgid="2406416831541615258">"Telefonoptionen"</string>
    <string name="global_action_lock" msgid="2844945191792119712">"Bildschirmsperre"</string>
@@ -137,7 +138,7 @@
    <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Flugmodus"</string>
    <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Flugmodus ist AN"</string>
    <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Flugmodus ist AUS"</string>
    <string name="global_action_reboot">Starte Telefon neu...</string>
    <string name="global_action_reboot">Neu starten</string>
    <string name="safeMode" msgid="2788228061547930246">"Abgesicherter Modus"</string>
    <string name="android_system_label" msgid="6577375335728551336">"Android System"</string>
    <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Kostenpflichtige Dienste"</string>