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

Commit 232b0d40 authored by phweiss's avatar phweiss Committed by Philipp Weiß
Browse files

DO NOT MERGE Finalize device-monitoring dialog strings 

Add Char-limits, do minor style changes and remove STOPSHIP comment.

Related change on master:
ag/1800040
0d08ca7d

BUG:33655277
BUG:31207965
BUG:29748723
Test: only string changes
Change-Id: I37d1b509c6344d7f7d144fc0d8950f45faeaaef4
parent fb764b70

core/res/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ 
    <string name="network_logging_notification_title">Network traffic is being monitored</string>

    <!-- Content text for a notification. Tapping opens a dialog with more information on network

        logging. [CHAR LIMIT=NONE]-->

    <string name="network_logging_notification_text">Tap for more details</string>

    <string name="network_logging_notification_text">Tap to learn more</string>



    <!-- Factory reset warning dialog strings--> <skip />

    <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->

packages/SystemUI/res/values/strings.xml

+10 −11
Original line number Diff line number Diff line
@@ -1013,11 +1013,10 @@ 
    <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->

    <string name="monitoring_title">Network monitoring</string>



    <!-- STOPSHIP(b/33655277) Monitoring strings still need to be finalized and approved -->

    <!-- Monitoring dialog subtitle for the section describing VPN [CHAR LIMIT=TODO]-->

    <!-- Monitoring dialog subtitle for the section describing VPN [CHAR LIMIT=35]-->

    <string name="monitoring_subtitle_vpn">VPN</string>



    <!-- Monitoring dialog subtitle for the section describing network logging [CHAR LIMIT=TODO]-->

    <!-- Monitoring dialog subtitle for the section describing network logging [CHAR LIMIT=35]-->

    <string name="monitoring_subtitle_network_logging">Network Logging</string>



    <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
@@ -1027,7 +1026,7 @@ 
    <string name="disconnect_vpn">Disconnect VPN</string>



    <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->

    <string name="monitoring_description_device_owned">Your device is managed by <xliff:g id="organization">%1$s</xliff:g>.\n\nYour administrator can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information. For more information, contact your administrator.</string>

    <string name="monitoring_description_device_owned">Your device is managed by <xliff:g id="organization">%1$s</xliff:g>.\n\nYour admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information. For more information, contact your admin.</string>



    <!-- Monitoring dialog: Part of text body explaining that a VPN is connected and what it can do, for devices managed by a Device Owner app [CHAR LIMIT=130] -->

    <string name="monitoring_description_do_body_vpn">You\'re connected to <xliff:g id="vpn_app">%1$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites.</string>
@@ -1035,21 +1034,21 @@ 
    <!-- Monitoring dialog: Space that separates the VPN body text and the "Open VPN Settings" link that follows it. [CHAR LIMIT=5] -->

    <string name="monitoring_description_vpn_settings_separator">" "</string>



    <!-- Monitoring dialog: Link to open the VPN settings page [CHAR LIMIT=TODO] -->

    <!-- Monitoring dialog: Link to open the VPN settings page [CHAR LIMIT=60] -->

    <string name="monitoring_description_vpn_settings">Open VPN Settings</string>



    <!-- Monitoring dialog: Network logging text [CHAR LIMIT=TODO] -->

    <string name="monitoring_description_network_logging">Your admin has turned on network logging, which monitors traffic on your device.\n\nFor more information contact your admin.</string>

    <!-- Monitoring dialog: Network logging text [CHAR LIMIT=400] -->

    <string name="monitoring_description_network_logging">Your admin has turned on network logging, which monitors traffic on your device.\n\nFor more information, contact your admin.</string>





    <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->

    <string name="monitoring_description_vpn">You gave an app permission to set up a VPN connection.\n\nThis app can monitor your device and network activity, including emails, apps, and websites.</string>



    <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->

    <string name="monitoring_description_vpn_device_owned">Your device is managed by <xliff:g id="organization">%1$s</xliff:g>.\n\nYour administrator can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information.\n\nYou\'re connected to a VPN, which can monitor your network activity, including emails, apps, and websites.\n\nFor more information, contact your administrator.</string>

    <string name="monitoring_description_vpn_device_owned">Your device is managed by <xliff:g id="organization">%1$s</xliff:g>.\n\nYour admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information.\n\nYou\'re connected to a VPN, which can monitor your network activity, including emails, apps, and websites.\n\nFor more information, contact your admin.</string>



    <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->

    <string name="monitoring_description_vpn_profile_owned">Your work profile is managed by <xliff:g id="organization">%1$s</xliff:g>.\n\nYour administrator is capable of monitoring your network activity including emails, apps, and websites.\n\nFor more information, contact your administrator.\n\nYou\'re also connected to a VPN, which can monitor your network activity.</string>

    <string name="monitoring_description_vpn_profile_owned">Your work profile is managed by <xliff:g id="organization">%1$s</xliff:g>.\n\nYour admin is capable of monitoring your network activity including emails, apps, and websites.\n\nFor more information, contact your admin.\n\nYou\'re also connected to a VPN, which can monitor your network activity.</string>



    <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->

    <string name="legacy_vpn_name">VPN</string>
@@ -1064,13 +1063,13 @@ 
    <string name="branded_monitoring_description_app_personal">You\'re connected to <xliff:g id="application">%1$s</xliff:g>, which can monitor your personal network activity, including emails, apps, and websites.</string>



    <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->

    <string name="monitoring_description_app_work">Your work profile is managed by <xliff:g id="organization">%1$s</xliff:g>. It is connected to <xliff:g id="application">%2$s</xliff:g>, which can monitor your work network activity, including emails, apps, and websites.\n\nFor more information, contact your administrator.</string>

    <string name="monitoring_description_app_work">Your work profile is managed by <xliff:g id="organization">%1$s</xliff:g>. It is connected to <xliff:g id="application">%2$s</xliff:g>, which can monitor your work network activity, including emails, apps, and websites.\n\nFor more information, contact your admin.</string>



    <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->

    <string name="monitoring_description_app_personal_work">Your work profile is managed by <xliff:g id="organization">%1$s</xliff:g>. It is connected to <xliff:g id="application_work">%2$s</xliff:g>, which can monitor your work network activity, including emails, apps, and websites.\n\nYou\'re also connected to <xliff:g id="application_personal">%3$s</xliff:g>, which can monitor your personal network activity.</string>



    <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->

    <string name="monitoring_description_vpn_app_device_owned">Your device is managed by <xliff:g id="organization">%1$s</xliff:g>.\n\nYour administrator can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information.\n\nYou\'re connected to <xliff:g id="application">%2$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites.\n\nFor more information, contact your administrator.</string>

    <string name="monitoring_description_vpn_app_device_owned">Your device is managed by <xliff:g id="organization">%1$s</xliff:g>.\n\nYour admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information.\n\nYou\'re connected to <xliff:g id="application">%2$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites.\n\nFor more information, contact your admin.</string>



    <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->

    <string name="keyguard_indication_trust_disabled">Device will stay locked until you manually unlock</string>