Fix packing localized strings for //remoting.

remoting/resources/remoting_strings.grd

 <?xml version="1.0" encoding="UTF-8"?>
 
 <grit base_dir="." latest_public_release="0" current_release="1"
       output_all_resource_defines="false" enc_check="möl" source_lang_id="en">
   <outputs>
     <output filename="remoting/base/string_resources.h" type="rc_header">
       <emit emit_type="prepend"/>
     </output>
 
     <output filename="remoting/resources/am.pak" lang="am" type="data_package"/>
     <output filename="remoting/resources/ar.pak" lang="ar" type="data_package"/>
     <output filename="remoting/resources/bg.pak" lang="bg" type="data_package"/>
     <output filename="remoting/resources/bn.pak" lang="bn" type="data_package"/>
     <output filename="remoting/resources/ca.pak" lang="ca" type="data_package"/>
     <output filename="remoting/resources/cs.pak" lang="cs" type="data_package"/>
     <output filename="remoting/resources/da.pak" lang="da" type="data_package"/>
     <output filename="remoting/resources/de.pak" lang="de" type="data_package"/>
     <output filename="remoting/resources/el.pak" lang="el" type="data_package"/>
     <output filename="remoting/resources/en-GB.pak" lang="en-GB" type="data_package"/>
     <if expr="chromeos or is_ios">
       <output filename="remoting/resources/en-US.pak" lang="en" type="data_package"/>
     </if>
     <output filename="remoting/resources/en.pak" lang="en" type="data_package"/>
     <if expr="is_ios">

[Wez, 2017/04/18 18:05:26]

nit: If it is acceptable in this file format, consider putting a line of
whitespace before and after the is_ios / not is_ios conditional block so that it
stands out as a single logical block, and put the explanatory comment preceding
the block (i.e. before the "if" immediately above) rather than inside it, i.e:

blank line
<!- ... >
<if>
</if>
<if>
</if>
blank line

[sdefresne, 2017/04/19 08:59:03]

It is acceptable, however, all the other .grd files that are compiled on both
iOS and other platforms in the chromium repository use the current format (look
for example at components/components_strings.grd). If it is okay with you I
would prefer having consistency in that file too.

[Wez, 2017/04/20 03:41:21]

Acknowledged.

       <!-- iOS uses es-MX for es-419 -->
       <output filename="remoting/resources/es-MX.pak" lang="es-419" type="data_package"/>
     </if>
-    <output filename="remoting/resources/es-419.pak" lang="es-419" type="data_package"/>
+    <if expr="not is_ios">
+      <output filename="remoting/resources/es-419.pak" lang="es-419" type="data_package"/>
+    </if>
     <output filename="remoting/resources/es.pak" lang="es" type="data_package"/>
     <output filename="remoting/resources/et.pak" lang="et" type="data_package"/>
     <output filename="remoting/resources/fa.pak" lang="fa" type="data_package"/>
     <output filename="remoting/resources/fake-bidi.pak" lang="fake-bidi" type="data_package"/>
     <output filename="remoting/resources/fi.pak" lang="fi" type="data_package"/>
     <output filename="remoting/resources/fil.pak" lang="fil" type="data_package"/>
     <output filename="remoting/resources/fr.pak" lang="fr" type="data_package"/>
     <output filename="remoting/resources/gu.pak" lang="gu" type="data_package"/>
     <output filename="remoting/resources/he.pak" lang="he" type="data_package"/>
     <output filename="remoting/resources/hi.pak" lang="hi" type="data_package"/>
@@ skipping 10 matching lines @@
     <output filename="remoting/resources/mr.pak" lang="mr" type="data_package"/>
     <output filename="remoting/resources/ms.pak" lang="ms" type="data_package"/>
     <!-- The translation console uses 'no' for Norwegian (Bokmål), but we use 'nb'. -->
     <output filename="remoting/resources/nb.pak" lang="no" type="data_package"/>
     <output filename="remoting/resources/nl.pak" lang="nl" type="data_package"/>
     <output filename="remoting/resources/pl.pak" lang="pl" type="data_package"/>
     <if expr="is_ios">
       <!-- iOS uses pt for pt-BR -->
       <output filename="remoting/resources/pt.pak" lang="pt-BR" type="data_package"/>
     </if>
-    <output filename="remoting/resources/pt-BR.pak" lang="pt-BR" type="data_package"/>
+    <if expr="not is_ios">
+      <output filename="remoting/resources/pt-BR.pak" lang="pt-BR" type="data_package"/>
+    </if>
     <output filename="remoting/resources/pt-PT.pak" lang="pt-PT" type="data_package"/>
     <output filename="remoting/resources/ro.pak" lang="ro" type="data_package"/>
     <output filename="remoting/resources/ru.pak" lang="ru" type="data_package"/>
     <output filename="remoting/resources/sk.pak" lang="sk" type="data_package"/>
     <output filename="remoting/resources/sl.pak" lang="sl" type="data_package"/>
     <output filename="remoting/resources/sr.pak" lang="sr" type="data_package"/>
     <output filename="remoting/resources/sv.pak" lang="sv" type="data_package"/>
     <output filename="remoting/resources/sw.pak" lang="sw" type="data_package"/>
     <output filename="remoting/resources/ta.pak" lang="ta" type="data_package"/>
     <output filename="remoting/resources/te.pak" lang="te" type="data_package"/>
     <output filename="remoting/resources/th.pak" lang="th" type="data_package"/>
     <output filename="remoting/resources/tr.pak" lang="tr" type="data_package"/>
     <output filename="remoting/resources/uk.pak" lang="uk" type="data_package"/>
     <output filename="remoting/resources/vi.pak" lang="vi" type="data_package"/>
     <output filename="remoting/resources/zh-CN.pak" lang="zh-CN" type="data_package"/>
     <output filename="remoting/resources/zh-TW.pak" lang="zh-TW" type="data_package"/>
 
     <output filename="remoting/webapp/_locales/am/messages.json" lang="am" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/ar/messages.json" lang="ar" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/bg/messages.json" lang="bg" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/bn/messages.json" lang="bn" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/ca/messages.json" lang="ca" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/cs/messages.json" lang="cs" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/da/messages.json" lang="da" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/de/messages.json" lang="de" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/fa/messages.json" lang="fa" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/fake_bidi/messages.json" lang="fake_bidi" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/el/messages.json" lang="el" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/en/messages.json" lang="en" type="chrome_messages_json"/>
-    <output filename="remoting/webapp/_locales/en_US/messages.json" lang="en-US" type="chrome_messages_json"/>
+    <if expr="chromeos or is_ios">
+      <output filename="remoting/webapp/_locales/en_US/messages.json" lang="en-US" type="chrome_messages_json"/>
+    </if>
     <output filename="remoting/webapp/_locales/en_GB/messages.json" lang="en-GB" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/es/messages.json" lang="es" type="chrome_messages_json"/>
-    <output filename="remoting/webapp/_locales/es_419/messages.json" lang="es-419" type="chrome_messages_json"/>
+    <if expr="is_ios">
+      <!-- iOS uses es-MX for es-419 -->
+      <output filename="remoting/webapp/_locales/es_MX/messages.json" lang="es-419" type="chrome_messages_json"/>
+    </if>
+    <if expr="not is_ios">
+      <output filename="remoting/webapp/_locales/es_419/messages.json" lang="es-419" type="chrome_messages_json"/>
+    </if>
     <output filename="remoting/webapp/_locales/et/messages.json" lang="et" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/fi/messages.json" lang="fi" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/fil/messages.json" lang="fil" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/fr/messages.json" lang="fr" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/gu/messages.json" lang="gu" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/he/messages.json" lang="he" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/hi/messages.json" lang="hi" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/hr/messages.json" lang="hr" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/hu/messages.json" lang="hu" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/id/messages.json" lang="id" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/it/messages.json" lang="it" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/ja/messages.json" lang="ja" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/kn/messages.json" lang="kn" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/ko/messages.json" lang="ko" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/lt/messages.json" lang="lt" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/lv/messages.json" lang="lv" type="chrome_messages_json"/>
     <!-- The translation console uses 'no' for Norwegian (Bokmål), but Chrome uses 'nb'. -->
     <output filename="remoting/webapp/_locales/ml/messages.json" lang="ml" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/mr/messages.json" lang="mr" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/ms/messages.json" lang="ms" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/nb/messages.json" lang="no" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/nl/messages.json" lang="nl" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/pl/messages.json" lang="pl" type="chrome_messages_json"/>
-    <output filename="remoting/webapp/_locales/pt_BR/messages.json" lang="pt-BR" type="chrome_messages_json"/>
+    <if expr="is_ios">
+      <!-- iOS uses pt for pt-BR -->
+      <output filename="remoting/webapp/_locales/pt/messages.json" lang="pt-BR" type="chrome_messages_json"/>
+    </if>
+    <if expr="not is_ios">
+      <output filename="remoting/webapp/_locales/pt_BR/messages.json" lang="pt-BR" type="chrome_messages_json"/>
+    </if>
     <output filename="remoting/webapp/_locales/pt_PT/messages.json" lang="pt-PT" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/ro/messages.json" lang="ro" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/ru/messages.json" lang="ru" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/sk/messages.json" lang="sk" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/sl/messages.json" lang="sl" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/sr/messages.json" lang="sr" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/sv/messages.json" lang="sv" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/sw/messages.json" lang="sw" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/ta/messages.json" lang="ta" type="chrome_messages_json"/>
     <output filename="remoting/webapp/_locales/te/messages.json" lang="te" type="chrome_messages_json"/>
@@ skipping 1060 matching lines @@
       <message desc="Platform-specific text indicating that a component is for the Mac OS." name="IDS_FOR_PLATFORM_MAC">
         For Mac (OS X Mavericks 10.9 and above)
       </message>
       <message desc="Text for the button the user clicks to indicate that they agree to the terms of service and want to proceed with downloading the installer." name="IDS_ACCEPT_AND_INSTALL">
         Accept and Install
       </message>
 
     </messages>
   </release>
 </grit>