resolve merge conflicts of 5ea76c1b to master

    <string name="extract_edit_menu_button">Edit</string>

    <string name="extract_edit_menu_button">Edit</string>

    <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->

    <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->

    <string name="data_usage_warning_title">Data usage warning</string>

    <string name="data_usage_warning_title">Data usage alert</string>

    <!-- Notification body when data usage has exceeded warning threshold. -->

    <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->

    <string name="data_usage_warning_body">Tap to view usage and settings.</string>

    <string name="data_usage_warning_body">Tap to view usage and settings.</string>

    <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->

    <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->

    <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->

    <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->

    <string name="data_usage_disabled_dialog_title">Data is paused</string>

    <string name="data_usage_disabled_dialog_title">Data is paused</string>

    <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->

    <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->

    <string name="data_usage_disabled_dialog">Because your set data limit was reached, the device has paused data usage for the remainder of this cycle.\n\nResuming may lead to charges from your carrier.</string>

    <string name="data_usage_disabled_dialog">The data limit you set has been reached. You are no longer using cellular data.\n\nIf you resume, charges may apply for data usage.</string>

    <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->

    <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->

    <string name="data_usage_disabled_dialog_enable">Resume</string>

    <string name="data_usage_disabled_dialog_enable">Resume</string>