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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/generated_resources.grd

Issue 7011032: Make the gyp files more cross-platform across the Unices (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: updated to trunk and added spaces, collapsed one check Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/app/resources/locale_settings.grd » ('j') | chrome/chrome_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 18f903ceaa33fb8399db739327c6d666d872d787..5adee0ca5c61369f93ceff535eebb6652dce329b 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>
@@ -6058,7 +6058,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 &quot;no proxy&quot; or &quot;direct.&quot;
</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">&lt;strong&gt;</ph>
@@ -6067,7 +6067,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 &quot;no proxy&quot; or &quot;direct.&quot;
</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">&lt;strong&gt;</ph>
@@ -6186,7 +6186,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">&lt;strong&gt;</ph>
@@ -6844,7 +6844,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>
@@ -7181,7 +7181,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>
@@ -7398,7 +7398,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>
@@ -7482,7 +7482,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>
@@ -7522,7 +7522,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>
@@ -9455,7 +9455,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
@@ -12193,7 +12193,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
« no previous file with comments | « no previous file | chrome/app/resources/locale_settings.grd » ('j') | chrome/chrome_tests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698