Skip to content

Commit

Permalink
Bug 1696054 Part 1 - Update copy for application update notification …
Browse files Browse the repository at this point in the history 
…panels. r=mconley,flod

Also remove the What's New links from the notifications that had those, along
with the associated string, since the new designs do not include those links.

Differential Revision: https://phabricator.services.mozilla.com/D110189
  • Loading branch information
Molly Howell committed Mar 30, 2021
1 parent abe3d9f commit 70c88a0
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 36 deletions.
18 changes: 8 additions & 10 deletions browser/components/customizableui/content/panelUI.inc.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,59 +99,57 @@
role="alert">
<popupnotification id="appMenu-update-available-notification"
popupid="update-available"
data-lazy-l10n-id="appmenu-update-available"
data-lazy-l10n-id="appmenu-update-available2"
data-l10n-attrs="buttonlabel, buttonaccesskey, secondarybuttonlabel, secondarybuttonaccesskey"
closebuttonhidden="true"
dropmarkerhidden="true"
checkboxhidden="true"
buttonhighlight="true"
hidden="true">
<popupnotificationcontent id="update-available-notification-content" orient="vertical">
<description id="update-available-description" data-lazy-l10n-id="appmenu-update-available-message"></description>
<label id="update-available-whats-new" is="text-link" data-lazy-l10n-id="appmenu-update-whats-new"/>
<description id="update-available-description" data-lazy-l10n-id="appmenu-update-available-message2"></description>
</popupnotificationcontent>
</popupnotification>

<popupnotification id="appMenu-update-manual-notification"
popupid="update-manual"
data-lazy-l10n-id="appmenu-update-manual"
data-lazy-l10n-id="appmenu-update-manual2"
data-l10n-attrs="buttonlabel, buttonaccesskey, secondarybuttonlabel, secondarybuttonaccesskey"
closebuttonhidden="true"
dropmarkerhidden="true"
checkboxhidden="true"
buttonhighlight="true"
hidden="true">
<popupnotificationcontent id="update-manual-notification-content" orient="vertical">
<description id="update-manual-description" data-lazy-l10n-id="appmenu-update-manual-message"></description>
<label id="update-manual-whats-new" is="text-link" data-lazy-l10n-id="appmenu-update-whats-new"/>
<description id="update-manual-description" data-lazy-l10n-id="appmenu-update-manual-message2"></description>
</popupnotificationcontent>
</popupnotification>

<popupnotification id="appMenu-update-unsupported-notification"
popupid="update-unsupported"
data-lazy-l10n-id="appmenu-update-unsupported"
data-lazy-l10n-id="appmenu-update-unsupported2"
data-l10n-attrs="buttonlabel, buttonaccesskey, secondarybuttonlabel, secondarybuttonaccesskey"
closebuttonhidden="true"
dropmarkerhidden="true"
checkboxhidden="true"
buttonhighlight="true"
hidden="true">
<popupnotificationcontent id="update-unsupported-notification-content" orient="vertical">
<description id="update-unsupported-description" data-lazy-l10n-id="appmenu-update-unsupported-message"></description>
<description id="update-unsupported-description" data-lazy-l10n-id="appmenu-update-unsupported-message2"></description>
</popupnotificationcontent>
</popupnotification>

<popupnotification id="appMenu-update-restart-notification"
popupid="update-restart"
data-lazy-l10n-id="appmenu-update-restart"
data-lazy-l10n-id="appmenu-update-restart2"
data-l10n-attrs="buttonlabel, buttonaccesskey, secondarybuttonlabel, secondarybuttonaccesskey"
closebuttonhidden="true"
dropmarkerhidden="true"
checkboxhidden="true"
buttonhighlight="true"
hidden="true">
<popupnotificationcontent id="update-restart-notification-content" orient="vertical">
<description id="update-restart-description" data-lazy-l10n-id="appmenu-update-restart-message"></description>
<description id="update-restart-description" data-lazy-l10n-id="appmenu-update-restart-message2"></description>
</popupnotificationcontent>
</popupnotification>

Expand Down
50 changes: 24 additions & 26 deletions browser/locales/en-US/browser/appMenuNotifications.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,34 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

appmenu-update-available =
.label = A new { -brand-shorter-name } update is available.
.buttonlabel = Download Update
appmenu-update-available2 =
.label = Update available
.buttonlabel = Download
.buttonaccesskey = D
.secondarybuttonlabel = Not Now
.secondarybuttonaccesskey = N
appmenu-update-available-message = Update your { -brand-shorter-name } for the latest in speed and privacy.
appmenu-update-manual =
.label = { -brand-shorter-name } can’t update to the latest version.
.buttonlabel = Download { -brand-shorter-name }
.secondarybuttonlabel = Dismiss
.secondarybuttonaccesskey = m
appmenu-update-available-message2 = Download the latest version of { -brand-shorter-name }.
appmenu-update-manual2 =
.label = Update available
.buttonlabel = Download
.buttonaccesskey = D
.secondarybuttonlabel = Not Now
.secondarybuttonaccesskey = N
appmenu-update-manual-message = Download a fresh copy of { -brand-shorter-name } and we’ll help you to install it.
appmenu-update-whats-new =
.value = See what’s new.
appmenu-update-unsupported =
.label = { -brand-shorter-name } is unable to update to the latest version.
.secondarybuttonlabel = Dismiss
.secondarybuttonaccesskey = m
appmenu-update-manual-message2 = { -brand-shorter-name } couldn’t update automatically. Download the new version — you won’t lose saved information or customizations.
appmenu-update-unsupported2 =
.label = Unable to update
.buttonlabel = Learn more
.buttonaccesskey = L
.secondarybuttonlabel = Close
.secondarybuttonaccesskey = C
appmenu-update-unsupported-message = The latest version of { -brand-shorter-name } is not supported on your system.
appmenu-update-restart =
.label = Restart to update { -brand-shorter-name }.
.buttonlabel = Restart and Restore
.buttonaccesskey = R
.secondarybuttonlabel = Not Now
.secondarybuttonaccesskey = N
appmenu-update-restart-message = After a quick restart, { -brand-shorter-name } will restore all your open tabs and windows that are not in Private Browsing mode.
.secondarybuttonlabel = Dismiss
.secondarybuttonaccesskey = m
appmenu-update-unsupported-message2 = Your operating system isn’t compatible with the latest version of { -brand-shorter-name }.
appmenu-update-restart2 =
.label = Update available
.buttonlabel = Update and restart
.buttonaccesskey = U
.secondarybuttonlabel = Dismiss
.secondarybuttonaccesskey = m
appmenu-update-restart-message2 = Get the latest version of { -brand-shorter-name }. Open tabs and windows will be restored.
appmenu-update-other-instance =
.label = { -brand-shorter-name } is unable to automatically update to the latest version.
.buttonlabel = Update { -brand-shorter-name } anyway
Expand Down

0 comments on commit 70c88a0

Please sign in to comment.