diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 17:48:28 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 17:48:28 +0000 |
| commit | a1a4d477c4749bcc1bbf4d61705e18cac49562f9 (patch) | |
| tree | 688becc3c3ec07c65bc35dc51634b9cb46119bb2 /chrome | |
| parent | c60a399d7e2f83806acf81b8eeec9d4dd20338a6 (diff) | |
| download | chromium_src-a1a4d477c4749bcc1bbf4d61705e18cac49562f9.zip chromium_src-a1a4d477c4749bcc1bbf4d61705e18cac49562f9.tar.gz chromium_src-a1a4d477c4749bcc1bbf4d61705e18cac49562f9.tar.bz2 | |
Move IDS_NOTIFICATION_PERMISSIONS to generated_resources.grd. This string
never belonged in chromium_strings.grd because it's not branding-dependent.
Placing it in chromium_strings.grd but not google_chrome_strings.grd caused
the two strings files to become out of sync, which is actually really really
bad.
BUG=24776
TEST=Application name shown in Mac menu bar should be Chrome, not
Google Chrome Helper or anything else
Review URL: http://codereview.chromium.org/277004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28980 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/chromium_strings.grd | 3 | ||||
| -rw-r--r-- | chrome/app/generated_resources.grd | 29 |
2 files changed, 16 insertions, 16 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index 9bd0485..1227671 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -362,9 +362,6 @@ be available for now. --> <message name="IDS_DEFAULT_BROWSER_INFOBAR_SHORT_TEXT" desc="More compact text to show in the default browser query infobar."> Chromium isn't your default browser. </message> - <message name="IDS_NOTIFICATION_PERMISSIONS" desc="Text requesting permission for desktop notifications."> - Allow <ph name="site">$1<ex>mail.google.com</ex></ph> to show desktop notifications? - </message> <if expr="os == 'darwin'"> <message name="IDS_SHORT_PRODUCT_NAME" desc="The application's short name, used for the Mac's application menu, activity monitor, etc. This should be less than 16 characters. Example: Chrome, not Google Chrome."> Chromium diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 9c38f3f..ebc1ed7 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -5337,19 +5337,22 @@ Keep your key file in a safe place. You will need it to create new versions of y Your login details are out of date. Click to re-enter your password. </message> - <!-- Desktop notifications -->
- <message name="IDS_NOTIFICATION_BALLOON_DISMISS_LABEL" desc="Text on the button which dismisses the balloon.">
- Dismiss
- </message>
- <message name="IDS_NOTIFICATION_BALLOON_SOURCE_LABEL" desc="Text which labels the balloon with the source origin.">
- from <ph name="SOURCE_ORIGIN">$1</ph>
- </message>
- <message name="IDS_NOTIFICATION_PERMISSION_YES" desc="The label of the 'allow' button on the notification permission infobar.">
- Allow
- </message>
- <message name="IDS_NOTIFICATION_PERMISSION_NO" desc="The label of the 'deny' button on the notification permission infobar.">
- Deny
- </message>
+ <!-- Desktop notifications --> + <message name="IDS_NOTIFICATION_BALLOON_DISMISS_LABEL" desc="Text on the button which dismisses the balloon."> + Dismiss + </message> + <message name="IDS_NOTIFICATION_BALLOON_SOURCE_LABEL" desc="Text which labels the balloon with the source origin."> + from <ph name="SOURCE_ORIGIN">$1</ph> + </message> + <message name="IDS_NOTIFICATION_PERMISSIONS" desc="Text requesting permission for desktop notifications."> + Allow <ph name="site">$1<ex>mail.google.com</ex></ph> to show desktop notifications? + </message> + <message name="IDS_NOTIFICATION_PERMISSION_YES" desc="The label of the 'allow' button on the notification permission infobar."> + Allow + </message> + <message name="IDS_NOTIFICATION_PERMISSION_NO" desc="The label of the 'deny' button on the notification permission infobar."> + Deny + </message> <!-- Mac Menubar Menus --> <if expr="os == 'darwin'"> |