diff options
| author | Reilly Grant <reillyg@chromium.org> | 2015-03-03 12:15:26 -0800 |
|---|---|---|
| committer | Reilly Grant <reillyg@chromium.org> | 2015-03-03 20:17:01 +0000 |
| commit | 25ce525cd8c3cbeabb5a8ffded6f5c93d30b0a13 (patch) | |
| tree | 0d7e25a964a540495a6b59635c34a3a382a3d2e2 | |
| parent | af6bcfd68a3a6aac5e5000bf9d589a3df0e18ce9 (diff) | |
| download | chromium_src-25ce525cd8c3cbeabb5a8ffded6f5c93d30b0a13.zip chromium_src-25ce525cd8c3cbeabb5a8ffded6f5c93d30b0a13.tar.gz chromium_src-25ce525cd8c3cbeabb5a8ffded6f5c93d30b0a13.tar.bz2 | |
Merge M-42: Move device-log UI strings to generated_resources
BUG=462044
Review URL: https://codereview.chromium.org/956623010
Cr-Commit-Position: refs/heads/master@{#318173}
R=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/961203002
Cr-Commit-Position: refs/branch-heads/2311@{#109}
Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
| -rw-r--r-- | chrome/app/chromium_strings.grd | 46 | ||||
| -rw-r--r-- | chrome/app/generated_resources.grd | 47 |
2 files changed, 47 insertions, 46 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index 28c6724..b9f60b3 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -1316,52 +1316,6 @@ and incorrect credentials. Either an attacker is trying to pretend to be <ph nam </message> </if> - <!-- About device logs UI display strings --> - <message name="IDS_DEVICE_LOG_TITLE" desc="Title of the chrome://device-log page"> - Device Log - </message> - <message name="IDS_DEVICE_AUTO_REFRESH" desc="Instructions for how to auto-refresh the page"> - Add a query param in URL to auto-refresh the page: chrome://device-log/?refresh=<sec> - </message> - <message name="IDS_DEVICE_LOG_REFRESH" desc="Button to refresh device log"> - Refresh - </message> - <message name="IDS_DEVICE_LOG_LEVEL_SHOW" desc="'Show' label before logging level checkboxes"> - Show: - </message> - <message name="IDS_DEVICE_LOG_LEVEL_ERROR" desc="Error logging level checkbox"> - Error - </message> - <message name="IDS_DEVICE_LOG_LEVEL_USER" desc="User logging level checkbox"> - User - </message> - <message name="IDS_DEVICE_LOG_LEVEL_EVENT" desc="Event logging level checkbox"> - Event - </message> - <message name="IDS_DEVICE_LOG_LEVEL_DEBUG" desc="Debug logging level checkbox"> - Debug - </message> - <message name="IDS_DEVICE_LOG_TYPE_LOGIN" desc="Checkbox to enable showing events of type LOGIN"> - Login - </message> - <message name="IDS_DEVICE_LOG_TYPE_NETWORK" desc="Checkbox to enable showing events of type NETWORK"> - Network - </message> - <message name="IDS_DEVICE_LOG_TYPE_POWER" desc="Checkbox to enable showing events of type POWER"> - Power - </message> - <message name="IDS_DEVICE_LOG_FILEINFO" desc="File info checkbox in device event log"> - File Info - </message> - <message name="IDS_DEVICE_LOG_TIME_DETAIL" desc="Detailed timestamps checkbox in device event log"> - Detailed Timestamps - </message> - <message name="IDS_DEVICE_LOG_ENTRY" desc="Format string for lines in chrome://device-log."> - [<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 Description</ex></ph> - </message> - </messages> </release> </grit> diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 4907d5a..4ca1672 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -15607,6 +15607,53 @@ Do you accept? <message name="IDS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION" desc="Description of the 'Allow insecure localhost' flag."> Allows requests to localhost over HTTPS even when an invalid certificate is presented. </message> + + <!-- About device logs UI display strings --> + <message name="IDS_DEVICE_LOG_TITLE" desc="Title of the chrome://device-log page"> + Device Log + </message> + <message name="IDS_DEVICE_AUTO_REFRESH" desc="Instructions for how to auto-refresh the page"> + Add a query param in URL to auto-refresh the page: chrome://device-log/?refresh=<sec> + </message> + <message name="IDS_DEVICE_LOG_REFRESH" desc="Button to refresh device log"> + Refresh + </message> + <message name="IDS_DEVICE_LOG_LEVEL_SHOW" desc="'Show' label before logging level checkboxes"> + Show: + </message> + <message name="IDS_DEVICE_LOG_LEVEL_ERROR" desc="Error logging level checkbox"> + Error + </message> + <message name="IDS_DEVICE_LOG_LEVEL_USER" desc="User logging level checkbox"> + User + </message> + <message name="IDS_DEVICE_LOG_LEVEL_EVENT" desc="Event logging level checkbox"> + Event + </message> + <message name="IDS_DEVICE_LOG_LEVEL_DEBUG" desc="Debug logging level checkbox"> + Debug + </message> + <message name="IDS_DEVICE_LOG_TYPE_LOGIN" desc="Checkbox to enable showing events of type LOGIN"> + Login + </message> + <message name="IDS_DEVICE_LOG_TYPE_NETWORK" desc="Checkbox to enable showing events of type NETWORK"> + Network + </message> + <message name="IDS_DEVICE_LOG_TYPE_POWER" desc="Checkbox to enable showing events of type POWER"> + Power + </message> + <message name="IDS_DEVICE_LOG_FILEINFO" desc="File info checkbox in device event log"> + File Info + </message> + <message name="IDS_DEVICE_LOG_TIME_DETAIL" desc="Detailed timestamps checkbox in device event log"> + Detailed Timestamps + </message> + <message name="IDS_DEVICE_LOG_ENTRY" desc="Format string for lines in chrome://device-log."> + [<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 Description</ex></ph> + </message> + </messages> </release> </grit> |