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

Commit c038c4c6 authored by Zhao Wei Liew's avatar Zhao Wei Liew Committed by Steve Kondik
Browse files

core: Import some string improvements from CM 13.0

This commit partially squashes the following commits:

c682ba59
core: String improvements from cm-12.1

7450f849
String update, change wording from "Mobile" to "Cellular"

Change-Id: I0616eb06f48813814b4005e9b60358669f69b0c8
parent ffdbfe2e
Loading
Loading
Loading
Loading
+7 −8
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Long-press back kill application -->
    <string name="app_killed_message">Application killed</string>
    <string name="app_killed_message">App killed</string>

    <!-- label for item that screenshots in phone options dialog -->
    <string name="global_action_screenshot">Screenshot</string>
@@ -83,8 +83,7 @@
    <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> would like to <xliff:g id="op">%2$s</xliff:g>.</string>

    <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
    <string name="permission_remember_choice">Remember</string>
    <string name="permission">Permission</string>
    <string name="permission_remember_choice">Remember my choice</string>

    <!-- App ops requests -->
    <string name="app_ops_access_camera">access the camera</string>
@@ -122,9 +121,9 @@
    <string name="app_ops_start_at_bootup">start at power up</string>
    <string name="app_ops_toast_window">display toast messages</string>
    <string name="app_ops_toggle_bluetooth">toggle Bluetooth</string>
    <string name="app_ops_toggle_mobile_data">toggle mobile data</string>
    <string name="app_ops_toggle_mobile_data">toggle cellular data</string>
    <string name="app_ops_toggle_nfc">toggle NFC</string>
    <string name="app_ops_toggle_wifi">toggle WiFi</string>
    <string name="app_ops_toggle_wifi">toggle Wi-Fi</string>
    <string name="app_ops_use_alarm_volume">control alarm volume</string>
    <string name="app_ops_use_audio_focus">control the audio focus</string>
    <string name="app_ops_use_bluetooth_volume">control the Bluetooth volume</string>
@@ -140,7 +139,7 @@
    <string name="app_ops_use_fingerprint">use fingerprint</string>
    <string name="app_ops_add_voicemail">add a voicemail</string>
    <string name="app_ops_read_phone_state">access phone state</string>
    <string name="app_ops_scan_wifi">Scan WiFi Networks</string>
    <string name="app_ops_scan_wifi">scan Wi-Fi Networks</string>
    <string name="app_ops_change_wallpaper">change the wallpaper</string>
    <string name="app_ops_assist_structure">use assist structure</string>
    <string name="app_ops_assist_screenshot">take a screenshot</string>
@@ -152,8 +151,8 @@
    <string name="app_ops_turn_on_screen">turn the screen on</string>
    <string name="app_ops_get_accounts">get device accounts</string>
    <string name="app_ops_run_in_background">run in background</string>
    <string name="app_ops_wifi_change">change WiFI state</string>
    <string name="app_ops_su">get Superuser access</string>
    <string name="app_ops_wifi_change">change Wi-Fi state</string>
    <string name="app_ops_su">get root access</string>

    <!-- Protected Apps Notification -->
    <string name="notify_package_component_protected_title">Activity launch blocked</string>
+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@
    <java-symbol type="id" name="permission_remember_choice_text" />
    <java-symbol type="string" name="allow" />
    <java-symbol type="string" name="deny" />
    <java-symbol type="string" name="permission" />
    <java-symbol type="layout" name="permission_confirmation_dialog" />
    <java-symbol type="array" name="app_ops_labels" />
    <java-symbol type="string" name="status_bar_su" />