Merge pull request #32833 from scottwu/1218705-data-connection-roamin…

…g-desc-update

Bug 1218705 - changed data connection and data roaming warning string…

apps/settings/elements/carrier.html

@@ -20,13 +20,13 @@ <h2 data-l10n-id="dataConnectivity"></h2>
         <li id="menuItem-enableDataCall" aria-disabled="true">
           <gaia-switch>
             <label data-l10n-id="dataConnection"></label>
-            <details id="dataConnection-expl" data-l10n-id="dataConnection-warning-message"></details>
+            <details id="dataConnection-expl" data-l10n-id="dataConnection-warning-message-short"></details>
           </gaia-switch>
         </li>
         <li id="menuItem-enableDataRoaming">
           <gaia-switch>
             <label data-l10n-id="dataRoaming"></label>
-            <details id="dataRoaming-expl" data-l10n-id="dataRoaming-warning-message"></details>
+            <details id="dataRoaming-expl" data-l10n-id="dataRoaming-warning-message-short"></details>
           </gaia-switch>
         </li>
       </ul>

apps/settings/locales/settings.en-US.properties

@@ -449,9 +449,9 @@ apn-protocol-ipv4v6 = IPv4/IPv6
 apn-type = APN Type
 apn-mtu = MTU
 dataConnection-warning-head=Turn ON data connection?
-dataConnection-warning-message=Applications will automatically fetch data via data connection when required. Additional data charges may apply.
+dataConnection-warning-message-short=Automatically fetch mobile network data.
 dataRoaming-warning-head=Turn ON data roaming?
-dataRoaming-warning-message=Depending on your service agreement, extra charges may apply for data when you are in a roaming area.
+dataRoaming-warning-message-short=Fetch data when roaming.
 change-apn-warning-message1=Depending on your service agreement, changing your APN setting may result in extra charges when roaming. Do you want to proceed?
 reset-apn-warning-title=Reset to Default
 reset-apn-warning-message=This resets the settings to default values. This cannot be undone.