Skip to content

Commit

Permalink
Merge M58: Add new sad tab strings.
Browse files Browse the repository at this point in the history 
These are being added before branch point so they can be localized.

Code will follow.

BUG=697259,698368

Review-Url: https://codereview.chromium.org/2730903006
Cr-Original-Commit-Position: refs/heads/master@{#454667}
Committed: https://chromium.googlesource.com/chromium/src/+/a8206e24e0758e349d1708fab7aa2774980dc4eb
Review-Url: https://codereview.chromium.org/2730903006
Cr-Commit-Position: refs/heads/master@{#454698}
(cherry picked from commit 16fe9a0)

Review-Url: https://codereview.chromium.org/2735653002 .
Cr-Commit-Position: refs/branch-heads/3029@{#15}
Cr-Branched-From: 939b32e-refs/heads/master@{#454471}
  • Loading branch information
@wfh-chromium
wfh-chromium committed Mar 6, 2017
1 parent 16f238b commit c5c307c
Showing 1 changed file with 75 additions and 0 deletions.
75 changes: 75 additions & 0 deletions components/new_or_sad_tab_strings.grdp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,81 @@
Send Feedback
</message>
</if>
<if expr="is_win">
<message name="IDS_SAD_TAB_OOM_TITLE" desc="The title of the web page displayed if content in Chrome browser does not load due to the browser being out of memory, and a reload failed to fix the issue.">
Not enough memory to open this page
</message>
</if>
<message name="IDS_SAD_TAB_RELOAD_TITLE" desc="The title of the web page displayed if content in Chrome browser does not load for an unknown reason, and a reload failed to fix the issue." formatter_data="android_java">
Can't open this page
</message>
<message name="IDS_SAD_TAB_OOM_MESSAGE_TABS" desc="The message displayed on the web page if content in Chrome browser does not load due to the browser being out of memory, a reload failed to fix the issue and other tabs are open." formatter_data="android_java">
Try closing other tabs or programs to free up memory.
</message>
<message name="IDS_SAD_TAB_OOM_MESSAGE_NOTABS" desc="The message displayed on the web page if content in Chrome browser does not load due to the browser being out of memory, a reload failed to fix the issue and no other tabs are open." formatter_data="android_java">
Try exiting other programs to free up memory.
</message>
<message name="IDS_SAD_TAB_RELOAD_TRY" desc="The message displayed on the web page if content in Chrome browser does not load and a reload failed to fix the issue. Introduces a bulleted list of solutions/tips for the user to try." formatter_data="android_java">
Try the following tips:
</message>
<if expr="is_macosx">
<message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to open the web page in Chrome's Incognito mode." formatter_data="android_java">
Open page in Incognito mode (⇧⌘N)
</message>
</if>
<if expr="is_win or is_linux or chromeos">
<message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to open the web page in Chrome's Incognito mode." formatter_data="android_java">
Open page in Incognito mode (Ctrl-Shift-N)
</message>
</if>
<if expr="is_android or is_ios">
<message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to open the web page in Chrome's Incognito mode." formatter_data="android_java">
Open page in Incognito mode
</message>
</if>
<if expr="is_macosx or chromeos">
<message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or apps running on their computer (Mac, Chrome OS)." formatter_data="android_java">
Close other tabs or apps
</message>
</if>
<if expr="is_linux and not chromeos">
<message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer." formatter_data="android_java">
Close other tabs or programs
</message>
</if>
<if expr="is_macosx or chromeos or is_android or is_ios">
<message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other apps running on their computer or device." formatter_data="android_java">
Close other apps
</message>
</if>
<if expr="is_linux and not chromeos">
<message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux)." formatter_data="android_java">
Close other programs
</message>
</if>
<if expr="_google_chrome">
<message name="IDS_SAD_TAB_RELOAD_RESTART_BROWSER" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to restart Chrome." formatter_data="android_java">
Restart Chrome
</message>
</if>
<if expr="not _google_chrome">
<message name="IDS_SAD_TAB_RELOAD_RESTART_BROWSER" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to restart Chromium." formatter_data="android_java">
Restart Chromium
</message>
</if>
<if expr="is_win or is_linux or is_maxosx or chromeos">
<message name="IDS_SAD_TAB_RELOAD_RESTART_DEVICE" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to restart their computer." formatter_data="android_java">
Restart your computer
</message>
</if>
<if expr="is_android or is_ios">
<message name="IDS_SAD_TAB_RELOAD_RESTART_DEVICE" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to restart their device (i.e. phone or tablet)." formatter_data="android_java">
Restart your device
</message>
</if>
<message name="IDS_SAD_TAB_UMA_OPTIN" desc="Text that appears next to a checkbox, allowing the user to opt-in to sending statistics about their Chrome browser usage and reports of crashes to Google." formatter_data="android_java">
Automatically send usage statistics and crash reports to Google
</message>

<!-- New Tab -->
<message name="IDS_NEW_TAB_TITLE"
Expand Down

0 comments on commit c5c307c

Please sign in to comment.