diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-01 12:59:39 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:40:43 +0000 |
commit | 28b1110370900897ab652cb420c371fab8857ad4 (patch) | |
tree | 41b32127d23b0df4f2add2a27e12dc87bddb260e /chromium/chrome/app/chromium_strings.grd | |
parent | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (diff) | |
download | qtwebengine-chromium-28b1110370900897ab652cb420c371fab8857ad4.tar.gz |
BASELINE: Update Chromium to 53.0.2785.41
Also adds a few extra files for extensions.
Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/app/chromium_strings.grd')
-rw-r--r-- | chromium/chrome/app/chromium_strings.grd | 87 |
1 files changed, 58 insertions, 29 deletions
diff --git a/chromium/chrome/app/chromium_strings.grd b/chromium/chrome/app/chromium_strings.grd index 1477ef05ac7..eadfe624fa1 100644 --- a/chromium/chrome/app/chromium_strings.grd +++ b/chromium/chrome/app/chromium_strings.grd @@ -187,10 +187,18 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> <message name="IDS_SESSION_CRASHED_VIEW_UMA_OPTIN" desc="Text besides the checkbox to let users optin to UMA in the restore from previous crash bubble."> Help make Chromium better by sending crash reports and <ph name="UMA_LINK">$1<ex>usage statistics</ex></ph> to Google </message> - <!-- Browser Window Title Format --> - <message name="IDS_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for titles displayed in tabs and popup windows"> - <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> - Chromium - </message> + <if expr="not chromeos"> + <!-- Browser Window Title Format --> + <message name="IDS_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for titles displayed in tabs and popup windows"> + <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> - Chromium + </message> + </if> + <if expr="chromeos"> + <!-- Browser Window Title Format --> + <message name="IDS_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for titles displayed in tabbed browser windows"> + Chromium - <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> + </message> + </if> <if expr="not chromeos"> <message name="IDS_GET_HELP_USING_CHROME" desc="Text of the button which takes the user to the Chrome help page."> Get help with using Chromium @@ -205,7 +213,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> The Chromium Authors </message> <message name="IDS_ABOUT_VERSION_COPYRIGHT" desc="Copyright information on the about pages"> - Copyright <ph name="YEAR">$1</ph> The Chromium Authors. All rights reserved. + Copyright <ph name="YEAR">{0,date,y}<ex>2016</ex></ph> The Chromium Authors. All rights reserved. </message> <if expr="chromeos"> <message name="IDS_ABOUT_VERSION_LICENSE_EULA" desc="The label below the copyright message, containing the URLs."> @@ -573,12 +581,12 @@ Chromium is unable to recover your settings. <!-- About Chrome page --> <if expr="not chromeos"> <message name="IDS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Successfully updated Chromium"> - Nearly up-to-date! Relaunch Chromium to finish updating. + Nearly up to date! Relaunch Chromium to finish updating. </message> </if> <if expr="chromeos"> <message name="IDS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Successfully updated Chromium OS"> - Nearly up-to-date! Restart your device to finish updating. + Nearly up to date! Restart your device to finish updating. </message> </if> <if expr="chromeos"> @@ -654,6 +662,9 @@ Chromium is unable to recover your settings. <message name="IDS_EXTENSIONS_UNINSTALL" desc="The link for uninstalling extensions."> Remove from Chromium... </message> + <message name="IDS_MD_EXTENSIONS_SHORTCUT_SCOPE_IN_CHROME" desc="The label to indicate that a shortcut will be triggerable only from within the Chrome application."> + In Chromium + </message> <if expr="enable_extensions"> <message name="IDS_EXTENSIONS_MULTIPLE_UNSUPPORTED_DISABLED_BODY" desc="Body of the dialog shown when multiple unsupported extensions have been disabled."> @@ -907,24 +918,6 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o </message> </if> - <!-- Chrome Notifications center --> - <if expr="enable_notifications"> - <if expr="is_win"> - <message name="IDS_MESSAGE_CENTER_BALLOON_TITLE" desc="Title of the first run notification ballon describing the notification center."> - Chromium Notification Center - </message> - <message name="IDS_MESSAGE_CENTER_BALLOON_TEXT" desc="Body text for the the first run notification ballon describing the notification center."> - You can see all your notifications from Chromium apps, extensions, and websites here. - </message> - </if> - <message name="IDS_MESSAGE_CENTER_TOOLTIP" desc="Tooltip for notification tray icon without unread notifications"> - Chromium - Notifications - </message> - <message name="IDS_MESSAGE_CENTER_TOOLTIP_UNREAD" desc="Tooltip for notification tray icon with unread notifications"> - Chromium - Notifications (<ph name="QUANTITY">$1<ex>3</ex></ph> unread) - </message> - </if> - <!-- MediaStream capture status tray icon --> <message name="IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_AUDIO_AND_VIDEO" desc="Tool tip for the capture status tray icon when microphone and camera are being used"> Chromium is using your camera and microphone. @@ -965,7 +958,8 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o </if> <!-- Material Design User Manager --> - <if expr="not is_android and not chromeos"> + <if expr="not is_android and not is_ios and not chromeos"> + <!-- Supervised user create confirmation page --> <message name="IDS_SUPERVISED_USER_CREATED_TEXT" desc="Informative text for the confirmation dialog that appears after a supervised user has been created."> To set which websites <ph name="NEW_PROFILE_NAME">$1<ex>New User</ex></ph> can view, you can configure restrictions and settings by visiting <ph name="BEGIN_LINK_1"><a target="_blank" href="$3"></ph><ph name="DISPLAY_LINK">$4</ph><ph name="END_LINK_1"></a></ph>. If you do not change the default settings, <ph name="NEW_PROFILE_NAME">$1<ex>New User</ex></ph> can browse everything on the web. @@ -974,10 +968,26 @@ To prevent <ph name="NEW_PROFILE_NAME">$1<ex>New User</ex></ph> from accessing y Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</ex></ph> for further instructions. </message> - </if> - <!-- User manager tutorial --> - <if expr="not is_android and not is_ios and not chromeos"> + <!-- User pod remove sync warning text --> + <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_SYNC" desc="Main text shown as a warning when attempting to remove an user. This case is for synced profiles, with all statistics loaded correctly. The symbol $1 will be substituted with custom JS code, so it should not be replaced by a #."> + {NUM_ITEMS, plural, + =1 {This will permanently delete $1 item from this device. To retrieve your data later, sign in to Chromium as $2.} + other {This will permanently delete $1 items from this device. To retrieve your data later, sign in to Chromium as $2.}} + </message> + <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_SYNC_WITH_ERRORS" desc="Main text shown as a warning when attempting to remove an user. This case is for non-synced profiles, with some statistics failed to load. The symbol $1 will be substituted with custom JS code, so it should not be replaced by a #."> + {NUM_ITEMS, plural, + =1 {This will permanently delete at least $1 item from this device. To retrieve your data later, sign in to Chromium as $2.} + other {This will permanently delete at least $1 items from this device. To retrieve your data later, sign in to Chromium as $2.}} + </message> + <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_SYNC_NOSTATS" desc="Main text shown as a warning when attempting to remove an user. This case is for synced profiles with statistics unavailable. (Possible case: Chromium decided not to load the statistics of closed profiles.)"> + This will permanently delete your browsing data from this device. To retrieve your data later, sign in to Chromium as $2. + </message> + <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_SYNC_CALCULATING" desc="Main text shown as a warning when attempting to remove an user. This case is for synced profiles when the statistics is still loading. $1 is always replaced by localized version of the ellipsis (...)."> + This will permanently delete at least <ph name="TOTAL_COUNT">$1<ex>...</ex></ph> items from this device. To retrieve your data later, sign in to Chromium as $2. + </message> + + <!-- Tutorial --> <message name="IDS_USER_MANAGER_TUTORIAL_SLIDE_INTRO_TITLE" desc="Title of the tutorial introduction slide"> Chromium just got better </message> @@ -1114,6 +1124,25 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</ Important security improvements and new features are available in the latest version. </message> + <!-- Critical Notification bubble --> + <message name="IDS_CRITICAL_NOTIFICATION_HEADLINE" desc="The headline for the critical notification"> + {SECONDS, plural, + =1 {Chromium will restart in 1 second.} + other {Chromium will restart in # seconds.}} + </message> + <message name="IDS_CRITICAL_NOTIFICATION_HEADLINE_ALTERNATE" desc="The headline for the critical notification when the countdown reaches 0 (will only be seen if an onbeforeunload handler on a web page cancels the shutdown sequence."> + You should restart Chromium now. + </message> + <message name="IDS_CRITICAL_NOTIFICATION_TEXT" desc="The text of the critical update notification"> + A special security update for Chromium was just applied; you should restart now for it to take effect (we'll restore your tabs). + </message> + <message name="IDS_CRITICAL_NOTIFICATION_RESTART" desc="The restart button label"> + OK - Restart now + </message> + <message name="IDS_CRITICAL_NOTIFICATION_DISMISS" desc="The dismiss button label"> + Don't restart + </message> + <!-- Dialog that asks whether user wants to participate in Safe Browsing Extended Reporting --> <message name="IDS_FEEDBACK_SERVICE_DIALOG_TITLE" desc="Title of the dialog asking whether the user wants to upload suspected malicious files for analysis"> Help make Chromium better |