Chromium Code Reviews| Index: chrome/app/generated_resources.grd |
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd |
| index db502cdee0fe5b3c71ec818bd41ae88270f85a40..dd2040cfaa71f3d84b6f104e850fdaf4e6396132 100644 |
| --- a/chrome/app/generated_resources.grd |
| +++ b/chrome/app/generated_resources.grd |
| @@ -12895,77 +12895,79 @@ Some features may be unavailable. Please check that the profile exists and you |
| </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."> |
| - <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_PERMISSIONS_FRAGMENT" desc="Permission sentence fragment to show following the prompt 'This site would like to:' in a permissions request"> |
| - 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> |
| - <message name="IDS_NOTIFICATION_OPTIONS_MENU_LABEL" desc="Text for the menu option"> |
| - Options |
| - </message> |
| - <message name="IDS_NOTIFICATION_BALLOON_REVOKE_MESSAGE" desc="Text for the menu option to revoke notification permission."> |
| - Disable notifications from <ph name="site">$1<ex>mail.google.com</ex></ph> |
| - </message> |
| - <message name="IDS_NOTIFICATION_BALLOON_ENABLE_MESSAGE" desc="Text for the menu option to enable notification permission."> |
| - Enable notifications from <ph name="site">$1<ex>mail.google.com</ex></ph> |
| - </message> |
| - <message name="IDS_NOTIFICATION_CHOOSE_POSITION" desc="Menu label for position choice submenu."> |
| - Choose position |
| - </message> |
| - <message name="IDS_NOTIFICATION_POSITION_DEFAULT" desc="Menu label for positioning in default location"> |
| - Use default |
| - </message> |
| - <message name="IDS_NOTIFICATION_POSITION_LOWER_LEFT" desc="Menu label for positioning in lower left corner"> |
| - Lower left |
| - </message> |
| - <message name="IDS_NOTIFICATION_POSITION_LOWER_RIGHT" desc="Menu label for positioning in lower right corner"> |
| - Lower right |
| - </message> |
| - <message name="IDS_NOTIFICATION_POSITION_UPPER_LEFT" desc="Menu label for positioning in upper left corner"> |
| - Upper left |
| - </message> |
| - <message name="IDS_NOTIFICATION_POSITION_UPPER_RIGHT" desc="Menu label for positioning in upper right corner"> |
| - Upper right |
| - </message> |
| - <message name="IDS_NOTIFICATION_WELCOME_BODY" desc="Notification body for the Welcome Notification"> |
| - Stay connected to what you need to know, across all devices. |
| - </message> |
| - <message name="IDS_NOTIFICATION_WELCOME_BUTTON_LEARN_MORE" desc="Learn more button text for the Welcome Notification"> |
| - Learn more |
| - </message> |
| - <message name="IDS_NOTIFICATION_WELCOME_DISPLAY_SOURCE" desc="Display source for the Welcome Notification"> |
| - Notifications |
| - </message> |
| - <message name="IDS_NOTIFICATION_WELCOME_TITLE" desc="Notification title for the Welcome Notification"> |
| - Google Now for Chrome! |
| - </message> |
| - <if expr="is_macosx"> |
| - <message name="IDS_MESSAGE_CENTER_FOOTER_WITH_PRODUCT_TITLE" desc="The label in the footer of the message center tray, with the product title."> |
| - <ph name="product_name">$1<ex>Chrome</ex></ph> Notifications |
| + <if expr="enable_notifications"> |
|
newt (away)
2014/02/12 18:40:00
what lovely expression syntax! :)
|
| + <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."> |
| + <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_PERMISSIONS_FRAGMENT" desc="Permission sentence fragment to show following the prompt 'This site would like to:' in a permissions request"> |
| + 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> |
| + <message name="IDS_NOTIFICATION_OPTIONS_MENU_LABEL" desc="Text for the menu option"> |
| + Options |
| + </message> |
| + <message name="IDS_NOTIFICATION_BALLOON_REVOKE_MESSAGE" desc="Text for the menu option to revoke notification permission."> |
| + Disable notifications from <ph name="site">$1<ex>mail.google.com</ex></ph> |
| + </message> |
| + <message name="IDS_NOTIFICATION_BALLOON_ENABLE_MESSAGE" desc="Text for the menu option to enable notification permission."> |
| + Enable notifications from <ph name="site">$1<ex>mail.google.com</ex></ph> |
| + </message> |
| + <message name="IDS_NOTIFICATION_CHOOSE_POSITION" desc="Menu label for position choice submenu."> |
| + Choose position |
| + </message> |
| + <message name="IDS_NOTIFICATION_POSITION_DEFAULT" desc="Menu label for positioning in default location"> |
| + Use default |
| + </message> |
| + <message name="IDS_NOTIFICATION_POSITION_LOWER_LEFT" desc="Menu label for positioning in lower left corner"> |
| + Lower left |
| + </message> |
| + <message name="IDS_NOTIFICATION_POSITION_LOWER_RIGHT" desc="Menu label for positioning in lower right corner"> |
| + Lower right |
| + </message> |
| + <message name="IDS_NOTIFICATION_POSITION_UPPER_LEFT" desc="Menu label for positioning in upper left corner"> |
| + Upper left |
| + </message> |
| + <message name="IDS_NOTIFICATION_POSITION_UPPER_RIGHT" desc="Menu label for positioning in upper right corner"> |
| + Upper right |
| + </message> |
| + <message name="IDS_NOTIFICATION_WELCOME_BODY" desc="Notification body for the Welcome Notification"> |
| + Stay connected to what you need to know, across all devices. |
| + </message> |
| + <message name="IDS_NOTIFICATION_WELCOME_BUTTON_LEARN_MORE" desc="Learn more button text for the Welcome Notification"> |
| + Learn more |
| + </message> |
| + <message name="IDS_NOTIFICATION_WELCOME_DISPLAY_SOURCE" desc="Display source for the Welcome Notification"> |
| + Notifications |
| + </message> |
| + <message name="IDS_NOTIFICATION_WELCOME_TITLE" desc="Notification title for the Welcome Notification"> |
| + Google Now for Chrome! |
| + </message> |
| + <if expr="is_macosx"> |
| + <message name="IDS_MESSAGE_CENTER_FOOTER_WITH_PRODUCT_TITLE" desc="The label in the footer of the message center tray, with the product title."> |
| + <ph name="product_name">$1<ex>Chrome</ex></ph> Notifications |
| + </message> |
| + </if> |
| + <message name="IDS_NOTIFIER_WELCOME_TITLE" desc="Notification title for when a new notifier service is introduced."> |
| + <ph name="service_name">$1<ex>Google+</ex></ph> notifications |
| + </message> |
| + <message name="IDS_NOTIFIER_WELCOME_BODY" desc="Notification body for when a new notifier service is introduced."> |
| + Now on your desktop |
| + </message> |
| + <message name="IDS_NOTIFIER_WELCOME_BUTTON" desc="Notification body for when a new notifier service is introduced."> |
| + Turn off these notifications |
| </message> |
| </if> |
| - <message name="IDS_NOTIFIER_WELCOME_TITLE" desc="Notification title for when a new notifier service is introduced."> |
| - <ph name="service_name">$1<ex>Google+</ex></ph> notifications |
| - </message> |
| - <message name="IDS_NOTIFIER_WELCOME_BODY" desc="Notification body for when a new notifier service is introduced."> |
| - Now on your desktop |
| - </message> |
| - <message name="IDS_NOTIFIER_WELCOME_BUTTON" desc="Notification body for when a new notifier service is introduced."> |
| - Turn off these notifications |
| - </message> |
| <!-- Mac AppleScript --> |
| <if expr="is_macosx"> |