Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(352)

Side by Side Diff: chrome/app/settings_strings.grdp

Issue 1997453006: MD Settings: About page, updating buttons based on current update status. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@about_page_main3
Patch Set: Nits. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Settings-specific strings (included from generated_resources.grd). --> 2 <!-- Settings-specific strings (included from generated_resources.grd). -->
3 <grit-part> 3 <grit-part>
4 <!-- About Page --> 4 <!-- About Page -->
5 <if expr="chromeos"> 5 <if expr="chromeos">
6 <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_STABLE" desc="The stab le label in the message about current channel."> 6 <message name="IDS_SETTINGS_ABOUT_PAGE_CHECK_FOR_UPDATES" desc="The button l abel to check for updates and apply (download and install) if found">
7 Check for updates
8 </message>
9 <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_STABLE" desc="The sta ble label in the message about current channel.">
7 stable 10 stable
8 </message> 11 </message>
9 <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_BETA" desc="The beta label in the message about current channel."> 12 <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_BETA" desc="The beta label in the message about current channel.">
10 beta 13 beta
11 </message> 14 </message>
12 <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_DEV" desc="The dev la bel in the message about current channel."> 15 <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_DEV" desc="The dev la bel in the message about current channel.">
13 dev 16 dev
14 </message> 17 </message>
15 <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL" desc="The message ab out current channel."> 18 <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL" desc="The message ab out current channel.">
16 Currently on <ph name="CHANNEL_NAME">$1<ex>stable</ex></ph> 19 Currently on <ph name="CHANNEL_NAME">$1<ex>stable</ex></ph>
17 </message> 20 </message>
18 <message name="IDS_SETTINGS_UPGRADE_UPDATING" desc="Status label: Updating C hromiumOS or ChromeOS"> 21 <message name="IDS_SETTINGS_UPGRADE_UPDATING" desc="Status label: Updating C hromiumOS or ChromeOS">
19 Updating your device 22 Updating your device
20 </message> 23 </message>
21 <message name="IDS_SETTINGS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Successfully updated ChromiumOS/ChromeOS"> 24 <message name="IDS_SETTINGS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Successfully updated ChromiumOS/ChromeOS">
22 Nearly up-to-date! Restart your device to finish updating. 25 Nearly up-to-date! Restart your device to finish updating.
23 </message> 26 </message>
24 <message name="IDS_SETTINGS_UPGRADE_UPDATING_CHANNEL_SWITCH" desc="Status la bel: Updating ChromiumOS/ChromeOS to a specified channel"> 27 <message name="IDS_SETTINGS_UPGRADE_UPDATING_CHANNEL_SWITCH" desc="Status la bel: Updating ChromiumOS/ChromeOS to a specified channel">
25 Updating your device to <ph name="CHANNEL_NAME">$1<ex>stable</ex></ph> cha nnel 28 Updating your device to <ph name="CHANNEL_NAME">$1<ex>stable</ex></ph> cha nnel
26 </message> 29 </message>
27 <message name="IDS_SETTINGS_UPGRADE_SUCCESSFUL_CHANNEL_SWITCH" desc="Status label: Channel was successfully switched on ChromiumOS/ChromeOS"> 30 <message name="IDS_SETTINGS_UPGRADE_SUCCESSFUL_CHANNEL_SWITCH" desc="Status label: Channel was successfully switched on ChromiumOS/ChromeOS">
28 Channel changed. Restart your device to apply changes. 31 Channel changed. Restart your device to apply changes.
29 </message> 32 </message>
30 <message name="IDS_SETTINGS_UPGRADE_UP_TO_DATE" desc="Status label: Already up to date (ChromiumOS/ChromeOS)"> 33 <message name="IDS_SETTINGS_UPGRADE_UP_TO_DATE" desc="Status label: Already up to date (ChromiumOS/ChromeOS)">
31 Your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> is up to date. 34 Your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> is up to date.
32 </message> 35 </message>
36 <message name="IDS_SETTINGS_ABOUT_PAGE_RELAUNCH_AND_POWERWASH" desc="The lab el for the button that relaunches and powerwashes the browser once update is co mplete">
tommycli 2016/05/20 22:53:18 nit: I assume you are trying to keep these alphabe
dpapad 2016/05/20 23:25:35 Done. Honestly I've given up of trying to make grd
37 Relaunch and Powerwash
38 </message>
39 <message name="IDS_SETTINGS_ABOUT_PAGE_RELAUNCH" desc="The label for the rel aunch button that relaunches the browser once update is complete">
40 Restart
41 </message>
42 </if>
43 <if expr="not chromeos">
44 <message name="IDS_SETTINGS_ABOUT_PAGE_RELAUNCH" desc="The label for the rel aunch button that relaunches the browser once update is complete">
45 Relaunch
46 </message>
33 </if> 47 </if>
34 <if expr="_google_chrome"> 48 <if expr="_google_chrome">
35 <message name="IDS_SETTINGS_ABOUT_PAGE_REPORT_AN_ISSUE" desc="Text of the bu tton which allows the user to report an issue with Chrome."> 49 <message name="IDS_SETTINGS_ABOUT_PAGE_REPORT_AN_ISSUE" desc="Text of the bu tton which allows the user to report an issue with Chrome.">
36 Report an issue 50 Report an issue
37 </message> 51 </message>
38 </if> 52 </if>
39 <message name="IDS_SETTINGS_ABOUT_UPGRADE_CHECK_STARTED" desc="Status label: A bout to start checking for updates"> 53 <message name="IDS_SETTINGS_ABOUT_UPGRADE_CHECK_STARTED" desc="Status label: A bout to start checking for updates">
40 Checking for updates 54 Checking for updates
41 </message> 55 </message>
42 56
(...skipping 1302 matching lines...) Expand 10 before | Expand all | Expand 10 after
1345 System 1359 System
1346 </message> 1360 </message>
1347 <message name="IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL" desc="Label for the checkbox that forces Chrome to render via hardware acceleration (GPU) wh en available."> 1361 <message name="IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL" desc="Label for the checkbox that forces Chrome to render via hardware acceleration (GPU) wh en available.">
1348 Use hardware acceleration when available 1362 Use hardware acceleration when available
1349 </message> 1363 </message>
1350 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings."> 1364 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings.">
1351 Change proxy settings 1365 Change proxy settings
1352 </message> 1366 </message>
1353 </if> 1367 </if>
1354 </grit-part> 1368 </grit-part>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698