fix locales for linux but desktop_linux=0

ui/strings/app_locale_settings.grd

 <?xml version="1.0" encoding="UTF-8"?>
 <grit latest_public_release="0" current_release="1">
   <outputs>
     <output filename="grit/app_locale_settings.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
     <output filename="app_locale_settings_am.pak" type="data_package" lang="am" />
     <output filename="app_locale_settings_ar.pak" type="data_package" lang="ar" />
     <if expr="use_third_party_translations">
       <output filename="app_locale_settings_ast.pak" type="data_package" lang="ast" />
@@ skipping 211 matching lines @@
         <!-- The font used in Web UI (e.g. History). -->
         <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
           'Lucida Grande', sans-serif
         </message>
 
         <!-- The relative font size in % used in Web UI (e.g. History).  -->
         <message name="IDS_WEB_FONT_SIZE" use_name_for_id="true">
           75%
         </message>
       </if>
-      <if expr="(desktop_linux or is_android) and not chromeos">
+      <if expr="(is_linux or is_android) and not chromeos">

[r.c.ladan, 2014/07/31 13:45:36]

I think it is better to use 

<if expr="(pp_ifdef('desktop_linux') or is_android) and not chromeos">

here?

[Mostyn Bramley-Moore, 2014/07/31 13:59:05]

That breaks my non-desktop linux build.

How about "(is_linux or is_android or is_bsd) and not chromeos" ?

[Mostyn Bramley-Moore, 2014/07/31 14:13:23]

Done in patchset 2.

         <!-- The font used in Web UI (e.g. History). Note that these are only
              backups. We try to use the system font if possible. -->
         <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
           Arial, sans-serif
         </message>
 
         <!-- The relative font size in % used in Web UI (e.g. History).  -->
         <message name="IDS_WEB_FONT_SIZE" use_name_for_id="true">
           75%
         </message>
@@ skipping 11 matching lines @@
         </message>
 
         <!-- The relative font size in % used in Web UI (e.g. History).  -->
         <message name="IDS_WEB_FONT_SIZE" use_name_for_id="true">
           75%
         </message>
       </if>
     </messages>
   </release>
 </grit>