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

Commit 051cda2e authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Third time is the charm."

parents 3a5a82c7 3a546eba

res/values/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -3533,10 +3533,10 @@ found in the list of installed apps.</string> 
    <!-- Label for data usage occuring while application in background. [CHAR LIMIT=48] -->

    <string name="data_usage_label_background">Background</string>



    <!-- Disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->

    <string name="data_usage_disclaimer" product="default">Measured by your phone. Your carrier\'s data usage accounting may differ.</string>

    <!-- Disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->

    <string name="data_usage_disclaimer" product="tablet">Measured by your tablet. Your carrier\'s data usage accounting may differ.</string>

    <!-- Disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->

    <string name="data_usage_disclaimer" product="default">Measured by your phone. Your carrier\'s data usage accounting may differ.</string>



    <!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] -->

    <string name="data_usage_disable_mobile">Disable mobile data?</string>
@@ -3602,9 +3602,9 @@ found in the list of installed apps.</string> 
    <!-- Title of dialog shown before user limits data usage. [CHAR LIMIT=48] -->

    <string name="data_usage_limit_dialog_title">Limiting data usage</string>

    <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->

    <string name="data_usage_limit_dialog" product="default">Your <xliff:g id="networks" example="mobile">%1$s</xliff:g> data connection will be disabled when the specified limit is reached.\n\nSince data usage is measured by your phone, and your carrier may account for usage differently, consider using a conservative limit.</string>

    <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->

    <string name="data_usage_limit_dialog" product="tablet">Your <xliff:g id="networks" example="mobile">%1$s</xliff:g> data connection will be disabled when the specified limit is reached.\n\nSince data usage is measured by your tablet, and your carrier may account for usage differently, consider using a conservative limit.</string>

    <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->

    <string name="data_usage_limit_dialog" product="default">Your <xliff:g id="networks" example="mobile">%1$s</xliff:g> data connection will be disabled when the specified limit is reached.\n\nSince data usage is measured by your phone, and your carrier may account for usage differently, consider using a conservative limit.</string>



    <!-- Title of dialog shown before user restricts background data usage. [CHAR LIMIT=48] -->

    <string name="data_usage_restrict_background_title">Restrict background data?</string>