Include upstream libaddressinput strings in Chrome build.

This patch adds the upstream libaddressinput strings into the Chrome
build inside of chrome/app/address_input.grd[p] to work well with the
translation tools.

This patch should precede using upstream libaddressinput to ensure that
the upstream libaddressinput has the correct strings well ahead of using
it in Chrome.

Although the strings include postal code examples and links for error
messages, these features are optional and can be turned off if
undesired.

BUG=327046

Review URL: https://codereview.chromium.org/304223010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276559 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

@@ -39,7 +39,7 @@ vars = {
   # to update other nacl_*_revision's.
   "nacl_tools_revision": "13077",  # native_client/DEPS: tools_rev
   "google_toolbox_for_mac_revision": "662",
-  "libaddressinput_revision": "265",
+  "libaddressinput_revision": "273",
   "libphonenumber_revision": "621",
   "libvpx_revision": "269083",
   "lss_revision": "26",

chrome/app/resources/address_input_strings_am.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="am">
+</translationbundle>

chrome/app/resources/address_input_strings_ar.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ar">
+</translationbundle>

chrome/app/resources/address_input_strings_bg.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="bg">
+</translationbundle>

chrome/app/resources/address_input_strings_bn.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="bn">
+</translationbundle>

chrome/app/resources/address_input_strings_ca.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ca">
+</translationbundle>

chrome/app/resources/address_input_strings_cs.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="cs">
+</translationbundle>

chrome/app/resources/address_input_strings_da.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="da">
+</translationbundle>

chrome/app/resources/address_input_strings_de.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="de">
+</translationbundle>

chrome/app/resources/address_input_strings_el.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="el">
+</translationbundle>

chrome/app/resources/address_input_strings_en-GB.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="en-GB">
+</translationbundle>

chrome/app/resources/address_input_strings_es-419.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="es-419">
+</translationbundle>

chrome/app/resources/address_input_strings_es.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="es">
+</translationbundle>

chrome/app/resources/address_input_strings_et.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="et">
+</translationbundle>

chrome/app/resources/address_input_strings_fa.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fa">
+</translationbundle>

chrome/app/resources/address_input_strings_fi.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fi">
+</translationbundle>

chrome/app/resources/address_input_strings_fil.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fil">
+</translationbundle>

chrome/app/resources/address_input_strings_fr.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fr">
+</translationbundle>

chrome/app/resources/address_input_strings_gu.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="gu">
+</translationbundle>

chrome/app/resources/address_input_strings_hi.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="hi">
+</translationbundle>

chrome/app/resources/address_input_strings_hr.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="hr">
+</translationbundle>

chrome/app/resources/address_input_strings_hu.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="hu">
+</translationbundle>

chrome/app/resources/address_input_strings_id.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="id">
+</translationbundle>

chrome/app/resources/address_input_strings_it.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="it">
+</translationbundle>

chrome/app/resources/address_input_strings_iw.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="iw">
+</translationbundle>

chrome/app/resources/address_input_strings_ja.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ja">
+</translationbundle>

chrome/app/resources/address_input_strings_kn.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="kn">
+</translationbundle>

chrome/app/resources/address_input_strings_ko.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ko">
+</translationbundle>

chrome/app/resources/address_input_strings_lt.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="lt">
+</translationbundle>

chrome/app/resources/address_input_strings_lv.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="lv">
+</translationbundle>

chrome/app/resources/address_input_strings_ml.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ml">
+</translationbundle>

chrome/app/resources/address_input_strings_mr.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="mr">
+</translationbundle>

chrome/app/resources/address_input_strings_ms.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ms">
+</translationbundle>

chrome/app/resources/address_input_strings_nl.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="nl">
+</translationbundle>

chrome/app/resources/address_input_strings_no.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="no">
+</translationbundle>

chrome/app/resources/address_input_strings_pl.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="pl">
+</translationbundle>

chrome/app/resources/address_input_strings_pt-BR.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="pt-BR">
+</translationbundle>

chrome/app/resources/address_input_strings_pt-PT.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="pt-PT">
+</translationbundle>

chrome/app/resources/address_input_strings_ro.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ro">
+</translationbundle>

chrome/app/resources/address_input_strings_ru.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ru">
+</translationbundle>

chrome/app/resources/address_input_strings_sk.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sk">
+</translationbundle>

chrome/app/resources/address_input_strings_sl.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sl">
+</translationbundle>

chrome/app/resources/address_input_strings_sr.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sr">
+</translationbundle>

chrome/app/resources/address_input_strings_sv.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sv">
+</translationbundle>

chrome/app/resources/address_input_strings_sw.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sw">
+</translationbundle>

chrome/app/resources/address_input_strings_ta.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ta">
+</translationbundle>

chrome/app/resources/address_input_strings_te.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="te">
+</translationbundle>

chrome/app/resources/address_input_strings_th.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="th">
+</translationbundle>

chrome/app/resources/address_input_strings_tr.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="tr">
+</translationbundle>

chrome/app/resources/address_input_strings_uk.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="uk">
+</translationbundle>

chrome/app/resources/address_input_strings_vi.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="vi">
+</translationbundle>

chrome/app/resources/address_input_strings_zh-CN.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="zh-CN">
+</translationbundle>

chrome/app/resources/address_input_strings_zh-TW.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="zh-TW">
+</translationbundle>

chrome/tools/build/repack_locales.py

@@ -115,6 +115,11 @@ def calc_inputs(locale):
     inputs.append(os.path.join(SHARE_INT_DIR, 'third_party', 'libaddressinput',
                                'libaddressinput_strings_%s.pak' % locale))
 
+    #e.g. '<(SHARED_INTERMEDIATE_DIR)/grit/libaddressinput/
+    # address_input_strings_da.pak',
+    inputs.append(os.path.join(SHARE_INT_DIR, 'grit', 'libaddressinput',
+                               'address_input_strings_%s.pak' % locale))
+
   #e.g. '<(grit_out_dir)/google_chrome_strings_da.pak'
   #     or
   #     '<(grit_out_dir)/chromium_strings_da.pak'

third_party/libaddressinput/README.chromium

@@ -2,8 +2,8 @@ Name: The library to input, validate, and display addresses.
 Short Name: libaddressinput
 URL: https://code.google.com/p/libaddressinput/
 Version: 0
-Date: 4 June 2014
-Revision: 265
+Date: 10 June 2014
+Revision: 273
 License: Apache 2.0
 License File: LICENSE
 Security Critical: no

third_party/libaddressinput/chromium/tools/update-strings.py

@@ -24,14 +24,6 @@ to the upstream library at https://libaddressinput.googlecode.com/.
 script_dir = os.path.dirname(os.path.realpath(__file__))
 from_file = os.path.abspath(os.path.join(
     script_dir, os.pardir, os.pardir, 'src', 'cpp', 'res', 'messages.grdp'))
-
-if not os.path.isfile(from_file):
-  # Android and iOS do not use src/third_party/libaddressinput/src/. Gclient
-  # cannot filter out hooks based on OS or (when using git) based on file name
-  # patterns.
-  print('No libaddressinput for this target OS.')
-  sys.exit()
-
 to_file = os.path.abspath(os.path.join(
     script_dir, os.pardir, os.pardir, os.pardir, os.pardir, 'chrome', 'app',
    'address_input_strings.grdp'))

third_party/libaddressinput/libaddressinput.gyp

@@ -41,6 +41,27 @@
         '../../build/grit_target.gypi',
       ],
     },
+    {
+      'target_name': 'libaddressinput_updated_strings',
+      'type': 'none',
+      'variables': {
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/grit/libaddressinput/',
+      },
+      'actions': [
+        {
+          'action_name': 'libaddressinput_updated_strings',
+          'variables': {
+            'grit_grd_file': '../../chrome/app/address_input_strings.grd',
+          },
+          'includes': [
+            '../../build/grit_action.gypi',
+          ],
+        },
+      ],
+      'includes': [
+        '../../build/grit_target.gypi',
+      ],
+    },
     # This target provides basic functionality which is cooked into the build.
     { 'target_name': 'libaddressinput_util',
       'type': 'static_library',
@@ -129,6 +150,7 @@
       ],
       'dependencies': [
         'libaddressinput_strings',
+        'libaddressinput_updated_strings',
         'libaddressinput_util',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',

tools/gritsettings/resource_ids

@@ -201,6 +201,9 @@
   "third_party/libaddressinput/chromium/cpp/res/libaddressinput_strings.grd": {
     "messages": [29050],
   },
+  "chrome/app/address_input_strings.grd": {
+    "messages": [29100],
+  },
   "components/components_strings.grd": {
     "messages": [30000],
   },