Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/generated_resources.grd

Issue 171053002: Move ChromeOS only strings to chromeos_strings.grd (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index c385ec896b1afe4de7a7b76b04826e1f33e2fec6..f57f2b04652bb8b97afdd1ec87977b665a686f12 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
@@ -7324,53 +7329,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message>
</if>
- <if expr="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...
@@ -13563,11 +13521,6 @@ Some features may be unavailable. Please check that the profile exists and you
</message>
</if>
- <!-- ChromeOS-specific strings -->
- <if expr="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.">
@@ -13653,126 +13606,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="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>
- <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 unrecoverable error while performing enrollment.">
- Oops! Something went really wrong while enrolling this device. Please try again or contact your support representative.
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_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_MISSING_LICENSES_ERROR" desc="Error message to show when the domain the device is trying to enroll into has expired or exhausted licenses.">
- You do not have enough software licenses to enroll this device. Please contact sales to purchase more. If you believe you're seeing this message in error, please contact support.
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_DEPROVISIONED_ERROR" desc="Error message to show when enrollment fails because the administrator has deprovisioned the device on the server side.">
- This device has been placed into a deprovisioned state by the administrator. To enable it for enrollment, please have your administrator place the device into a pending state.
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_SCREEN_TITLE" desc="The title on the enterprise enrollment dialog.">
- Enterprise enrollment
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_RETRY" desc="Label for the retry button on the error step in the enterprise enrollment dialog.">
- Try again
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_CANCEL" desc="Label for the cancel button on the enterprise enrollment dialog.">
- Cancel
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_DONE" desc="Label for the done button on the success screen in the enterprise enrollment dialog.">
- Done
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_SUCCESS" desc="Success message to be shown once enterprise enrollment completes.">
- Your device has successfully been enrolled for enterprise management.
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_WORKING" desc="Status message to show while enterprise enrollment is underway.">
- Enrolling the device. Please wait...
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_RESUMING_LOGIN" desc="Status message to show after enterprise enrollment is complete and the first user sign-in is prepared.">
- Preparing for first enterprise sign-in...
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_EXPLAIN" desc="Explanatory text describing what enterprise enrollment is and guiding the user to sign in with an account from the enterprise domain.">
- Welcome to your managed Chromebook!
-
- To complete the setup of this Chromebook, you must sign in with a username given to you by your organization.
-
- Contact your system administrator for more information.
-
- If this device does not belong to your organization, and is your personal device, you can press Ctrl+Alt+E now to cancel enrollment of the device and go back to the sign-in screen.
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_EXPLAIN_LINK" desc="Text on the link to the screen that explain what enterprise enrollment is.">
- Learn more about Enterprise Enrollment
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_EXPLAIN_BUTTON" desc="Text on the button that closes the explanatory dialog and sends to user back to the sign-in screen.">
- Sign in now
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_CANCEL_AUTO_REALLY" desc="Message asking the user to confirm if he really wants to cancel auto enrollment.">
- Please confirm that this is not an enterprise device. Enterprise enrollment will be cancelled.
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_CANCEL_AUTO_CONFIRM" desc="Text on the button that confirms opting out of auto enrollment.">
- Cancel enterprise enrollment
- </message>
- <message name="IDS_ENTERPRISE_ENROLLMENT_CANCEL_AUTO_GO_BACK" desc="Text on the button that goes back to enrollment from the confirmation dialog.">
- Back
- </message>
- </if>
-
<!-- Fullscreen Strings -->
<message name="IDS_FULLSCREEN_USER_ENTERED_FULLSCREEN" desc="Message for the user telling them that they have entered fullscreen mode.">
You have gone full screen.
@@ -14750,156 +14583,6 @@ Do you accept?
Screen <ph name="SCREEN_INDEX">$1<ex>1</ex></ph>
</message>
- <!-- About network UI display strings -->
- <if expr="chromeos">
- <message name="IDS_NETWORK_TITLE" desc="Title of the page">
- Network
- </message>
- <message name="IDS_NETWORK_AUTO_REFRESH" desc="A instruction of how to auto-refresh the page">
- Add a query param in URL to auto-refresh the page: chrome://network/?refresh=&lt;sec&gt;
- </message>
- <message name="IDS_NETWORK_LOG_REFRESH" desc="Button to refresh network log">
- Refresh
- </message>
- <message name="IDS_NETWORK_LOG_LEVEL_SHOW" desc="'Show' label before logging level checkboxes">
- Show:
- </message>
- <message name="IDS_NETWORK_LOG_LEVEL_ERROR" desc="Error logging level checkbox">
- Error
- </message>
- <message name="IDS_NETWORK_LOG_LEVEL_USER" desc="User logging level checkbox">
- User
- </message>
- <message name="IDS_NETWORK_LOG_LEVEL_EVENT" desc="Event logging level checkbox">
- Event
- </message>
- <message name="IDS_NETWORK_LOG_LEVEL_DEBUG" desc="Debug logging level checkbox">
- Debug
- </message>
- <message name="IDS_NETWORK_LOG_LEVEL_FILEINFO" desc="Debug logging level checkbox">
- File Info
- </message>
- <message name="IDS_NETWORK_LOG_ENTRY" desc="The log entry displayed in network event log table.">
- [<ph name="TIMESTAMP">$1<ex>Timestamp</ex></ph>]
- <ph name="FILE_INFO">$2<ex>file:123</ex></ph>
- <ph name="EVENT_NAME">$3<ex>Event Name</ex></ph>
- <ph name="DESCRIPTION">$4<ex>Description</ex></ph>
- </message>
- </if>
-
- <!-- About NFC Debug UI display strings. They aren't being internationalized bacause this page is meant for debugging only. -->
- <if expr="chromeos">
- <message name="IDS_NFC_DEBUG_TITLE" desc="Title of the debug page meant for developers to test NFC functionality" translateable="false">
- NFC API Test Page
- </message>
- <message name="IDS_NFC_DEBUG_NOT_SUPPORTED" desc="Message shown if the NFC API is not supported on platform" translateable="false">
- NFC is not supported on the current platform.
- </message>
- <message name="IDS_NFC_DEBUG_ADAPTER_HEADER" desc="Header of the 'NFC Adapter' box, that shows the state of the NFC adapter" translateable="false">
- NFC Adapter
- </message>
- <message name="IDS_NFC_DEBUG_ADAPTER_POWER_ON" desc="Adapter power button text to turn the adapter on" translateable="false">
- Power ON
- </message>
- <message name="IDS_NFC_DEBUG_ADAPTER_POWER_OFF" desc="Adapter power button text to turn the adapter off" translateable="false">
- Power OFF
- </message>
- <message name="IDS_NFC_DEBUG_ADAPTER_START_POLL" desc="Adapter poll button text to start polling" translateable="false">
- Start Poll
- </message>
- <message name="IDS_NFC_DEBUG_ADAPTER_STOP_POLL" desc="Adapter poll button text to stop polling" translateable="false">
- Stop Poll
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_HEADER" desc="Header of the 'NFC NDEF message form' box used send a message to tag/peer" translateable="false">
- Push/Write NDEF Message
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_TYPE_TEXT" desc="NDEF message form dropdown menu item for message type 'Text'" translateable="false">
- Text
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_TYPE_URI" desc="NDEF message form dropdown menu item for message type 'URI'" translateable="false">
- URI
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_TYPE_SMART_POSTER" desc="NDEF message form dropdown menu text for message type 'SmartPoster'" translateable="false">
- SmartPoster
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_FIELD_TEXT" desc="Label for required input field 'Text'" translateable="false">
- Text (required):
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_FIELD_ENCODING" desc="Label for required input field 'Encoding'" translateable="false">
- Encoding (required):
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_FIELD_LANGUAGE_CODE" desc="Label for required input field 'Language Code'" translateable="false">
- Language Code (required):
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_FIELD_URI" desc="Label for required input field 'URI'" translateable="false">
- URI (required):
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_FIELD_MIME_TYPE" desc="Label for input field 'MIME Type'" translateable="false">
- MIME Type:
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_FIELD_TARGET_SIZE" desc="Label for input field 'Target Size'" translateable="false">
- Target Size:
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_FIELD_TITLE_TEXT" desc="Label for required input field 'Title Text'" translateable="false">
- Title Text (required):
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_FIELD_TITLE_ENCODING" desc="Label for required input field 'Title Encoding'" translateable="false">
- Title Encoding (required):
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_FIELD_TITLE_LANGUAGE_CODE" desc="Label for required input field 'Title Language Code'" translateable="false">
- Title Language Code (required):
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_WRITE_BUTTON" desc="NDEF message form button text for writing message to an NFC tag" translateable="false">
- Write to Tag
- </message>
- <message name="IDS_NFC_DEBUG_NDEF_FORM_PUSH_BUTTON" desc="NDEF message form button text for pushing a message to an NFC peer device" translateable="false">
- Push to Peer
- </message>
- <message name="IDS_NFC_DEBUG_NFC_PEER_HEADER" desc="Header of the 'NFC Peer' box" translateable="false">
- NDEF Peer
- </message>
- <message name="IDS_NFC_DEBUG_NFC_TAG_HEADER" desc="Header of the 'NFC Tag' box" translateable="false">
- NDEF Tag
- </message>
- <message name="IDS_NFC_DEBUG_RECORDS_HEADER" desc="Header of the 'Records' section in the tag and peer boxes" translateable="false">
- Records
- </message>
- <message name="IDS_NFC_DEBUG_ERROR_FAILED_TO_SET_POWER" desc="Error message shown when adapter power could not be set." translateable="false">
- Failed to set adapter power.
- </message>
- <message name="IDS_NFC_DEBUG_ERROR_FAILED_TO_SET_POLLING" desc="Error message shown when polling state could not be set." translateable="false">
- Failed to start/stop polling.
- </message>
- <message name="IDS_NFC_DEBUG_ERROR_FAILED_TO_SUBMIT_PREFIX" desc="Error message shown when an NDEF form could not be submitted." translateable="false">
- Failed to submit NDEF:
- </message>
- </if>
-
- <!-- About power UI display strings -->
- <if expr="chromeos">
- <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>
- </if>
-
<!-- Local Device Discovery display strings -->
<if expr="enable_mdns">
<message name="IDS_LOCAL_DISCOVERY_SERVICE_REGISTER" desc="Table header for registering a service">
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698