Index: chrome/app/generated_resources.grd |
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd |
index ab2d6595ec996dfc3970f27b031add3e0f5aeec0..f9090daa416b2624d2122dae44a18c20b537aa98 100644 |
--- a/chrome/app/generated_resources.grd |
+++ b/chrome/app/generated_resources.grd |
@@ -1006,7 +1006,7 @@ Other platform defines such as use_titlecase are declared in build/common.gypi. |
Preferences... |
</message> |
</if> |
- <if expr="os == 'linux2'"> |
+ <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> |
<message name="IDS_PREFERENCES" desc="The text label of the Preferences menu item."> |
Preferences |
</message> |
@@ -2403,7 +2403,7 @@ Other platform defines such as use_titlecase are declared in build/common.gypi. |
<message name="IDS_CREATE_SHORTCUTS_QUICK_LAUNCH_BAR_CHKBOX" desc="Label of the checkbox to create an application shortcut in quick launch bar."> |
Quick launch bar |
</message> |
- <if expr="os == 'linux2' or os.find('bsd') != -1"> |
+ <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> |
<message name="IDS_CREATE_SHORTCUTS_ERROR_TITLE" desc="Title of the error dialog box when creating an application shortcut failed."> |
Failed to Create Application Shortcut |
</message> |
@@ -6043,7 +6043,7 @@ Keep your key file in a safe place. You will need it to create new versions of y |
and make sure your configuration is set to "no proxy" or "direct." |
</message> |
</if> |
- <if expr="not pp_ifdef('chromeos') and (os == 'linux2' or os.find('bsd') != -1)"> |
+ <if expr="not pp_ifdef('chromeos') and (os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5')"> |
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server."> |
Go to |
<ph name="BEGIN_BOLD"><strong></ph> |
@@ -6052,7 +6052,7 @@ Keep your key file in a safe place. You will need it to create new versions of y |
and make sure your configuration is set to "no proxy" or "direct." |
</message> |
</if> |
- <if expr="os != 'darwin' and os != 'linux2'"> |
+ <if expr="os != 'darwin' and os != 'linux2' and os.find('bsd') == -1 and os != 'sunos5'"> |
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Windows instructions for disabling use of a proxy server."> |
Go to |
<ph name="BEGIN_BOLD"><strong></ph> |
@@ -6171,7 +6171,7 @@ Keep your key file in a safe place. You will need it to create new versions of y |
to test your connection. |
</message> |
</if> |
- <if expr="os != 'darwin' and os != 'linux2'"> |
+ <if expr="os != 'darwin' and os != 'linux2' and os.find('bsd') == -1 and os != 'sunos5'"> |
<message name="IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_PLATFORM" desc="Summary (platform dependent section) in the error page when the network connection failed. Describes how to get to the network Diagnostics screen under Windows 7 and later."> |
Go to |
<ph name="BEGIN_BOLD"><strong></ph> |
@@ -6829,7 +6829,7 @@ Keep your key file in a safe place. You will need it to create new versions of y |
Settings |
</message> |
</if> |
- <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1)"> |
+ <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5')"> |
<message name="IDS_SETTINGS_TITLE" desc="Title for the settings tab."> |
Preferences |
</message> |
@@ -7166,7 +7166,7 @@ Keep your key file in a safe place. You will need it to create new versions of y |
</message> |
</if> |
- <if expr="os == 'darwin' or (os =='linux2' and not pp_ifdef('chromeos'))"> |
+ <if expr="os == 'darwin' or os.find('bsd') != -1 or os == 'sunos5' or (os =='linux2' and not pp_ifdef('chromeos'))"> |
<message name="IDS_AUTOFILL_OPTIONS_TITLE" desc="The title of the Autofill dialog."> |
Autofill Preferences |
</message> |
@@ -7383,7 +7383,7 @@ Keep your key file in a safe place. You will need it to create new versions of y |
</message> |
</if> |
- <if expr="os == 'linux2' or os.find('bsd') != -1"> |
+ <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> |
<message name="IDS_APPEARANCE_GROUP_NAME" desc="In Title Case: The title of the themes group"> |
Appearance |
</message> |
@@ -7467,7 +7467,7 @@ Keep your key file in a safe place. You will need it to create new versions of y |
Some settings have been disabled by your IT administrator. |
</message> |
</if> |
- <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1)"> |
+ <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5')"> |
<message name="IDS_OPTIONS_MANAGED_PREFS" desc="Mac/Linux banner displayed in case there are managed options the user won't be able to change."> |
Some preferences have been disabled by your IT administrator. |
</message> |
@@ -7507,7 +7507,7 @@ Keep your key file in a safe place. You will need it to create new versions of y |
Search settings |
</message> |
</if> |
- <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1)"> |
+ <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5')"> |
<message name="IDS_OPTIONS_SEARCH_PLACEHOLDER" desc="Text placeholder for an empty search field on Mac/Linux."> |
Search preferences |
</message> |
@@ -9437,7 +9437,7 @@ Keep your key file in a safe place. You will need it to create new versions of y |
</if> <!-- os == 'darwin' --> |
<!-- Linux Global Menubar Menus --> |
- <if expr="os == 'linux2'"> |
+ <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> |
<!-- Unity and some other GNOME configurations now have a permanent, |
Mac-like menu bar that lives outside the window at the top of the |
screen. The following strings should be in Linux style, not Mac |
@@ -12172,7 +12172,7 @@ Keep your key file in a safe place. You will need it to create new versions of y |
Import bookmarks now... |
</message> |
- <if expr="os == 'linux2' or os == 'openbsd4' or os=='freebsd6'"> |
+ <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> |
<!-- Linux proxy configuration fallback help --> |
<message name="IDS_ABOUT_LINUX_PROXY_CONFIG_TITLE" desc="Title of HTML page shown on systems where system proxy configuration is unsupported."> |
Proxy Configuration Help |