Index: chrome/app/chromium_strings.grd |
=================================================================== |
--- chrome/app/chromium_strings.grd (revision 271719) |
+++ chrome/app/chromium_strings.grd (working copy) |
@@ -220,18 +220,17 @@ |
<message name="IDS_SHORT_PRODUCT_NAME" desc="The Chrome application short name."> |
Chromium |
</message> |
- <message name="IDS_SHORT_PRODUCT_NAME_LOWER" desc="The Chrome application short name all lowercase"> |
- chromium |
- </message> |
- <message name="IDS_SXS_SHORTCUT_NAME" desc="The Chrome short cut name for SxS channel"> |
- Chromium |
- </message> |
- <message name="IDS_PRODUCT_DESCRIPTION" desc="Browser description"> |
- Chromium is a web browser that runs webpages and applications with lightning speed. It's fast, stable, and easy to use. Browse the web more safely with malware and phishing protection built into Chromium. |
- </message> |
- <message name="IDS_APP_LAUNCHER_PRODUCT_DESCRIPTION" desc="App Launcher description"> |
- Chromium App Launcher is a standalone platform for Chromium apps. |
- </message> |
+ <if expr="is_win"> |
+ <message name="IDS_SXS_SHORTCUT_NAME" desc="The Chrome short cut name for SxS channel"> |
+ Chromium |
+ </message> |
+ <message name="IDS_PRODUCT_DESCRIPTION" desc="Browser description"> |
+ Chromium is a web browser that runs webpages and applications with lightning speed. It's fast, stable, and easy to use. Browse the web more safely with malware and phishing protection built into Chromium. |
+ </message> |
+ <message name="IDS_APP_LAUNCHER_PRODUCT_DESCRIPTION" desc="App Launcher description"> |
+ Chromium App Launcher is a standalone platform for Chromium apps. |
+ </message> |
+ </if> |
<if expr="chromeos"> |
<message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name"> |
Chromium OS |
@@ -315,10 +314,10 @@ |
<message name="IDS_ABOUT_VERSION_LICENSE" desc="The label below the copyright message, containing the URLs."> |
Chromium is made possible by the <ph name="BEGIN_LINK_CHROMIUM"><a target="_blank" href="$1"></ph>Chromium<ph name="END_LINK_CHROMIUM"></a></ph> open source project and other <ph name="BEGIN_LINK_OSS"><a target="_blank" href="$2"></ph>open source software<ph name="END_LINK_OSS"></a></ph>. |
</message> |
- <message name="IDS_ABOUT_VERSION_LICENSE_EULA" desc="The label below the copyright message, containing the URLs."> |
- Chromium open source licenses |
- </message> |
<if expr="chromeos"> |
+ <message name="IDS_ABOUT_VERSION_LICENSE_EULA" desc="The label below the copyright message, containing the URLs."> |
+ Chromium open source licenses |
+ </message> |
<message name="IDS_ABOUT_CROS_VERSION_LICENSE" desc="Additional text displayed beneath the Chromium open source URLs for Chrome OS."> |
Chromium OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS"><a target="_blank" href="$1"></ph>open source software<ph name="END_LINK_CROS_OSS"></a></ph>. |
</message> |
@@ -351,9 +350,11 @@ |
Chromium Toolbar |
</message> |
<!-- Hung Browser Detector --> |
- <message name="IDS_BROWSER_HUNGBROWSER_MESSAGE" desc="Content of the dialog box shown when the browser is hung"> |
- Chromium is unresponsive. Relaunch now? |
- </message> |
+ <if expr="is_win"> |
+ <message name="IDS_BROWSER_HUNGBROWSER_MESSAGE" desc="Content of the dialog box shown when the browser is hung"> |
+ Chromium is unresponsive. Relaunch now? |
+ </message> |
+ </if> |
<message name="IDS_IMPORT_FIND_YOUR_BOOKMARKS" desc="Helpful reminder for where to find imported bookmarks"> |
Find your bookmarks in the Chromium menu or on the bookmarks bar. |
</message> |
@@ -368,16 +369,16 @@ |
<message name="IDS_UNINSTALL_CLOSE_APP_IMMERSIVE" desc="Message to user when uninstall detects other app instance running, possibly in the Windows 8 immersive mode"> |
Please close all Chromium windows (including those in Windows 8 mode) and try again. |
</message> |
+ <message name="IDS_UNINSTALL_VERIFY" desc="Message to confirm user wants to uninstall"> |
+ Are you sure you want to uninstall Chromium? |
+ </message> |
+ <message name="IDS_UNINSTALL_CHROME" desc="The text of the shortcut in the Start Menu for uninstalling chrome."> |
+ Uninstall Chromium |
+ </message> |
+ <message name="IDS_UNINSTALL_APP_LAUNCHER" desc="The text of the shortcut in the Start Menu for uninstalling App Launcher."> |
+ Uninstall Chromium App Launcher |
+ </message> |
</if> |
- <message name="IDS_UNINSTALL_VERIFY" desc="Message to confirm user wants to uninstall"> |
- Are you sure you want to uninstall Chromium? |
- </message> |
- <message name="IDS_UNINSTALL_CHROME" desc="The text of the shortcut in the Start Menu for uninstalling chrome."> |
- Uninstall Chromium |
- </message> |
- <message name="IDS_UNINSTALL_APP_LAUNCHER" desc="The text of the shortcut in the Start Menu for uninstalling App Launcher."> |
- Uninstall Chromium App Launcher |
- </message> |
<message name="IDS_FR_CUSTOMIZE_DEFAULT_BROWSER" desc="Default browser checkbox label"> |
Make Chromium the default browser |
</message> |
@@ -449,9 +450,11 @@ |
<ph name="USER_DATA_DIRECTORY">$1<ex>C:\Documents and Settings\devint\Local Settings\Application Data\Google\Chrome</ex></ph> |
</message> |
- <message name="IDS_EULA_CHECKBOX_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging"> |
- Optional: Help make Chromium better by automatically sending usage statistics and crash reports to Google. |
- </message> |
+ <if expr="chromeos"> |
+ <message name="IDS_EULA_CHECKBOX_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging"> |
+ Optional: Help make Chromium better by automatically sending usage statistics and crash reports to Google. |
+ </message> |
+ </if> |
<message name="IDS_PROFILE_TOO_NEW_ERROR" desc="Error displayed on startup when the profile is from a newer version of the product and can not be read"> |
Your profile can not be used because it is from a newer version of Chromium. |
@@ -471,9 +474,11 @@ |
<message name="IDS_CRASH_RECOVERY_TITLE" desc="Title of dialog shown when the browser crashes."> |
Chromium |
</message> |
- <message name="IDS_CRASH_RECOVERY_CONTENT" desc="Text content telling the user the browser has crashed."> |
- Whoa! Chromium has crashed. Relaunch now? |
- </message> |
+ <if expr="is_win"> |
+ <message name="IDS_CRASH_RECOVERY_CONTENT" desc="Text content telling the user the browser has crashed."> |
+ Whoa! Chromium has crashed. Relaunch now? |
+ </message> |
+ </if> |
<message name="IDS_PASSWORD_GENERATION_SUGGESTION" desc="Text shown next to a generated password describing it as a suggestion."> |
Suggested by Chromium |
</message> |
@@ -545,24 +550,26 @@ |
<message name="IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing experience."> |
Chromium may use web services to improve your browsing experience. |
</message> |
- <message name="IDS_OEM_MAIN_SHORTCUT_NAME" desc="Name of the desktop shortcut to start the application for OEM pre-installations."> |
- Internet Browser |
- </message> |
- <message name="IDS_SHORTCUT_TOOLTIP" desc="Text for the hover-on tooltip for the Chromium shortcuts."> |
- Access the Internet |
- </message> |
- <message name="IDS_APP_LAUNCHER_SHORTCUT_TOOLTIP" desc="Text for the hover-on tooltip for the App Launcher shortcut."> |
- Launch Chromium apps |
- </message> |
- <message name="IDS_UNINSTALL_DELETE_PROFILE" desc="Text to show user to ask whether to delete all the profile data also during uninstallation."> |
- Also delete your browsing data? |
- </message> |
- <message name="IDS_UNINSTALL_SET_DEFAULT_BROWSER" desc="Text to ask whether to set another browser as default when Chromium is uninstalled."> |
- Change default browser to: |
- </message> |
- <message name="IDS_UNINSTALL_BUTTON_TEXT" desc="Label for uninstall button on Uninstall confirmation dialog."> |
- Uninstall |
- </message> |
+ <if expr="is_win"> |
+ <message name="IDS_OEM_MAIN_SHORTCUT_NAME" desc="Name of the desktop shortcut to start the application for OEM pre-installations."> |
+ Internet Browser |
+ </message> |
+ <message name="IDS_SHORTCUT_TOOLTIP" desc="Text for the hover-on tooltip for the Chromium shortcuts."> |
+ Access the Internet |
+ </message> |
+ <message name="IDS_APP_LAUNCHER_SHORTCUT_TOOLTIP" desc="Text for the hover-on tooltip for the App Launcher shortcut."> |
+ Launch Chromium apps |
+ </message> |
+ <message name="IDS_UNINSTALL_DELETE_PROFILE" desc="Text to show user to ask whether to delete all the profile data also during uninstallation."> |
+ Also delete your browsing data? |
+ </message> |
+ <message name="IDS_UNINSTALL_SET_DEFAULT_BROWSER" desc="Text to ask whether to set another browser as default when Chromium is uninstalled."> |
+ Change default browser to: |
+ </message> |
+ <message name="IDS_UNINSTALL_BUTTON_TEXT" desc="Label for uninstall button on Uninstall confirmation dialog."> |
+ Uninstall |
+ </message> |
+ </if> |
<message name="IDS_DEFAULT_BROWSER_INFOBAR_SHORT_TEXT" desc="More compact text to show in the default browser query infobar."> |
Chromium isn't your default browser. |
</message> |
@@ -571,33 +578,33 @@ |
Set up Sync to save your personalized browser features to the web and access them from Chromium on any computer. |
</message> |
</if> |
- <!-- Try Chrome Toast Dialog --> |
- <message name="IDS_TRY_TOAST_HEADING" desc="Top line of the try-chrome-again dialog"> |
- There is a new version of Chromium available. |
- </message> |
- <message name="IDS_TRY_TOAST_HEADING2" desc="Top line of the try-chrome-again dialog"> |
- There's a new version of Chromium available, and it's faster than ever. |
- </message> |
- <message name="IDS_TRY_TOAST_HEADING3" desc="Top line of the try-chrome-again dialog"> |
- There's a new, safer version of Chromium available. |
- </message> |
- <message name="IDS_TRY_TOAST_HEADING4" desc="Top line of the try-chrome-again dialog"> |
- Chromium has been updated, but you haven't used it for at least 30 days. |
- </message> |
- <message name="IDS_TRY_TOAST_HEADING_SKYPE" desc="Top line of the try-chrome-again dialog"> |
- Chromium lets you click a phone number on the web and call it with Skype! |
- </message> |
- <message name="IDS_TRY_TOAST_TRY_OPT" desc="First option radio button on the dialog to try chrome"> |
- Try it out, it's already installed |
- </message> |
- <message name="IDS_TRY_TOAST_CANCEL" desc="Try chrome again dialog Cancel button"> |
- Don't bug me |
- </message> |
- <message name="IDS_TRY_TOAST_WHY" desc="Text of the url link that explains why this dialog is being shown"> |
- Why am I seeing this? |
- </message> |
- <!-- about:conflicts strings --> |
<if expr="is_win"> |
+ <!-- Try Chrome Toast Dialog --> |
+ <message name="IDS_TRY_TOAST_HEADING" desc="Top line of the try-chrome-again dialog"> |
+ There is a new version of Chromium available. |
+ </message> |
+ <message name="IDS_TRY_TOAST_HEADING2" desc="Top line of the try-chrome-again dialog"> |
+ There's a new version of Chromium available, and it's faster than ever. |
+ </message> |
+ <message name="IDS_TRY_TOAST_HEADING3" desc="Top line of the try-chrome-again dialog"> |
+ There's a new, safer version of Chromium available. |
+ </message> |
+ <message name="IDS_TRY_TOAST_HEADING4" desc="Top line of the try-chrome-again dialog"> |
+ Chromium has been updated, but you haven't used it for at least 30 days. |
+ </message> |
+ <message name="IDS_TRY_TOAST_HEADING_SKYPE" desc="Top line of the try-chrome-again dialog"> |
+ Chromium lets you click a phone number on the web and call it with Skype! |
+ </message> |
+ <message name="IDS_TRY_TOAST_TRY_OPT" desc="First option radio button on the dialog to try chrome"> |
+ Try it out, it's already installed |
+ </message> |
+ <message name="IDS_TRY_TOAST_CANCEL" desc="Try chrome again dialog Cancel button"> |
+ Don't bug me |
+ </message> |
+ <message name="IDS_TRY_TOAST_WHY" desc="Text of the url link that explains why this dialog is being shown"> |
+ Why am I seeing this? |
+ </message> |
+ <!-- about:conflicts strings --> |
<message name="IDS_CONFLICTS_CHECK_PAGE_TITLE_LONG" desc="The long title on the compatibility page"> |
Modules loaded into Chromium |
</message> |
@@ -660,9 +667,11 @@ |
</if> |
<!-- Autolaunch infobar --> |
- <message name="IDS_AUTO_LAUNCH_INFOBAR_TEXT" desc="The text to show in the infobar when Chromium was automatically launched on startup"> |
- Chromium is configured to automatically launch when you start your computer. |
- </message> |
+ <if expr="is_win"> |
+ <message name="IDS_AUTO_LAUNCH_INFOBAR_TEXT" desc="The text to show in the infobar when Chromium was automatically launched on startup"> |
+ Chromium is configured to automatically launch when you start your computer. |
+ </message> |
+ </if> |
<!-- about:flags --> |
<if expr="not chromeos"> |
@@ -857,11 +866,6 @@ |
Thanks for trying out the new Chromium. Chromium needs to restart to make sure you've saved any open work before continuing. |
</message> |
- <!-- Sync Promo New Tab Page bubble strings --> |
- <message name="IDS_SYNC_PROMO_NTP_BUBBLE_MESSAGE_NEW" desc="The body of the sync promo NTP bubble."> |
- Now that you're signed in, you can get your tabs, bookmarks and other Chromium stuff across your laptop, phone and tablet. You will also receive more relevant suggestions and features on Google services. |
- </message> |
- |
<!-- One click sign-in infobar --> |
<if expr="not chromeos"> |
<!-- New one-click sign-in dialog contents for SAML support --> |
@@ -871,9 +875,6 @@ |
<message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The message of the one click sign-in dialog."> |
You're signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>. Now you can access your bookmarks, history, and other settings on all your signed in devices. |
</message> |
- <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE_NEW" desc="The body of the sync promo NTP bubble."> |
- Now that you're signed in, you can get your tabs, bookmarks and other Chromium stuff across your laptop, phone and tablet. You will also receive more relevant suggestions and features on Google services. |
- </message> |
<message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE" desc="The body of the sign-in bubble, when sync has been disabled."> |
You're now signed in to Chromium! Sync is disabled by your administrator. |
</message> |
@@ -1036,9 +1037,11 @@ |
<message name="IDS_APP_LIST_SHORTCUT_NAME" desc="Name for the Chromium App List to appear in the taskbar and in any shortcuts to it."> |
Chromium App Launcher |
</message> |
- <message name="IDS_APP_LIST_SHORTCUT_NAME_CANARY" desc="Name for the Chromium App List to appear in the taskbar and in any shortcuts to it."> |
- Chromium App Launcher |
- </message> |
+ <if expr="is_win or is_macosx"> |
+ <message name="IDS_APP_LIST_SHORTCUT_NAME_CANARY" desc="Name for the Chromium App List to appear in the taskbar and in any shortcuts to it."> |
+ Chromium App Launcher |
+ </message> |
+ </if> |
<message name="IDS_APP_LIST_SIGNIN_HEADING" desc="Heading for when the launcher needs to sign in."> |
Sign in to Chromium |
</message> |
@@ -1123,9 +1126,11 @@ |
</if> |
<!-- Toast experiment. --> |
- <message name="IDS_TRY_TOAST_SET_DEFAULT" desc="Text of the checkbox to make Chromium the default browser"> |
- Make Chromium the default browser |
- </message> |
+ <if expr="is_win"> |
+ <message name="IDS_TRY_TOAST_SET_DEFAULT" desc="Text of the checkbox to make Chromium the default browser"> |
+ Make Chromium the default browser |
+ </message> |
+ </if> |
<!-- User manager tutorial --> |
<if expr="not is_android and not is_ios and not chromeos"> |