Move ChromeOS only strings to chromeos_strings.grd

Move ChromeOS only strings to chromeos_strings.grd

BUG=326023
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=252657

[aurimas (slooooooooow), 2014-02-20 22:36:53]

Hey Newton,

Please take a look at this change.

Thanks,
Aurimas

[newt (away), 2014-02-20 23:11:35]

lgtm

[aurimas (slooooooooow), 2014-02-20 23:21:18]

The CQ bit was checked by aurimas@chromium.org

[commit-bot: I haz the power, 2014-02-20 23:21:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/aurimas@chromium.org/171053002/1

[commit-bot: I haz the power, 2014-02-20 23:22:02]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-20 23:22:02]

Failed to apply patch for chrome/app/generated_resources.grd:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/app/generated_resources.grd
  Hunk #2 FAILED at 7352.
  Hunk #3 FAILED at 13596.
  Hunk #4 FAILED at 13686.
  Hunk #5 FAILED at 14785.
  4 out of 5 hunks FAILED -- saving rejects to file
chrome/app/generated_resources.grd.rej

Patch:       chrome/app/generated_resources.grd
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd
b/chrome/app/generated_resources.grd
index
c4aba89c9f85ead1a0f9366df0c0673c93d59f23..0ca09f042e43e540bc22cf2487d6daf537878a2b
100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -261,6 +261,11 @@ are declared in build/common.gypi.
       <!-- Bookmarks specific strings -->
       <part file="bookmarks_strings.grdp" />
 
+      <!-- ChromeOS-specific strings -->
+      <if expr="pp_ifdef('chromeos')">
+        <part file="chromeos_strings.grdp" />
+      </if>
+
       <!-- TODO add all of your "string table" messages here.  Remember to
       change nontranslateable parts of the messages into placeholders (using
the
       <ph> element).  You can also use the 'grit add' tool to help you identify
@@ -7347,53 +7352,6 @@ Keep your key file in a safe place. You will need it to
create new versions of y
         </message>
       </if>
 
-      <if expr="pp_ifdef('chromeos')">
-        <!-- Locale Change Notification-->
-        <message name="IDS_LOCALE_CHANGE_MESSAGE" desc="Message shown when
locale was changed based on profile content.">
-          Chrome's language has changed from "<ph
name="FROM_LOCALE">$1<ex>Italian</ex></ph>" to "<ph
name="TO_LOCALE">$2<ex>English (United States)</ex></ph>" after syncing your
settings.
-        </message>
-        <message name="IDS_LOCALE_CHANGE_REVERT_MESSAGE" desc="Link to revert a
change.">
-          Change back to "<ph name="FROM_LOCALE">$1<ex>Italian</ex></ph>"
(requires sign-out)
-        </message>
-
-        <!-- 3G data Notifications -->
-        <message name="IDS_3G_NOTIFICATION_MESSAGE" desc="Text of the 3G data
notification telling that 3G data is enabled.">
-          Google Chrome will use mobile data if you're not connected to another
network.
-        </message>
-
-        <!-- chrome://mobilesetup strings -->
-        <message name="IDS_MOBILE_SETUP_TITLE" desc="ChromeOS mobile device
activation page title">
-          Mobile data service management
-        </message>
-        <message name="IDS_MOBILE_CONNECTING_HEADER" desc="Mobile connection
page header while connecting to the provider">
-          Connecting to <ph name="PROVIDER_NAME">$1<ex>Acme Mobile</ex></ph>
-        </message>
-        <message name="IDS_MOBILE_ERROR_HEADER" desc="Mobile connection page
header when connection error occur">
-          Connection error
-        </message>
-        <message name="IDS_MOBILE_ACTIVATING_HEADER" desc="Message header when
data service is being activated">
-          Activating your mobile data service
-        </message>
-        <message name="IDS_MOBILE_COMPLETED_HEADER" desc="Message header when
data service is completed">
-          Activation complete
-        </message>
-        <message name="IDS_MOBILE_PLEASE_WAIT" desc="Message user the header
displayed while mobile plan is being activated">
-          (this might take a few minutes)
-        </message>
-        <message name="IDS_MOBILE_COMPLETED_TEXT" desc="Message when cellular
data service activation or payment is completed">
-          Your mobile data service is activated and ready to use
-        </message>
-        <message name="IDS_MOBILE_CANCEL_ACTIVATION" desc="Message when user
attempts to cancel cellular data service activation proces">
-          Are you sure you want to cancel mobile data service setup process?
-        </message>
-        <message name="IDS_MOBILE_NO_CONNECTION_HEADER" desc="Mobile page
header when the network portal is not reachable due to no connection">
-          Connect to Wi-Fi to begin
-        </message>
-        <message name="IDS_MOBILE_INVALID_DEVICE_INFO_HEADER" desc="Mobile page
header when the user tries to access mobile portal for a device with an invalid
MDN">
-          Please come back later
-        </message>
-      </if>
-
       <!-- chrome://flash strings -->
       <message name="IDS_FLASH_LOADING_MESSAGE" desc="Shown while loading until
full list of modules is retrieved">
       Loading...
@@ -13591,11 +13549,6 @@ Some features may be unavailable.  Please check that
the profile exists and you
       </message>
     </if>
 
-    <!-- ChromeOS-specific strings -->
-    <if expr="pp_ifdef('chromeos')">
-      <part file="chromeos_strings.grdp" />
-    </if>
-
     <if expr="is_posix and not is_macosx and not is_ios">
       <!-- Linux proxy configuration fallback help -->
       <message name="IDS_ABOUT_LINUX_PROXY_CONFIG_TITLE" desc="Title of HTML
page shown on systems where system proxy configuration is unsupported.">
@@ -13681,126 +13634,6 @@ Some features may be unavailable.  Please check that
the profile exists and you
       Custom Files
     </message>
 
-    <!-- Strings for the new-style OAuth-based enterprise enrollment page -->
-    <if expr="pp_ifdef('chromeos')">
-      <message name="IDS_ENTERPRISE_DEVICE_REQUISITION_PROMPT_CANCEL"
desc="Cancel button text in the device requisition poup.">
-        Cancel
-      </message>
-      <message name="IDS_ENTERPRISE_DEVICE_REQUISITION_PROMPT_OK" desc="OK
button text in the device requisition poup.">
-        Restart
-      </message>
-      <message name="IDS_ENTERPRISE_DEVICE_REQUISITION_PROMPT_TEXT"
desc="Prompt shown in the device requisition prompt popup.">
-        Use this device requisition when enrolling the device for enterprise
management:
-      </message>
-      <message name="IDS_ENTERPRISE_DEVICE_REQUISITION_REMORA_PROMPT_TEXT"
desc="Prompt shown in the device requisition remora prompt popup.">
-        Are you sure, you want to set up this device as a Chromebox for
Meetings device?
-      </message>
-
-      <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_REGISTRATION_FAILED"
desc="Error message shown on the enrollment screen upon failed device
registration.">
-        Error when registering the device with the server: <ph
name="CLIENT_ERROR">$1<ex>Failed to connect to the server</ex></ph>.
-      </message>
-      <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_REGISTRATION_BAD_MODE"
desc="Error message shown on the enrollment screen upon receiving a bad mode on
device registration.">
-        The supplied enrollment mode is not supported by this version of the
operating system.  Please make sure you are running the newest version and try
again.
-      </message>
-      <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_POLICY_FETCH_FAILED"
desc="Error message shown on the enrollment screen upon a failed policy fetch.">
-        Error when fetching policy settings from the server: <ph
name="CLIENT_ERROR">$1<ex>Failed to connect to the server</ex></ph>.
-      </message>
-      <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_VALIDATION_FAILED"
desc="Error message shown on the enrollment screen upon a failure to validate
downloaded policy.">
-        The policy downloaded from the server is invalid: <ph
name="VALIDATION_ERROR">$1<ex>Invalid signature</ex></ph>.
-      </message>
-      <message name="IDS_ENTERPRISE_ENROLLMENT_ROBOT_AUTH_FETCH_FAILED"
desc="Error message shown on the enrollment screen upon failure to fetch the
OAuth2 authorization code for device-level API access.">
-        Oops!  The system failed to authorize API access for this device.
-      </message>
-      <message name="IDS_ENTERPRISE_ENROLLMENT_ROBOT_REFRESH_FETCH_FAILED"
desc="Error message shown on the enrollment screen upon failure to fetch the
OAuth2 refresh token for device-level API access.">
-        Oops!  The system failed to attain a long-term API access token for
this device.
-      </message>
-      <message name="IDS_ENTERPRISE_ENROLLMENT_ROBOT_REFRESH_STORE_FAILED"
desc="Error message shown on the enrollment screen upon failure to store the
OAuth2 refresh token for device-level API access.">
-        Oops!  The system failed to store the long-term API access token for
this device.
-      </message>
-
-      <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_LOCK_ERROR" desc="Error
message shown on the enrollment screen upon failure to lock the device mode.">
-        Oops!  The system failed to establish the device installation-time
attributes lock.
-      </message>
-      <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_LOCK_TIMEOUT" desc="Error
message to show when the initialization of the lockbox is taking too long.">
-        Oops!  The initialization of the installation-time attributes has timed
out.  Please contact your support representative.
-      </message>
-      <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_LOCK_WRONG_USER"
desc="Error message to show when the user used to re-enroll the device does not
belong to the domain that the device was originally enrolled into.">
-        This user account does not belong to the domain that the device is
enrolled to.  If you want to enroll to a different domain you need to go through
device recovery first.
-      </message>
-      <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_STORE_ERROR" desc="Error
message shown on the enrollment screen when the installation of the policy on
the device fails.">
-        Failed to install policy settings on the device: <ph
name="VALIDATION_ERROR">$1<ex>Policy parsing failed</ex></ph>.
-      </message>
-      <message name="IDS_ENTERPRISE_ENROLLMENT_AUTH_FATAL_ERROR" desc="Error
message to show when there is an unrecoverable error while authenticating with
GAIA.">
-        Oops!  Something went wrong when trying to authenticate you.  Please
double-check your sign-in credentials and try again.
-      </message>
-      <mess…
(message too large)

[aurimas (slooooooooow), 2014-02-21 01:35:43]

The CQ bit was checked by aurimas@chromium.org

[commit-bot: I haz the power, 2014-02-21 01:37:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/aurimas@chromium.org/171053002/110002

[commit-bot: I haz the power, 2014-02-21 02:42:06]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-21 02:42:07]

Retried try job too often on win_rel for step(s) interactive_ui_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[aurimas (slooooooooow), 2014-02-21 16:35:57]

The CQ bit was checked by aurimas@chromium.org

[commit-bot: I haz the power, 2014-02-21 16:36:42]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/aurimas@chromium.org/171053002/110002

[commit-bot: I haz the power, 2014-02-21 16:36:44]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-21 16:36:44]

Failed to apply patch for chrome/app/chromeos_strings.grdp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/app/chromeos_strings.grdp
  Hunk #1 FAILED at 4967.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/app/chromeos_strings.grdp.rej

Patch:       chrome/app/chromeos_strings.grdp
Index: chrome/app/chromeos_strings.grdp
diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp
index
d2de8bbe6f251eedff0fe11d04dddce83f95e267..7e432d82d0ae869c752e37dfe958e1b7e903023a
100644
--- a/chrome/app/chromeos_strings.grdp
+++ b/chrome/app/chromeos_strings.grdp
@@ -4967,4 +4967,311 @@ All users must sign out to continue.
     Check charger
   </message>
 
+  <!-- Locale Change Notification-->
+  <message name="IDS_LOCALE_CHANGE_MESSAGE" desc="Message shown when locale was
changed based on profile content.">
+    Chrome's language has changed from "<ph
name="FROM_LOCALE">$1<ex>Italian</ex></ph>" to "<ph
name="TO_LOCALE">$2<ex>English (United States)</ex></ph>" after syncing your
settings.
+  </message>
+  <message name="IDS_LOCALE_CHANGE_REVERT_MESSAGE" desc="Link to revert a
change.">
+    Change back to "<ph name="FROM_LOCALE">$1<ex>Italian</ex></ph>" (requires
sign-out)
+  </message>
+
+  <!-- 3G data Notifications -->
+  <message name="IDS_3G_NOTIFICATION_MESSAGE" desc="Text of the 3G data
notification telling that 3G data is enabled.">
+    Google Chrome will use mobile data if you're not connected to another
network.
+  </message>
+
+  <!-- chrome://mobilesetup strings -->
+  <message name="IDS_MOBILE_SETUP_TITLE" desc="ChromeOS mobile device
activation page title">
+    Mobile data service management
+  </message>
+  <message name="IDS_MOBILE_CONNECTING_HEADER" desc="Mobile connection page
header while connecting to the provider">
+    Connecting to <ph name="PROVIDER_NAME">$1<ex>Acme Mobile</ex></ph>
+  </message>
+  <message name="IDS_MOBILE_ERROR_HEADER" desc="Mobile connection page header
when connection error occur">
+    Connection error
+  </message>
+  <message name="IDS_MOBILE_ACTIVATING_HEADER" desc="Message header when data
service is being activated">
+    Activating your mobile data service
+  </message>
+  <message name="IDS_MOBILE_COMPLETED_HEADER" desc="Message header when data
service is completed">
+    Activation complete
+  </message>
+  <message name="IDS_MOBILE_PLEASE_WAIT" desc="Message user the header
displayed while mobile plan is being activated">
+    (this might take a few minutes)
+  </message>
+  <message name="IDS_MOBILE_COMPLETED_TEXT" desc="Message when cellular data
service activation or payment is completed">
+    Your mobile data service is activated and ready to use
+  </message>
+  <message name="IDS_MOBILE_CANCEL_ACTIVATION" desc="Message when user attempts
to cancel cellular data service activation proces">
+    Are you sure you want to cancel mobile data service setup process?
+  </message>
+  <message name="IDS_MOBILE_NO_CONNECTION_HEADER" desc="Mobile page header when
the network portal is not reachable due to no connection">
+    Connect to Wi-Fi to begin
+  </message>
+  <message name="IDS_MOBILE_INVALID_DEVICE_INFO_HEADER" desc="Mobile page
header when the user tries to access mobile portal for a device with an invalid
MDN">
+    Please come back later
+  </message>
+
+  <!-- About power UI display strings -->
+  <message name="IDS_ABOUT_POWER_TITLE" desc="Title of the page">
+    Power
+  </message>
+  <message name="IDS_ABOUT_POWER_RELOAD_BUTTON" desc="Text on the reload
button">
+    Reload
+  </message>
+  <message name="IDS_ABOUT_POWER_BATTERY_CHARGE_PERCENTAGE_HEADER" desc="Header
of the battery charge plot">
+    Battery Charge Percentage
+  </message>
+  <message name="IDS_ABOUT_POWER_BATTERY_DISCHARGE_RATE_HEADER" desc="Header of
the battery discharge rate plot">
+    Battery Discharge Rate in Watts
+  </message>
+  <message name="IDS_ABOUT_POWER_NEGATIVE_DISCHARGE_RATE_INFO" desc="Describes
what a negative discharge rate means">
+    Negative discharge rate means the battery is charging
+  </message>
+  <message name="IDS_ABOUT_POWER_NOT_ENOUGH_DATA" desc="String to display when
enough plot data is not available">
+    Not enough data available yet.
+  </message>
+  <message name="IDS_ABOUT_POWER_SYSTEM_SUSPENDED" desc="String to display on
plots for sleep duration">
+    Suspended
+  </message>
+
+  <!-- Strings for the new-style OAuth-based enterprise enrollment page -->
+  <message name="IDS_ENTERPRISE_DEVICE_REQUISITION_PROMPT_CANCEL" desc="Cancel
button text in the device requisition poup.">
+    Cancel
+  </message>
+  <message name="IDS_ENTERPRISE_DEVICE_REQUISITION_PROMPT_OK" desc="OK button
text in the device requisition poup.">
+    Restart
+  </message>
+  <message name="IDS_ENTERPRISE_DEVICE_REQUISITION_PROMPT_TEXT" desc="Prompt
shown in the device requisition prompt popup.">
+    Use this device requisition when enrolling the device for enterprise
management:
+  </message>
+  <message name="IDS_ENTERPRISE_DEVICE_REQUISITION_REMORA_PROMPT_TEXT"
desc="Prompt shown in the device requisition remora prompt popup.">
+    Are you sure, you want to set up this device as a Chromebox for Meetings
device?
+  </message>
+
+  <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_REGISTRATION_FAILED"
desc="Error message shown on the enrollment screen upon failed device
registration.">
+    Error when registering the device with the server: <ph
name="CLIENT_ERROR">$1<ex>Failed to connect to the server</ex></ph>.
+  </message>
+  <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_REGISTRATION_BAD_MODE"
desc="Error message shown on the enrollment screen upon receiving a bad mode on
device registration.">
+    The supplied enrollment mode is not supported by this version of the
operating system.  Please make sure you are running the newest version and try
again.
+  </message>
+  <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_POLICY_FETCH_FAILED"
desc="Error message shown on the enrollment screen upon a failed policy fetch.">
+    Error when fetching policy settings from the server: <ph
name="CLIENT_ERROR">$1<ex>Failed to connect to the server</ex></ph>.
+  </message>
+  <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_VALIDATION_FAILED"
desc="Error message shown on the enrollment screen upon a failure to validate
downloaded policy.">
+    The policy downloaded from the server is invalid: <ph
name="VALIDATION_ERROR">$1<ex>Invalid signature</ex></ph>.
+  </message>
+  <message name="IDS_ENTERPRISE_ENROLLMENT_ROBOT_AUTH_FETCH_FAILED" desc="Error
message shown on the enrollment screen upon failure to fetch the OAuth2
authorization code for device-level API access.">
+    Oops!  The system failed to authorize API access for this device.
+  </message>
+  <message name="IDS_ENTERPRISE_ENROLLMENT_ROBOT_REFRESH_FETCH_FAILED"
desc="Error message shown on the enrollment screen upon failure to fetch the
OAuth2 refresh token for device-level API access.">
+    Oops!  The system failed to attain a long-term API access token for this
device.
+  </message>
+  <message name="IDS_ENTERPRISE_ENROLLMENT_ROBOT_REFRESH_STORE_FAILED"
desc="Error message shown on the enrollment screen upon failure to store the
OAuth2 refresh token for device-level API access.">
+    Oops!  The system failed to store the long-term API access token for this
device.
+  </message>
+
+  <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_LOCK_ERROR" desc="Error
message shown on the enrollment screen upon failure to lock the device mode.">
+    Oops!  The system failed to establish the device installation-time
attributes lock.
+  </message>
+  <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_LOCK_TIMEOUT" desc="Error
message to show when the initialization of the lockbox is taking too long.">
+    Oops!  The initialization of the installation-time attributes has timed
out.  Please contact your support representative.
+  </message>
+  <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_LOCK_WRONG_USER" desc="Error
message to show when the user used to re-enroll the device does not belong to
the domain that the device was originally enrolled into.">
+    This user account does not belong to the domain that the device is enrolled
to.  If you want to enroll to a different domain you need to go through device
recovery first.
+  </message>
+  <message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_STORE_ERROR" desc="Error
message shown on the enrollment screen when the installation of the policy on
the device fails.">
+    Failed to install policy settings on the device: <ph
name="VALIDATION_ERROR">$1<ex>Policy parsing failed</ex></ph>.
+  </message>
+  <message name="IDS_ENTERPRISE_ENROLLMENT_AUTH_FATAL_ERROR" desc="Error
message to show when there is an unrecoverable error while authenticating with
GAIA.">
+    Oops!  Something went wrong when trying to authenticate you.  Please
double-check your sign-in credentials and try again.
+  </message>
+  <message name="IDS_ENTERPRISE_ENROLLMENT_AUTH_ACCOUNT_ERROR" desc="Error
message to show when there is a problem with the user account.">
+    This user account is not eligible for the service.
+  </message>
+  <message name="IDS_ENTERPRISE_ENROLLMENT_AUTH_NETWORK_ERROR" desc="Error
message to show when there is a network problem when authenticating for
enrollment.">
+    Oops!  A network communication problem occurred during authentication. 
Please check your network connection and try again.
+  </message>
+  <message name="IDS_ENTERPRISE_AUTO_ENROLLMENT_BAD_MODE" desc="Error message
to show when auto-enrollment is not supported for the enrollment mode supplied
by the DMServer.">
+    Oops!  Something went wrong while auto-enrolling this device.  Please try
again from the sign-in screen using the Ctrl-Alt-E key combination, or contact
your support representative.
+  </message>
+  <message name="IDS_ENTERPRISE_ENROLLMENT_FATAL_ENROLLMENT_ERROR" desc="Error
message to show when there is an unrecoverab…
(message too large)

[aurimas (slooooooooow), 2014-02-21 16:46:03]

The CQ bit was checked by aurimas@chromium.org

[commit-bot: I haz the power, 2014-02-21 16:46:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/aurimas@chromium.org/171053002/420001

[commit-bot: I haz the power, 2014-02-21 18:23:30]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-21 18:23:31]

No LGTM from a valid reviewer yet. Only full committers are accepted.
Even if an LGTM may have been provided, it was from a non-committer or
a lowly provisional committer, _not_ a full super star committer.
See http://www.chromium.org/getting-involved/become-a-committer
Note that this has nothing to do with OWNERS files.

[commit-bot: I haz the power, 2014-02-21 18:23:41]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-21 18:23:41]

No LGTM from a valid reviewer yet. Only full committers are accepted.
Even if an LGTM may have been provided, it was from a non-committer or
a lowly provisional committer, _not_ a full super star committer.
See http://www.chromium.org/getting-involved/become-a-committer
Note that this has nothing to do with OWNERS files.

[Sergey Berezin, 2014-02-21 19:57:46]

The CQ bit was checked by sergeyberezin@chromium.org

[commit-bot: I haz the power, 2014-02-21 20:00:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/aurimas@chromium.org/171053002/420001

[commit-bot: I haz the power, 2014-02-21 21:54:33]

Change committed as 252657