From b1a40bcab448c280053a8d369b2bd165dc2de066 Mon Sep 17 00:00:00 2001
From: Matthias Rampke <matthias@rampke.de>
Date: Fri, 20 May 2011 11:42:40 +0200
Subject: [PATCH] update generated_resources conditions for dragonfly

---
 distinfo                                      |  2 +-
 .../patch-chrome_app_generated__resources.grd | 37 ++++++++++++++++---
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/distinfo b/distinfo
index fbc60e2..d9d052d 100644
--- a/distinfo
+++ b/distinfo
@@ -55,7 +55,7 @@ SHA1 (patch-build_common.gypi) = a5c94f476ec965240c3aaddc782868ed2a0c9818
 SHA1 (patch-build_features__override.gypi) = 6b3d456481f1846bcb1113ba7ed76f1ef7229f37
 SHA1 (patch-build_linux_python__arch.sh) = 9c60f323440f24b97e5343ae4d04a300259cdf08
 SHA1 (patch-chrome_app_chrome__exe__main__gtk.cc) = 9050b7590dd188b3c3d9cb4e29242f0f8b211f61
-SHA1 (patch-chrome_app_generated__resources.grd) = 729014c342768ffe745dd0f37a1cdc56d80c33e5
+SHA1 (patch-chrome_app_generated__resources.grd) = 6cf2ad8248467d14959d2688c044435fc3816fd8
 SHA1 (patch-chrome_app_resources_locale__settings.grd) = 3bea698538a019f1146447fe6eaba5764f322db8
 SHA1 (patch-chrome_browser_about__flags.cc) = e488fe4c626b7d01e53794c96fc074118b029491
 SHA1 (patch-chrome_browser_browser__about__handler.cc) = 885918e40b9b9efe32796be0f25b6410326f4412
diff --git a/patches/patch-chrome_app_generated__resources.grd b/patches/patch-chrome_app_generated__resources.grd
index 3d03a1c..1f712bb 100644
--- a/patches/patch-chrome_app_generated__resources.grd
+++ b/patches/patch-chrome_app_generated__resources.grd
@@ -20,7 +20,16 @@ $NetBSD$
          <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>
-@@ -6754,7 +6754,7 @@ Keep your key file in a safe place. You 
+@@ -5961,7 +5961,7 @@ Keep your key file in a safe place. You
+           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 == 'dragonfly2')">
+         <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>
+@@ -6754,7 +6754,7 @@ Keep your key file in a safe place. You
            Settings
          </message>
        </if>
@@ -29,7 +38,7 @@ $NetBSD$
          <message name="IDS_SETTINGS_TITLE" desc="Title for the settings tab.">
            Preferences
          </message>
-@@ -6774,7 +6774,7 @@ Keep your key file in a safe place. You 
+@@ -6774,7 +6774,7 @@ Keep your key file in a safe place. You
        <message name="IDS_OPTIONS_DIALOG_TITLE" desc="The title of the Options dialog box">
          <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> Options
        </message>
@@ -38,7 +47,7 @@ $NetBSD$
          <message name="IDS_PREFERENCES_DIALOG_TITLE" desc="The title of the Preferences dialog box">
            <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> Preferences
          </message>
-@@ -7167,7 +7167,7 @@ Keep your key file in a safe place. You 
+@@ -7167,7 +7167,7 @@ Keep your key file in a safe place. You
          </message>
        </if>
  
@@ -47,7 +56,7 @@ $NetBSD$
          <message name="IDS_AUTOFILL_OPTIONS_TITLE" desc="The title of the Autofill dialog.">
            Autofill Preferences
          </message>
-@@ -7339,7 +7339,7 @@ Keep your key file in a safe place. You 
+@@ -7339,7 +7339,7 @@ Keep your key file in a safe place. You
        <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group">
          Themes:
        </message>
@@ -56,7 +65,25 @@ $NetBSD$
          <message name="IDS_APPEARANCE_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the themes group">
            Appearance
          </message>
-@@ -11501,7 +11501,7 @@ Keep your key file in a safe place. You 
+@@ -7423,7 +7423,7 @@ Keep your key file in a safe place. You
+           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 == 'dragonfly2')">
+         <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>
+@@ -7463,7 +7463,7 @@ Keep your key file in a safe place. You
+           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 == 'dragonfly2')">
+         <message name="IDS_OPTIONS_SEARCH_PLACEHOLDER" desc="Text placeholder for an empty search field on Mac/Linux.">
+           Search preferences
+         </message>
+@@ -11501,7 +11501,7 @@ Keep your key file in a safe place. You
        Import bookmarks now...
      </message>
  
-- 
2.41.0