summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstevenjb <stevenjb@chromium.org>2015-02-25 17:53:04 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-26 01:54:08 +0000
commit362ae2101b8a3710e1a07066746ed98bc577b52d (patch)
tree5063ff6b60a1a32267cbd7ef5356571fcc6a8fe2
parentf8a2ca3720d41d2bf03b2e68f483d5edd28d8af6 (diff)
downloadchromium_src-362ae2101b8a3710e1a07066746ed98bc577b52d.zip
chromium_src-362ae2101b8a3710e1a07066746ed98bc577b52d.tar.gz
chromium_src-362ae2101b8a3710e1a07066746ed98bc577b52d.tar.bz2
Move device-log UI strings to generated_resources
BUG=462044 Review URL: https://codereview.chromium.org/956623010 Cr-Commit-Position: refs/heads/master@{#318173}
-rw-r--r--chrome/app/chromium_strings.grd52
-rw-r--r--chrome/app/generated_resources.grd53
2 files changed, 53 insertions, 52 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index bfcbac7..442f18e 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -1321,58 +1321,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=&lt;sec&gt;
- </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_TYPE_USB" desc="Checkbox to enable showing events of type USB">
- USB
- </message>
- <message name="IDS_DEVICE_LOG_TYPE_HID" desc="Checkbox to enable showing events of type HID (Human Interface Device)">
- HID
- </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 bde181d..d24e20d 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -15626,6 +15626,59 @@ 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=&lt;sec&gt;
+ </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_TYPE_USB" desc="Checkbox to enable showing events of type USB">
+ USB
+ </message>
+ <message name="IDS_DEVICE_LOG_TYPE_HID" desc="Checkbox to enable showing events of type HID (Human Interface Device)">
+ HID
+ </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>